@dagger.io/dagger 0.9.6 → 0.9.8

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

@@ -1,7 +1,11 @@
 import { ClassTypeDef, FunctionTypedef } from "./typeDefs.js";
 export type ScanResult = {
-    classes: ClassTypeDef[];
-    functions: FunctionTypedef[];
+    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":"AAIA,OAAO,EACL,YAAY,EAIZ,eAAe,EAChB,MAAM,eAAe,CAAA;AAStB,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB,SAAS,EAAE,eAAe,EAAE,CAAA;CAC7B,CAAA;AAED;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CA6BhD"}
+{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../../introspector/scanner/scan.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EAIZ,eAAe,EAChB,MAAM,eAAe,CAAA;AAStB,MAAM,MAAM,UAAU,GAAG;IACvB,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;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,UAAU,CA+BhD"}

package/dist/introspector/scanner/scan.js

@@ -20,8 +20,8 @@ export function scan(files) {
     const program = ts.createProgram(files, { experimentalDecorators: true });
     const checker = program.getTypeChecker();
     const metadata = {
-        classes: [],
-        functions: [],
+        classes: {},
+        functions: {},
     };
     for (const file of program.getSourceFiles()) {
         // Ignore type declaration files.
@@ -31,7 +31,8 @@ export function scan(files) {
         ts.forEachChild(file, (node) => {
             // Handle class
             if (ts.isClassDeclaration(node) && isObject(node)) {
-                metadata.classes.push(introspectClass(checker, node));
+                const classTypeDef = introspectClass(checker, node);
+                metadata.classes[classTypeDef.name] = classTypeDef;
             }
         });
     }
@@ -65,8 +66,8 @@ function introspectClass(checker, node) {
         name,
         description,
         constructor: undefined,
-        fields: [],
-        methods: [],
+        fields: {},
+        methods: {},
     };
     // Loop through all members in the class to get their metadata.
     node.members.forEach((member) => {
@@ -76,12 +77,13 @@ function introspectClass(checker, node) {
         }
         // Handle method from the class.
         if (ts.isMethodDeclaration(member) && isFunction(member)) {
-            metadata.methods.push(introspectMethod(checker, member));
+            const fctTypeDef = introspectMethod(checker, member);
+            metadata.methods[fctTypeDef.name] = fctTypeDef;
         }
         // Handle public properties from the class.
-        if (ts.isPropertyDeclaration(member) && isPublicProperty(member)) {
-            // Handle properties
-            metadata.fields.push(introspectProperty(checker, member));
+        if (ts.isPropertyDeclaration(member)) {
+            const fieldTypeDef = introspectProperty(checker, member);
+            metadata.fields[fieldTypeDef.name] = fieldTypeDef;
         }
     });
     return metadata;
@@ -100,27 +102,33 @@ function introspectProperty(checker, property) {
         throw new UnknownDaggerError(`could not get property symbol: ${property.name.getText()}`, {});
     }
     const { name, typeName, description } = serializeSymbol(checker, propertySymbol);
-    return { name, description, typeDef: typeNameToTypedef(typeName) };
+    return {
+        name,
+        description,
+        typeDef: typeNameToTypedef(typeName),
+        isExposed: isPublicProperty(property),
+    };
 }
 /**
  * Introspect the constructor of the class and return its metadata.
  */
 function introspectConstructor(checker, constructor) {
-    const args = constructor.parameters.map((param) => {
+    const args = constructor.parameters.reduce((acc, param) => {
         const paramSymbol = checker.getSymbolAtLocation(param.name);
         if (!paramSymbol) {
             throw new UnknownDaggerError(`could not get constructor param: ${param.name.getText()}`, {});
         }
         const { name, typeName, description } = serializeSymbol(checker, paramSymbol);
         const { optional, defaultValue } = isOptional(paramSymbol);
-        return {
+        acc[name] = {
             name,
             description,
             typeDef: typeNameToTypedef(typeName),
             optional,
             defaultValue,
         };
-    });
+        return acc;
+    }, {});
     return { args };
 }
 /**
@@ -146,13 +154,16 @@ function introspectMethod(checker, method) {
     return {
         name: methodMetadata.name,
         description: methodMetadata.description,
-        args: methodSignature.params.map(({ name, typeName, description, optional, defaultValue }) => ({
-            name,
-            typeDef: typeNameToTypedef(typeName),
-            description,
-            optional,
-            defaultValue,
-        })),
+        args: methodSignature.params.reduce((acc, { name, typeName, description, optional, defaultValue }) => {
+            acc[name] = {
+                name,
+                typeDef: typeNameToTypedef(typeName),
+                description,
+                optional,
+                defaultValue,
+            };
+            return acc;
+        }, {}),
         returnType: typeNameToTypedef(methodSignature.returnType),
     };
 }

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

@@ -9,14 +9,14 @@ export type BaseTypeDef = {
  * Extends the base type def if it's an object to add its name.
  */
 export type ObjectTypeDef = BaseTypeDef & {
-    kind: TypeDefKind.Objectkind;
+    kind: TypeDefKind.ObjectKind;
     name: string;
 };
 /**
  * Extends the base if it's a list to add its subtype.
  */
 export type ListTypeDef = BaseTypeDef & {
-    kind: TypeDefKind.Listkind;
+    kind: TypeDefKind.ListKind;
     typeDef: TypeDef<TypeDefKind>;
 };
 /**
@@ -26,7 +26,7 @@ export type ListTypeDef = BaseTypeDef & {
  * If it's type of kind list, 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.Objectkind ? ObjectTypeDef : T extends TypeDefKind.Listkind ? ListTypeDef : BaseTypeDef;
+export type TypeDef<T extends BaseTypeDef["kind"]> = T extends TypeDefKind.ObjectKind ? ObjectTypeDef : T extends TypeDefKind.ListKind ? ListTypeDef : BaseTypeDef;
 /**
  * The type of field in a class
  */
@@ -34,6 +34,7 @@ export type FieldTypeDef = {
     name: string;
     description: string;
     typeDef: TypeDef<TypeDefKind>;
+    isExposed: boolean;
 };
 /**
  * The type of function argument in a method or function.
@@ -51,11 +52,15 @@ export type FunctionArg = {
 export type FunctionTypedef = {
     name: string;
     description: string;
-    args: FunctionArg[];
+    args: {
+        [name: string]: FunctionArg;
+    };
     returnType: TypeDef<TypeDefKind>;
 };
 export type ConstructorTypeDef = {
-    args: FunctionArg[];
+    args: {
+        [name: string]: FunctionArg;
+    };
 };
 /**
  * A type of Class.
@@ -63,8 +68,12 @@ export type ConstructorTypeDef = {
 export type ClassTypeDef = {
     name: string;
     description: string;
-    fields: FieldTypeDef[];
+    fields: {
+        [name: string]: FieldTypeDef;
+    };
     constructor?: ConstructorTypeDef;
-    methods: FunctionTypedef[];
+    methods: {
+        [name: string]: FunctionTypedef;
+    };
 };
 //# 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,WAAW,GAAG,WAAW,GAAG;IACtC,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B,CAAA;AAED;;;;;;GAMG;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,QAAQ,GAC9B,WAAW,GACX,WAAW,CAAA;AAEjB;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,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,IAAI,EAAE,WAAW,EAAE,CAAA;IACnB,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,EAAE,CAAA;CACpB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,YAAY,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,kBAAkB,CAAA;IAChC,OAAO,EAAE,eAAe,EAAE,CAAA;CAC3B,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,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CAC9B,CAAA;AAED;;;;;;GAMG;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,QAAQ,GAC9B,WAAW,GACX,WAAW,CAAA;AAEjB;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC7B,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,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,IAAI,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAA;IACrC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAA;CACtC,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"}

package/dist/introspector/scanner/utils.js

@@ -102,22 +102,22 @@ export function typeNameToTypedef(typeName) {
     // the type of list
     if (typeName.endsWith("[]")) {
         return {
-            kind: TypeDefKind.Listkind,
+            kind: TypeDefKind.ListKind,
             typeDef: typeNameToTypedef(typeName.slice(0, typeName.length - 2)),
         };
     }
     switch (typeName) {
         case "string":
-            return { kind: TypeDefKind.Stringkind };
+            return { kind: TypeDefKind.StringKind };
         case "number":
-            return { kind: TypeDefKind.Integerkind };
+            return { kind: TypeDefKind.IntegerKind };
         case "boolean":
-            return { kind: TypeDefKind.Booleankind };
+            return { kind: TypeDefKind.BooleanKind };
         case "void":
-            return { kind: TypeDefKind.Voidkind };
+            return { kind: TypeDefKind.VoidKind };
         default:
             return {
-                kind: TypeDefKind.Objectkind,
+                kind: TypeDefKind.ObjectKind,
                 name: typeName,
             };
     }

package/dist/provisioning/default.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_VERSION = "0.9.6";
+export declare const CLI_VERSION = "0.9.8";
 //# 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.9.6";
+export const CLI_VERSION = "0.9.8";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dagger.io/dagger",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "author": "hello@dagger.io",
   "license": "Apache-2.0",
   "types": "./dist/index.d.ts",
@@ -23,9 +23,11 @@
     "graphql": "^16.8.0",
     "graphql-request": "^6.1.0",
     "graphql-tag": "^2.12.6",
-    "node-color-log": "^10.0.2",
+    "node-color-log": "^11.0.0",
     "node-fetch": "^3.3.1",
-    "tar": "^6.1.13"
+    "reflect-metadata": "^0.2.1",
+    "tar": "^6.1.13",
+    "typescript": "^5.3.3"
   },
   "scripts": {
     "build": "tsc",
@@ -40,7 +42,7 @@
     "@trivago/prettier-plugin-sort-imports": "^4.2.0",
     "@types/adm-zip": "^0.5.0",
     "@types/mocha": "latest",
-    "@types/node": "~16",
+    "@types/node": "~20",
     "@types/tar": "^6.1.4",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
@@ -49,7 +51,6 @@
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.2.0",
     "prettier": "^2.8.7",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "ts-node": "^10.9.1"
   }
 }