Merge pull request #6 from fluent-ci-templates/remove-graphql-schema

remove GraphQL, use jsdocs for exported functions
fluent-ci-templates · Dec 8, 2023 · fc6be8c · fc6be8c
2 parents f8e7a54 + a0bae1c
commit fc6be8c
Show file tree

Hide file tree

Showing 34 changed files with 13,188 additions and 881 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,14 +14,9 @@ jobs:
         with:
           deno-version: v1.37
       - name: Setup Fluent CI CLI
-        run: deno install -A -r https://cli.fluentci.io -n fluentci
-      - name: Setup Dagger
-        run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.1 sh
-          sudo mv bin/dagger /usr/local/bin
-          dagger version
+        uses: fluentci-io/setup-fluentci@v2
       - name: Run Dagger Pipelines
-        run: dagger run fluentci deno_pipeline fmt lint test
+        run: fluentci run deno_pipeline fmt lint test
       - name: Upload Coverage
         run: fluentci run codecov_pipeline
         env:

diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
@@ -17,7 +17,7 @@ jobs:
         run: deno install -A -r https://cli.fluentci.io -n fluentci
       - name: Setup Dagger
         run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.9.3 sh
           sudo mv bin/dagger /usr/local/bin
           dagger version
       - name: Run Dagger Pipelines

diff --git a/.github/workflows/zenith.yml b/.github/workflows/zenith.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup Dagger Zenith
         run: |
-          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.8.8 sh
+          curl -L https://dl.dagger.io/dagger/install.sh | DAGGER_VERSION=0.9.3 sh
           sudo mv bin/dagger /usr/local/bin
           dagger version
       - name: Run Dagger Pipelines

diff --git a/README.md b/README.md
@@ -35,6 +35,15 @@ Or simply:
 fluentci
 ```
 
+## Dagger Module
+
+Use as a [Dagger](https://dagger.io) module:
+
+```bash
+dagger mod install github.com/fluent-ci-templates/nodejs-pipeline@mod
+```
+
+
 ## Environment variables
 
 | Variable          | Description                                | Default    |
@@ -51,39 +60,45 @@ fluentci
 | test    | Run the tests        |
 | run     | Run a custom task    |
 
-```graphql
-build(
-  nodeVersion: String!, 
-  packageManager: String!, 
-  src: String!
-): String
+```typescript
+test(
+  src: Directory | string | undefined = ".",
+  packageManager?: string,
+  nodeVersion?: string
+): Promise<string>
 
-install(
-  nodeVersion: String!,
-  packageManager: String!, 
-  src: String!
-): String
+build(
+  src: Directory | string | undefined = ".",
+  packageManager?: string,
+  nodeVersion?: string
+): Promise<Directory | string>
 
 run(
-  nodeVersion: String!, 
-  packageManager: String!, 
-  src: String!, 
-  task: String!
-): String
+  src: Directory | string | undefined = ".",
+  task: string,
+  packageManager?: string,
+  nodeVersion?: string
+): Promise<string>
 
-test(
-  nodeVersion: String!, 
-  packageManager: String!, 
-  src: String!
-): String
+install(
+  src: Directory | string | undefined = ".",
+  packageManager?: string,
+  nodeVersion?: string
+): Promise<Container | string>
+
+dev(
+  src: Directory | string | undefined = ".",
+  packageManager?: string,
+  nodeVersion?: string
+): Promise<Container | string>
 ```
 
 ## Programmatic usage
 
 You can also use this pipeline programmatically:
 
 ```ts
-import { test, build } from "https://pkg.fluentci.io/nodejs_pipeline@v0.5.0/mod.ts";
+import { test, build } from "https://pkg.fluentci.io/nodejs_pipeline@v0.6.0/mod.ts";
 
 await test();
 await build();

diff --git a/ci.ts b/ci.ts
@@ -1,7 +1,7 @@
 import {
   test,
   build,
-} from "https://pkg.fluentci.io/nodejs_pipeline@v0.5.0/mod.ts";
+} from "https://pkg.fluentci.io/nodejs_pipeline@v0.6.0/mod.ts";
 
 await test();
 await build();
diff --git a/deno.json b/deno.json
@@ -3,9 +3,7 @@
   "tasks": {
     "esm:add": "deno run -A https://esm.sh/v128 add",
     "esm:update": "deno run -A https://esm.sh/v128 update",
-    "esm:remove": "deno run -A https://esm.sh/v128 remove",
-    "schema": "deno run -A src/dagger/schema.ts",
-    "clean": "rm -rf gen schema.graphql"
+    "esm:remove": "deno run -A https://esm.sh/v128 remove"
   },
   "fmt": {
     "exclude": [

diff --git a/deno.lock b/deno.lock
diff --git a/deps.ts b/deps.ts
@@ -1,26 +1,13 @@
 export { assertEquals } from "https://deno.land/std@0.191.0/testing/asserts.ts";
-import Client from "https://sdk.fluentci.io/v0.2.0/mod.ts";
-export default Client;
 
-export {
-  connect,
-  uploadContext,
-  CacheSharingMode,
-} from "https://sdk.fluentci.io/v0.2.0/mod.ts";
+export type { DirectoryID, SecretID } from "./sdk/client.gen.ts";
+export { Directory, Secret, File, Container } from "./sdk/client.gen.ts";
+export { connect, uploadContext } from "https://sdk.fluentci.io/v0.3.0/mod.ts";
 export { brightGreen } from "https://deno.land/std@0.191.0/fmt/colors.ts";
-export { withDevbox } from "https://nix.fluentci.io/v0.5.2/src/dagger/steps.ts";
+export { withDevbox } from "https://nix.fluentci.io/v0.5.3/src/dagger/steps.ts";
 export { stringifyTree } from "https://esm.sh/stringify-tree@1.1.1";
 import gql from "https://esm.sh/graphql-tag@2.12.6";
 export { gql };
-
-export {
-  arg,
-  queryType,
-  stringArg,
-  intArg,
-  nonNull,
-  makeSchema,
-} from "npm:nexus";
 export {
   dirname,
   join,
@@ -29,6 +16,30 @@ export {
 export { parse } from "https://deno.land/std@0.205.0/flags/mod.ts";
 export { snakeCase, camelCase } from "https://cdn.skypack.dev/lodash";
 
+export {
+  ClientError,
+  GraphQLClient,
+} from "https://esm.sh/v128/graphql-request@6.1.0";
+export {
+  DaggerSDKError,
+  UnknownDaggerError,
+  DockerImageRefValidationError,
+  EngineSessionConnectParamsParseError,
+  ExecError,
+  GraphQLRequestError,
+  InitEngineSessionBinaryError,
+  TooManyNestedObjectsError,
+  EngineSessionError,
+  EngineSessionConnectionTimeoutError,
+  NotAwaitedRequestError,
+  ERROR_CODES,
+} from "https://esm.sh/@dagger.io/dagger@0.9.3";
+
+export type {
+  CallbackFct,
+  ConnectOpts,
+} from "https://sdk.fluentci.io/v0.3.0/mod.ts";
+
 export * as FluentGitlabCI from "https://deno.land/x/fluent_gitlab_ci@v0.4.2/mod.ts";
 export * as FluentGithubActions from "https://deno.land/x/fluent_github_actions@v0.2.1/mod.ts";
 export * as FluentCircleCI from "https://deno.land/x/fluent_circleci@v0.2.5/mod.ts";

diff --git a/example/.fluentci/deno.json b/example/.fluentci/deno.json
@@ -3,9 +3,7 @@
   "tasks": {
     "esm:add": "deno run -A https://esm.sh/v128 add",
     "esm:update": "deno run -A https://esm.sh/v128 update",
-    "esm:remove": "deno run -A https://esm.sh/v128 remove",
-    "schema": "deno run -A src/dagger/schema.ts",
-    "clean": "rm -rf gen schema.graphql"
+    "esm:remove": "deno run -A https://esm.sh/v128 remove"
   },
   "fmt": {
     "exclude": [