@dagger.io/dagger 0.15.1 → 0.15.3

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

@@ -0,0 +1,87 @@
+import ts from "typescript";
+import { IntrospectionError } from "../../../common/errors/index.js";
+import { AST, isTypeDefResolved, resolveTypeDef, } from "../typescript_module/index.js";
+import { DaggerArgument } from "./argument.js";
+import { Locatable } from "./locatable.js";
+export class DaggerInterfaceFunction extends Locatable {
+    node;
+    ast;
+    name;
+    description;
+    _returnTypeRef;
+    returnType;
+    arguments = {};
+    // Just a placeholder to be compatible with `Method` during registration
+    alias;
+    symbol;
+    signature;
+    constructor(node, ast) {
+        super(node);
+        this.node = node;
+        this.ast = ast;
+        if (!this.node.name) {
+            throw new IntrospectionError(`could not resolve name of interface function at ${AST.getNodePosition(node)}`);
+        }
+        this.name = this.node.name.getText();
+        this.symbol = this.ast.getSymbolOrThrow(this.node.name);
+        this.description = this.ast.getDocFromSymbol(this.symbol);
+        // If it's a method signature, we can directly use it to get the signature props
+        // If it's a property kind signature, we need to get the signature from the type
+        // Examle:
+        // interface Foo {
+        //   bar(): void       // <- this is a method signature
+        //   baz: () => string // <- this is a property kind signature
+        // }
+        const nodeType = this.node.type && ts.isFunctionTypeNode(this.node.type)
+            ? this.node.type
+            : this.node;
+        const signature = this.ast.getSignatureFromFunctionOrThrow(nodeType);
+        for (const parameter of nodeType.parameters) {
+            this.arguments[parameter.name.getText()] = new DaggerArgument(parameter, this.ast);
+        }
+        const signatureReturnType = signature.getReturnType();
+        const typedef = this.ast.tsTypeToTypeDef(this.node, signatureReturnType);
+        if (typedef === undefined || !isTypeDefResolved(typedef)) {
+            this._returnTypeRef = this.ast.typeToStringType(signatureReturnType);
+        }
+        this.returnType = typedef;
+    }
+    getReferences() {
+        const references = [];
+        if (this._returnTypeRef &&
+            (this.returnType === undefined || !isTypeDefResolved(this.returnType))) {
+            references.push(this._returnTypeRef);
+        }
+        for (const argument of Object.values(this.arguments)) {
+            const reference = argument.getReference();
+            if (reference) {
+                references.push(reference);
+            }
+        }
+        return references;
+    }
+    propagateReferences(references) {
+        for (const argument of Object.values(this.arguments)) {
+            argument.propagateReferences(references);
+        }
+        if (!this._returnTypeRef) {
+            return;
+        }
+        if (this.returnType && isTypeDefResolved(this.returnType)) {
+            return;
+        }
+        const typeDef = references[this._returnTypeRef];
+        if (!typeDef) {
+            throw new IntrospectionError(`could not find type reference for ${this._returnTypeRef} at ${AST.getNodePosition(this.node)}.`);
+        }
+        this.returnType = resolveTypeDef(this.returnType, typeDef);
+    }
+    toJSON() {
+        return {
+            name: this.name,
+            description: this.description,
+            arguments: this.arguments,
+            returnType: this.returnType,
+        };
+    }
+}

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

@@ -0,0 +1,12 @@
+import ts from "typescript";
+import { Location } from "../typescript_module/index.js";
+/**
+ * Locatable is a base class that any Dagger object can extend from to
+ * provide a location method.
+ */
+export declare class Locatable {
+    private readonly __node;
+    constructor(__node: ts.Node);
+    getLocation(): Location;
+}
+//# sourceMappingURL=locatable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"locatable.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/locatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAO,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAE7D;;;GAGG;AACH,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,EAAE,CAAC,IAAI;IAE5C,WAAW,IAAI,QAAQ;CAGxB"}

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

@@ -0,0 +1,14 @@
+import { AST } from "../typescript_module/index.js";
+/**
+ * Locatable is a base class that any Dagger object can extend from to
+ * provide a location method.
+ */
+export class Locatable {
+    __node;
+    constructor(__node) {
+        this.__node = __node;
+    }
+    getLocation() {
+        return AST.getNodeLocation(this.__node);
+    }
+}

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

@@ -1,6 +1,7 @@
 import Module from "node:module";
 import { AST } from "../typescript_module/index.js";
 import { DaggerEnumsBase } from "./enumBase.js";
+import { DaggerInterfaces } from "./interface.js";
 import { DaggerObjectsBase } from "./objectBase.js";
 /**
  * DaggerModule represents a TypeScript module with a set of files
@@ -60,6 +61,18 @@ export declare class DaggerModule {
      * ```
      */
     enums: DaggerEnumsBase;
+    /**
+     * An interface is declared using the `interface` keyword.
+     *
+     * @example
+     * ```ts
+     * export interface Example {
+     *   foo: (): string
+     *   asyncFoo: (): Promise<string>
+     * }
+     * ```
+     */
+    interfaces: DaggerInterfaces;
     description: string | undefined;
     private references;
     constructor(name: string, userModule: Module[], ast: AST);
@@ -72,8 +85,9 @@ export declare class DaggerModule {
      * - classes
      * - enums
      * - scalars
+     * - interfaces
      *
-     * If the reference is an object or a class, recursively find the references of the object.
+     * If the reference is an object, a class or an interface, recursively find the references of the object.
      *
      * *Note*: If a class is referenced but not exported and not decorated with `@object()`, we throw an error
      * because we aim to be explicit. (TomChv: Should we change this behaviour?)
@@ -105,6 +119,7 @@ export declare class DaggerModule {
         description: string | undefined;
         objects: DaggerObjectsBase;
         enums: DaggerEnumsBase;
+        interfaces: DaggerInterfaces;
     };
 }
 //# sourceMappingURL=module.d.ts.map

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;AAG/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAInD;;;;;;;;GAQG;AACH,qBAAa,YAAY;IAoDd,IAAI,EAAE,MAAM;IACnB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IArDb;;;;;;;;;;;;;;;;;;;OAmBG;IACI,OAAO,EAAE,iBAAiB,CAAK;IAEtC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,KAAK,EAAE,eAAe,CAAK;IAC3B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAA;IAEtC,OAAO,CAAC,UAAU,CAAiB;gBAG1B,IAAI,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAAE,EACpB,GAAG,EAAE,GAAG;IAkClB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,iBAAiB;IAmHzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IAsExB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAM3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB,MAAM;;;;;;CAQP"}
+{"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;IAuEd,IAAI,EAAE,MAAM;IACnB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,GAAG;IAxEb;;;;;;;;;;;;;;;;;;;OAmBG;IACI,OAAO,EAAE,iBAAiB,CAAK;IAEtC;;;;;;;;;;;;;;;;;;;;;;OAsBG;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;IAkClB;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,iBAAiB;IAkIzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,gBAAgB;IAsExB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAgBtB,MAAM;;;;;;;CASP"}

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

@@ -5,6 +5,7 @@ import { findModuleByExportedName, AST, CLIENT_GEN_FILE, } from "../typescript_m
 import { ENUM_DECORATOR, OBJECT_DECORATOR } from "./decorator.js";
 import { DaggerEnum } from "./enum.js";
 import { DaggerEnumClass } from "./enumClass.js";
+import { DaggerInterface } from "./interface.js";
 import { DaggerObject } from "./object.js";
 import { DaggerTypeObject } from "./typeObject.js";
 /**
@@ -65,8 +66,25 @@ export class DaggerModule {
      * ```
      */
     enums = {};
+    /**
+     * An interface is declared using the `interface` keyword.
+     *
+     * @example
+     * ```ts
+     * export interface Example {
+     *   foo: (): string
+     *   asyncFoo: (): Promise<string>
+     * }
+     * ```
+     */
+    interfaces = {};
     description;
-    references = {};
+    references = {
+        // Float is a special case, it's an alias of number but it serves to declare a float type
+        // in the Dagger API.
+        // So we auto register it because it will be detected as a referenced type by the introspector.
+        float: { kind: TypeDefKind.FloatKind },
+    };
     constructor(name, userModule, ast) {
         this.name = name;
         this.userModule = userModule;
@@ -99,8 +117,9 @@ export class DaggerModule {
      * - classes
      * - enums
      * - scalars
+     * - interfaces
      *
-     * If the reference is an object or a class, recursively find the references of the object.
+     * If the reference is an object, a class or an interface, recursively find the references of the object.
      *
      * *Note*: If a class is referenced but not exported and not decorated with `@object()`, we throw an error
      * because we aim to be explicit. (TomChv: Should we change this behaviour?)
@@ -164,6 +183,17 @@ export class DaggerModule {
                 // There should be no reference in enums.
                 continue;
             }
+            const interfaceRef = this.ast.findResolvedNodeByName(reference, ts.SyntaxKind.InterfaceDeclaration);
+            if (interfaceRef) {
+                const daggerInterface = new DaggerInterface(interfaceRef.node, this.ast);
+                this.interfaces[daggerInterface.name] = daggerInterface;
+                this.references[daggerInterface.name] = {
+                    kind: TypeDefKind.InterfaceKind,
+                    name: daggerInterface.name,
+                };
+                this.resolveReferences(daggerInterface.getReferences());
+                continue;
+            }
             const typeAliasRef = this.ast.findResolvedNodeByName(reference, ts.SyntaxKind.TypeAliasDeclaration);
             if (typeAliasRef) {
                 // The resolution is to big so we split it in a sub function.
@@ -248,6 +278,9 @@ export class DaggerModule {
         for (const object of Object.values(this.objects)) {
             object.propagateReferences(this.references);
         }
+        for (const interface_ of Object.values(this.interfaces)) {
+            interface_.propagateReferences(this.references);
+        }
     }
     /**
      * Get the top level comment of the file that contains the module entrypoint.
@@ -270,6 +303,7 @@ export class DaggerModule {
             description: this.description,
             objects: this.objects,
             enums: this.enums,
+            interfaces: this.interfaces,
         };
     }
 }

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

@@ -1,11 +1,25 @@
 import ts from "typescript";
-import { AST } from "../typescript_module/index.js";
+import { AST, Location } from "../typescript_module/index.js";
 import { DaggerConstructor } from "./constructor.js";
 import { DaggerFunctions } from "./function.js";
+import { Locatable } from "./locatable.js";
 import { DaggerObjectBase } from "./objectBase.js";
 import { DaggerProperties } from "./property.js";
 import { References } from "./reference.js";
-export declare class DaggerObject implements DaggerObjectBase {
+/**
+ * Represents an object defined using the `class` keyword.
+ *
+ * The class may contains methods and fields, that may or may not be exposed to the Dagger API.
+ *
+ * @example
+ * ```ts
+ * type MyObject = {
+ *   name: string
+ *   age: number
+ * }
+ * ```
+ */
+export declare class DaggerObject extends Locatable implements DaggerObjectBase {
     private readonly node;
     private readonly ast;
     name: string;
@@ -16,6 +30,7 @@ export declare class DaggerObject implements DaggerObjectBase {
     private symbol;
     kind(): "class" | "object";
     constructor(node: ts.ClassDeclaration, ast: AST);
+    getLocation(): Location;
     getReferences(): string[];
     propagateReferences(references: References): void;
     toJSON(): {

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

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,eAAe,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,qBAAa,YAAa,YAAW,gBAAgB;IAcjD,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAY;IACvD,OAAO,EAAE,eAAe,CAAK;IAC7B,UAAU,EAAE,gBAAgB,CAAK;IAExC,OAAO,CAAC,MAAM,CAAW;IAEzB,IAAI,IAAI,OAAO,GAAG,QAAQ;gBAKP,IAAI,EAAE,EAAE,CAAC,gBAAgB,EACzB,GAAG,EAAE,GAAG;IAqDpB,aAAa,IAAI,MAAM,EAAE;IAqBzB,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAcjD,MAAM;;;;;;;CASd"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,OAAO,EAAkB,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,eAAe,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C;;;;;;;;;;;;GAYG;AACH,qBAAa,YAAa,SAAQ,SAAU,YAAW,gBAAgB;IAcnE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAY;IACvD,OAAO,EAAE,eAAe,CAAK;IAC7B,UAAU,EAAE,gBAAgB,CAAK;IAExC,OAAO,CAAC,MAAM,CAAW;IAEzB,IAAI,IAAI,OAAO,GAAG,QAAQ;gBAKP,IAAI,EAAE,EAAE,CAAC,gBAAgB,EACzB,GAAG,EAAE,GAAG;IAuDpB,WAAW,IAAI,QAAQ;IAIvB,aAAa,IAAI,MAAM,EAAE;IAqBzB,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAcjD,MAAM;;;;;;;CASd"}

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

@@ -4,8 +4,22 @@ import { AST } from "../typescript_module/index.js";
 import { DaggerConstructor } from "./constructor.js";
 import { FUNCTION_DECORATOR, OBJECT_DECORATOR } from "./decorator.js";
 import { DaggerFunction } from "./function.js";
+import { Locatable } from "./locatable.js";
 import { DaggerProperty } from "./property.js";
-export class DaggerObject {
+/**
+ * Represents an object defined using the `class` keyword.
+ *
+ * The class may contains methods and fields, that may or may not be exposed to the Dagger API.
+ *
+ * @example
+ * ```ts
+ * type MyObject = {
+ *   name: string
+ *   age: number
+ * }
+ * ```
+ */
+export class DaggerObject extends Locatable {
     node;
     ast;
     name;
@@ -18,6 +32,7 @@ export class DaggerObject {
         return "class";
     }
     constructor(node, ast) {
+        super(node);
         this.node = node;
         this.ast = ast;
         if (!this.node.name) {
@@ -52,6 +67,9 @@ export class DaggerObject {
             }
         }
     }
+    getLocation() {
+        return AST.getNodeLocation(this.node);
+    }
     getReferences() {
         const references = [];
         if (this._constructor) {

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

@@ -2,8 +2,9 @@ import { TypeDefKind } from "../../../api/client.gen.js";
 import { TypeDef } from "../typedef.js";
 import { DaggerConstructor } from "./constructor.js";
 import { DaggerFunctions } from "./function.js";
+import { Locatable } from "./locatable.js";
 import { References } from "./reference.js";
-export interface DaggerObjectPropertyBase {
+export interface DaggerObjectPropertyBase extends Locatable {
     name: string;
     description: string;
     alias?: string;
@@ -14,7 +15,7 @@ export interface DaggerObjectPropertyBase {
 export type DaggerObjectPropertiesBase = {
     [name: string]: DaggerObjectPropertyBase;
 };
-export interface DaggerObjectBase {
+export interface DaggerObjectBase extends Locatable {
     name: string;
     description: string;
     _constructor: DaggerConstructor | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"objectBase.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/objectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAE3B,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAA;CAClD;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAA;CACzC,CAAA;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAA;IAC3C,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,0BAA0B,CAAA;IAEtC,IAAI,IAAI,OAAO,GAAG,QAAQ,CAAA;IAE1B,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAA;CAClD;AAED,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,CAAA"}
+{"version":3,"file":"objectBase.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/objectBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,WAAW,wBAAyB,SAAQ,SAAS;IACzD,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAE3B,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAA;CAClD;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAA;CACzC,CAAA;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAA;IAC3C,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,0BAA0B,CAAA;IAEtC,IAAI,IAAI,OAAO,GAAG,QAAQ,CAAA;IAE1B,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAA;CAClD;AAED,MAAM,MAAM,iBAAiB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAA;CAAE,CAAA"}

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

@@ -2,12 +2,13 @@ import ts from "typescript";
 import { TypeDefKind } from "../../../api/client.gen.js";
 import { TypeDef } from "../typedef.js";
 import { AST } from "../typescript_module/index.js";
+import { Locatable } from "./locatable.js";
 import { DaggerObjectPropertyBase } from "./objectBase.js";
 import { References } from "./reference.js";
 export type DaggerProperties = {
     [name: string]: DaggerProperty;
 };
-export declare class DaggerProperty implements DaggerObjectPropertyBase {
+export declare class DaggerProperty extends Locatable implements DaggerObjectPropertyBase {
     private readonly node;
     private readonly ast;
     name: string;

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

@@ -1 +1 @@
-{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/property.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;AAEtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAA;AAEjE,qBAAa,cAAe,YAAW,wBAAwB;IAW3D,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAXf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,SAAS,EAAE,OAAO,CAAA;IAEzB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,QAAQ,CAAC,CAAQ;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;gBAGf,IAAI,EAAE,EAAE,CAAC,mBAAmB,EAC5B,GAAG,EAAE,GAAG;IAmB3B,OAAO,CAAC,QAAQ;IAsBhB,OAAO,CAAC,OAAO;IAWR,YAAY,IAAI,MAAM,GAAG,SAAS;IAWlC,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAmBjD,MAAM;;;;;;;CASd"}
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/property.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;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,gBAAgB,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAA;AAEjE,qBAAa,cACX,SAAQ,SACR,YAAW,wBAAwB;IAYjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAXf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAA;IACzB,SAAS,EAAE,OAAO,CAAA;IAEzB,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,QAAQ,CAAC,CAAQ;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;gBAGf,IAAI,EAAE,EAAE,CAAC,mBAAmB,EAC5B,GAAG,EAAE,GAAG;IAqB3B,OAAO,CAAC,QAAQ;IAsBhB,OAAO,CAAC,OAAO;IAWR,YAAY,IAAI,MAAM,GAAG,SAAS;IAWlC,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAmBjD,MAAM;;;;;;;CASd"}

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

@@ -1,7 +1,8 @@
 import { IntrospectionError } from "../../../common/errors/index.js";
 import { AST, isTypeDefResolved, resolveTypeDef, } from "../typescript_module/index.js";
 import { FIELD_DECORATOR, FUNCTION_DECORATOR } from "./decorator.js";
-export class DaggerProperty {
+import { Locatable } from "./locatable.js";
+export class DaggerProperty extends Locatable {
     node;
     ast;
     name;
@@ -12,6 +13,7 @@ export class DaggerProperty {
     _typeRef;
     type;
     constructor(node, ast) {
+        super(node);
         this.node = node;
         this.ast = ast;
         if (!this.node.name) {

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

@@ -3,7 +3,7 @@ import { TypeDef } from "../typedef.js";
 export type References = {
     [name: string]: TypeDef<TypeDefKind>;
 };
-export type ReferencableType = TypeDef<TypeDefKind.ObjectKind> | TypeDef<TypeDefKind.EnumKind> | TypeDef<TypeDefKind.ScalarKind>;
+export type ReferencableType = TypeDef<TypeDefKind.ObjectKind> | TypeDef<TypeDefKind.EnumKind> | TypeDef<TypeDefKind.FloatKind> | TypeDef<TypeDefKind.ScalarKind> | TypeDef<TypeDefKind.InterfaceKind>;
 export declare function isKindArray(type: TypeDef<TypeDefKind>): type is TypeDef<TypeDefKind.ListKind>;
 export declare function isKindObject(type: TypeDef<TypeDefKind>): type is TypeDef<TypeDefKind.ObjectKind>;
 export declare function isKindEnum(type: TypeDef<TypeDefKind>): type is TypeDef<TypeDefKind.EnumKind>;

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

@@ -1 +1 @@
-{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/reference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CAAE,CAAA;AAEjE,MAAM,MAAM,gBAAgB,GACxB,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAC/B,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,GAC7B,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAA;AAEnC,wBAAgB,WAAW,CACzB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAEvC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAEzC;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAEvC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAEzC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAazE;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,OAAO,CAAC,WAAW,CAAC,CAMtB"}
+{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/reference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,MAAM,UAAU,GAAG;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CAAE,CAAA;AAEjE,MAAM,MAAM,gBAAgB,GACxB,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAC/B,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,GAC7B,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,GAC9B,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,GAC/B,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;AAEtC,wBAAgB,WAAW,CACzB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAEvC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAEzC;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAEvC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAEzC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,OAAO,CAazE;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,GACzB,OAAO,CAAC,WAAW,CAAC,CAMtB"}

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

@@ -1,9 +1,30 @@
 import ts from "typescript";
-import { AST } from "../typescript_module/index.js";
+import { AST, Location } from "../typescript_module/index.js";
+import { Locatable } from "./locatable.js";
 import { DaggerObjectBase } from "./objectBase.js";
 import { References } from "./reference.js";
 import { DaggerObjectTypeProperties } from "./typeObjectProperty.js";
-export declare class DaggerTypeObject implements DaggerObjectBase {
+/**
+ * Represents an object defined using the `type` keyword.
+ *
+ * Type object can only contains fields, no methods are allowed.
+ * All fields are public and exposed to the Dagger API.
+ *
+ * @example
+ * ```ts
+ * @object()
+ * export class MyObject {
+ *  @func()
+ *  public name: string
+ *
+ *  @func()
+ *  async getName(): Promise<string> {
+ *    return this.name
+ *  }
+ * }
+ * ```
+ */
+export declare class DaggerTypeObject extends Locatable implements DaggerObjectBase {
     private readonly node;
     private readonly ast;
     name: string;
@@ -14,6 +35,7 @@ export declare class DaggerTypeObject implements DaggerObjectBase {
     private symbol;
     kind(): "class" | "object";
     constructor(node: ts.TypeAliasDeclaration, ast: AST);
+    getLocation(): Location;
     getReferences(): string[];
     propagateReferences(references: References): void;
     toJSON(): {

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

@@ -1 +1 @@
-{"version":3,"file":"typeObject.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/typeObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EACL,0BAA0B,EAE3B,MAAM,yBAAyB,CAAA;AAEhC,qBAAa,gBAAiB,YAAW,gBAAgB;IAcrD,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,YAAY;IACxB,OAAO,KAAK;IACZ,UAAU,EAAE,0BAA0B,CAAK;IAElD,OAAO,CAAC,MAAM,CAAW;IAEzB,IAAI,IAAI,OAAO,GAAG,QAAQ;gBAKP,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAC7B,GAAG,EAAE,GAAG;IA2BpB,aAAa,IAAI,MAAM,EAAE;IAazB,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMxD,MAAM;;;;;CAOP"}
+{"version":3,"file":"typeObject.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/typeObject.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAA;AAG3B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EACL,0BAA0B,EAE3B,MAAM,yBAAyB,CAAA;AAEhC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,gBAAiB,SAAQ,SAAU,YAAW,gBAAgB;IAcvE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,YAAY;IACxB,OAAO,KAAK;IACZ,UAAU,EAAE,0BAA0B,CAAK;IAElD,OAAO,CAAC,MAAM,CAAW;IAEzB,IAAI,IAAI,OAAO,GAAG,QAAQ;gBAKP,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAC7B,GAAG,EAAE,GAAG;IA6BpB,WAAW,IAAI,QAAQ;IAIvB,aAAa,IAAI,MAAM,EAAE;IAazB,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAMxD,MAAM;;;;;CAOP"}

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

@@ -1,8 +1,29 @@
 import ts from "typescript";
 import { IntrospectionError } from "../../../common/errors/index.js";
 import { AST } from "../typescript_module/index.js";
+import { Locatable } from "./locatable.js";
 import { DaggerObjectTypeProperty, } from "./typeObjectProperty.js";
-export class DaggerTypeObject {
+/**
+ * Represents an object defined using the `type` keyword.
+ *
+ * Type object can only contains fields, no methods are allowed.
+ * All fields are public and exposed to the Dagger API.
+ *
+ * @example
+ * ```ts
+ * @object()
+ * export class MyObject {
+ *  @func()
+ *  public name: string
+ *
+ *  @func()
+ *  async getName(): Promise<string> {
+ *    return this.name
+ *  }
+ * }
+ * ```
+ */
+export class DaggerTypeObject extends Locatable {
     node;
     ast;
     name;
@@ -15,6 +36,7 @@ export class DaggerTypeObject {
         return "object";
     }
     constructor(node, ast) {
+        super(node);
         this.node = node;
         this.ast = ast;
         if (!this.node.name) {
@@ -33,6 +55,9 @@ export class DaggerTypeObject {
             }
         }
     }
+    getLocation() {
+        return AST.getNodeLocation(this.node);
+    }
     getReferences() {
         const references = [];
         for (const property of Object.values(this.properties)) {

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

@@ -2,12 +2,13 @@ import ts from "typescript";
 import { TypeDefKind } from "../../../api/client.gen.js";
 import { TypeDef } from "../typedef.js";
 import { AST } from "../typescript_module/index.js";
+import { Locatable } from "./locatable.js";
 import { DaggerObjectPropertyBase } from "./objectBase.js";
 import { References } from "./reference.js";
 export type DaggerObjectTypeProperties = {
     [name: string]: DaggerObjectTypeProperty;
 };
-export declare class DaggerObjectTypeProperty implements DaggerObjectPropertyBase {
+export declare class DaggerObjectTypeProperty extends Locatable implements DaggerObjectPropertyBase {
     private readonly node;
     private readonly symbol;
     private readonly ast;

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

@@ -1 +1 @@
-{"version":3,"file":"typeObjectProperty.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/typeObjectProperty.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,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAA;CACzC,CAAA;AAED,qBAAa,wBAAyB,YAAW,wBAAwB;IAUrE,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAXf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,YAAY;IACjB,SAAS,EAAE,OAAO,CAAO;IAEhC,OAAO,CAAC,QAAQ,CAAC,CAAQ;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;gBAGf,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAC7B,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,GAAG,EAAE,GAAG;IAepB,YAAY,IAAI,MAAM,GAAG,SAAS;IAWlC,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAmBjD,MAAM;;;;;;;CASd"}
+{"version":3,"file":"typeObjectProperty.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/dagger_module/typeObjectProperty.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,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAA;CACzC,CAAA;AAED,qBAAa,wBACX,SAAQ,SACR,YAAW,wBAAwB;IAWjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAXf,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,YAAY;IACjB,SAAS,EAAE,OAAO,CAAO;IAEhC,OAAO,CAAC,QAAQ,CAAC,CAAQ;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;gBAGf,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAC7B,MAAM,EAAE,EAAE,CAAC,MAAM,EACjB,GAAG,EAAE,GAAG;IAiBpB,YAAY,IAAI,MAAM,GAAG,SAAS;IAWlC,mBAAmB,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;IAmBjD,MAAM;;;;;;;CASd"}

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

@@ -1,6 +1,7 @@
 import { IntrospectionError } from "../../../common/errors/index.js";
 import { isTypeDefResolved, resolveTypeDef, } from "../typescript_module/index.js";
-export class DaggerObjectTypeProperty {
+import { Locatable } from "./locatable.js";
+export class DaggerObjectTypeProperty extends Locatable {
     node;
     symbol;
     ast;
@@ -11,6 +12,7 @@ export class DaggerObjectTypeProperty {
     _typeRef;
     type;
     constructor(node, symbol, ast) {
+        super(node);
         this.node = node;
         this.symbol = symbol;
         this.ast = ast;

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

@@ -19,6 +19,13 @@ export type EnumTypeDef = BaseTypeDef & {
     kind: TypeDefKind.EnumKind;
     name: string;
 };
+/**
+ * Extends the base type def if it's an interface to add its name
+ */
+export type InterfaceTypeDef = BaseTypeDef & {
+    kind: TypeDefKind.InterfaceKind;
+    name: string;
+};
 /**
  * Extends the base typedef if it's a scalar to add its name and real type.
  */
@@ -41,5 +48,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 : T extends TypeDefKind.EnumKind ? EnumTypeDef : BaseTypeDef;
+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 : T extends TypeDefKind.InterfaceKind ? InterfaceTypeDef : BaseTypeDef;
 //# sourceMappingURL=typedef.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"typedef.d.ts","sourceRoot":"","sources":["../../../../src/module/introspector/typedef.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"}
+{"version":3,"file":"typedef.d.ts","sourceRoot":"","sources":["../../../../src/module/introspector/typedef.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,gBAAgB,GAAG,WAAW,GAAG;IAC3C,IAAI,EAAE,WAAW,CAAC,aAAa,CAAA;IAC/B,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,CAAC,SAAS,WAAW,CAAC,aAAa,GACjC,gBAAgB,GAChB,WAAW,CAAA"}

package/dist/src/module/introspector/typescript_module/ast.d.ts

@@ -4,6 +4,7 @@ import { TypeDefKind } from "../../../api/client.gen.js";
 import { DaggerDecorators } from "../dagger_module/index.js";
 import { TypeDef } from "../typedef.js";
 import { DeclarationsMap } from "./declarations.js";
+import { Location } from "./location.js";
 export declare const CLIENT_GEN_FILE = "client.gen.ts";
 export type ResolvedNodeWithSymbol<T extends keyof DeclarationsMap> = {
     type: T;
@@ -25,6 +26,19 @@ export declare class AST {
     kind: T): ResolvedNodeWithSymbol<T> | undefined;
     getTypeFromTypeAlias(typeAlias: ts.TypeAliasDeclaration): ts.Type;
     static getNodePosition(node: ts.Node): string;
+    /**
+     * Returns the location of the node in the source file.
+     *
+     * The filepath is relative to the module root directory.
+     * Ideally, we use the identifier of the node accessible by node.name but fallback
+     * to node itself if it's not available.
+     *
+     * The TypeScript SDK based it's line and column on index 0 but editors starts
+     * at 1 so we always add 1 to fix that difference.
+     */
+    static getNodeLocation(node: ts.Node & {
+        name?: ts.Identifier;
+    }): Location;
     getDocFromSymbol(symbol: ts.Symbol): string;
     getSymbolOrThrow(node: ts.Node): ts.Symbol;
     getSignatureFromFunctionOrThrow(node: ts.SignatureDeclaration): ts.Signature;

package/dist/src/module/introspector/typescript_module/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/typescript_module/ast.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,eAAe,EAAmB,MAAM,mBAAmB,CAAA;AAGpE,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAE9C,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,MAAM,eAAe,IAAI;IACpE,IAAI,EAAE,CAAC,CAAA;IACP,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IACxB,MAAM,EAAE,EAAE,CAAC,MAAM,CAAA;IACjB,IAAI,EAAE,EAAE,CAAC,UAAU,CAAA;CACpB,CAAA;AAED,qBAAa,GAAG;aAMI,KAAK,EAAE,MAAM,EAAE;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU;IANtB,OAAO,EAAE,EAAE,CAAC,WAAW,CAAA;IAE9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiB;gBAG3B,KAAK,EAAE,MAAM,EAAE,EACd,UAAU,EAAE,MAAM,EAAE;IAahC,sBAAsB,CAAC,CAAC,SAAS,MAAM,eAAe,EAC3D,IAAI,EAAE,MAAM;IAEZ;;;OAGG;IACH,IAAI,EAAE,CAAC,GACN,sBAAsB,CAAC,CAAC,CAAC,GAAG,SAAS;IA6CjC,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,IAAI;WAM1D,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM;IAW7C,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,MAAM;IAI3C,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,MAAM;IAW1C,+BAA+B,CACpC,IAAI,EAAE,EAAE,CAAC,oBAAoB,GAC5B,EAAE,CAAC,SAAS;IAWR,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,MAAM,GAAG,SAAS;IAI/C,mBAAmB,CACxB,IAAI,EAAE,EAAE,CAAC,aAAa,EACtB,eAAe,EAAE,gBAAgB,GAChC,OAAO;IAsBH,oBAAoB,CAAC,CAAC,EAC3B,IAAI,EAAE,EAAE,CAAC,aAAa,EACtB,eAAe,EAAE,gBAAgB,EACjC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EACzB,QAAQ,SAAI,GACX,CAAC,GAAG,SAAS;IA4BT,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYjD,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAY/C,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAY/C,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM;IAMvC,eAAe,CACpB,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,IAAI,EAAE,EAAE,CAAC,IAAI,GACZ,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS;IAoDnC,OAAO,CAAC,yCAAyC;IAoB1C,4BAA4B,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG;CAkDpE"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../../../src/module/introspector/typescript_module/ast.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,eAAe,EAAmB,MAAM,mBAAmB,CAAA;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAE9C,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,MAAM,eAAe,IAAI;IACpE,IAAI,EAAE,CAAC,CAAA;IACP,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IACxB,MAAM,EAAE,EAAE,CAAC,MAAM,CAAA;IACjB,IAAI,EAAE,EAAE,CAAC,UAAU,CAAA;CACpB,CAAA;AAED,qBAAa,GAAG;aAMI,KAAK,EAAE,MAAM,EAAE;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU;IANtB,OAAO,EAAE,EAAE,CAAC,WAAW,CAAA;IAE9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAiB;gBAG3B,KAAK,EAAE,MAAM,EAAE,EACd,UAAU,EAAE,MAAM,EAAE;IAahC,sBAAsB,CAAC,CAAC,SAAS,MAAM,eAAe,EAC3D,IAAI,EAAE,MAAM;IAEZ;;;OAGG;IACH,IAAI,EAAE,CAAC,GACN,sBAAsB,CAAC,CAAC,CAAC,GAAG,SAAS;IA6CjC,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC,oBAAoB,GAAG,EAAE,CAAC,IAAI;WAM1D,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM;IAWpD;;;;;;;;;OASG;WACW,eAAe,CAC3B,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG;QAAE,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,CAAA;KAAE,GACvC,QAAQ;IAyBJ,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,GAAG,MAAM;IAI3C,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,MAAM;IAW1C,+BAA+B,CACpC,IAAI,EAAE,EAAE,CAAC,oBAAoB,GAC5B,EAAE,CAAC,SAAS;IAWR,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,MAAM,GAAG,SAAS;IAI/C,mBAAmB,CACxB,IAAI,EAAE,EAAE,CAAC,aAAa,EACtB,eAAe,EAAE,gBAAgB,GAChC,OAAO;IAsBH,oBAAoB,CAAC,CAAC,EAC3B,IAAI,EAAE,EAAE,CAAC,aAAa,EACtB,eAAe,EAAE,gBAAgB,EACjC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EACzB,QAAQ,SAAI,GACX,CAAC,GAAG,SAAS;IA4BT,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAYjD,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAY/C,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAY/C,gBAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM;IAMvC,eAAe,CACpB,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,IAAI,EAAE,EAAE,CAAC,IAAI,GACZ,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS;IA4DnC,OAAO,CAAC,yCAAyC;IAoB1C,4BAA4B,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG;CAkDpE"}