@telorun/templating 0.19.0 → 0.20.1

package/dist/cel/catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/cel/catalog.ts"],"names":[],"mappings":"AAIA;;;0DAG0D;AAC1D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9B,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAClE,YAAY,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC,YAAY,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;CAClC;AA2CD,MAAM,MAAM,mBAAmB,GAC3B,YAAY,GACZ,MAAM,GACN,MAAM,GACN,QAAQ,GACR,MAAM,GACN,YAAY,GACZ,MAAM,GACN,UAAU,GACV,SAAS,GACT,YAAY,GACZ,MAAM,CAAC;AAEX;;;qBAGqB;AACrB,MAAM,WAAW,cAAc;IAC7B,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;0EACsE;IACtE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;;;;yDAIqD;IACrD,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;wBACoB;IACpB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC;2EACuE;IACvE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;IAChE;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,KAAK,MAAM,GAAG,SAAS,CAAC;CAC3E;AAYD,wEAAwE;AACxE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AA4X5D,eAAO,MAAM,aAAa,EAAE,SAAS,cAAc,EA8wBlD,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,kBAAkB,IAAI,eAAe,EAAE,CAEtD"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/cel/catalog.ts"],"names":[],"mappings":"AAIA;;;0DAG0D;AAC1D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9B,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IAClE,YAAY,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC,YAAY,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;CAClC;AA2CD,MAAM,MAAM,mBAAmB,GAC3B,YAAY,GACZ,MAAM,GACN,MAAM,GACN,QAAQ,GACR,MAAM,GACN,YAAY,GACZ,MAAM,GACN,UAAU,GACV,SAAS,GACT,YAAY,GACZ,MAAM,CAAC;AAEX;;;qBAGqB;AACrB,MAAM,WAAW,cAAc;IAC7B,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;0EACsE;IACtE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;;;;yDAIqD;IACrD,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;wBACoB;IACpB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC;2EACuE;IACvE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;IAChE;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,KAAK,MAAM,GAAG,SAAS,CAAC;CAC3E;AAYD,wEAAwE;AACxE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AA8Z5D,eAAO,MAAM,aAAa,EAAE,SAAS,cAAc,EAyxBlD,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,kBAAkB,IAAI,eAAe,EAAE,CAEtD"}

package/dist/cel/catalog.js

@@ -357,6 +357,40 @@ const compactValue = (v) => {
     }
     throw new Error(`compact: expected a map or a list, got ${JSON.stringify(v)}`);
 };
+/** A CEL map as entries. Read the way `compact` reads one — a map arrives as a
+ *  plain object or a `Map` depending on how it was produced — and refusing
+ *  anything that is not one, since rebuilding an arbitrary object from its
+ *  entries is how a byte buffer becomes `{"0":137,…}` silently. A LIST is named
+ *  rather than coerced: CEL's `+` already concatenates lists, so a list here is
+ *  a mistake with a spelling that works, not a case to support. */
+const mapEntries = (fn, v) => {
+    if (v instanceof Map)
+        return [...v.entries()];
+    if (Array.isArray(v))
+        throw new Error(`${fn}: expected a map, got a list — use '+' to join lists`);
+    if (v !== null && typeof v === "object") {
+        const proto = Object.getPrototypeOf(v);
+        if (proto !== Object.prototype && proto !== null) {
+            throw new Error(`${fn}: expected a map, got ${v.constructor?.name ?? "an object"}`);
+        }
+        return Object.entries(v);
+    }
+    throw new Error(`${fn}: expected a map, got ${JSON.stringify(v)}`);
+};
+/** Right-hand precedence, so `merge(defaults, overrides)` reads as it looks.
+ *
+ *  The map case is the one with no spelling at all — `+` joins lists and
+ *  strings and refuses maps — so a child kind inheriting a map-valued field
+ *  could only REPLACE it. That turns a default the parent set for a reason into
+ *  something every consumer must restate, and a consumer who restates it
+ *  incompletely gets a system that works until the omitted entry matters.
+ *
+ *  Follows the LEFT argument's shape: this extends that map, so what comes back
+ *  is what was extended. */
+const mergeMaps = (a, b) => {
+    const entries = [...mapEntries("merge", a), ...mapEntries("merge", b)];
+    return a instanceof Map ? new Map(entries) : Object.fromEntries(entries);
+};
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 /** Base64 → bytes, written out rather than delegated: `Buffer` is not browser-
  *  safe and `atob` round-trips through a string, which is the corruption this
@@ -1097,6 +1131,16 @@ export const CEL_FUNCTIONS = [
         hostBacked: false,
         build: () => (v) => compactValue(v),
     },
+    {
+        name: "merge",
+        signature: "merge(map, map): map",
+        register: ["merge(map, map): map"],
+        category: "collection",
+        summary: "Combine two maps, with the right-hand map winning on a shared key. Use it to add to a map rather than replace it — `merge(defaults, overrides)`.",
+        deterministic: true,
+        hostBacked: false,
+        build: () => (a, b) => mergeMaps(a, b),
+    },
     // UUID
     {
         name: "uuidv1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/templating",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "description": "Telo Templating - Engine registry and shared CEL core for Telo manifests.",
   "keywords": [
     "telo",
@@ -46,7 +46,7 @@
     "@types/node": "^20.0.0",
     "typescript": "^5.0.0",
     "vitest": "^2.1.8",
-    "@telorun/sdk": "0.87.0"
+    "@telorun/sdk": "0.90.0"
   },
   "peerDependencies": {
     "@telorun/sdk": "*"

package/src/cel/catalog.ts

@@ -460,6 +460,40 @@ const compactValue = (v: unknown): unknown => {
   throw new Error(`compact: expected a map or a list, got ${JSON.stringify(v)}`);
 };
 
+/** A CEL map as entries. Read the way `compact` reads one — a map arrives as a
+ *  plain object or a `Map` depending on how it was produced — and refusing
+ *  anything that is not one, since rebuilding an arbitrary object from its
+ *  entries is how a byte buffer becomes `{"0":137,…}` silently. A LIST is named
+ *  rather than coerced: CEL's `+` already concatenates lists, so a list here is
+ *  a mistake with a spelling that works, not a case to support. */
+const mapEntries = (fn: string, v: unknown): [string, unknown][] => {
+  if (v instanceof Map) return [...v.entries()] as [string, unknown][];
+  if (Array.isArray(v)) throw new Error(`${fn}: expected a map, got a list — use '+' to join lists`);
+  if (v !== null && typeof v === "object") {
+    const proto = Object.getPrototypeOf(v);
+    if (proto !== Object.prototype && proto !== null) {
+      throw new Error(`${fn}: expected a map, got ${v.constructor?.name ?? "an object"}`);
+    }
+    return Object.entries(v as Record<string, unknown>);
+  }
+  throw new Error(`${fn}: expected a map, got ${JSON.stringify(v)}`);
+};
+
+/** Right-hand precedence, so `merge(defaults, overrides)` reads as it looks.
+ *
+ *  The map case is the one with no spelling at all — `+` joins lists and
+ *  strings and refuses maps — so a child kind inheriting a map-valued field
+ *  could only REPLACE it. That turns a default the parent set for a reason into
+ *  something every consumer must restate, and a consumer who restates it
+ *  incompletely gets a system that works until the omitted entry matters.
+ *
+ *  Follows the LEFT argument's shape: this extends that map, so what comes back
+ *  is what was extended. */
+const mergeMaps = (a: unknown, b: unknown): unknown => {
+  const entries = [...mapEntries("merge", a), ...mapEntries("merge", b)];
+  return a instanceof Map ? new Map(entries) : Object.fromEntries(entries);
+};
+
 const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 /** Base64 → bytes, written out rather than delegated: `Buffer` is not browser-
@@ -1216,6 +1250,17 @@ export const CEL_FUNCTIONS: readonly CelFunctionDoc[] = [
     hostBacked: false,
     build: () => (v: unknown) => compactValue(v),
   },
+  {
+    name: "merge",
+    signature: "merge(map, map): map",
+    register: ["merge(map, map): map"],
+    category: "collection",
+    summary:
+      "Combine two maps, with the right-hand map winning on a shared key. Use it to add to a map rather than replace it — `merge(defaults, overrides)`.",
+    deterministic: true,
+    hostBacked: false,
+    build: () => (a: unknown, b: unknown) => mergeMaps(a, b),
+  },
   // UUID
   {
     name: "uuidv1",