@dagger.io/dagger 0.19.2 → 0.19.4

package/dist/src/api/client.gen.js

@@ -112,6 +112,47 @@ function ExistsTypeNameToValue(name) {
             return name;
     }
 }
+/**
+ * The behavior configured for function result caching.
+ */
+export var FunctionCachePolicy;
+(function (FunctionCachePolicy) {
+    FunctionCachePolicy["Default"] = "Default";
+    FunctionCachePolicy["Never"] = "Never";
+    FunctionCachePolicy["PerSession"] = "PerSession";
+})(FunctionCachePolicy || (FunctionCachePolicy = {}));
+/**
+ * Utility function to convert a FunctionCachePolicy value to its name so
+ * it can be uses as argument to call a exposed function.
+ */
+function FunctionCachePolicyValueToName(value) {
+    switch (value) {
+        case FunctionCachePolicy.Default:
+            return "Default";
+        case FunctionCachePolicy.Never:
+            return "Never";
+        case FunctionCachePolicy.PerSession:
+            return "PerSession";
+        default:
+            return value;
+    }
+}
+/**
+ * Utility function to convert a FunctionCachePolicy name to its value so
+ * it can be properly used inside the module runtime.
+ */
+function FunctionCachePolicyNameToValue(name) {
+    switch (name) {
+        case "Default":
+            return FunctionCachePolicy.Default;
+        case "Never":
+            return FunctionCachePolicy.Never;
+        case "PerSession":
+            return FunctionCachePolicy.PerSession;
+        default:
+            return name;
+    }
+}
 /**
  * Compression algorithm to use for image layers.
  */
@@ -197,6 +238,40 @@ function ImageMediaTypesNameToValue(name) {
             return name;
     }
 }
+/**
+ * Experimental features of a module
+ */
+export var ModuleSourceExperimentalFeature;
+(function (ModuleSourceExperimentalFeature) {
+    /**
+     * Self calls
+     */
+    ModuleSourceExperimentalFeature["SelfCalls"] = "SELF_CALLS";
+})(ModuleSourceExperimentalFeature || (ModuleSourceExperimentalFeature = {}));
+/**
+ * Utility function to convert a ModuleSourceExperimentalFeature value to its name so
+ * it can be uses as argument to call a exposed function.
+ */
+function ModuleSourceExperimentalFeatureValueToName(value) {
+    switch (value) {
+        case ModuleSourceExperimentalFeature.SelfCalls:
+            return "SELF_CALLS";
+        default:
+            return value;
+    }
+}
+/**
+ * Utility function to convert a ModuleSourceExperimentalFeature name to its value so
+ * it can be properly used inside the module runtime.
+ */
+function ModuleSourceExperimentalFeatureNameToValue(name) {
+    switch (name) {
+        case "SELF_CALLS":
+            return ModuleSourceExperimentalFeature.SelfCalls;
+        default:
+            return name;
+    }
+}
 /**
  * The kind of module source.
  */
@@ -854,14 +929,16 @@ export class CacheVolume extends BaseClient {
 export class Changeset extends BaseClient {
     _id = undefined;
     _export = undefined;
+    _isEmpty = undefined;
     _sync = undefined;
     /**
      * Constructor is used for internal usage only, do not create object from it.
      */
-    constructor(ctx, _id, _export, _sync) {
+    constructor(ctx, _id, _export, _isEmpty, _sync) {
         super(ctx);
         this._id = _id;
         this._export = _export;
+        this._isEmpty = _isEmpty;
         this._sync = _sync;
     }
     /**
@@ -916,6 +993,17 @@ export class Changeset extends BaseClient {
         const response = await ctx.execute();
         return response;
     };
+    /**
+     * Returns true if the changeset is empty (i.e. there are no changes).
+     */
+    isEmpty = async () => {
+        if (this._isEmpty) {
+            return this._isEmpty;
+        }
+        const ctx = this._ctx.select("isEmpty");
+        const response = await ctx.execute();
+        return response;
+    };
     /**
      * Return a snapshot containing only the created and modified files
      */
@@ -1514,6 +1602,7 @@ export class Container extends BaseClient {
      * @param source Identifier of the directory to write
      * @param opts.exclude Patterns to exclude in the written directory (e.g. ["node_modules/**", ".gitignore", ".git/"]).
      * @param opts.include Patterns to include in the written directory (e.g. ["*.go", "go.mod", "go.sum"]).
+     * @param opts.gitignore Apply .gitignore rules when writing the directory.
      * @param opts.owner A user:group to set for the directory and its contents.
      *
      * The user and group can either be an ID (1000:1000) or a name (foo:bar).
@@ -1544,6 +1633,14 @@ export class Container extends BaseClient {
         const ctx = this._ctx.select("withEnvVariable", { name, value, ...opts });
         return new Container(ctx);
     };
+    /**
+     * Raise an error.
+     * @param err Message of the error to raise. If empty, the error will be ignored.
+     */
+    withError = (err) => {
+        const ctx = this._ctx.select("withError", { err });
+        return new Container(ctx);
+    };
     /**
      * Execute a command in the container, and return a new snapshot of the container state after execution.
      * @param args Command to execute. Must be valid exec() arguments, not a shell command. Example: ["go", "run", "main.go"].
@@ -2039,6 +2136,7 @@ export class CurrentModule extends BaseClient {
      * @param path Location of the directory to access (e.g., ".").
      * @param opts.exclude Exclude artifacts that match the given pattern (e.g., ["node_modules/", ".git*"]).
      * @param opts.include Include only artifacts that match the given pattern (e.g., ["app/", "package.*"]).
+     * @param opts.gitignore Apply .gitignore filter rules inside the directory
      */
     workdir = (path, opts) => {
         const ctx = this._ctx.select("workdir", { path, ...opts });
@@ -2237,6 +2335,7 @@ export class Directory extends BaseClient {
      * Return a snapshot with some paths included or excluded
      * @param opts.exclude If set, paths matching one of these glob patterns is excluded from the new snapshot. Example: ["node_modules/", ".git*", ".env"]
      * @param opts.include If set, only paths matching one of these glob patterns is included in the new snapshot. Example: (e.g., ["app/", "package.*"]).
+     * @param opts.gitignore If set, apply .gitignore rules when filtering the directory.
      */
     filter = (opts) => {
         const ctx = this._ctx.select("filter", { ...opts });
@@ -2329,6 +2428,7 @@ export class Directory extends BaseClient {
      * @param source Identifier of the directory to copy.
      * @param opts.exclude Exclude artifacts that match the given pattern (e.g., ["node_modules/", ".git*"]).
      * @param opts.include Include only artifacts that match the given pattern (e.g., ["app/", "package.*"]).
+     * @param opts.gitignore Apply .gitignore filter rules inside the directory
      * @param opts.owner A user:group to set for the copied directory and its contents.
      *
      * The user and group must be an ID (1000:1000), not a name (foo:bar).
@@ -2339,6 +2439,14 @@ export class Directory extends BaseClient {
         const ctx = this._ctx.select("withDirectory", { path, source, ...opts });
         return new Directory(ctx);
     };
+    /**
+     * Raise an error.
+     * @param err Message of the error to raise. If empty, the error will be ignored.
+     */
+    withError = (err) => {
+        const ctx = this._ctx.select("withError", { err });
+        return new Directory(ctx);
+    };
     /**
      * Retrieves this directory plus the contents of the given file copied to the given path.
      * @param path Location of the copied file (e.g., "/file.txt").
@@ -2458,12 +2566,14 @@ export class Directory extends BaseClient {
  */
 export class Engine extends BaseClient {
     _id = undefined;
+    _name = undefined;
     /**
      * Constructor is used for internal usage only, do not create object from it.
      */
-    constructor(ctx, _id) {
+    constructor(ctx, _id, _name) {
         super(ctx);
         this._id = _id;
+        this._name = _name;
     }
     /**
      * A unique identifier for this Engine.
@@ -2476,6 +2586,14 @@ export class Engine extends BaseClient {
         const response = await ctx.execute();
         return response;
     };
+    /**
+     * The list of connected client IDs
+     */
+    clients = async () => {
+        const ctx = this._ctx.select("clients");
+        const response = await ctx.execute();
+        return response;
+    };
     /**
      * The local (on-disk) cache for the Dagger engine
      */
@@ -2483,6 +2601,17 @@ export class Engine extends BaseClient {
         const ctx = this._ctx.select("localCache");
         return new EngineCache(ctx);
     };
+    /**
+     * The name of the engine instance.
+     */
+    name = async () => {
+        if (this._name) {
+            return this._name;
+        }
+        const ctx = this._ctx.select("name");
+        const response = await ctx.execute();
+        return response;
+    };
 }
 /**
  * A cache storage for the Dagger engine
@@ -3526,6 +3655,14 @@ export class EnvFile extends BaseClient {
         const response = await ctx.execute();
         return response;
     };
+    /**
+     * Filters variables by prefix and removes the pref from keys. Variables without the prefix are excluded. For example, with the prefix "MY_APP_" and variables: MY_APP_TOKEN=topsecret MY_APP_NAME=hello FOO=bar the resulting environment will contain: TOKEN=topsecret NAME=hello
+     * @param prefix The prefix to filter by
+     */
+    namespace_ = (prefix) => {
+        const ctx = this._ctx.select("namespace", { prefix });
+        return new EnvFile(ctx);
+    };
     /**
      * Return all variables
      * @param opts.raw Return values exactly as written to the file. No quote removal or variable expansion
@@ -4062,6 +4199,22 @@ export class Function_ extends BaseClient {
         const ctx = this._ctx.select("withArg", { name, typeDef, ...opts });
         return new Function_(ctx);
     };
+    /**
+     * Returns the function updated to use the provided cache policy.
+     * @param policy The cache policy to use.
+     * @param opts.timeToLive The TTL for the cache policy, if applicable. Provided as a duration string, e.g. "5m", "1h30s".
+     */
+    withCachePolicy = (policy, opts) => {
+        const metadata = {
+            policy: { is_enum: true, value_to_name: FunctionCachePolicyValueToName },
+        };
+        const ctx = this._ctx.select("withCachePolicy", {
+            policy,
+            ...opts,
+            __metadata: metadata,
+        });
+        return new Function_(ctx);
+    };
     /**
      * Returns the function with the given doc string.
      * @param description The doc string to set.
@@ -4567,6 +4720,13 @@ export class GitRepository extends BaseClient {
         const response = await ctx.execute();
         return response;
     };
+    /**
+     * Returns the changeset of uncommitted changes in the git repository.
+     */
+    uncommitted = () => {
+        const ctx = this._ctx.select("uncommitted");
+        return new Changeset(ctx);
+    };
     /**
      * The URL of the git repository.
      */
@@ -5432,6 +5592,17 @@ export class Module_ extends BaseClient {
         const response = await ctx.execute();
         return response.map((r) => new Client(ctx.copy()).loadTypeDefFromID(r.id));
     };
+    /**
+     * The introspection schema JSON file for this module.
+     *
+     * This file represents the schema visible to the module's source code, including all core types and those from the dependencies.
+     *
+     * Note: this is in the context of a module, so some core types may be hidden.
+     */
+    introspectionSchemaJSON = () => {
+        const ctx = this._ctx.select("introspectionSchemaJSON");
+        return new File(ctx);
+    };
     /**
      * The name of the module
      */
@@ -5791,6 +5962,17 @@ export class ModuleSource extends BaseClient {
         const response = await ctx.execute();
         return response;
     };
+    /**
+     * The introspection schema JSON file for this module source.
+     *
+     * This file represents the schema visible to the module's source code, including all core types and those from the dependencies.
+     *
+     * Note: this is in the context of a module, so some core types may be hidden.
+     */
+    introspectionSchemaJSON = () => {
+        const ctx = this._ctx.select("introspectionSchemaJSON");
+        return new File(ctx);
+    };
     /**
      * The kind of module source (currently local, git or dir).
      */
@@ -5905,6 +6087,14 @@ export class ModuleSource extends BaseClient {
         const response = await ctx.execute();
         return new Client(ctx.copy()).loadModuleSourceFromID(response);
     };
+    /**
+     * The toolchains referenced by the module source.
+     */
+    toolchains = async () => {
+        const ctx = this._ctx.select("toolchains").select("id");
+        const response = await ctx.execute();
+        return response.map((r) => new Client(ctx.copy()).loadModuleSourceFromID(r.id));
+    };
     /**
      * User-defined defaults read from local .env files
      */
@@ -5956,6 +6146,14 @@ export class ModuleSource extends BaseClient {
         const ctx = this._ctx.select("withEngineVersion", { version });
         return new ModuleSource(ctx);
     };
+    /**
+     * Enable the experimental features for the module source.
+     * @param features The experimental features to enable.
+     */
+    withExperimentalFeatures = (features) => {
+        const ctx = this._ctx.select("withExperimentalFeatures", { features });
+        return new ModuleSource(ctx);
+    };
     /**
      * Update the module source with additional include patterns for files+directories from its context that are required for building it
      * @param patterns The new additional include patterns.
@@ -5988,6 +6186,14 @@ export class ModuleSource extends BaseClient {
         const ctx = this._ctx.select("withSourceSubpath", { path });
         return new ModuleSource(ctx);
     };
+    /**
+     * Add toolchains to the module source.
+     * @param toolchains The toolchain modules to add.
+     */
+    withToolchains = (toolchains) => {
+        const ctx = this._ctx.select("withToolchains", { toolchains });
+        return new ModuleSource(ctx);
+    };
     /**
      * Update the blueprint module to the latest version.
      */
@@ -6003,6 +6209,14 @@ export class ModuleSource extends BaseClient {
         const ctx = this._ctx.select("withUpdateDependencies", { dependencies });
         return new ModuleSource(ctx);
     };
+    /**
+     * Update one or more toolchains.
+     * @param toolchains The toolchains to update.
+     */
+    withUpdateToolchains = (toolchains) => {
+        const ctx = this._ctx.select("withUpdateToolchains", { toolchains });
+        return new ModuleSource(ctx);
+    };
     /**
      * Update one or more clients.
      * @param clients The clients to update
@@ -6034,6 +6248,22 @@ export class ModuleSource extends BaseClient {
         const ctx = this._ctx.select("withoutDependencies", { dependencies });
         return new ModuleSource(ctx);
     };
+    /**
+     * Disable experimental features for the module source.
+     * @param features The experimental features to disable.
+     */
+    withoutExperimentalFeatures = (features) => {
+        const ctx = this._ctx.select("withoutExperimentalFeatures", { features });
+        return new ModuleSource(ctx);
+    };
+    /**
+     * Remove the provided toolchains from the module source.
+     * @param toolchains The toolchains to remove.
+     */
+    withoutToolchains = (toolchains) => {
+        const ctx = this._ctx.select("withoutToolchains", { toolchains });
+        return new ModuleSource(ctx);
+    };
     /**
      * Call the provided function with current ModuleSource.
      *

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

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../src/module/decorators.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,eAAO,MAAM,MAAM,wEAAkB,CAAA;AAErC;;;;;GAKG;AACH,eAAO,MAAM,IAAI,gFAoCqtC,CAAC,8BApCtsC,CAAA;AAEjC;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,qEAAiB,CAAA;AAEnC;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,wEAAoB,CAAA;AAEzC;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,QAAQ,yIAAoB,CAAA"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../../src/module/decorators.ts"],"names":[],"mappings":"AAKA;;;;GAIG;AACH,eAAO,MAAM,MAAM,wEAAkB,CAAA;AAErC;;;;;GAKG;AACH,eAAO,MAAM,IAAI,gFAoC2rD,CAAC,8BApC5qD,CAAA;AAEjC;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,qEAAiB,CAAA;AAEnC;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,wEAAoB,CAAA;AAEzC;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,QAAQ,yIAAoB,CAAA"}

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":"AAYA,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,iBA+D/C"}
+{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/entrypoint.ts"],"names":[],"mappings":"AAYA,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,iBA8D/C"}

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

@@ -13,8 +13,8 @@ export async function entrypoint(files) {
     await connection(async () => {
         const fnCall = dag.currentFunctionCall();
         const moduleName = await dag.currentModule().name();
-        const parentName = await fnCall.parentName();
         const scanResult = await scan(files, moduleName);
+        const parentName = await fnCall.parentName();
         // Pre allocate the result, we got one in both case.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         let result;

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=introspection_entrypoint.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"introspection_entrypoint.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/introspection_entrypoint.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,52 @@
+import * as fs from "fs";
+import * as path from "path";
+import { connection } from "../../connect.js";
+import { scan } from "../introspector/index.js";
+import { Register } from "./register.js";
+async function introspection(files, moduleName) {
+    return await scan(files, moduleName, false);
+}
+const allowedExtensions = [".ts", ".mts"];
+function getTsSourceCodeFiles(dir) {
+    return fs
+        .readdirSync(dir)
+        .map((file) => {
+        const filepath = path.join(dir, file);
+        const stat = fs.statSync(filepath);
+        if (stat.isDirectory()) {
+            return getTsSourceCodeFiles(filepath);
+        }
+        const ext = path.extname(filepath);
+        if (allowedExtensions.find((allowedExt) => allowedExt === ext)) {
+            return [path.join(dir, file)];
+        }
+        return [];
+    })
+        .reduce((p, c) => [...c, ...p]);
+}
+async function main() {
+    const args = process.argv.slice(2);
+    if (args.length < 3) {
+        console.log("usage: introspection <moduleName> <userSourceCodeDir> <typescriptClientFile>");
+        process.exit(1);
+    }
+    const moduleName = args[0];
+    const userSourceCodeDir = args[1];
+    const typescriptClientFile = args[2];
+    const userSourceCodeFiles = getTsSourceCodeFiles(userSourceCodeDir);
+    const result = await introspection([...userSourceCodeFiles, typescriptClientFile], moduleName);
+    if (process.env.DRY_RUN) {
+        console.log(JSON.stringify(result, null, 2));
+        process.exit(0);
+    }
+    // TODO(TomChv): move that logic inside the engine at some point
+    // so we don't even need a connection.
+    // Idea: We should output a JSON schema of the module that can be transformed
+    // into a Dagger module by the engine.
+    await connection(async () => {
+        const outputFilePath = process.env.TYPEDEF_OUTPUT_FILE ?? "/module-id.json";
+        const moduleID = await new Register(result).run();
+        await fs.promises.writeFile(outputFilePath, JSON.stringify(moduleID));
+    });
+}
+main();

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,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;IAkDtD;;;;;;;OAOG;IACH,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS;CA4BjE"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["../../../../src/module/entrypoint/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,QAAQ,EACR,OAAO,EAKR,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;IA2B7D;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,KAAK,SAAS;IAkDtD;;;;;;;OAOG;IACH,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,GAAG,SAAS;CA4BjE"}

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

@@ -1,4 +1,4 @@
-import { dag, TypeDefKind, } from "../../api/client.gen.js";
+import { dag, TypeDefKind, FunctionCachePolicy, } from "../../api/client.gen.js";
 export class Register {
     module;
     constructor(module) {
@@ -77,11 +77,29 @@ export class Register {
      * Create a function in the Dagger API.
      */
     addFunction(fct) {
-        return dag
+        let fnDef = dag
             .function_(fct.alias ?? fct.name, addTypeDef(fct.returnType))
             .withDescription(fct.description)
             .withSourceMap(addSourceMap(fct))
             .with(this.addArg(fct.arguments));
+        switch (fct.cache) {
+            case "never": {
+                fnDef = fnDef.withCachePolicy(FunctionCachePolicy.Never);
+                break;
+            }
+            case "session": {
+                fnDef = fnDef.withCachePolicy(FunctionCachePolicy.PerSession);
+                break;
+            }
+            case "": {
+                break;
+            }
+            default: {
+                const opts = { timeToLive: fct.cache };
+                fnDef = fnDef.withCachePolicy(FunctionCachePolicy.Default, opts);
+            }
+        }
+        return fnDef;
     }
     /**
      * Register all arguments in the function.

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

@@ -15,13 +15,13 @@ export declare class DaggerFunction extends Locatable {
     description: string;
     private _returnTypeRef?;
     returnType?: TypeDef<TypeDefKind>;
-    alias: string | undefined;
     arguments: DaggerArguments;
+    alias: string | undefined;
+    cache: string | undefined;
     private signature;
     private symbol;
     constructor(node: ts.MethodDeclaration, ast: AST);
     private getReturnType;
-    private getAlias;
     getArgsOrder(): string[];
     getReferences(): string[];
     propagateReferences(references: References): void;

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

@@ -1 +1 @@
-{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EACL,GAAG,EAGJ,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAA;AAEhE,qBAAa,cAAe,SAAQ,SAAS;IAYzC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAZf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,cAAc,CAAC,CAAQ;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,SAAS,EAAE,eAAe,CAAK;IAEtC,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAC1B,GAAG,EAAE,GAAG;IAmB3B,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,QAAQ;IAaT,YAAY,IAAI,MAAM,EAAE;IAIxB,aAAa,IAAI,MAAM,EAAE;IAoBzB,mBAAmB,CAAC,UAAU,EAAE,UAAU;IAuB1C,MAAM;;;;;;;CASd"}
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAGxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EACL,GAAG,EAGJ,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAA;AAEhE,qBAAa,cAAe,SAAQ,SAAS;IAazC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAbf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,cAAc,CAAC,CAAQ;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,SAAS,EAAE,eAAe,CAAK;IAC/B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IAEhC,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,MAAM,CAAW;gBAGN,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAC1B,GAAG,EAAE,GAAG;IAgC3B,OAAO,CAAC,aAAa;IAWd,YAAY,IAAI,MAAM,EAAE;IAIxB,aAAa,IAAI,MAAM,EAAE;IAoBzB,mBAAmB,CAAC,UAAU,EAAE,UAAU;IAuB1C,MAAM;;;;;;;CASd"}

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

@@ -10,8 +10,9 @@ export class DaggerFunction extends Locatable {
     description;
     _returnTypeRef;
     returnType;
-    alias;
     arguments = {};
+    alias;
+    cache;
     signature;
     symbol;
     constructor(node, ast) {
@@ -22,11 +23,22 @@ export class DaggerFunction extends Locatable {
         this.signature = this.ast.getSignatureFromFunctionOrThrow(node);
         this.name = this.node.name.getText();
         this.description = this.ast.getDocFromSymbol(this.symbol);
+        const functionArguments = this.ast.getDecoratorArgument(this.node, FUNCTION_DECORATOR, "object");
+        if (functionArguments) {
+            if (typeof functionArguments === "string") {
+                // previously only a single arg was accepted for alias, so if there's just
+                // a string we intrepret it that way for backward compatibility
+                this.alias = functionArguments;
+            }
+            else {
+                this.alias = functionArguments.alias;
+                this.cache = functionArguments.cache;
+            }
+        }
         for (const parameter of this.node.parameters) {
             this.arguments[parameter.name.getText()] = new DaggerArgument(parameter, this.ast);
         }
         this.returnType = this.getReturnType();
-        this.alias = this.getAlias();
     }
     getReturnType() {
         const type = this.signature.getReturnType();
@@ -36,13 +48,6 @@ export class DaggerFunction extends Locatable {
         }
         return typedef;
     }
-    getAlias() {
-        const alias = this.ast.getDecoratorArgument(this.node, FUNCTION_DECORATOR, "string");
-        if (!alias) {
-            return;
-        }
-        return JSON.parse(alias.replace(/'/g, '"'));
-    }
     getArgsOrder() {
         return Object.keys(this.arguments);
     }

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

@@ -16,9 +16,10 @@ export declare class DaggerInterfaceFunction extends Locatable {
     private _returnTypeRef?;
     returnType?: TypeDef<TypeDefKind>;
     arguments: DaggerArguments;
-    alias: undefined;
     private symbol;
     private signature?;
+    alias: undefined;
+    cache: undefined;
     constructor(node: ts.PropertySignature | ts.MethodSignature, ast: AST);
     getReferences(): string[];
     propagateReferences(references: References): void;

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

@@ -1 +1 @@
-{"version":3,"file":"interfaceFunction.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/interfaceFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EACL,GAAG,EAGJ,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,wBAAwB,GAAG;IACrC,CAAC,IAAI,EAAE,MAAM,GAAG,uBAAuB,CAAA;CACxC,CAAA;AAED,qBAAa,uBAAwB,SAAQ,SAAS;IAYlD,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAZf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,cAAc,CAAC,CAAQ;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,SAAS,EAAE,eAAe,CAAK;IAE/B,KAAK,EAAE,SAAS,CAAA;IACvB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,SAAS,CAAC,CAAc;gBAGb,IAAI,EAAE,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,eAAe,EAC/C,GAAG,EAAE,GAAG;IA2CpB,aAAa,IAAI,MAAM,EAAE;IAqBzB,mBAAmB,CAAC,UAAU,EAAE,UAAU;IAuB1C,MAAM;;;;;;CAQd"}
+{"version":3,"file":"interfaceFunction.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/interfaceFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EACL,GAAG,EAGJ,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,wBAAwB,GAAG;IACrC,CAAC,IAAI,EAAE,MAAM,GAAG,uBAAuB,CAAA;CACxC,CAAA;AAED,qBAAa,uBAAwB,SAAQ,SAAS;IAclD,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,cAAc,CAAC,CAAQ;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IACjC,SAAS,EAAE,eAAe,CAAK;IACtC,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,SAAS,CAAC,CAAc;IAGzB,KAAK,EAAE,SAAS,CAAA;IAChB,KAAK,EAAE,SAAS,CAAA;gBAGJ,IAAI,EAAE,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,eAAe,EAC/C,GAAG,EAAE,GAAG;IA2CpB,aAAa,IAAI,MAAM,EAAE;IAqBzB,mBAAmB,CAAC,UAAU,EAAE,UAAU;IAuB1C,MAAM;;;;;;CAQd"}

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

@@ -11,10 +11,11 @@ export class DaggerInterfaceFunction extends Locatable {
     _returnTypeRef;
     returnType;
     arguments = {};
-    // Just a placeholder to be compatible with `Method` during registration
-    alias;
     symbol;
     signature;
+    // Just placeholders to be compatible with `Method` during registration
+    alias;
+    cache;
     constructor(node, ast) {
         super(node);
         this.node = node;

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

@@ -1 +1 @@
-{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/module.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAKhC,OAAO,EAEL,GAAG,EAGJ,MAAM,+BAA+B,CAAA;AAGtC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/C,OAAO,EAAmB,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAInD;;;;;;;;GAQG;AACH,qBAAa,YAAY;IA4Dd,IAAI,EAAE,MAAM;IACnB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IA7Db;;;;;;;;;;;;;;;;;;;OAmBG;IACI,OAAO,EAAE,iBAAiB,CAAK;IAEtC;;;;;;;;;;;OAWG;IACI,KAAK,EAAE,eAAe,CAAK;IAElC;;;;;;;;;;OAUG;IACI,UAAU,EAAE,gBAAgB,CAAK;IAEjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAEtC,OAAO,CAAC,UAAU,CAKjB;gBAGQ,IAAI,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAAE,EACpB,GAAG,EAAE,GAAG;IA8BlB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,iBAAiB;IAkIzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IAsExB;;OAEG;IACH,OAAO,CAAC,WAAW;IA2BnB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB,MAAM;;;;;;;CASP"}
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/module.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAKhC,OAAO,EACL,GAAG,EAGJ,MAAM,+BAA+B,CAAA;AAGtC,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAE/C,OAAO,EAAmB,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAInD;;;;;;;;GAQG;AACH,qBAAa,YAAY;IA4Dd,IAAI,EAAE,MAAM;IACnB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IA7Db;;;;;;;;;;;;;;;;;;;OAmBG;IACI,OAAO,EAAE,iBAAiB,CAAK;IAEtC;;;;;;;;;;;OAWG;IACI,KAAK,EAAE,eAAe,CAAK;IAElC;;;;;;;;;;OAUG;IACI,UAAU,EAAE,gBAAgB,CAAK;IAEjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAEtC,OAAO,CAAC,UAAU,CAKjB;gBAGQ,IAAI,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAAE,EACpB,GAAG,EAAE,GAAG;IAuBlB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,iBAAiB;IAkIzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IAsExB;;OAEG;IACH,OAAO,CAAC,WAAW;IA2BnB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB,MAAM;;;;;;;CASP"}

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

@@ -1,7 +1,7 @@
 import ts from "typescript";
 import { TypeDefKind } from "../../../api/client.gen.js";
 import { IntrospectionError } from "../../../common/errors/index.js";
-import { findModuleByExportedName, AST, CLIENT_GEN_FILE, } from "../typescript_module/index.js";
+import { AST, CLIENT_GEN_FILE, } from "../typescript_module/index.js";
 import { ENUM_DECORATOR, OBJECT_DECORATOR } from "./decorator.js";
 import { DaggerEnum } from "./enum.js";
 import { DaggerEnumClass } from "./enumClass.js";
@@ -78,10 +78,6 @@ export class DaggerModule {
         this.name = name;
         this.userModule = userModule;
         this.ast = ast;
-        const mainModule = findModuleByExportedName(this.name, this.userModule);
-        if (!mainModule) {
-            console.warn(`could not find module entrypoint: class ${this.name} from import. Class should be exported to benefit from all features.`);
-        }
         const classObjects = this.findClasses();
         for (const classObject of classObjects) {
             // This only applies to cloud. If this is the true main object, it is correct

package/dist/src/module/introspector/index.d.ts

@@ -1,3 +1,3 @@
 import { DaggerModule } from "./dagger_module/index.js";
-export declare function scan(files: string[], moduleName?: string): Promise<DaggerModule>;
+export declare function scan(files: string[], moduleName?: string, loadModule?: boolean): Promise<DaggerModule>;
 //# sourceMappingURL=index.d.ts.map