@telorun/analyzer 0.23.2 → 0.24.1

package/dist/validate-cel-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate-cel-context.d.ts","sourceRoot":"","sources":["../src/validate-cel-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC;mEAC+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC;;kDAE8C;IAC9C,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;KACxD,CAAC;IACF,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KAC/C,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAClC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAkCjC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAoBzE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,IAAI,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAChD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAqGrB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQrB;AAWD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,SAAM,GACT,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CAAC,CAGvD"}
+{"version":3,"file":"validate-cel-context.d.ts","sourceRoot":"","sources":["../src/validate-cel-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAEtF,MAAM,WAAW,kBAAkB;IACjC;mEAC+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC;;kDAE8C;IAC9C,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;KACxD,CAAC;IACF,OAAO,CAAC,EAAE;QACR,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;KAC/C,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAClC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAkCjC;AA6DD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAoBzE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,IAAI,CAAC,EAAE,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAChD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAgHrB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC5B,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAQrB;AAWD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,SAAM,GACT,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAAE,CAAC,CAGvD"}

package/dist/validate-cel-context.js

@@ -35,6 +35,63 @@ export function resolveTypeFieldToSchema(value, allManifests) {
     }
     return undefined;
 }
+/** Pull the raw expression source from a CEL field value — a compiled value
+ *  (`{ source }`), or a string (`!cel "x"` or `"${{ x }}"`). Strips a lone
+ *  `${{ }}` wrapper. Returns null when no source is recoverable. */
+function celExprSource(raw) {
+    let s;
+    if (typeof raw === "string")
+        s = raw;
+    else if (raw && typeof raw === "object" && typeof raw.source === "string")
+        s = raw.source;
+    if (s == null)
+        return null;
+    const exact = s.match(/^\s*\$\{\{\s*([^}]+?)\s*\}\}\s*$/);
+    return (exact ? exact[1] : s).trim();
+}
+/** Member-access chain for a bare dotted-identifier expression
+ *  (`inputs.user.tags` → ["inputs","user","tags"]). Returns null for anything
+ *  else (literals, calls, indexing, comprehensions) — those are not statically
+ *  reducible to a single typed path. */
+function purePathChain(raw) {
+    const expr = celExprSource(raw);
+    if (expr == null)
+        return null;
+    if (!/^[A-Za-z_]\w*(\.[A-Za-z_]\w*)*$/.test(expr))
+        return null;
+    return expr.split(".");
+}
+/** Walk a member-access chain through a JSON Schema (descending `properties`)
+ *  and return the terminal node, or undefined when the path leaves typed schema. */
+function schemaAtChain(chain, root) {
+    let cur = root;
+    for (const key of chain) {
+        if (!cur || typeof cur !== "object")
+            return undefined;
+        const props = cur.properties;
+        if (!props || !(key in props))
+            return undefined;
+        cur = props[key];
+    }
+    return cur && typeof cur === "object" ? cur : undefined;
+}
+/** The element schema of a sibling collection expression, when statically known.
+ *  Resolves `inputs.*` chains against the resource's `inputs:` contract and
+ *  returns the array's `items`. Returns undefined for non-chain or untyped
+ *  collections (caller substitutes `dyn`). */
+function resolveCollectionElementSchema(manifestRoot, field) {
+    const chain = purePathChain(manifestRoot?.[field]);
+    if (!chain || chain[0] !== "inputs")
+        return undefined;
+    const contract = manifestRoot.inputs;
+    if (!contract || typeof contract !== "object")
+        return undefined;
+    const terminal = schemaAtChain(chain.slice(1), { type: "object", properties: contract });
+    if (terminal && terminal.type === "array" && terminal.items && typeof terminal.items === "object") {
+        return terminal.items;
+    }
+    return undefined;
+}
 /**
  * Returns true when a CEL expression path (from walkCelExpressions, e.g. "routes[0].inputs.q")
  * falls within the scope of a context (e.g. "$.routes[*].inputs").
@@ -131,6 +188,16 @@ export function resolveContextAnnotations(schema, manifestItem, opts) {
             additionalProperties: false,
         };
     }
+    // Element typing: derive a variable's schema from the element type of a sibling
+    // collection expression (e.g. `item` from `collection`). Resolves only when the
+    // collection is a member-access chain into the resource's typed `inputs` contract
+    // (the common, statically-knowable case); list literals, comprehensions, and
+    // untyped sources fall back to `dyn` so a wrong element type is never invented.
+    const elementFrom = schema["x-telo-context-element-from"];
+    if (elementFrom) {
+        const items = resolveCollectionElementSchema(manifestRoot, elementFrom);
+        return items ?? {};
+    }
     const fromRoot = schema["x-telo-context-from-root"];
     const fromRefKindRaw = schema["x-telo-context-from-ref-kind"];
     const fromRefKinds = fromRefKindRaw == null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/analyzer",
-  "version": "0.23.2",
+  "version": "0.24.1",
   "description": "Telo Analyzer - Static manifest validator for Telo manifests.",
   "keywords": [
     "telo",
@@ -42,7 +42,7 @@
     "ajv-formats": "^3.0.1",
     "jsonpath-plus": "^10.3.0",
     "yaml": "^2.8.3",
-    "@telorun/templating": "0.8.0"
+    "@telorun/templating": "0.10.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/validate-cel-context.ts

@@ -61,6 +61,65 @@ export function resolveTypeFieldToSchema(
   return undefined;
 }
 
+/** Pull the raw expression source from a CEL field value — a compiled value
+ *  (`{ source }`), or a string (`!cel "x"` or `"${{ x }}"`). Strips a lone
+ *  `${{ }}` wrapper. Returns null when no source is recoverable. */
+function celExprSource(raw: unknown): string | null {
+  let s: string | undefined;
+  if (typeof raw === "string") s = raw;
+  else if (raw && typeof raw === "object" && typeof (raw as Record<string, any>).source === "string")
+    s = (raw as Record<string, any>).source;
+  if (s == null) return null;
+  const exact = s.match(/^\s*\$\{\{\s*([^}]+?)\s*\}\}\s*$/);
+  return (exact ? exact[1] : s).trim();
+}
+
+/** Member-access chain for a bare dotted-identifier expression
+ *  (`inputs.user.tags` → ["inputs","user","tags"]). Returns null for anything
+ *  else (literals, calls, indexing, comprehensions) — those are not statically
+ *  reducible to a single typed path. */
+function purePathChain(raw: unknown): string[] | null {
+  const expr = celExprSource(raw);
+  if (expr == null) return null;
+  if (!/^[A-Za-z_]\w*(\.[A-Za-z_]\w*)*$/.test(expr)) return null;
+  return expr.split(".");
+}
+
+/** Walk a member-access chain through a JSON Schema (descending `properties`)
+ *  and return the terminal node, or undefined when the path leaves typed schema. */
+function schemaAtChain(
+  chain: string[],
+  root: Record<string, any>,
+): Record<string, any> | undefined {
+  let cur: Record<string, any> | undefined = root;
+  for (const key of chain) {
+    if (!cur || typeof cur !== "object") return undefined;
+    const props = cur.properties as Record<string, any> | undefined;
+    if (!props || !(key in props)) return undefined;
+    cur = props[key] as Record<string, any>;
+  }
+  return cur && typeof cur === "object" ? cur : undefined;
+}
+
+/** The element schema of a sibling collection expression, when statically known.
+ *  Resolves `inputs.*` chains against the resource's `inputs:` contract and
+ *  returns the array's `items`. Returns undefined for non-chain or untyped
+ *  collections (caller substitutes `dyn`). */
+function resolveCollectionElementSchema(
+  manifestRoot: Record<string, any>,
+  field: string,
+): Record<string, any> | undefined {
+  const chain = purePathChain(manifestRoot?.[field]);
+  if (!chain || chain[0] !== "inputs") return undefined;
+  const contract = manifestRoot.inputs;
+  if (!contract || typeof contract !== "object") return undefined;
+  const terminal = schemaAtChain(chain.slice(1), { type: "object", properties: contract });
+  if (terminal && terminal.type === "array" && terminal.items && typeof terminal.items === "object") {
+    return terminal.items as Record<string, any>;
+  }
+  return undefined;
+}
+
 /**
  * Returns true when a CEL expression path (from walkCelExpressions, e.g. "routes[0].inputs.q")
  * falls within the scope of a context (e.g. "$.routes[*].inputs").
@@ -162,6 +221,17 @@ export function resolveContextAnnotations(
     };
   }
 
+  // Element typing: derive a variable's schema from the element type of a sibling
+  // collection expression (e.g. `item` from `collection`). Resolves only when the
+  // collection is a member-access chain into the resource's typed `inputs` contract
+  // (the common, statically-knowable case); list literals, comprehensions, and
+  // untyped sources fall back to `dyn` so a wrong element type is never invented.
+  const elementFrom = schema["x-telo-context-element-from"] as string | undefined;
+  if (elementFrom) {
+    const items = resolveCollectionElementSchema(manifestRoot, elementFrom);
+    return items ?? {};
+  }
+
   const fromRoot = schema["x-telo-context-from-root"] as string | undefined;
   const fromRefKindRaw = schema["x-telo-context-from-ref-kind"] as
     | string