@dagger.io/dagger 0.13.5 → 0.13.7

package/dist/entrypoint/load.d.ts

@@ -1,5 +1,7 @@
+import Module from "node:module";
 import { TypeDefKind } from "../api/client.gen.js";
-import { Args, Registry } from "../introspector/registry/registry.js";
+import { Executor } from "../introspector/executor/executor.js";
+import { Args } from "../introspector/executor/executor.js";
 import { Constructor } from "../introspector/scanner/abtractions/constructor.js";
 import { DaggerEnum } from "../introspector/scanner/abtractions/enum.js";
 import { Method } from "../introspector/scanner/abtractions/method.js";
@@ -13,7 +15,7 @@ import { InvokeCtx } from "./context.js";
  *
  * @param files List of files to load.
  */
-export declare function load(files: string[]): Promise<void>;
+export declare function load(files: string[]): Promise<Module[]>;
 /**
  * Return the object invoked from the module.
  *
@@ -28,20 +30,20 @@ export declare function loadInvokedMethod(object: DaggerObject, ctx: InvokeCtx):
  * @param method Method to load the arguments from.
  * @param ctx The context of the invocation.
  */
-export declare function loadArgs(registry: Registry, method: Method | Constructor, ctx: InvokeCtx): Promise<Args>;
+export declare function loadArgs(executor: Executor, method: Method | Constructor, ctx: InvokeCtx): Promise<Args>;
 /**
  * Load the state of the parent object from the context.
  *
  * @param object The object to load the parent state from.
  * @param ctx The context of the invocation.
  */
-export declare function loadParentState(registry: Registry, object: DaggerObject, ctx: InvokeCtx): Promise<Args>;
+export declare function loadParentState(executor: Executor, object: DaggerObject, ctx: InvokeCtx): Promise<Args>;
 /**
  * This function load the value as a Dagger type.
  *
  * Note: The JSON.parse() is required to remove extra quotes
  */
-export declare function loadValue(registry: Registry, value: any, type: TypeDef<TypeDefKind>): Promise<any>;
+export declare function loadValue(executor: Executor, value: any, type: TypeDef<TypeDefKind>): Promise<any>;
 /**
  * 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.

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,IAAI,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAA;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,oDAAoD,CAAA;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAA;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAExC;;;;;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,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,GAAG,WAAW,EAC5B,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;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,CA4Cd;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,YAAY,GAAG,UAAU,CAqB3B;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GAAG,UAAU,GAChC,OAAO,CAAC,GAAG,CAAC,CA0Ed"}
+{"version":3,"file":"load.d.ts","sourceRoot":"","sources":["../../entrypoint/load.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAO,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAA;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,sCAAsC,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oDAAoD,CAAA;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAA;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAA;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAA;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAA;AAC7D,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,CAyCf;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,SAAS,GACb,OAAO,CAAC,IAAI,CAAC,CAaf;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,CA4Cd;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GACb,YAAY,GAAG,UAAU,CAqB3B;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GAAG,UAAU,GAChC,OAAO,CAAC,GAAG,CAAC,CA0Ed"}

package/dist/entrypoint/load.js

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 import { dag, TypeDefKind } from "../api/client.gen.js";
 import { DaggerEnum } from "../introspector/scanner/abtractions/enum.js";
 import { DaggerObject } from "../introspector/scanner/abtractions/object.js";
@@ -9,7 +8,7 @@ import { DaggerObject } from "../introspector/scanner/abtractions/object.js";
  * @param files List of files to load.
  */
 export async function load(files) {
-    await Promise.all(files.map(async (f) => await import(f)));
+    return await Promise.all(files.map(async (f) => await import(f)));
 }
 /**
  * Return the object invoked from the module.
@@ -32,7 +31,7 @@ export function loadInvokedMethod(object, ctx) {
  * @param method Method to load the arguments from.
  * @param ctx The context of the invocation.
  */
-export async function loadArgs(registry, method, ctx) {
+export async function loadArgs(executor, method, ctx) {
     const args = {};
     // Load arguments
     for (const argName of method.getArgOrder()) {
@@ -40,7 +39,7 @@ export async function loadArgs(registry, method, ctx) {
         if (!argument) {
             throw new Error(`could not find argument ${argName}`);
         }
-        const loadedArg = await loadValue(registry, ctx.fnArgs[argName], argument.type);
+        const loadedArg = await loadValue(executor, 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.
@@ -67,14 +66,14 @@ export async function loadArgs(registry, method, ctx) {
  * @param object The object to load the parent state from.
  * @param ctx The context of the invocation.
  */
-export async function loadParentState(registry, object, ctx) {
+export async function loadParentState(executor, 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(registry, value, property.type);
+        parentState[property.name] = await loadValue(executor, value, property.type);
     }
     return parentState;
 }
@@ -83,14 +82,14 @@ export async function loadParentState(registry, object, ctx) {
  *
  * Note: The JSON.parse() is required to remove extra quotes
  */
-export async function loadValue(registry, value, type) {
+export async function loadValue(executor, 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 loadValue(registry, v, type.typeDef)));
+            return Promise.all(value.map(async (v) => await loadValue(executor, v, type.typeDef)));
         case TypeDefKind.ObjectKind: {
             const objectType = type.name;
             // Workaround to call get any object that has an id
@@ -102,7 +101,7 @@ export async function loadValue(registry, value, type) {
                 return dag[`load${objectType}FromID`](value);
             }
             // TODO(supports subfields serialization)
-            return registry.buildClass(objectType, value);
+            return executor.buildClass(objectType, value);
         }
         // Cannot use `,` to specify multiple matching case so instead we use fallthrough.
         case TypeDefKind.StringKind:

package/dist/introspector/executor/executor.d.ts

@@ -0,0 +1,13 @@
+import Module from "node:module";
+export type State = {
+    [property: string]: any;
+};
+export type Args = Record<string, unknown>;
+export declare class Executor {
+    readonly modules: Module[];
+    constructor(modules: Module[]);
+    private getObject;
+    buildClass(object: string, state: State): any;
+    getResult(object: string, method: string, state: State, inputs: Args): Promise<any>;
+}
+//# sourceMappingURL=executor.d.ts.map

package/dist/introspector/executor/executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../introspector/executor/executor.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAIhC,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;aACS,OAAO,EAAE,MAAM,EAAE;gBAAjB,OAAO,EAAE,MAAM,EAAE;IAE7C,OAAO,CAAC,SAAS;IAUjB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,GAAG;IASvC,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/introspector/executor/executor.js

@@ -0,0 +1,32 @@
+import { FunctionNotFound } from "../../common/errors/FunctionNotFound.js";
+export class Executor {
+    modules;
+    constructor(modules) {
+        this.modules = modules;
+    }
+    getObject(object) {
+        const key = object;
+        const module = this.modules.find((m) => m[key] !== undefined);
+        if (!module) {
+            throw new FunctionNotFound(`Object ${object} not found`);
+        }
+        return module[key];
+    }
+    buildClass(object, state) {
+        const obj = this.getObject(object);
+        const instanciatedClass = Object.create(obj.prototype);
+        Object.assign(instanciatedClass, state);
+        return instanciatedClass;
+    }
+    async getResult(object, method, state, inputs) {
+        const obj = this.getObject(object);
+        if (method === "") {
+            return new obj(...Object.values(inputs));
+        }
+        const builtObj = this.buildClass(object, state);
+        if (!builtObj[method]) {
+            throw new FunctionNotFound(`Method ${method} not found`);
+        }
+        return await builtObj[method](...Object.values(inputs));
+    }
+}

package/dist/provisioning/default.d.ts

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

package/dist/provisioning/default.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dagger.io/dagger",
-  "version": "0.13.5",
+  "version": "0.13.7",
   "author": "hello@dagger.io",
   "license": "Apache-2.0",
   "types": "./dist/index.d.ts",