@dagger.io/dagger 0.18.12 → 0.18.14

package/dist/src/common/graphql/client.js

@@ -1,6 +1,7 @@
 import * as opentelemetry from "@opentelemetry/api";
 import { GraphQLClient } from "graphql-request";
-import fetch from "node-fetch";
+import nodeFetch from "node-fetch";
+import { isDeno } from "../utils.js";
 const createFetchWithTimeout = (timeout) => async (input, init) => {
     if (init?.signal) {
         throw new Error("Internal error: could not create fetch client with timeout");
@@ -10,7 +11,16 @@ const createFetchWithTimeout = (timeout) => async (input, init) => {
         controller.abort();
     }, timeout);
     try {
-        return (await fetch(input, {
+        // Edge case for Deno that doesn't work as expected with node-fetch and would
+        // rather rely on its native fetch implementation
+        // See: https://github.com/dagger/dagger/issues/10546
+        if (isDeno()) {
+            return await fetch(input, {
+                ...init,
+                signal: controller.signal,
+            });
+        }
+        return (await nodeFetch(input, {
             ...init,
             signal: controller.signal,
         }));

package/dist/src/common/graphql/compute_query.d.ts

@@ -6,6 +6,7 @@ export type QueryTree = {
 export type Metadata = {
     [key: string]: {
         is_enum?: boolean;
+        value_to_name?: (value: any) => string;
     };
 };
 /**

package/dist/src/common/graphql/compute_query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compute_query.d.ts","sourceRoot":"","sources":["../../../../src/common/graphql/compute_query.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAUjE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,CAAC,EAAE,OAAO,CAAA;KAClB,CAAA;CACF,CAAA;AAkHD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,MAAM,CAYjD;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAClC,CAAC,EAAE,SAAS,EAAE,EACd,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,CAAC,CAAC,CAMZ;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,CAuBhD;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,CAAC,CAAC,CA6CZ"}
+{"version":3,"file":"compute_query.d.ts","sourceRoot":"","sources":["../../../../src/common/graphql/compute_query.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAUjE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,CAAA;KACvC,CAAA;CACF,CAAA;AAqHD;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,MAAM,CAYjD;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAClC,CAAC,EAAE,SAAS,EAAE,EACd,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,CAAC,CAAC,CAMZ;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,CAuBhD;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,CAAC,CAAC,CA6CZ"}

package/dist/src/common/graphql/compute_query.js

@@ -10,7 +10,7 @@ function buildArgs(args) {
     const formatValue = (key, value) => {
         // Special treatment for enumeration, they must be inserted without quotes
         if (metadata[key]?.is_enum) {
-            return JSON.stringify(value).replace(/['"]+/g, "");
+            return JSON.stringify(metadata[key].value_to_name?.(value)).replace(/['"]+/g, "");
         }
         return JSON.stringify(value).replace(/\{"[a-zA-Z]+":|,"[a-zA-Z]+":/gi, (str) => {
             return str.replace(/"/g, "");

package/dist/src/common/utils.d.ts

@@ -65,4 +65,5 @@ export declare const log: (stack?: string) => {
     debug(...args: any[]): void;
     success(...args: any[]): void;
 };
+export declare function isDeno(): boolean;
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,GAAI,QAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CACe,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/common/utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,GAAI,QAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CACe,CAAA;AAEjD,wBAAgB,MAAM,IAAI,OAAO,CAGhC"}

package/dist/src/common/utils.js

@@ -1,2 +1,6 @@
 import logger from "node-color-log";
 export const log = (stack) => logger.bgColor("red").color("black").log(stack);
+export function isDeno() {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return typeof globalThis.Deno !== "undefined";
+}

package/dist/src/module/entrypoint/entrypoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/entrypoint.ts"],"names":[],"mappings":"AAWA,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,iBAyD/C"}
+{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/entrypoint.ts"],"names":[],"mappings":"AAYA,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,iBA+D/C"}

package/dist/src/module/entrypoint/entrypoint.js

@@ -2,11 +2,12 @@ import { dag } from "../../api/client.gen.js";
 import { ExecError } from "../../common/errors/ExecError.js";
 import { GraphQLRequestError } from "../../common/errors/GraphQLRequestError.js";
 import { connection } from "../../connect.js";
+import * as telemetry from "../../telemetry/telemetry.js";
 import { Executor } from "../executor.js";
 import { scan } from "../introspector/index.js";
 import { invoke } from "./invoke.js";
 import { load } from "./load.js";
-import { register } from "./register.js";
+import { Register } from "./register.js";
 export async function entrypoint(files) {
     // Start a Dagger session to get the call context
     await connection(async () => {
@@ -18,7 +19,7 @@ export async function entrypoint(files) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let result;
         if (parentName === "") {
-            result = await register(files, scanResult);
+            result = await new Register(scanResult).run();
         }
         else {
             // Invocation
@@ -42,6 +43,10 @@ export async function entrypoint(files) {
             }
             catch (e) {
                 await fnCall.returnError(formatError(e));
+                // Closing telemetry here since the process is shutdown after
+                // so any parent's finally will not be executed.
+                // That way, we guarantee that the spans are flushed.
+                await telemetry.close();
                 process.exit(1);
             }
         }

package/dist/src/module/entrypoint/load.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/load.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAO,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EACL,iBAAiB,IAAI,WAAW,EAChC,cAAc,IAAI,MAAM,EAExB,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAEjB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAE7D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAEd;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,SAAS,CAMpC;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,WAAW,EAC5B,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,OAAO,CAAC,GAAG,CAAC,CAiDd;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,gBAAgB,GAAG,cAAc,CAwBnC;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,gBAAgB,GAAG,cAAc,GACxC,OAAO,CAAC,GAAG,CAAC,CAiFd"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/load.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAO,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EACL,iBAAiB,IAAI,WAAW,EAChC,cAAc,IAAI,MAAM,EAExB,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAGjB,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAE7D;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAEd;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,SAAS,CAMpC;AAED;;;;;GAKG;AACH,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,WAAW,EAC5B,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,OAAO,CAAC,GAAG,CAAC,CAqDd;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,gBAAgB,GAAG,cAAc,CA4BnC;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,gBAAgB,GAAG,cAAc,GACxC,OAAO,CAAC,GAAG,CAAC,CA0Gd"}

package/dist/src/module/entrypoint/load.js

@@ -1,5 +1,5 @@
 import { dag, TypeDefKind } from "../../api/client.gen.js";
-import { DaggerEnum, DaggerObject, DaggerTypeObject, } from "../introspector/dagger_module/index.js";
+import { DaggerEnum, DaggerObject, DaggerTypeObject, DaggerEnumClass, } from "../introspector/dagger_module/index.js";
 /**
  * Import all given typescript files so that trigger their decorators
  * and register their class and functions inside the Registry.
@@ -111,6 +111,10 @@ export async function loadValue(executor, value, type) {
             const interfaceType = type.name;
             return executor.buildInterface(interfaceType, value);
         }
+        case TypeDefKind.EnumKind: {
+            const enumType = type.name;
+            return executor.buildEnum(enumType, value);
+        }
         // Cannot use `,` to specify multiple matching case so instead we use fallthrough.
         case TypeDefKind.StringKind:
         case TypeDefKind.IntegerKind:
@@ -118,7 +122,6 @@ export async function loadValue(executor, value, type) {
         case TypeDefKind.FloatKind:
         case TypeDefKind.VoidKind:
         case TypeDefKind.ScalarKind:
-        case TypeDefKind.EnumKind:
             return value;
         default:
             throw new Error(`unsupported type ${type.kind}`);
@@ -146,6 +149,9 @@ export function loadObjectReturnType(module, object, method) {
             while (listType.kind === TypeDefKind.ListKind) {
                 listType = listType.typeDef;
             }
+            if (listType.kind === TypeDefKind.EnumKind) {
+                return module.enums[listType.name];
+            }
             return module.objects[listType.name];
         }
         case TypeDefKind.ObjectKind:
@@ -196,6 +202,16 @@ export async function loadResult(result, module, object) {
                     referencedObject =
                         module.objects[_property.name];
                 }
+                // If the original type is a enum, we use it as the referenced object.
+                if (_property.kind === TypeDefKind.EnumKind) {
+                    referencedObject =
+                        module.enums[_property.name];
+                }
+            }
+            // Handle enums
+            if (property.type.kind === TypeDefKind.EnumKind) {
+                referencedObject =
+                    module.enums[property.type.name];
             }
             // If there's no referenced object, we use the current object.
             if (!referencedObject) {
@@ -205,8 +221,16 @@ export async function loadResult(result, module, object) {
         }
         return state;
     }
-    if (typeof result === "object" && object instanceof DaggerEnum) {
-        return result;
+    // If it's an enum, we need to resolve the enum member name instead of the value.
+    // A enum value A = "a" will be returned as "a" by the function so we need to
+    // transform it back to "A" to be sent as result to the engine.
+    if (object instanceof DaggerEnum || object instanceof DaggerEnumClass) {
+        const enumMember = Object.entries(object.values).find(([, member]) => member.value === result);
+        // If the enum member is not found, we return the result as is and let the engine handle it.
+        if (!enumMember) {
+            return result;
+        }
+        return enumMember[0];
     }
     // Handle primitive types
     return result;

package/dist/src/module/entrypoint/register.d.ts

@@ -1,7 +1,33 @@
-import { ModuleID } from "../../api/client.gen.js";
-import { DaggerModule } from "../introspector/dagger_module/index.js";
-/**
- * Register the module files and returns its ID
- */
-export declare function register(files: string[], module: DaggerModule): Promise<ModuleID>;
+import { Function_, ModuleID, TypeDef } from "../../api/client.gen.js";
+import { DaggerArguments as Arguments, DaggerConstructor as Constructor, DaggerFunction as Method, DaggerModule, DaggerArgument } from "../introspector/dagger_module/index.js";
+import { DaggerInterfaceFunction } from "../introspector/dagger_module/interfaceFunction.js";
+export declare class Register {
+    private readonly module;
+    constructor(module: DaggerModule);
+    /**
+     * Register the module in the engine and returns its ID
+     */
+    run(): Promise<ModuleID>;
+    /**
+     * Bind a constructor to the given object.
+     */
+    addConstructor(constructor: Constructor, owner: TypeDef): Function_;
+    /**
+     * Create a function in the Dagger API.
+     */
+    addFunction(fct: Method | DaggerInterfaceFunction): Function_;
+    /**
+     * Register all arguments in the function.
+     */
+    addArg(args: Arguments): (fct: Function_) => Function_;
+    /**
+     * Extract the default value from the argument.
+     * - If the argument isn't a primitive type, we can't resolve it so we make it optional and let the runtime
+     *   resolve it on execution.
+     * - If the argument is a primitive type but not an enum, we resolve it directly.
+     * - If the argument is an enum but not registered in the module, it must be a core enum so we keep the value as is.
+     * - If the argument is an enum registered in the module, we resolve the value to the member name.
+     */
+    getDefaultValueFromArg(arg: DaggerArgument): unknown | undefined;
+}
 //# sourceMappingURL=register.d.ts.map

package/dist/src/module/entrypoint/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,QAAQ,EAIT,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAIL,YAAY,EAEb,MAAM,wCAAwC,CAAA;AAW/C;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,QAAQ,CAAC,CA8EnB"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,QAAQ,EACR,OAAO,EAGR,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,eAAe,IAAI,SAAS,EAC5B,iBAAiB,IAAI,WAAW,EAChC,cAAc,IAAI,MAAM,EACxB,YAAY,EAEZ,cAAc,EACf,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAA;AAU5F,qBAAa,QAAQ;IACP,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAEjD;;OAEG;IACG,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC;IAgF9B;;OAEG;IACH,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS;IAInE;;OAEG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,GAAG,SAAS;IAQ7D;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,KAAK,SAAS;IAoDtD;;;;;;;OAOG;IACH,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS;CA4BjE"}

package/dist/src/module/entrypoint/register.js

@@ -1,125 +1,159 @@
 import { dag, TypeDefKind, } from "../../api/client.gen.js";
-/**
- * Register the module files and returns its ID
- */
-export async function register(files, module) {
-    // Get a new module that we will fill in with all the types
-    let mod = dag.module_();
-    // Add module description if any.
-    if (module.description) {
-        mod = mod.withDescription(module.description);
+export class Register {
+    module;
+    constructor(module) {
+        this.module = module;
     }
-    // For each class scanned, register its type, method and properties in the module.
-    Object.values(module.objects).forEach((object) => {
-        // Register the class Typedef object in Dagger
-        let typeDef = dag.typeDef().withObject(object.name, {
-            description: object.description,
-            sourceMap: addSourceMap(object),
-        });
-        // Register all functions (methods) to this object
-        Object.values(object.methods).forEach((method) => {
-            typeDef = typeDef.withFunction(addFunction(method));
-        });
-        // Register all fields that belong to this object
-        Object.values(object.properties).forEach((field) => {
-            if (field.isExposed) {
-                typeDef = typeDef.withField(field.alias ?? field.name, addTypeDef(field.type), {
-                    description: field.description,
-                    sourceMap: addSourceMap(field),
-                });
-            }
-        });
-        if (object._constructor) {
-            typeDef = typeDef.withConstructor(addConstructor(object._constructor, typeDef));
+    /**
+     * Register the module in the engine and returns its ID
+     */
+    async run() {
+        // Get a new module that we will fill in with all the types
+        let mod = dag.module_();
+        // Add module description if any.
+        if (this.module.description) {
+            mod = mod.withDescription(this.module.description);
         }
-        // Add it to the module object
-        mod = mod.withObject(typeDef);
-    });
-    // Register all enums defined by this modules
-    Object.values(module.enums).forEach((enum_) => {
-        let typeDef = dag.typeDef().withEnum(enum_.name, {
-            description: enum_.description,
-            sourceMap: addSourceMap(enum_),
-        });
-        Object.values(enum_.values).forEach((value) => {
-            typeDef = typeDef.withEnumValue(value.value, {
-                description: value.description,
-                sourceMap: addSourceMap(value),
+        // For each class scanned, register its type, method and properties in the module.
+        Object.values(this.module.objects).forEach((object) => {
+            // Register the class Typedef object in Dagger
+            let typeDef = dag.typeDef().withObject(object.name, {
+                description: object.description,
+                sourceMap: addSourceMap(object),
+            });
+            // Register all functions (methods) to this object
+            Object.values(object.methods).forEach((method) => {
+                typeDef = typeDef.withFunction(this.addFunction(method));
             });
+            // Register all fields that belong to this object
+            Object.values(object.properties).forEach((field) => {
+                if (field.isExposed) {
+                    typeDef = typeDef.withField(field.alias ?? field.name, addTypeDef(field.type), {
+                        description: field.description,
+                        sourceMap: addSourceMap(field),
+                    });
+                }
+            });
+            if (object._constructor) {
+                typeDef = typeDef.withConstructor(this.addConstructor(object._constructor, typeDef));
+            }
+            // Add it to the module object
+            mod = mod.withObject(typeDef);
         });
-        mod = mod.withEnum(typeDef);
-    });
-    // Register all interfaces defined by this module
-    Object.values(module.interfaces).forEach((interface_) => {
-        let typeDef = dag.typeDef().withInterface(interface_.name, {
-            description: interface_.description,
+        // Register all enums defined by this modules
+        Object.values(this.module.enums).forEach((enum_) => {
+            let typeDef = dag.typeDef().withEnum(enum_.name, {
+                description: enum_.description,
+                sourceMap: addSourceMap(enum_),
+            });
+            Object.values(enum_.values).forEach((value) => {
+                typeDef = typeDef.withEnumMember(value.name, {
+                    value: value.value,
+                    description: value.description,
+                    sourceMap: addSourceMap(value),
+                });
+            });
+            mod = mod.withEnum(typeDef);
         });
-        Object.values(interface_.functions).forEach((function_) => {
-            typeDef = typeDef.withFunction(addFunction(function_));
+        // Register all interfaces defined by this module
+        Object.values(this.module.interfaces).forEach((interface_) => {
+            let typeDef = dag.typeDef().withInterface(interface_.name, {
+                description: interface_.description,
+            });
+            Object.values(interface_.functions).forEach((function_) => {
+                typeDef = typeDef.withFunction(this.addFunction(function_));
+            });
+            mod = mod.withInterface(typeDef);
         });
-        mod = mod.withInterface(typeDef);
-    });
-    // Call ID to actually execute the registration
-    return await mod.id();
-}
-/**
- * Bind a constructor to the given object.
- */
-function addConstructor(constructor, owner) {
-    return dag.function_("", owner).with(addArg(constructor.arguments));
-}
-/**
- * Create a function in the Dagger API.
- */
-function addFunction(fct) {
-    return dag
-        .function_(fct.alias ?? fct.name, addTypeDef(fct.returnType))
-        .withDescription(fct.description)
-        .withSourceMap(addSourceMap(fct))
-        .with(addArg(fct.arguments));
-}
-/**
- * Register all arguments in the function.
- */
-function addArg(args) {
-    return function (fct) {
-        Object.values(args).forEach((arg) => {
-            const opts = {
-                description: arg.description,
-                sourceMap: addSourceMap(arg),
-            };
-            let typeDef = addTypeDef(arg.type);
-            if (arg.isOptional) {
-                typeDef = typeDef.withOptional(true);
-            }
-            // Check if both values are used, return an error if so.
-            if (arg.defaultValue && arg.defaultPath) {
-                throw new Error("cannot set both default value and default path from context");
-            }
-            // We do not set the default value if it's not a primitive type, we let TypeScript
-            // resolve the default value during the runtime instead.
-            // If it has a default value but is not primitive, we set the value as optional
-            // to workaround the fact that the API isn't aware of the default value and will
-            // expect it to be set as required input.
-            if (arg.defaultValue !== undefined) {
-                if (isPrimitiveType(arg.type)) {
-                    opts.defaultValue = JSON.stringify(arg.defaultValue);
-                }
-                else {
+        return await mod.id();
+    }
+    /**
+     * Bind a constructor to the given object.
+     */
+    addConstructor(constructor, owner) {
+        return dag.function_("", owner).with(this.addArg(constructor.arguments));
+    }
+    /**
+     * Create a function in the Dagger API.
+     */
+    addFunction(fct) {
+        return dag
+            .function_(fct.alias ?? fct.name, addTypeDef(fct.returnType))
+            .withDescription(fct.description)
+            .withSourceMap(addSourceMap(fct))
+            .with(this.addArg(fct.arguments));
+    }
+    /**
+     * Register all arguments in the function.
+     */
+    addArg(args) {
+        return (fct) => {
+            Object.values(args).forEach((arg) => {
+                const opts = {
+                    description: arg.description,
+                    sourceMap: addSourceMap(arg),
+                };
+                let typeDef = addTypeDef(arg.type);
+                if (arg.isOptional) {
                     typeDef = typeDef.withOptional(true);
                 }
-            }
-            // If the argument is a contextual argument, it becomes optional.
-            if (arg.defaultPath) {
-                opts.defaultPath = arg.defaultPath;
-            }
-            if (arg.ignore) {
-                opts.ignore = arg.ignore;
-            }
-            fct = fct.withArg(arg.name, typeDef, opts);
-        });
-        return fct;
-    };
+                // Check if both values are used, return an error if so.
+                if (arg.defaultValue && arg.defaultPath) {
+                    throw new Error("cannot set both default value and default path from context");
+                }
+                // We do not set the default value if it's not a primitive type, we let TypeScript
+                // resolve the default value during the runtime instead.
+                // If it has a default value but is not primitive, we set the value as optional
+                // to workaround the fact that the API isn't aware of the default value and will
+                // expect it to be set as required input.
+                if (arg.defaultValue !== undefined) {
+                    const defaultValue = this.getDefaultValueFromArg(arg);
+                    if (defaultValue === undefined) {
+                        typeDef = typeDef.withOptional(true);
+                    }
+                    else {
+                        opts.defaultValue = JSON.stringify(defaultValue);
+                    }
+                }
+                // If the argument is a contextual argument, it becomes optional.
+                if (arg.defaultPath) {
+                    opts.defaultPath = arg.defaultPath;
+                }
+                if (arg.ignore) {
+                    opts.ignore = arg.ignore;
+                }
+                fct = fct.withArg(arg.name, typeDef, opts);
+            });
+            return fct;
+        };
+    }
+    /**
+     * Extract the default value from the argument.
+     * - If the argument isn't a primitive type, we can't resolve it so we make it optional and let the runtime
+     *   resolve it on execution.
+     * - If the argument is a primitive type but not an enum, we resolve it directly.
+     * - If the argument is an enum but not registered in the module, it must be a core enum so we keep the value as is.
+     * - If the argument is an enum registered in the module, we resolve the value to the member name.
+     */
+    getDefaultValueFromArg(arg) {
+        if (!isPrimitiveType(arg.type)) {
+            return undefined;
+        }
+        if (arg.type.kind !== TypeDefKind.EnumKind) {
+            return arg.defaultValue;
+        }
+        const enumObj = this.module.enums[arg.type.name];
+        if (!enumObj) {
+            // If the enum isn't found in the module, it may be a core enum so we keep the value
+            return arg.defaultValue;
+        }
+        // If it's a known enum, we need to resolve set the name of the member as default value instead of the actual value
+        const enumMember = Object.entries(enumObj.values).find(([, member]) => member.value === arg.defaultValue);
+        if (!enumMember) {
+            throw new Error(`could not resolve default value '${arg.defaultValue}' for enum ${arg.type.name}`);
+        }
+        return enumMember[0];
+    }
 }
 /**
  * Wrapper around TypeDef to return the right Dagger TypesDef with its options.

package/dist/src/module/executor.d.ts

@@ -15,6 +15,14 @@ export declare class Executor {
      * interface serves as module call binding to reach the true implementation.
      */
     buildInterface(iface: string, id: string): any;
+    /**
+     * Transfer a Dagger enum member name into its implemented value.
+     * An enum value A = "a" will be received as "A" by the entrypoint
+     * but should be transformed into "a" to be sent to the function.
+     * If the enum isn't found in the module, it may be a core enum so we keep the value
+     * as is.
+     */
+    buildEnum(enumName: string, value: string): any;
     getResult(object: string, method: string, state: State, inputs: Args): Promise<any>;
 }
 //# sourceMappingURL=executor.d.ts.map

package/dist/src/module/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/module/executor.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAA;AAMhC,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAIpE,MAAM,MAAM,KAAK,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAA;AAE/C,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAE1C,qBAAa,QAAQ;aAED,OAAO,EAAE,MAAM,EAAE;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADb,OAAO,EAAE,MAAM,EAAE,EAChB,YAAY,EAAE,YAAY;IAG7C,OAAO,CAAC,iBAAiB;IAUzB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG;IAqB7C;;;OAGG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,GAAG;IAiBxC,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,IAAI,GACX,OAAO,CAAC,GAAG,CAAC;CAchB"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../src/module/executor.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAA;AAMhC,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AAIpE,MAAM,MAAM,KAAK,GAAG;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAAA;AAE/C,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAE1C,qBAAa,QAAQ;aAED,OAAO,EAAE,MAAM,EAAE;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBADb,OAAO,EAAE,MAAM,EAAE,EAChB,YAAY,EAAE,YAAY;IAG7C,OAAO,CAAC,iBAAiB;IAUzB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG;IAqB7C;;;OAGG;IACH,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,GAAG;IAiB9C;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG;IAazC,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,IAAI,GACX,OAAO,CAAC,GAAG,CAAC;CAchB"}

package/dist/src/module/executor.js

@@ -46,6 +46,23 @@ export class Executor {
         const ifaceImpl = new InterfaceWrapper(this, this.daggerModule, `${this.daggerModule.name}${iface}`, id, interfaceObject.functions);
         return ifaceImpl;
     }
+    /**
+     * Transfer a Dagger enum member name into its implemented value.
+     * An enum value A = "a" will be received as "A" by the entrypoint
+     * but should be transformed into "a" to be sent to the function.
+     * If the enum isn't found in the module, it may be a core enum so we keep the value
+     * as is.
+     */
+    buildEnum(enumName, value) {
+        const enumObject = this.daggerModule.enums[enumName];
+        if (!enumObject) {
+            return value;
+        }
+        if (!enumObject.values[value]) {
+            throw new Error(`Enum ${enumName} does not have member ${value}`);
+        }
+        return enumObject.values[value].value;
+    }
     async getResult(object, method, state, inputs) {
         const obj = this.getExportedObject(object);
         if (method === "") {

package/dist/src/module/introspector/dagger_module/enum.d.ts

@@ -18,6 +18,7 @@ export declare class DaggerEnumValue extends Locatable implements DaggerEnumBase
     constructor(node: ts.EnumMember, ast: AST);
     toJSON(): {
         name: string;
+        value: string;
         description: string;
     };
 }

package/dist/src/module/introspector/dagger_module/enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,WAAW,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAA;AACxD,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,CAAA;AAElE,qBAAa,eAAgB,SAAQ,SAAU,YAAW,mBAAmB;IAQzE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IAE1B,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,UAAU,EACnB,GAAG,EAAE,GAAG;IAiB3B,MAAM;;;;CAMP;AAED,qBAAa,UAAW,SAAQ,SAAU,YAAW,cAAc;IAQ/D,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,gBAAgB,CAAK;IAEpC,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,eAAe,EACxB,GAAG,EAAE,GAAG;IAgB3B,MAAM;;;;;CAOP"}
+{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/enum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,WAAW,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAAA;CAAE,CAAA;AACxD,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,CAAA;AAElE,qBAAa,eAAgB,SAAQ,SAAU,YAAW,mBAAmB;IAQzE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IAE1B,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,UAAU,EACnB,GAAG,EAAE,GAAG;IAiB3B,MAAM;;;;;CAOP;AAED,qBAAa,UAAW,SAAQ,SAAU,YAAW,cAAc;IAQ/D,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,gBAAgB,CAAK;IAEpC,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,eAAe,EACxB,GAAG,EAAE,GAAG;IAgB3B,MAAM;;;;;CAOP"}

package/dist/src/module/introspector/dagger_module/enum.js

@@ -23,7 +23,8 @@ export class DaggerEnumValue extends Locatable {
     }
     toJSON() {
         return {
-            name: this.value,
+            name: this.name,
+            value: this.value,
             description: this.description,
         };
     }

package/dist/src/module/introspector/dagger_module/enumClass.d.ts

@@ -18,6 +18,7 @@ export declare class DaggerEnumClassValue extends Locatable implements DaggerEnu
     constructor(node: ts.PropertyDeclaration, ast: AST);
     toJSON(): {
         name: string;
+        value: string;
         description: string;
     };
 }

package/dist/src/module/introspector/dagger_module/enumClass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enumClass.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/enumClass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,CAAA;AAEnE,MAAM,MAAM,qBAAqB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAA;CAAE,CAAA;AAE5E,qBAAa,oBACX,SAAQ,SACR,YAAW,mBAAmB;IAS5B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IAE1B,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,mBAAmB,EAC5B,GAAG,EAAE,GAAG;IAe3B,MAAM;;;;CAMP;AAED,qBAAa,eAAgB,SAAQ,SAAU,YAAW,cAAc;IAQpE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,qBAAqB,CAAK;IAEzC,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,gBAAgB,EACzB,GAAG,EAAE,GAAG;IAuB3B,MAAM;;;;;CAOP"}
+{"version":3,"file":"enumClass.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/enumClass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE,CAAA;AAEnE,MAAM,MAAM,qBAAqB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAA;CAAE,CAAA;AAE5E,qBAAa,oBACX,SAAQ,SACR,YAAW,mBAAmB;IAS5B,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IAE1B,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,mBAAmB,EAC5B,GAAG,EAAE,GAAG;IAe3B,MAAM;;;;;CAOP;AAED,qBAAa,eAAgB,SAAQ,SAAU,YAAW,cAAc;IAQpE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IARf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,qBAAqB,CAAK;IAEzC,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,gBAAgB,EACzB,GAAG,EAAE,GAAG;IAuB3B,MAAM;;;;;CAOP"}

package/dist/src/module/introspector/dagger_module/enumClass.js

@@ -24,7 +24,8 @@ export class DaggerEnumClassValue extends Locatable {
     }
     toJSON() {
         return {
-            name: this.value,
+            name: this.name,
+            value: this.value,
             description: this.description,
         };
     }

package/dist/src/provisioning/default.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_VERSION = "0.18.12";
+export declare const CLI_VERSION = "0.18.14";
 //# sourceMappingURL=default.d.ts.map

package/dist/src/provisioning/default.js

@@ -1,2 +1,2 @@
 // Code generated by dagger. DO NOT EDIT.
-export const CLI_VERSION = "0.18.12";
+export const CLI_VERSION = "0.18.14";