add support for directory args

deps.ts

@@ -2,6 +2,8 @@ export { assertEquals } from "https://deno.land/std@0.191.0/testing/asserts.ts";
 import { Client } from "./sdk/client.gen.ts";
 export default Client;
 
+export type { DirectoryID } from "./sdk/client.gen.ts";
+export { Directory } 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.3/src/dagger/steps.ts";

example/.fluentci/deps.ts

@@ -2,6 +2,8 @@ export { assertEquals } from "https://deno.land/std@0.191.0/testing/asserts.ts";
 import { Client } from "./sdk/client.gen.ts";
 export default Client;
 
+export type { DirectoryID } from "./sdk/client.gen.ts";
+export { Directory } 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.3/src/dagger/steps.ts";

example/.fluentci/src/dagger/jobs.ts

@@ -1,5 +1,6 @@
-import Client from "../../deps.ts";
+import Client, { Directory } from "../../deps.ts";
 import { connect } from "../../sdk/connect.ts";
+import { getDirectory } from "./lib.ts";
 
 export enum Job {
   test = "test",
@@ -10,10 +11,13 @@ const NODE_VERSION = Deno.env.get("NODE_VERSION") || "18.16.1";
 
 export const exclude = [".git", ".devbox", "node_modules", ".fluentci"];
 
-export const test = async (src = ".", bunVersion?: string) => {
+export const test = async (
+  src: string | Directory | undefined = ".",
+  bunVersion?: string
+) => {
   const BUN_VERSION = Deno.env.get("BUN_VERSION") || bunVersion || "1.0.3";
   await connect(async (client: Client) => {
-    const context = client.host().directory(src);
+    const context = getDirectory(client, src);
     const ctr = client
       .pipeline(Job.test)
       .container()
@@ -43,10 +47,14 @@ export const test = async (src = ".", bunVersion?: string) => {
   return "All tests passed";
 };
 
-export const run = async (command: string, src = ".", bunVersion?: string) => {
+export const run = async (
+  command: string,
+  src: string | Directory | undefined = ".",
+  bunVersion?: string
+) => {
   const BUN_VERSION = Deno.env.get("BUN_VERSION") || bunVersion || "1.0.3";
   await connect(async (client: Client) => {
-    const context = client.host().directory(src);
+    const context = getDirectory(client, src);
     let ctr = client
       .pipeline(Job.run)
       .container()

example/.fluentci/src/dagger/lib.ts

@@ -0,0 +1,13 @@
+import Client, { Directory, DirectoryID } from "../../deps.ts";
+
+export const getDirectory = (
+  client: Client,
+  src: string | Directory | undefined = "."
+) => {
+  if (typeof src === "string" && src.startsWith("core.Directory")) {
+    return client.directory({
+      id: src as DirectoryID,
+    });
+  }
+  return src instanceof Directory ? src : client.host().directory(src);
+};

example/.fluentci/src/dagger/schema.ts

@@ -18,7 +18,7 @@ const Query = queryType({
         bunVersion: stringArg(),
       },
       resolve: async (_root, args, _ctx) =>
-        await test(args.src || undefined, args.bunVersion),
+        await test(args.src || undefined, args.bunVersion || undefined),
     });
     t.string("run", {
       args: {
@@ -27,15 +27,26 @@ const Query = queryType({
         bunVersion: stringArg(),
       },
       resolve: async (_root, args, _ctx) =>
-        await run(args.command, args.src, args.bunVersion),
+        await run(
+          args.command,
+          args.src || undefined,
+          args.bunVersion || undefined
+        ),
     });
   },
 });
 
-export const schema = makeSchema({
+const schema = makeSchema({
   types: [Query],
   outputs: {
     schema: resolve(join(dirname(".."), dirname(".."), "schema.graphql")),
     typegen: resolve(join(dirname(".."), dirname(".."), "gen", "nexus.ts")),
   },
 });
+
+schema.description = JSON.stringify({
+  "test.src": "directory",
+  "run.src": "directory",
+});
+
+export { schema };

src/dagger/jobs.ts

@@ -1,5 +1,6 @@
-import Client from "../../deps.ts";
+import Client, { Directory } from "../../deps.ts";
 import { connect } from "../../sdk/connect.ts";
+import { getDirectory } from "./lib.ts";
 
 export enum Job {
   test = "test",
@@ -10,10 +11,13 @@ const NODE_VERSION = Deno.env.get("NODE_VERSION") || "18.16.1";
 
 export const exclude = [".git", ".devbox", "node_modules", ".fluentci"];
 
-export const test = async (src = ".", bunVersion?: string) => {
+export const test = async (
+  src: string | Directory | undefined = ".",
+  bunVersion?: string
+) => {
   const BUN_VERSION = Deno.env.get("BUN_VERSION") || bunVersion || "1.0.3";
   await connect(async (client: Client) => {
-    const context = client.host().directory(src);
+    const context = getDirectory(client, src);
     const ctr = client
       .pipeline(Job.test)
       .container()
@@ -43,10 +47,14 @@ export const test = async (src = ".", bunVersion?: string) => {
   return "All tests passed";
 };
 
-export const run = async (command: string, src = ".", bunVersion?: string) => {
+export const run = async (
+  command: string,
+  src: string | Directory | undefined = ".",
+  bunVersion?: string
+) => {
   const BUN_VERSION = Deno.env.get("BUN_VERSION") || bunVersion || "1.0.3";
   await connect(async (client: Client) => {
-    const context = client.host().directory(src);
+    const context = getDirectory(client, src);
     let ctr = client
       .pipeline(Job.run)
       .container()

src/dagger/lib.ts

@@ -0,0 +1,13 @@
+import Client, { Directory, DirectoryID } from "../../deps.ts";
+
+export const getDirectory = (
+  client: Client,
+  src: string | Directory | undefined = "."
+) => {
+  if (typeof src === "string" && src.startsWith("core.Directory")) {
+    return client.directory({
+      id: src as DirectoryID,
+    });
+  }
+  return src instanceof Directory ? src : client.host().directory(src);
+};

src/dagger/schema.ts

@@ -18,7 +18,7 @@ const Query = queryType({
         bunVersion: stringArg(),
       },
       resolve: async (_root, args, _ctx) =>
-        await test(args.src || undefined, args.bunVersion),
+        await test(args.src || undefined, args.bunVersion || undefined),
     });
     t.string("run", {
       args: {
@@ -27,15 +27,26 @@ const Query = queryType({
         bunVersion: stringArg(),
       },
       resolve: async (_root, args, _ctx) =>
-        await run(args.command, args.src, args.bunVersion),
+        await run(
+          args.command,
+          args.src || undefined,
+          args.bunVersion || undefined
+        ),
     });
   },
 });
 
-export const schema = makeSchema({
+const schema = makeSchema({
   types: [Query],
   outputs: {
     schema: resolve(join(dirname(".."), dirname(".."), "schema.graphql")),
     typegen: resolve(join(dirname(".."), dirname(".."), "gen", "nexus.ts")),
   },
 });
+
+schema.description = JSON.stringify({
+  "test.src": "directory",
+  "run.src": "directory",
+});
+
+export { schema };