@dagger.io/dagger 0.10.1 → 0.10.2

package/dist/api/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../api/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AASjE,OAAO,EAAY,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAkHrD;;;;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,CAqBhD;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,CAAC,CAAC,CA2CZ"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../api/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AASjE,OAAO,EAAY,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAkHrD;;;;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/api/utils.js

@@ -121,7 +121,9 @@ export function queryFlatten(response) {
     if (keys.length != 1) {
         // Dagger is currently expecting to only return one value
         // If the response is nested in a way were more than one object is nested inside throw an error
-        throw new TooManyNestedObjectsError("Too many nested objects inside graphql response", { response: response });
+        throw new TooManyNestedObjectsError("Too many nested objects inside graphql response", {
+            response: response,
+        });
     }
     const nestedKey = keys[0];
     return queryFlatten(response[nestedKey]);
@@ -161,7 +163,9 @@ export async function compute(query, client) {
             throw new NotAwaitedRequestError("Encountered an error while requesting data via graphql through a synchronous call. Make sure the function called is awaited.", { cause: e });
         }
         // Just throw the unknown error
-        throw new UnknownDaggerError("Encountered an unknown error while requesting data via graphql", { cause: e });
+        throw new UnknownDaggerError("Encountered an unknown error while requesting data via graphql", {
+            cause: e,
+        });
     }
     return queryFlatten(computeQuery);
 }

package/dist/common/errors/ExecError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExecError.d.ts","sourceRoot":"","sources":["../../../common/errors/ExecError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAG3E,UAAU,gBAAiB,SAAQ,qBAAqB;IACtD,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,qBAAa,SAAU,SAAQ,cAAc;IAC3C,IAAI,cAAwB;IAC5B,IAAI,SAAwB;IAE5B;;OAEG;IACH,GAAG,EAAE,MAAM,EAAE,CAAA;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAEhB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;gBACS,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB;IAQtD,QAAQ,IAAI,MAAM;CAKnB"}
+{"version":3,"file":"ExecError.d.ts","sourceRoot":"","sources":["../../../common/errors/ExecError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAG3E,UAAU,gBAAiB,SAAQ,qBAAqB;IACtD,GAAG,EAAE,MAAM,EAAE,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,qBAAa,SAAU,SAAQ,cAAc;IAC3C,IAAI,cAAwB;IAC5B,IAAI,SAAwB;IAE5B;;OAEG;IACH,GAAG,EAAE,MAAM,EAAE,CAAA;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;IAEhB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;gBACS,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB;IAQtD,QAAQ,IAAI,MAAM;CAGnB"}

package/dist/entrypoint/context.d.ts

@@ -0,0 +1,8 @@
+import { Args } from "../introspector/registry/registry.js";
+export type InvokeCtx = {
+    parentName: string;
+    fnName: string;
+    parentArgs: Args;
+    fnArgs: Args;
+};
+//# sourceMappingURL=context.d.ts.map

package/dist/entrypoint/context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../entrypoint/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sCAAsC,CAAA;AAE3D,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,IAAI,CAAA;IAChB,MAAM,EAAE,IAAI,CAAA;CACb,CAAA"}

package/dist/entrypoint/invoke.d.ts

@@ -1,11 +1,5 @@
-import { Args } from "../introspector/registry/registry.js";
-import { ScanResult } from "../introspector/scanner/scan.js";
-export type InvokeCtx = {
-    parentName: string;
-    fnName: string;
-    parentArgs: Args;
-    fnArgs: Args;
-};
+import { DaggerModule } from "../introspector/scanner/abtractions/module.js";
+import { InvokeCtx } from "./context.js";
 /**
  * A wrapper around the registry to invoke a function.
  *
@@ -15,5 +9,5 @@ export type InvokeCtx = {
  * @param parentArgs The arguments of the parent object.
  * @param fnArgs The arguments of the function to call.
  */
-export declare function invoke(scanResult: ScanResult, { parentName, fnName, parentArgs, fnArgs }: InvokeCtx): Promise<any>;
+export declare function invoke(module: DaggerModule, ctx: InvokeCtx): Promise<any>;
 //# sourceMappingURL=invoke.d.ts.map

package/dist/entrypoint/invoke.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invoke.d.ts","sourceRoot":"","sources":["../../entrypoint/invoke.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,sCAAsC,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAY5D,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,IAAI,CAAA;IAChB,MAAM,EAAE,IAAI,CAAA;CACb,CAAA;AAED;;;;;;;;GAQG;AACH,wBAAsB,MAAM,CAC1B,UAAU,EAAE,UAAU,EACtB,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,SAAS,GAEvD,OAAO,CAAC,GAAG,CAAC,CAmDX"}
+{"version":3,"file":"invoke.d.ts","sourceRoot":"","sources":["../../entrypoint/invoke.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAcxC;;;;;;;;GAQG;AACH,wBAAsB,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,gBAgChE"}

package/dist/entrypoint/invoke.js

@@ -1,6 +1,8 @@
-import { TypeDefKind } from "../api/client.gen.js";
 import { registry } from "../introspector/registry/registry.js";
-import { loadArgOrder, loadArg, loadArgType, loadPropertyType, loadResult, isArgVariadic, loadName, } from "./load.js";
+import { loadResult, loadInvokedMethod, loadInvokedObject, loadArgs, loadParentState, loadObjectReturnType, } from "./load.js";
+function isConstructor(method) {
+    return method.name === "";
+}
 /**
  * A wrapper around the registry to invoke a function.
  *
@@ -10,38 +12,25 @@ import { loadArgOrder, loadArg, loadArgType, loadPropertyType, loadResult, isArg
  * @param parentArgs The arguments of the parent object.
  * @param fnArgs The arguments of the function to call.
  */
-export async function invoke(scanResult, { parentName, fnName, parentArgs, fnArgs }) {
-    const args = {};
-    // Load function arguments in the right order
-    for (const argName of loadArgOrder(scanResult, parentName, fnName)) {
-        const loadedArg = await loadArg(fnArgs[argName], loadArgType(scanResult, parentName, fnName, argName));
-        if (isArgVariadic(scanResult, parentName, fnName, argName)) {
-            // If the argument is variadic, we need to load each args independently
-            // so it's correctly propagated when it's sent to the function.
-            // Note: variadic args are always last in the list of args.
-            for (const [i, arg] of (loadedArg ?? []).entries()) {
-                args[`${argName}${i}`] = arg;
-            }
-        }
-        else {
-            args[argName] = loadedArg;
-        }
+export async function invoke(module, ctx) {
+    let object = loadInvokedObject(module, ctx.parentName);
+    if (!object) {
+        throw new Error(`could not find object ${ctx.parentName}`);
     }
-    // Load parent state
-    for (const [key, value] of Object.entries(parentArgs)) {
-        parentArgs[loadName(scanResult, parentName, key, "field")] = await loadArg(value, loadPropertyType(scanResult, parentName, key));
+    const method = loadInvokedMethod(object, ctx);
+    if (!method) {
+        throw new Error(`could not find method ${ctx.fnName}`);
     }
-    let result = await registry.getResult(loadName(scanResult, parentName, parentName, "object"), loadName(scanResult, parentName, fnName, "function"), parentArgs, args);
+    const args = await loadArgs(method, ctx);
+    const parentState = await loadParentState(object, ctx);
+    let result = await registry.getResult(object.name, method.name, parentState, args);
     if (result) {
         // Handle alias serialization by getting the return type to load
         // if the function called isn't a constructor.
-        if (fnName !== "") {
-            const retType = scanResult.classes[parentName].methods[fnName].returnType;
-            if (retType.kind === TypeDefKind.ObjectKind) {
-                parentName = retType.name;
-            }
+        if (!isConstructor(method)) {
+            object = loadObjectReturnType(module, object, method);
         }
-        result = await loadResult(result, scanResult, parentName);
+        result = await loadResult(result, module, object);
     }
     return result;
 }

package/dist/entrypoint/load.d.ts

@@ -1,6 +1,11 @@
 import { TypeDefKind } from "../api/client.gen.js";
-import { ScanResult } from "../introspector/scanner/scan.js";
 import { TypeDef } from "../introspector/scanner/typeDefs.js";
+import { InvokeCtx } from "./context.js";
+import { DaggerModule } from "../introspector/scanner/abtractions/module.js";
+import { Method } from "../introspector/scanner/abtractions/method.js";
+import { Constructor } from "../introspector/scanner/abtractions/constructor.js";
+import { DaggerObject } from "../introspector/scanner/abtractions/object.js";
+import { Args } from "../introspector/registry/registry.js";
 /**
  * Import all given typescript files so that trigger their decorators
  * and register their class and functions inside the Registry.
@@ -9,87 +14,42 @@ import { TypeDef } from "../introspector/scanner/typeDefs.js";
  */
 export declare function load(files: string[]): Promise<void>;
 /**
- * Load the order of arguments for a given function from the scan result.
+ * Return the object invoked from the module.
  *
- * @param scanResult The result of the scan.
- * @param parentName The name of the class.
- * @param fnName The name of the function.
- *
- * @returns An array of strings representing the order of arguments.
- */
-export declare function loadArgOrder(scanResult: ScanResult, parentName: string, fnName: string): string[];
-/**
- * Load the argument for the given function and check if it's variadic.
- *
- * @param scanResult The result of the scan.
- * @param parentName The name of the class.
- * @param fnName The name of the function.
- * @param argName The name of the argument.
- *
- * @returns True if the argument is variadic, false otherwise.
- */
-export declare function isArgVariadic(scanResult: ScanResult, parentName: string, fnName: string, argName: string): boolean;
-/**
- * Load the argument type from the scan result.
- *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param fnName Function called
- * @param argName Argument name
- * @returns The type of the argument
- */
-export declare function loadArgType(scanResult: ScanResult, parentName: string, fnName: string, argName: string): TypeDef<TypeDefKind>;
-/**
- * Load the property type from the scan result.
- *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param propertyName property of the class
- * @returns the type of the property
- */
-export declare function loadPropertyType(scanResult: ScanResult, parentName: string, propertyName: string): TypeDef<TypeDefKind>;
-/**
- * Load the true name from the scan result
- *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param alias exposed name
- * @param kind location of the alias
+ * @param module The module to load the object from.
+ * @param parentName The name of the parent object.
  */
-export declare function loadName(scanResult: ScanResult, parentName: string, alias: string, kind: "field" | "function" | "object"): string;
+export declare function loadInvokedObject(module: DaggerModule, parentName: string): DaggerObject;
+export declare function loadInvokedMethod(object: DaggerObject, ctx: InvokeCtx): (Method | Constructor) | undefined;
 /**
- * Load the alias from the true property name.
- * If not found, return the original alias because it's not
- * a registered field.
+ * Load the values of the arguments from the context.
  *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param alias exposed name
+ * @param method Method to load the arguments from.
+ * @param ctx The context of the invocation.
  */
-export declare function loadResultAlias(scanResult: ScanResult, parentName: string, alias: string): string;
+export declare function loadArgs(method: Method | Constructor, ctx: InvokeCtx): Promise<Args>;
 /**
- * Return the eventual parent name of a field if its return type is a
- * registered object.
- * If not found, return the original parent name.
+ * Load the state of the parent object from the context.
  *
- * @param scanResult The result of the scan.
- * @param parentName Original parent name
- * @param alias The field alias
+ * @param object The object to load the parent state from.
+ * @param ctx The context of the invocation.
  */
-export declare function loadAliasParentName(scanResult: ScanResult, parentName: string, alias: string): string;
+export declare function loadParentState(object: DaggerObject, ctx: InvokeCtx): Promise<Args>;
 /**
- * This function load the argument as a Dagger type.
+ * This function load the value as a Dagger type.
  *
  * Note: The JSON.parse() is required to remove extra quotes
  */
-export declare function loadArg(value: any, type: TypeDef<TypeDefKind>): Promise<any>;
+export declare function loadValue(value: any, type: TypeDef<TypeDefKind>): Promise<any>;
 /**
- * Load subfields of the result and IDable object.
+ * Load the object type from the return type of the method.
+ * This covers the case where the return type is an other object of the module.
+ * For example: `msg(): Message` where message is an object of the module.
  *
- * @param result The result of the invocation.
- * @param scanResult The result of the scan.
- * @param parentName The name of the parent object.
- * @returns Loaded result.
+ * @param module  The module to load the object from.
+ * @param object The current object to load the return type from.
+ * @param method The method to load the return type from.
  */
-export declare function loadResult(result: any, scanResult: ScanResult, parentName: string): Promise<any>;
+export declare function loadObjectReturnType(module: DaggerModule, object: DaggerObject, method: Method): DaggerObject;
+export declare function loadResult(result: any, module: DaggerModule, object: DaggerObject): Promise<any>;
 //# sourceMappingURL=load.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../entrypoint/load.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAE7D;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzD;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,EAAE,CAiBV;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAiBT;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,WAAW,CAAC,CA2BtB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,WAAW,CAAC,CAYtB;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CACtB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,QAAQ,GACpC,MAAM,CAgCR;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACZ,MAAM,CAcR;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,GACZ,MAAM,CAkBR;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAC3B,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,OAAO,CAAC,GAAG,CAAC,CAsCd;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,GAAG,CAAC,CA+Bd"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../entrypoint/load.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAA;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,oDAAoD,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,sCAAsC,CAAA;AAE3D;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzD;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,MAAM,EAAE,MAAM,GAAG,WAAW,EAC5B,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAqCf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,OAAO,CAAC,GAAG,CAAC,CAsCd;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,YAAY,CAmBd;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,GAAG,CAAC,CAiDd"}

package/dist/entrypoint/load.js

@@ -10,198 +10,85 @@ export async function load(files) {
     await Promise.all(files.map(async (f) => await import(f)));
 }
 /**
- * Load the order of arguments for a given function from the scan result.
+ * Return the object invoked from the module.
  *
- * @param scanResult The result of the scan.
- * @param parentName The name of the class.
- * @param fnName The name of the function.
- *
- * @returns An array of strings representing the order of arguments.
- */
-export function loadArgOrder(scanResult, parentName, fnName) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        throw new Error(`could not find class ${parentName}`);
-    }
-    // Call for the constructor
-    if (fnName === "") {
-        return Object.keys(classTypeDef.constructor?.args ?? {});
-    }
-    const methodTypeDef = classTypeDef.methods[fnName];
-    if (!methodTypeDef) {
-        throw new Error(`could not find method ${fnName}`);
-    }
-    return Object.keys(methodTypeDef.args);
-}
-/**
- * Load the argument for the given function and check if it's variadic.
- *
- * @param scanResult The result of the scan.
- * @param parentName The name of the class.
- * @param fnName The name of the function.
- * @param argName The name of the argument.
- *
- * @returns True if the argument is variadic, false otherwise.
- */
-export function isArgVariadic(scanResult, parentName, fnName, argName) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        throw new Error(`could not find class ${parentName}`);
-    }
-    // It's not possible to have variadic arguments in the constructor.
-    if (fnName === "") {
-        return false;
-    }
-    const methodTypeDef = classTypeDef.methods[fnName];
-    if (!methodTypeDef) {
-        throw new Error(`could not find method ${fnName}`);
-    }
-    return methodTypeDef.args[argName].isVariadic;
-}
-/**
- * Load the argument type from the scan result.
- *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param fnName Function called
- * @param argName Argument name
- * @returns The type of the argument
+ * @param module The module to load the object from.
+ * @param parentName The name of the parent object.
  */
-export function loadArgType(scanResult, parentName, fnName, argName) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        throw new Error(`could not find class ${parentName}`);
-    }
-    // Call for the constructor
-    if (fnName === "") {
-        const argTypeDef = classTypeDef.constructor?.args[argName];
-        if (!argTypeDef) {
-            throw new Error(`could not find argument ${argName} type in constructor`);
-        }
-        return argTypeDef.typeDef;
-    }
-    const methodTypeDef = classTypeDef.methods[fnName];
-    if (!methodTypeDef) {
-        throw new Error(`could not find method ${fnName}`);
-    }
-    const argTypeDef = methodTypeDef.args[argName];
-    if (!argTypeDef) {
-        throw new Error(`could not find argument ${argName} type`);
-    }
-    return argTypeDef.typeDef;
+export function loadInvokedObject(module, parentName) {
+    return module.objects[parentName];
 }
-/**
- * Load the property type from the scan result.
- *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param propertyName property of the class
- * @returns the type of the property
- */
-export function loadPropertyType(scanResult, parentName, propertyName) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        throw new Error(`could not find class ${parentName}`);
-    }
-    const propertyTypeDef = classTypeDef.fields[propertyName];
-    if (!propertyTypeDef) {
-        throw new Error(`could not find property ${propertyName} type`);
+export function loadInvokedMethod(object, ctx) {
+    if (ctx.fnName === "") {
+        return object._constructor;
     }
-    return propertyTypeDef.typeDef;
+    return object.methods[ctx.fnName];
 }
 /**
- * Load the true name from the scan result
+ * Load the values of the arguments from the context.
  *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param alias exposed name
- * @param kind location of the alias
+ * @param method Method to load the arguments from.
+ * @param ctx The context of the invocation.
  */
-export function loadName(scanResult, parentName, alias, kind) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        throw new Error(`could not find class ${parentName}`);
-    }
-    switch (kind) {
-        case "object": {
-            return classTypeDef.name;
+export async function loadArgs(method, ctx) {
+    const args = {};
+    // Load arguments
+    for (const argName of method.getArgOrder()) {
+        const argument = method.arguments[argName];
+        if (!argument) {
+            throw new Error(`could not find argument ${argName}`);
         }
-        case "function": {
-            // Handle constructor
-            if (alias === "") {
-                return "";
-            }
-            const methodTypeDef = classTypeDef.methods[alias];
-            if (!methodTypeDef) {
-                throw new Error(`could not find method ${alias} type`);
+        const loadedArg = await loadValue(ctx.fnArgs[argName], argument.type);
+        // If the argument is variadic, we need to load each args independently
+        // so it's correctly propagated when it's sent to the function.
+        // Note: variadic args are always last in the list of args.
+        if (argument.isVariadic) {
+            for (const [i, arg] of (loadedArg ?? []).entries()) {
+                args[`${argName}${i}`] = arg;
             }
-            return methodTypeDef.name;
+            continue;
         }
-        case "field": {
-            const propertyTypeDef = classTypeDef.fields[alias];
-            if (!propertyTypeDef) {
-                throw new Error(`could not find property ${alias}`);
-            }
-            return propertyTypeDef.name;
+        // If the argument is nullable and the loaded arg is undefined with no default value, we set it to null.
+        if (argument.isNullable &&
+            loadedArg === undefined &&
+            !argument.defaultValue) {
+            args[argName] = null;
+            continue;
         }
+        args[argName] = loadedArg;
     }
+    return args;
 }
 /**
- * Load the alias from the true property name.
- * If not found, return the original alias because it's not
- * a registered field.
- *
- * @param scanResult Result of the scan
- * @param parentName Class called
- * @param alias exposed name
- */
-export function loadResultAlias(scanResult, parentName, alias) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        return alias;
-    }
-    const fieldTypeDef = Object.values(classTypeDef.fields).find((field) => field.name === alias);
-    if (!fieldTypeDef) {
-        return alias;
-    }
-    return fieldTypeDef.alias ?? fieldTypeDef.name;
-}
-/**
- * Return the eventual parent name of a field if its return type is a
- * registered object.
- * If not found, return the original parent name.
+ * Load the state of the parent object from the context.
  *
- * @param scanResult The result of the scan.
- * @param parentName Original parent name
- * @param alias The field alias
+ * @param object The object to load the parent state from.
+ * @param ctx The context of the invocation.
  */
-export function loadAliasParentName(scanResult, parentName, alias) {
-    const classTypeDef = scanResult.classes[parentName];
-    if (!classTypeDef) {
-        return parentName;
-    }
-    const fieldTypeDef = Object.values(classTypeDef.fields).find((field) => field.name === alias);
-    if (!fieldTypeDef) {
-        return parentName;
-    }
-    if (fieldTypeDef.typeDef.kind === TypeDefKind.ObjectKind) {
-        return fieldTypeDef.typeDef.name;
+export async function loadParentState(object, ctx) {
+    const parentState = {};
+    for (const [key, value] of Object.entries(ctx.parentArgs)) {
+        const property = object.properties[key];
+        if (!property) {
+            throw new Error(`could not find parent property ${key}`);
+        }
+        parentState[property.name] = await loadValue(value, property.type);
     }
-    return parentName;
+    return parentState;
 }
 /**
- * This function load the argument as a Dagger type.
+ * This function load the value as a Dagger type.
  *
  * Note: The JSON.parse() is required to remove extra quotes
  */
-export async function loadArg(value, type) {
+export async function loadValue(value, type) {
     // If value is undefinied, return it directly.
     if (value === undefined) {
         return value;
     }
     switch (type.kind) {
         case TypeDefKind.ListKind:
-            return Promise.all(value.map(async (v) => await loadArg(v, type.typeDef)));
+            return Promise.all(value.map(async (v) => await loadValue(v, type.typeDef)));
         case TypeDefKind.ObjectKind: {
             const objectType = type.name;
             // Workaround to call get any object that has an id
@@ -215,7 +102,7 @@ export async function loadArg(value, type) {
             // TODO(supports subfields serialization)
             return value;
         }
-        // Cannot use , to specify multiple matching case so instead we use fallthrough.
+        // Cannot use `,` to specify multiple matching case so instead we use fallthrough.
         case TypeDefKind.StringKind:
         case TypeDefKind.IntegerKind:
         case TypeDefKind.BooleanKind:
@@ -226,30 +113,60 @@ export async function loadArg(value, type) {
     }
 }
 /**
- * Load subfields of the result and IDable object.
+ * Load the object type from the return type of the method.
+ * This covers the case where the return type is an other object of the module.
+ * For example: `msg(): Message` where message is an object of the module.
  *
- * @param result The result of the invocation.
- * @param scanResult The result of the scan.
- * @param parentName The name of the parent object.
- * @returns Loaded result.
+ * @param module  The module to load the object from.
+ * @param object The current object to load the return type from.
+ * @param method The method to load the return type from.
  */
-export async function loadResult(result, scanResult, parentName) {
+export function loadObjectReturnType(module, object, method) {
+    const retType = method.returnType;
+    switch (retType.kind) {
+        case TypeDefKind.ListKind: {
+            // Loop until we find the original object type.
+            // This way we handle the list of list (e.g Object[][][]...[])
+            let listType = retType;
+            while (listType.kind === TypeDefKind.ListKind) {
+                listType = listType.typeDef;
+            }
+            return module.objects[listType.name];
+        }
+        case TypeDefKind.ObjectKind:
+            return module.objects[retType.name];
+        default:
+            return object;
+    }
+}
+export async function loadResult(result, module, object) {
     // Handle IDable objects
     if (result && typeof result?.id === "function") {
         result = await result.id();
     }
     // Handle arrays
     if (Array.isArray(result)) {
-        result = await Promise.all(result.map(async (r) => await loadResult(r, scanResult, parentName)));
+        result = await Promise.all(result.map(async (r) => await loadResult(r, module, object)));
         return result;
     }
     // Handle objects
     if (typeof result === "object") {
         const state = {};
         for (const [key, value] of Object.entries(result)) {
-            state[loadResultAlias(scanResult, parentName, key)] = await loadResult(value, scanResult, loadAliasParentName(scanResult, parentName, key));
+            const property = Object.values(object.properties).find((p) => p.name === key);
+            if (!property) {
+                throw new Error(`could not find result property ${key}`);
+            }
+            if (property.type.kind === TypeDefKind.ObjectKind) {
+                const referencedObject = module.objects[property.type.name];
+                if (referencedObject) {
+                    object = referencedObject;
+                }
+            }
+            state[property.alias ?? property.name] = await loadResult(value, module, object);
         }
-        result = state;
+        return state;
     }
+    // Handle primitive types
     return result;
 }

package/dist/entrypoint/register.d.ts

@@ -1,7 +1,7 @@
 import { ModuleID } from "../api/client.gen.js";
-import { ScanResult } from "../introspector/scanner/scan.js";
+import { DaggerModule } from "../introspector/scanner/abtractions/module.js";
 /**
  * Register the module files and returns its ID
  */
-export declare function register(files: string[], scanResult: ScanResult): Promise<ModuleID>;
+export declare function register(files: string[], module: DaggerModule): Promise<ModuleID>;
 //# sourceMappingURL=register.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../entrypoint/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,QAAQ,EAGT,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAA;AAU5D;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,QAAQ,CAAC,CA8CnB"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../entrypoint/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,QAAQ,EAGT,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAU5E;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,QAAQ,CAAC,CA8CnB"}