@dagger.io/dagger 0.11.9 → 0.12.0

package/dist/introspector/scanner/abtractions/object.js

@@ -1,14 +1,34 @@
 import ts from "typescript";
 import { UnknownDaggerError } from "../../../common/errors/UnknownDaggerError.js";
-import { isFunction } from "../utils.js";
+import { object } from "../../decorators/decorators.js";
 import { Constructor } from "./constructor.js";
-import { Method } from "./method.js";
+import { Method, isMethodDecorated } from "./method.js";
 import { Property } from "./property.js";
+export const OBJECT_DECORATOR = object.name;
+/**
+ * Return true if the given class declaration has the decorator @obj() on
+ * top of its declaration.
+ * @param object
+ */
+export function isObjectDecorated(object) {
+    return (ts.getDecorators(object)?.find((d) => {
+        if (ts.isCallExpression(d.expression)) {
+            return d.expression.expression.getText() === OBJECT_DECORATOR;
+        }
+        return false;
+    }) !== undefined);
+}
 export class DaggerObject {
     checker;
     class;
     symbol;
     file;
+    // Preloaded values.
+    _name;
+    _description;
+    _classConstructor;
+    _methods;
+    _properties;
     /**
      *
      * @param checker The checker to use to introspect the class.
@@ -29,14 +49,44 @@ export class DaggerObject {
             throw new UnknownDaggerError(`could not get class symbol: ${classDeclaration.name.getText()}`, {});
         }
         this.symbol = classSymbol;
+        // Preload values to optimize introspection.
+        this._name = this.loadName();
+        this._description = this.loadDescription();
+        this._classConstructor = this.loadConstructor();
+        this._methods = this.loadMethods();
+        this._properties = this.loadProperties();
     }
     get name() {
-        return this.symbol.getName();
+        return this._name;
     }
     get description() {
-        return ts.displayPartsToString(this.symbol.getDocumentationComment(this.checker));
+        return this._description;
     }
     get _constructor() {
+        return this._classConstructor;
+    }
+    get methods() {
+        return this._methods;
+    }
+    get properties() {
+        return this._properties;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            description: this.description,
+            constructor: this._constructor,
+            methods: this.methods,
+            properties: this.properties,
+        };
+    }
+    loadName() {
+        return this.symbol.getName();
+    }
+    loadDescription() {
+        return ts.displayPartsToString(this.symbol.getDocumentationComment(this.checker));
+    }
+    loadConstructor() {
         const constructor = this.class.members.find((member) => {
             if (ts.isConstructorDeclaration(member)) {
                 return true;
@@ -47,16 +97,16 @@ export class DaggerObject {
         }
         return new Constructor(this.checker, constructor);
     }
-    get methods() {
+    loadMethods() {
         return this.class.members
-            .filter((member) => ts.isMethodDeclaration(member) && isFunction(member))
+            .filter((member) => ts.isMethodDeclaration(member) && isMethodDecorated(member))
             .reduce((acc, member) => {
             const method = new Method(this.checker, member);
             acc[method.alias ?? method.name] = method;
             return acc;
         }, {});
     }
-    get properties() {
+    loadProperties() {
         return this.class.members
             .filter((member) => ts.isPropertyDeclaration(member))
             .reduce((acc, member) => {
@@ -65,30 +115,4 @@ export class DaggerObject {
             return acc;
         }, {});
     }
-    // TODO(TomChv): replace with `ToJson` method
-    // after the refactor is complete.
-    get typeDef() {
-        return {
-            name: this.name,
-            description: this.description,
-            constructor: this._constructor?.typeDef,
-            methods: Object.entries(this.methods).reduce((acc, [name, method]) => {
-                acc[name] = method.typeDef;
-                return acc;
-            }, {}),
-            fields: Object.entries(this.properties).reduce((acc, [name, property]) => {
-                acc[name] = property.typeDef;
-                return acc;
-            }, {}),
-        };
-    }
-    toJSON() {
-        return {
-            name: this.name,
-            description: this.description,
-            constructor: this._constructor,
-            methods: this.methods,
-            properties: this.properties,
-        };
-    }
 }

package/dist/introspector/scanner/abtractions/property.d.ts

@@ -1,6 +1,6 @@
 import ts from "typescript";
 import { TypeDefKind } from "../../../api/client.gen.js";
-import { FieldTypeDef, TypeDef } from "../typeDefs.js";
+import { TypeDef } from "../typeDefs.js";
 export type Properties = {
     [name: string]: Property;
 };
@@ -15,6 +15,11 @@ export declare class Property {
     private checker;
     private property;
     private decorator;
+    private _name;
+    private _description;
+    private _alias;
+    private _type;
+    private _isExposed;
     /**
      *
      * @param checker Checker to use to introspect the property.
@@ -34,7 +39,6 @@ export declare class Property {
      */
     get type(): TypeDef<TypeDefKind>;
     get isExposed(): boolean;
-    get typeDef(): FieldTypeDef;
     toJSON(): {
         name: string;
         description: string;
@@ -42,5 +46,10 @@ export declare class Property {
         type: TypeDef<TypeDefKind>;
         isExposed: boolean;
     };
+    private loadName;
+    private loadDescription;
+    private loadAlias;
+    private loadType;
+    private loadIsExposed;
 }
 //# sourceMappingURL=property.d.ts.map

package/dist/introspector/scanner/abtractions/property.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../introspector/scanner/abtractions/property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAKtD,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AAErD;;;;;GAKG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAW;IAEzB,OAAO,CAAC,OAAO,CAAgB;IAE/B,OAAO,CAAC,QAAQ,CAAwB;IAExC,OAAO,CAAC,SAAS,CAA0B;IAE3C;;;;;;OAMG;gBACS,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,mBAAmB;IAuBrE,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,WAAW,IAAI,MAAM,CAIxB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAa9B;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAc/B;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAID,IAAI,OAAO,IAAI,YAAY,CAQ1B;IAED,MAAM;;;;;;;CASP"}
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../introspector/scanner/abtractions/property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAGxD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAMxC,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAA;AAErD;;;;;GAKG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAW;IAEzB,OAAO,CAAC,OAAO,CAAgB;IAE/B,OAAO,CAAC,QAAQ,CAAwB;IAExC,OAAO,CAAC,SAAS,CAA0B;IAG3C,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,UAAU,CAAS;IAE3B;;;;;;OAMG;gBACS,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE,CAAC,mBAAmB;IAiCrE,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;OAEG;IACH,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,CAE/B;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,MAAM;;;;;;;IAUN,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,QAAQ;IAgBhB,OAAO,CAAC,aAAa;CAGtB"}

package/dist/introspector/scanner/abtractions/property.js

@@ -1,7 +1,9 @@
 import ts from "typescript";
 import { UnknownDaggerError } from "../../../common/errors/UnknownDaggerError.js";
-import { typeToTypedef } from "../utils.js";
-const PROPERTY_DECORATOR = "field";
+import { field, func } from "../../decorators/decorators.js";
+import { typeToTypedef } from "./typeToTypedef.js";
+const DEPRECATED_PROPERTY_DECORATOR = field.name;
+const PROPERTY_DECORATOR = func.name;
 /**
  * Property is an abstraction of a class property.
  *
@@ -13,6 +15,12 @@ export class Property {
     checker;
     property;
     decorator;
+    // Preloaded values.
+    _name;
+    _description;
+    _alias;
+    _type;
+    _isExposed;
     /**
      *
      * @param checker Checker to use to introspect the property.
@@ -30,21 +38,55 @@ export class Property {
         this.symbol = propertySymbol;
         this.decorator = ts.getDecorators(property)?.find((d) => {
             if (ts.isCallExpression(d.expression)) {
-                return d.expression.expression.getText() === PROPERTY_DECORATOR;
+                return (d.expression.expression.getText() === PROPERTY_DECORATOR ||
+                    d.expression.expression.getText() === DEPRECATED_PROPERTY_DECORATOR);
             }
             return false;
         });
+        // Preload values to optimize introspection
+        this._name = this.loadName();
+        this._description = this.loadDescription();
+        this._alias = this.loadAlias();
+        this._type = this.loadType();
+        this._isExposed = this.loadIsExposed();
     }
     get name() {
-        return this.property.name.getText();
+        return this._name;
     }
     get description() {
-        return ts.displayPartsToString(this.symbol.getDocumentationComment(this.checker));
+        return this._description;
     }
     /**
      * Return the alias of the property if it has one.
      */
     get alias() {
+        return this._alias;
+    }
+    /**
+     * Return the type of the property in a Dagger TypeDef format.
+     */
+    get type() {
+        return this._type;
+    }
+    get isExposed() {
+        return this._isExposed;
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            description: this.description,
+            alias: this.alias,
+            type: this.type,
+            isExposed: this.isExposed,
+        };
+    }
+    loadName() {
+        return this.symbol.getName();
+    }
+    loadDescription() {
+        return ts.displayPartsToString(this.symbol.getDocumentationComment(this.checker));
+    }
+    loadAlias() {
         if (!this.decorator) {
             return undefined;
         }
@@ -55,37 +97,14 @@ export class Property {
         }
         return JSON.parse(aliasArg.getText().replace(/'/g, '"'));
     }
-    /**
-     * Return the type of the property in a Dagger TypeDef format.
-     */
-    get type() {
+    loadType() {
         if (!this.symbol.valueDeclaration) {
             throw new UnknownDaggerError("could not find symbol value declaration", {});
         }
         const type = this.checker.getTypeOfSymbolAtLocation(this.symbol, this.symbol.valueDeclaration);
         return typeToTypedef(this.checker, type);
     }
-    get isExposed() {
+    loadIsExposed() {
         return this.decorator !== undefined;
     }
-    // TODO(TomChv): replace with `ToJson` method
-    // after the refactor is complete.
-    get typeDef() {
-        return {
-            name: this.name,
-            description: this.description,
-            alias: this.alias,
-            typeDef: this.type,
-            isExposed: this.isExposed,
-        };
-    }
-    toJSON() {
-        return {
-            name: this.name,
-            description: this.description,
-            alias: this.alias,
-            type: this.type,
-            isExposed: this.isExposed,
-        };
-    }
 }

package/dist/introspector/scanner/abtractions/typeToTypedef.d.ts

@@ -0,0 +1,8 @@
+import ts from "typescript";
+import { TypeDefKind } from "../../../api/client.gen.js";
+import { TypeDef } from "../typeDefs.js";
+/**
+ * Convert a type into a Dagger Typedef using dynamic typing.
+ */
+export declare function typeToTypedef(checker: ts.TypeChecker, type: ts.Type): TypeDef<TypeDefKind>;
+//# sourceMappingURL=typeToTypedef.d.ts.map

package/dist/introspector/scanner/abtractions/typeToTypedef.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"typeToTypedef.d.ts","sourceRoot":"","sources":["../../../../introspector/scanner/abtractions/typeToTypedef.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAGxC;;GAEG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,IAAI,EAAE,EAAE,CAAC,IAAI,GACZ,OAAO,CAAC,WAAW,CAAC,CAuFtB"}

package/dist/introspector/scanner/abtractions/typeToTypedef.js

@@ -0,0 +1,76 @@
+import ts from "typescript";
+import { TypeDefKind } from "../../../api/client.gen.js";
+import { isEnumDecorated } from "./enum.js";
+/**
+ * Convert a type into a Dagger Typedef using dynamic typing.
+ */
+export function typeToTypedef(checker, type) {
+    const symbol = type.getSymbol();
+    const symbolName = symbol?.name;
+    const symbolDeclaration = symbol?.valueDeclaration;
+    if (symbolName === "Promise") {
+        const typeArgs = checker.getTypeArguments(type);
+        if (typeArgs.length > 0) {
+            return typeToTypedef(checker, typeArgs[0]);
+        }
+    }
+    if (symbolName === "Array") {
+        const typeArgs = checker.getTypeArguments(type);
+        if (typeArgs.length === 0) {
+            throw new Error("Generic array not supported");
+        }
+        return {
+            kind: TypeDefKind.ListKind,
+            typeDef: typeToTypedef(checker, typeArgs[0]),
+        };
+    }
+    const strType = checker.typeToString(type);
+    switch (strType) {
+        case "string":
+            return { kind: TypeDefKind.StringKind };
+        case "number":
+            return { kind: TypeDefKind.IntegerKind };
+        case "boolean":
+            return { kind: TypeDefKind.BooleanKind };
+        case "void":
+            return { kind: TypeDefKind.VoidKind };
+        // Intercept primitive types and throw error in this case
+        case "String":
+            throw new Error("Use of primitive String type detected, did you mean string?");
+        case "Number":
+            throw new Error("Use of primitive Number type detected, did you mean number?");
+        case "Boolean":
+            throw new Error("Use of primitive Boolean type detected, did you mean boolean?");
+        default:
+            if (symbolName &&
+                type.isClassOrInterface() &&
+                symbolDeclaration &&
+                ts.isClassDeclaration(symbolDeclaration)) {
+                if (isEnumDecorated(symbolDeclaration)) {
+                    return {
+                        kind: TypeDefKind.EnumKind,
+                        name: symbolName,
+                    };
+                }
+                return {
+                    kind: TypeDefKind.ObjectKind,
+                    name: symbolName,
+                };
+            }
+            if (symbol?.getFlags() !== undefined &&
+                (symbol.getFlags() & ts.SymbolFlags.Enum) !== 0) {
+                return {
+                    kind: TypeDefKind.EnumKind,
+                    name: strType,
+                };
+            }
+            // If it's a union, then it's a scalar type
+            if (type.isUnionOrIntersection()) {
+                return {
+                    kind: TypeDefKind.ScalarKind,
+                    name: strType,
+                };
+            }
+            throw new Error(`Unsupported type ${strType}`);
+    }
+}

package/dist/introspector/scanner/scan.d.ts

@@ -1,16 +1,4 @@
 import { DaggerModule } from "./abtractions/module.js";
-import { ClassTypeDef, FunctionTypedef } from "./typeDefs.js";
-export type ScanResult = {
-    module: {
-        description?: string;
-    };
-    classes: {
-        [name: string]: ClassTypeDef;
-    };
-    functions: {
-        [name: string]: FunctionTypedef;
-    };
-};
 /**
  * Scan the list of TypeScript File using the TypeScript compiler API.
  *

package/dist/introspector/scanner/scan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/scan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAE7D,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAA;KACrB,CAAA;IACD,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAA;IACzC,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAA;CAC/C,CAAA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,SAAK,GAAG,YAAY,CAenE"}
+{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/scan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEtD;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,SAAK,GAAG,YAAY,CAenE"}

package/dist/introspector/scanner/typeDefs.d.ts

@@ -12,6 +12,13 @@ export type ObjectTypeDef = BaseTypeDef & {
     kind: TypeDefKind.ObjectKind;
     name: string;
 };
+/**
+ * Extends the base type def if it's an enum to add its name.
+ */
+export type EnumTypeDef = BaseTypeDef & {
+    kind: TypeDefKind.EnumKind;
+    name: string;
+};
 /**
  * Extends the base typedef if it's a scalar to add its name and real type.
  */
@@ -34,57 +41,5 @@ export type ListTypeDef = BaseTypeDef & {
  * If it's type of kind object, it transforms the BaseTypeDef into an ObjectTypeDef.
  * If it's a type of kind list, it transforms the BaseTypeDef into a ListTypeDef.
  */
-export type TypeDef<T extends BaseTypeDef["kind"]> = T extends TypeDefKind.ScalarKind ? ScalarTypeDef : T extends TypeDefKind.ObjectKind ? ObjectTypeDef : T extends TypeDefKind.ListKind ? ListTypeDef : BaseTypeDef;
-/**
- * The type of field in a class
- */
-export type FieldTypeDef = {
-    name: string;
-    alias?: string;
-    description: string;
-    typeDef: TypeDef<TypeDefKind>;
-    isExposed: boolean;
-};
-/**
- * The type of function argument in a method or function.
- */
-export type FunctionArgTypeDef = {
-    name: string;
-    description: string;
-    optional: boolean;
-    defaultValue?: string;
-    isVariadic: boolean;
-    typeDef: TypeDef<TypeDefKind>;
-};
-/**
- * The type of function, it can be a method from a class or an actual function.
- */
-export type FunctionTypedef = {
-    name: string;
-    description: string;
-    alias?: string;
-    args: {
-        [name: string]: FunctionArgTypeDef;
-    };
-    returnType: TypeDef<TypeDefKind>;
-};
-export type ConstructorTypeDef = {
-    args: {
-        [name: string]: FunctionArgTypeDef;
-    };
-};
-/**
- * A type of Class.
- */
-export type ClassTypeDef = {
-    name: string;
-    description: string;
-    fields: {
-        [name: string]: FieldTypeDef;
-    };
-    constructor?: ConstructorTypeDef;
-    methods: {
-        [name: string]: FunctionTypedef;
-    };
-};
+export type TypeDef<T extends BaseTypeDef["kind"]> = T extends TypeDefKind.ScalarKind ? ScalarTypeDef : T extends TypeDefKind.ObjectKind ? ObjectTypeDef : T extends TypeDefKind.ListKind ? ListTypeDef : T extends TypeDefKind.EnumKind ? EnumTypeDef : BaseTypeDef;
 //# sourceMappingURL=typeDefs.d.ts.map

package/dist/introspector/scanner/typeDefs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeDefs.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/typeDefs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,WAAW,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG;IACxC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG;IACxC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,IAC/C,CAAC,SAAS,WAAW,CAAC,UAAU,GAC5B,aAAa,GACb,CAAC,SAAS,WAAW,CAAC,UAAU,GAC9B,aAAa,GACb,CAAC,SAAS,WAAW,CAAC,QAAQ,GAC5B,WAAW,GACX,WAAW,CAAA;AAErB;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC7B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAA;IAC5C,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAE,CAAA;CAC7C,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAA;IACxC,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAA;CAC7C,CAAA"}
+{"version":3,"file":"typeDefs.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/typeDefs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,WAAW,CAAA;CAClB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG;IACxC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG;IACxC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAA;IAC5B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,WAAW,GAAG;IACtC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,IAC/C,CAAC,SAAS,WAAW,CAAC,UAAU,GAC5B,aAAa,GACb,CAAC,SAAS,WAAW,CAAC,UAAU,GAC9B,aAAa,GACb,CAAC,SAAS,WAAW,CAAC,QAAQ,GAC5B,WAAW,GACX,CAAC,SAAS,WAAW,CAAC,QAAQ,GAC5B,WAAW,GACX,WAAW,CAAA"}

package/dist/introspector/scanner/utils.d.ts

@@ -9,7 +9,7 @@ import { TypeDef } from "./typeDefs.js";
 export declare function isObject(object: ts.ClassDeclaration): boolean;
 export declare function toPascalCase(input: string): string;
 /**
- * Return true if the given method has the decorator @fct() on top
+ * Return true if the given method has the decorator @func() on top
  * of its declaration.
  *
  * @param method The method to check

package/dist/introspector/scanner/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,GAAG,OAAO,CAU7D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAoBlD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,GAAG,OAAO,CAUhE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,IAAI,EAAE,EAAE,CAAC,IAAI,GACZ,OAAO,CAAC,WAAW,CAAC,CAgDtB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,GAAG,OAAO,CAU7D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAoBlD;AAED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,GAAG,OAAO,CAUhE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,IAAI,EAAE,EAAE,CAAC,IAAI,GACZ,OAAO,CAAC,WAAW,CAAC,CA8DtB"}

package/dist/introspector/scanner/utils.js

@@ -31,7 +31,7 @@ export function toPascalCase(input) {
     return pascalCase;
 }
 /**
- * Return true if the given method has the decorator @fct() on top
+ * Return true if the given method has the decorator @func() on top
  * of its declaration.
  *
  * @param method The method to check
@@ -64,12 +64,6 @@ export function typeToTypedef(checker, type) {
             typeDef: typeToTypedef(checker, typeArgs[0]),
         };
     }
-    if (type.symbol?.name && type.isClassOrInterface()) {
-        return {
-            kind: TypeDefKind.ObjectKind,
-            name: type.symbol.name,
-        };
-    }
     const strType = checker.typeToString(type);
     switch (strType) {
         case "string":
@@ -80,7 +74,21 @@ export function typeToTypedef(checker, type) {
             return { kind: TypeDefKind.BooleanKind };
         case "void":
             return { kind: TypeDefKind.VoidKind };
+        // Intercept primitive types and throw error in this case
+        case "String":
+            throw new Error("Use of primitive String type detected, did you mean string?");
+        case "Number":
+            throw new Error("Use of primitive Number type detected, did you mean number?");
+        case "Boolean":
+            throw new Error("Use of primitive Boolean type detected, did you mean boolean?");
         default:
+            // If it's a class or interface, it's an object
+            if (type.symbol?.name && type.isClassOrInterface()) {
+                return {
+                    kind: TypeDefKind.ObjectKind,
+                    name: strType,
+                };
+            }
             // If it's a union, then it's a scalar type
             if (type.isUnionOrIntersection()) {
                 return {

package/dist/provisioning/default.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_VERSION = "0.11.9";
+export declare const CLI_VERSION = "0.12.0";
 //# 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.11.9";
+export const CLI_VERSION = "0.12.0";

package/package.json

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