@cargo-ai/cdk 1.0.7 → 1.0.8

package/build/src/cli/commands/inputTypes.js

@@ -83,10 +83,20 @@ function printSchema(schema, topLevel, encRef) {
         // Connectors model "pick an auth method, then its fields" as an object with
         // a discriminant property plus `allOf: [{ if, then, else }]`. Expand that to
         // a discriminated union (e.g. HubSpot → `{ method: "privateApp"; … } | { …
-        // "oauth"; … }`); otherwise fall back to rendering the head.
+        // "oauth"; … }`).
         const conditional = printConditionalObject(schema, topLevel, encRef);
         if (conditional !== undefined)
             return conditional;
+        // General case: expand the `allOf` into the distinct object shapes it allows
+        // (see `flattenAllOf`) and render them as a union — e.g. Slack postMessage →
+        // `{ channelId; … format: "markdown"; body } | { … format: "blockKit";
+        // blocks }`. This keeps the base props AND the variant members instead of
+        // dropping either.
+        const shapes = flattenAllOf(schema);
+        if (shapes.length > 0) {
+            return uniqueUnion(shapes.map((s) => printObjectShape(s, topLevel, encRef)));
+        }
+        // Last resort: render the head (never abort codegen on an odd schema).
         return printSchema(schema.allOf[0], topLevel, encRef);
     }
     if (typeof schema.type !== "string")
@@ -120,10 +130,14 @@ function printConditionalObject(schema, topLevel, encRef) {
     if (props === undefined || schema.allOf === undefined)
         return undefined;
     const block = schema.allOf.find((a) => a.if !== undefined);
-    if (block === undefined || block.if?.properties === undefined)
+    if (block === undefined)
+        return undefined;
+    const blockIf = block.if;
+    if (blockIf === undefined || blockIf.properties === undefined) {
         return undefined;
+    }
     // The discriminant: the single property the `if` tests, and its `const` value.
-    const ifEntries = Object.entries(block.if.properties);
+    const ifEntries = Object.entries(blockIf.properties);
     if (ifEntries.length !== 1)
         return undefined;
     const [discKey, discCond] = ifEntries[0];
@@ -143,11 +157,11 @@ function printConditionalObject(schema, topLevel, encRef) {
             ...props,
             [discKey]: { const: value },
         };
-        if (extra?.properties !== undefined) {
+        if (extra !== undefined && extra.properties !== undefined) {
             Object.assign(branchProps, extra.properties);
         }
         const required = new Set(baseRequired);
-        if (Array.isArray(extra?.required)) {
+        if (extra !== undefined && Array.isArray(extra.required)) {
             for (const r of extra.required)
                 required.add(r);
         }
@@ -162,7 +176,7 @@ function discriminantValues(schema) {
         return [schema.const];
     if (Array.isArray(schema.enum))
         return schema.enum;
-    const variants = schema.oneOf ?? schema.anyOf;
+    const variants = schema.oneOf !== undefined ? schema.oneOf : schema.anyOf;
     if (Array.isArray(variants)) {
         const consts = variants.map((v) => v.const).filter((v) => v !== undefined);
         if (consts.length > 0)
@@ -170,6 +184,63 @@ function discriminantValues(schema) {
     }
     return [];
 }
+function flattenAllOf(schema) {
+    const { allOf = [] } = schema;
+    const base = objectShapeOf(schema);
+    const seed = base === undefined ? emptyShape() : base;
+    return allOf.map(shapesOf).reduce(crossMerge, [seed]);
+}
+// The object shape(s) a single allOf member contributes: one for a plain object,
+// several for an `anyOf`/`oneOf`, or a nested `allOf`'s result. Empty when the
+// member (or any `anyOf`/`oneOf` variant) isn't object-shaped.
+function shapesOf(member) {
+    const { allOf, anyOf, oneOf } = member;
+    if (allOf !== undefined && allOf.length > 0) {
+        return flattenAllOf(member);
+    }
+    const variants = anyOf !== undefined ? anyOf : oneOf;
+    if (variants !== undefined && variants.length > 0) {
+        const shapes = variants
+            .map(objectShapeOf)
+            .filter((shape) => shape !== undefined);
+        // A non-object variant drops out above; if any did, the union is incomplete
+        // so give up on the whole member rather than emit a narrower type.
+        return shapes.length === variants.length ? shapes : [];
+    }
+    const shape = objectShapeOf(member);
+    return shape === undefined ? [] : [shape];
+}
+// Every current shape merged with every option: {a} × [{b}, {c}] → [{ab}, {ac}].
+function crossMerge(shapes, options) {
+    return shapes.flatMap((shape) => options.map((option) => mergeShapes(shape, option)));
+}
+// Read a schema as an object shape (its properties + required), or undefined
+// when it isn't object-shaped.
+function objectShapeOf(schema) {
+    const { properties, type, required } = schema;
+    if (properties === undefined && type !== "object")
+        return undefined;
+    return {
+        properties: { ...properties },
+        required: new Set(Array.isArray(required) ? required : []),
+    };
+}
+function mergeShapes(a, b) {
+    return {
+        properties: { ...a.properties, ...b.properties },
+        required: new Set([...a.required, ...b.required]),
+    };
+}
+function emptyShape() {
+    return { properties: {}, required: new Set() };
+}
+function printObjectShape(shape, topLevel, encRef) {
+    return printObject({
+        type: "object",
+        properties: shape.properties,
+        required: [...shape.required],
+    }, topLevel, encRef);
+}
 function printArray(schema, encRef) {
     if (schema.items === undefined)
         return "unknown[]";

package/build/src/cli/commands/types.js

@@ -97,7 +97,9 @@ async function fetchWorkspaceSurface(api) {
 function collectConnectorConfigs(integrations) {
     const out = [];
     for (const integration of integrations) {
-        const schema = integration.connector?.config?.schema;
+        const { connector } = integration;
+        const connectorConfig = connector !== undefined ? connector.config : undefined;
+        const schema = connectorConfig !== undefined ? connectorConfig.schema : undefined;
         if (schema === undefined)
             continue;
         const typeSrc = printJsonSchemaType(schema);
@@ -118,7 +120,10 @@ function collectConnectorConfigs(integrations) {
 function collectAgentTriggerConfigs(integrations) {
     const out = [];
     for (const integration of integrations) {
-        const schema = integration.agent?.trigger?.config?.schema;
+        const { agent } = integration;
+        const trigger = agent !== undefined ? agent.trigger : undefined;
+        const triggerConfig = trigger !== undefined ? trigger.config : undefined;
+        const schema = triggerConfig !== undefined ? triggerConfig.schema : undefined;
         if (schema === undefined)
             continue;
         const typeSrc = printJsonSchemaType(schema);
@@ -139,8 +144,10 @@ function collectExtractorConfigs(integrations) {
     const out = [];
     for (const integration of integrations) {
         const extractors = [];
-        for (const [slug, extractor] of Object.entries(integration.extractors ?? {}).sort(([a], [b]) => a.localeCompare(b))) {
-            const schema = extractor.config?.schema;
+        const { extractors: rawExtractors = {} } = integration;
+        for (const [slug, extractor] of Object.entries(rawExtractors).sort(([a], [b]) => a.localeCompare(b))) {
+            const { config } = extractor;
+            const schema = config !== undefined ? config.schema : undefined;
             if (schema === undefined)
                 continue;
             const typeSrc = printJsonSchemaType(schema);
@@ -161,7 +168,8 @@ function collectExtractorConfigs(integrations) {
 function collectExtractorSlugs(integrations) {
     const out = [];
     for (const integration of integrations) {
-        const slugs = Object.keys(integration.extractors ?? {}).sort((a, b) => a.localeCompare(b));
+        const { extractors = {} } = integration;
+        const slugs = Object.keys(extractors).sort((a, b) => a.localeCompare(b));
         if (slugs.length === 0)
             continue;
         out.push({ integrationSlug: integration.slug, slugs });
@@ -172,16 +180,18 @@ function collectExtractorSlugs(integrations) {
 function collectIntegrations(integrations) {
     const out = [];
     for (const integration of integrations) {
-        const actionEntries = Object.entries(integration.actions ?? {}).sort(([a], [b]) => a.localeCompare(b));
+        const { actions: rawActions = {} } = integration;
+        const actionEntries = Object.entries(rawActions).sort(([a], [b]) => a.localeCompare(b));
         if (actionEntries.length === 0)
             continue;
         const actions = actionEntries.map(([slug, raw]) => {
             const meta = raw;
+            const { config } = meta;
             return {
                 slug,
                 name: trimOrUndefined(meta.name),
                 description: trimOrUndefined(meta.description),
-                inputTypeSrc: printJsonSchemaInput(meta.config?.schema),
+                inputTypeSrc: printJsonSchemaInput(config !== undefined ? config.schema : undefined),
             };
         });
         out.push({
@@ -231,7 +241,10 @@ function renderTypes(payload) {
     if (payload.connectorConfigs.length > 0) {
         cdkLines.push(`  interface ConnectorConfigs {`);
         for (const c of payload.connectorConfigs) {
-            const doc = formatJsDoc({ name: c.name ?? c.slug, updatedAt: GENERATED_AT }, "    ");
+            const doc = formatJsDoc({
+                name: c.name !== undefined ? c.name : c.slug,
+                updatedAt: GENERATED_AT,
+            }, "    ");
             if (doc !== "")
                 cdkLines.push(doc.trimEnd());
             cdkLines.push(`    ${jsonKey(c.slug)}: ${c.typeSrc};`);
@@ -260,7 +273,10 @@ function renderTypes(payload) {
     if (payload.agentTriggerConfigs.length > 0) {
         cdkLines.push(`  interface AgentTriggerConfigs {`);
         for (const t of payload.agentTriggerConfigs) {
-            const doc = formatJsDoc({ name: t.name ?? t.slug, updatedAt: GENERATED_AT }, "    ");
+            const doc = formatJsDoc({
+                name: t.name !== undefined ? t.name : t.slug,
+                updatedAt: GENERATED_AT,
+            }, "    ");
             if (doc !== "")
                 cdkLines.push(doc.trimEnd());
             cdkLines.push(`    ${jsonKey(t.slug)}: ${t.typeSrc};`);
@@ -276,7 +292,7 @@ function renderTypes(payload) {
         wfLines.push(`  interface Integrations {`);
         for (const c of payload.integrations) {
             const intDoc = formatJsDoc({
-                name: c.name ?? c.slug,
+                name: c.name !== undefined ? c.name : c.slug,
                 description: c.description,
                 updatedAt: GENERATED_AT,
             }, "    ");

package/build/src/cli/io.js

@@ -14,7 +14,7 @@ const useColor = process.stderr.isTTY === true &&
     process.env["NO_COLOR"] === undefined &&
     process.env["CI"] !== "true";
 const colorize = (text, code) => {
-    if (useColor !== true) {
+    if (useColor === false) {
         return text;
     }
     return `\x1B[${code}m${text}\x1B[0m`;
@@ -114,7 +114,7 @@ export function startSpinner(message) {
             process.stderr.write(`\r\x1B[K${line}\n`);
         },
         stop: () => {
-            if (stopped) {
+            if (stopped === true) {
                 return;
             }
             stopped = true;

package/build/src/cli/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/cli/version.ts"],"names":[],"mappings":"AAOA,wBAAgB,cAAc,IAAI,MAAM,CAkBvC"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/cli/version.ts"],"names":[],"mappings":"AAOA,wBAAgB,cAAc,IAAI,MAAM,CAevC"}

package/build/src/cli/version.js

@@ -5,8 +5,8 @@ import { fileURLToPath } from "node:url";
 // package.json — a walk (not a fixed relative path) so it's independent of build
 // layout depth.
 export function packageVersion() {
-    let cursor = dirname(fileURLToPath(import.meta.url));
-    for (let i = 0; i < 8; i += 1) {
+    const start = dirname(fileURLToPath(import.meta.url));
+    for (const cursor of ancestorDirs(start, 8)) {
         try {
             const pkg = JSON.parse(readFileSync(join(cursor, "package.json"), "utf-8"));
             if (pkg.name === "@cargo-ai/cdk" && typeof pkg.version === "string") {
@@ -16,10 +16,14 @@ export function packageVersion() {
         catch {
             // no package.json here (or unreadable) — keep walking up
         }
-        const parent = dirname(cursor);
-        if (parent === cursor)
-            break;
-        cursor = parent;
     }
     return "0.0.0";
 }
+// The directory chain from `start` walking up to `max` levels, stopping at the
+// filesystem root — so the package root can be found independent of build depth.
+function ancestorDirs(start, max) {
+    const parent = dirname(start);
+    if (max <= 1 || parent === start)
+        return [start];
+    return [start, ...ancestorDirs(parent, max - 1)];
+}

package/build/src/deploy/apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/deploy/apply.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAK7C,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,KAAK,CACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,KAAK,CACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,SAAS,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,MAAM,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,iBAAiB,CACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,MAAM,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,GAAG,CACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,OAAO,CACL,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,QAAQ,CACN,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,SAAS,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,OAAO,CACL,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,YAAY,CACV,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,OAAO,EAAE,SAAS,EAAE,CAAC;CACtB,CAAC;AAMF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAwBF,wBAAsB,KAAK,CACzB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,EAChC,OAAO,CAAC,EAAE,WAAW,EACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,GAC1C,OAAO,CAAC,WAAW,CAAC,CA6HtB"}
+{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/deploy/apply.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,UAAU,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAK7C,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5D,KAAK,CACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,KAAK,CACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,SAAS,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,MAAM,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,IAAI,CACF,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,iBAAiB,CACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,MAAM,CACJ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,GAAG,CACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,OAAO,CACL,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,QAAQ,CACN,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,SAAS,CACP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,OAAO,CACL,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvC,YAAY,CACV,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,OAAO,CAAC,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,OAAO,EAAE,SAAS,EAAE,CAAC;CACtB,CAAC;AAMF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAwBF,wBAAsB,KAAK,CACzB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,EAChC,OAAO,CAAC,EAAE,WAAW,EACrB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,GAC1C,OAAO,CAAC,WAAW,CAAC,CAuHtB"}

package/build/src/deploy/apply.js

@@ -36,16 +36,18 @@ export async function apply(input, executors, persist, readers, onProgress) {
         throw new Error(`apply aborted — fix plan errors first: ${detail}`);
     }
     const byId = new Map(input.nodes.map((n) => [n.id, n]));
+    const priorState = input.state;
+    const priorResources = priorState === undefined ? {} : priorState.resources;
     // Resolved outputs by resource id, seeded from prior state so unchanged
     // ("noop") dependencies still resolve for their dependents.
     const outputs = new Map();
-    for (const [id, entry] of Object.entries(input.state?.resources ?? {})) {
+    for (const [id, entry] of Object.entries(priorResources)) {
         outputs.set(id, entry.outputs);
     }
     const state = {
-        version: input.state?.version ?? 1,
-        workspaceUuid: input.state?.workspaceUuid ?? "",
-        resources: { ...(input.state?.resources ?? {}) },
+        version: priorState === undefined ? 1 : priorState.version,
+        workspaceUuid: priorState === undefined ? "" : priorState.workspaceUuid,
+        resources: { ...priorResources },
     };
     const applied = [];
     const skipped = [];
@@ -61,8 +63,7 @@ export async function apply(input, executors, persist, readers, onProgress) {
         const node = byId.get(entry.id);
         if (node === undefined)
             continue; // delete entries — handled by destroy
-        let change = entry.change;
-        if (change === "noop") {
+        if (entry.change === "noop") {
             // A noop's own spec hash is unchanged, but if one of its dependencies
             // produced a NEW output identity this run, the tokens in this spec now
             // resolve to different values than its live config holds (e.g. it still
@@ -70,50 +71,41 @@ export async function apply(input, executors, persist, readers, onProgress) {
             // re-points at the new value; otherwise it silently dangles.
             const deps = dependenciesOf(node.spec);
             const stale = Array.from(deps).some((d) => changedOutputs.has(d));
-            if (!stale) {
+            if (stale === false) {
                 skipped.push(entry);
                 continue;
             }
-            change = "update";
             total += 1; // a noop promoted to a re-apply — count it
         }
-        index += 1;
         // `change` is create|update here (noop was skipped/promoted above; delete
-        // entries have no node and were `continue`d). `index`/`total` are fixed for
-        // this resource, so the start/done events share one payload.
+        // entries have no node and were `continue`d).
+        const change = entry.change === "noop" ? "update" : entry.change;
+        index += 1;
+        // `index`/`total` are fixed for this resource, so the start/done events
+        // share one payload.
         const progress = {
             id: node.id,
             change: change,
             index,
             total,
         };
-        onProgress?.({ phase: "start", ...progress });
+        if (onProgress !== undefined)
+            onProgress({ phase: "start", ...progress });
         // tokens (deferred outputs) then secrets (deferred env reads) — both resolve
         // to real values here, at apply, just before the executor runs.
         const resolved = resolveSecrets(resolveTokens(node.spec, outputs));
         assertNoPlaceholders(node.id, resolved);
-        const prior = input.state?.resources[node.id];
-        let produced;
-        try {
-            produced = await runExecutor(node, resolved, prior, executors);
-        }
-        catch (error) {
-            // Tag the failure with the resource that failed and surface the API's
-            // structured detail — executors throw `@cargo-ai/api` FetcherErrors whose
-            // bare `message` is often a terse "Invalid configuration", with the
-            // actionable bits (reason, status, which field) on `reason`/`status`/`data`.
-            throw new Error(`${node.id}: ${describeExecutorError(error)}`, {
-                cause: error,
-            });
-        }
+        const prior = priorState === undefined ? undefined : priorState.resources[node.id];
+        const produced = await runExecutorTagged(node, resolved, prior, executors);
+        const priorOutputs = prior === undefined ? undefined : prior.outputs;
         // Carry the "adopted" marker forward across updates so destroy keeps
         // releasing (not deleting) a resource the CDK adopted or imported, even for
         // kinds whose executor doesn't echo it back.
-        if (prior?.outputs["adopted"] === "true" &&
-            produced["adopted"] === undefined) {
+        const priorAdopted = priorOutputs === undefined ? undefined : priorOutputs["adopted"];
+        if (priorAdopted === "true" && produced["adopted"] === undefined) {
             produced["adopted"] = "true";
         }
-        if (outputsChanged(prior?.outputs, produced)) {
+        if (outputsChanged(priorOutputs, produced)) {
             changedOutputs.add(node.id);
         }
         outputs.set(node.id, produced);
@@ -139,7 +131,8 @@ export async function apply(input, executors, persist, readers, onProgress) {
         }
         if (persist !== undefined)
             persist(state);
-        onProgress?.({ phase: "done", ...progress });
+        if (onProgress !== undefined)
+            onProgress({ phase: "done", ...progress });
         applied.push(change === entry.change ? entry : { ...entry, change });
     }
     return { state, applied, skipped };
@@ -191,6 +184,20 @@ function outputsChanged(prior, produced) {
     }
     return false;
 }
+// Run the executor, tagging any failure with the resource that failed and the
+// API's structured detail — executors throw `@cargo-ai/api` FetcherErrors whose
+// bare `message` is often a terse "Invalid configuration", with the actionable
+// bits (reason, status, which field) on `reason`/`status`/`data`.
+async function runExecutorTagged(node, resolved, prior, executors) {
+    try {
+        return await runExecutor(node, resolved, prior, executors);
+    }
+    catch (error) {
+        throw new Error(`${node.id}: ${describeExecutorError(error)}`, {
+            cause: error,
+        });
+    }
+}
 function runExecutor(node, resolved, prior, executors) {
     switch (node.kind) {
         case "connector":

package/build/src/deploy/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/deploy/compile.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,YAAY,EAElB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEjE,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAGb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAIhC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAKhB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,KAAK,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAGhB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B,CAAC;AAmEF,wBAAgB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,aAAa,CAuC1D"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/deploy/compile.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,YAAY,EAElB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEjE,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,YAAY,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IAIb,IAAI,EAAE,MAAM,CAAC;IAGb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAIhC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAKhB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,KAAK,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAGhB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,SAAS,YAAY,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,SAAS,EAAE,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B,CAAC;AAqEF,wBAAgB,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,aAAa,CAyC1D"}

package/build/src/deploy/compile.js

@@ -18,7 +18,8 @@ function validate(nodes, edges) {
     const errors = [];
     const ids = new Set(nodes.map((n) => n.id));
     for (const node of nodes) {
-        for (const dep of edges.get(node.id) ?? new Set()) {
+        const nodeEdges = edges.get(node.id);
+        for (const dep of nodeEdges !== undefined ? nodeEdges : new Set()) {
             if (!ids.has(dep)) {
                 errors.push({
                     id: node.id,
@@ -42,7 +43,8 @@ function topoSort(nodes, edges) {
             return false;
         }
         visited.set(id, "visiting");
-        for (const dep of edges.get(id) ?? new Set()) {
+        const idEdges = edges.get(id);
+        for (const dep of idEdges !== undefined ? idEdges : new Set()) {
             if (!edges.has(dep))
                 continue; // unknown dep — reported by validate()
             if (!visit(dep)) {
@@ -63,7 +65,7 @@ function topoSort(nodes, edges) {
     return { order, cycle };
 }
 export function compile(input) {
-    const { nodes } = input;
+    const { nodes, state } = input;
     const byId = new Map(nodes.map((n) => [n.id, n]));
     const edges = new Map();
     for (const node of nodes) {
@@ -80,14 +82,14 @@ export function compile(input) {
     const plan = order.map((id) => {
         const node = byId.get(id);
         const hash = hashOf(node.spec);
-        const prior = input.state?.resources[id];
+        const prior = state !== undefined ? state.resources[id] : undefined;
         const change = prior === undefined ? "create" : prior.hash === hash ? "noop" : "update";
         return { id, kind: node.kind, slug: node.slug, change, hash };
     });
     // Resources in state but no longer in code — candidates to prune. Appended
     // after the apply order; the actual removal runs in dependency-safe order.
     const deletes = [];
-    for (const [id, entry] of Object.entries(input.state?.resources ?? {})) {
+    for (const [id, entry] of Object.entries(state !== undefined ? state.resources : {})) {
         if (byId.has(id))
             continue;
         const kind = id.slice(0, id.indexOf(":"));

package/build/src/deploy/destroy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"destroy.d.ts","sourceRoot":"","sources":["../../../src/deploy/destroy.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAMzC,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AA8ItE;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,MAAM,EAAE,GACZ,OAAO,CAAC,aAAa,CAAC,CA4BxB;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7B,OAAO,CAAC,aAAa,CAAC,CA4BxB"}
+{"version":3,"file":"destroy.d.ts","sourceRoot":"","sources":["../../../src/deploy/destroy.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAMzC,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAyJtE;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,MAAM,EAAE,GACZ,OAAO,CAAC,aAAa,CAAC,CA4BxB;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,GAAG,EACR,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7B,OAAO,CAAC,aAAa,CAAC,CAgCxB"}

package/build/src/deploy/destroy.js

@@ -55,7 +55,9 @@ function removalOrder(ids, state) {
         if (visited.has(id))
             return;
         visited.add(id);
-        const deps = (state.resources[id]?.deps ?? [])
+        const entry = state.resources[id];
+        const rawDeps = entry !== undefined && entry.deps !== undefined ? entry.deps : [];
+        const deps = rawDeps
             .filter((dep) => inSet.has(dep) && dep !== id)
             .sort(reverseKind);
         for (const dep of deps)
@@ -116,18 +118,21 @@ async function remove(api, kind, uuid) {
             const datasetUuid = target.fromDatasetUuid;
             const remaining = relationships
                 .filter((r) => r.fromDatasetUuid === datasetUuid && r.uuid !== uuid)
-                .map((r) => ({
-                uuid: r.uuid,
-                fromModelUuid: r.fromModelUuid,
-                fromColumnSlug: r.fromColumnSlug,
-                fromPropertySlug: r.fromPropertySlug ?? null,
-                toModelUuid: r.toModelUuid,
-                toColumnSlug: r.toColumnSlug,
-                toPropertySlug: r.toPropertySlug ?? null,
-                fromSelectedColumnSlugs: r.fromSelectedColumnSlugs ?? null,
-                toSelectedColumnSlugs: r.toSelectedColumnSlugs ?? null,
-                relation: r.relation,
-            }));
+                .map((r) => {
+                const { fromPropertySlug = null, toPropertySlug = null, fromSelectedColumnSlugs = null, toSelectedColumnSlugs = null, } = r;
+                return {
+                    uuid: r.uuid,
+                    fromModelUuid: r.fromModelUuid,
+                    fromColumnSlug: r.fromColumnSlug,
+                    fromPropertySlug,
+                    toModelUuid: r.toModelUuid,
+                    toColumnSlug: r.toColumnSlug,
+                    toPropertySlug,
+                    fromSelectedColumnSlugs,
+                    toSelectedColumnSlugs,
+                    relation: r.relation,
+                };
+            });
             await api.storage.relationship.set({
                 datasetUuid,
                 relationships: remaining,
@@ -181,7 +186,12 @@ export async function destroy(root, api, opts = {}) {
     if (opts.target !== undefined && opts.target in state.resources) {
         const target = opts.target;
         const dependents = Object.entries(state.resources)
-            .filter(([id, e]) => id !== target && (e.deps ?? []).includes(target))
+            .filter(([id, e]) => {
+            if (id === target)
+                return false;
+            const deps = e.deps !== undefined ? e.deps : [];
+            return deps.includes(target);
+        })
             .map(([id]) => id);
         if (dependents.length > 0) {
             throw new Error(`cannot destroy "${target}": ${String(dependents.length)} resource(s) ` +

package/build/src/deploy/executors.live.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executors.live.d.ts","sourceRoot":"","sources":["../../../src/deploy/executors.live.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AA4BrD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CAkxBjD"}
+{"version":3,"file":"executors.live.d.ts","sourceRoot":"","sources":["../../../src/deploy/executors.live.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIzC,OAAO,KAAK,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AA4NrD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,CA8oBjD"}