@telorun/templating 0.6.0 → 0.7.0

package/README.md

@@ -55,8 +55,8 @@ metadata:
     A complete feedback collection REST API — no code, pure YAML.
     Persists entries to SQLite and serves them over HTTP.
 imports:
-  Http: std/http-server@0.8.0
-  Sql: std/sql@0.5.1
+  Http: std/http-server@0.9.0
+  Sql: std/sql@0.8.0
 targets:
   - Migrations
   - Server

package/dist/cel/catalog.d.ts

@@ -24,8 +24,10 @@ export interface CelFunctionDoc {
      *  optional args even though cel-js itself has no optional syntax. */
     readonly signature: string;
     /** Actual cel-js signatures to register — one per arity for an overloaded
-     *  function. Defaults to `[signature]` when omitted (the common single-arity
-     *  case, where `signature` is itself a valid cel-js signature). */
+     *  function. When omitted, `deriveSignatures(signature)` is used: if the
+     *  signature contains `type?`-marked optional params (e.g. `fn(string?): T`),
+     *  it auto-expands to one registration per arity. Set `register` explicitly
+     *  only when the auto-derivation is insufficient. */
     readonly register?: readonly string[];
     readonly category: CelFunctionCategory;
     readonly summary: string;

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

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/cel/catalog.ts"],"names":[],"mappings":"AAEA;;;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;AAED,MAAM,MAAM,mBAAmB,GAC3B,YAAY,GACZ,MAAM,GACN,MAAM,GACN,QAAQ,GACR,MAAM,GACN,YAAY,GACZ,MAAM,GACN,UAAU,GACV,SAAS,GACT,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;;uEAEmE;IACnE,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;CACjE;AAED,wEAAwE;AACxE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAyE5D,eAAO,MAAM,aAAa,EAAE,SAAS,cAAc,EAsZlD,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,kBAAkB,IAAI,eAAe,EAAE,CAEtD"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/cel/catalog.ts"],"names":[],"mappings":"AAEA;;;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;AAED,MAAM,MAAM,mBAAmB,GAC3B,YAAY,GACZ,MAAM,GACN,MAAM,GACN,QAAQ,GACR,MAAM,GACN,YAAY,GACZ,MAAM,GACN,UAAU,GACV,SAAS,GACT,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;CACjE;AAED,wEAAwE;AACxE,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAyE5D,eAAO,MAAM,aAAa,EAAE,SAAS,cAAc,EAoZlD,CAAC;AAEF,oEAAoE;AACpE,wBAAgB,kBAAkB,IAAI,eAAe,EAAE,CAEtD"}

package/dist/cel/catalog.js

@@ -359,8 +359,7 @@ export const CEL_FUNCTIONS = [
     // (default "UTC"); epoch values are absolute and take none.
     {
         name: "nowIso",
-        signature: "nowIso(tz?): string",
-        register: ["nowIso(): string", "nowIso(string): string"],
+        signature: "nowIso(string?): string",
         category: "time",
         summary: "Current time as ISO-8601; UTC by default, or in the given IANA timezone.",
         deterministic: false,
@@ -369,8 +368,7 @@ export const CEL_FUNCTIONS = [
     },
     {
         name: "today",
-        signature: "today(tz?): string",
-        register: ["today(): string", "today(string): string"],
+        signature: "today(string?): string",
         category: "time",
         summary: "Current calendar date (YYYY-MM-DD); UTC by default, or in the given IANA timezone.",
         deterministic: false,

package/dist/cel/environment.d.ts

@@ -17,5 +17,12 @@ export type { CelHandlers } from "./catalog.js";
  *  no fields, so terminal access (passing the value through CEL) succeeds but
  *  member access raises a CEL error at runtime — matching the analyzer's
  *  static check on `x-telo-stream`-marked properties. */
+/** Expand a documented signature that may contain `type?`-marked optional
+ *  parameters into one cel-js registration signature per arity. For example,
+ *  `"nowIso(string?): string"` produces `["nowIso(): string",
+ *  "nowIso(string): string"]`. Required parameters must precede optional ones.
+ *  Returns `[signature]` unchanged when no `?` is present or the signature
+ *  cannot be parsed. */
+export declare function deriveSignatures(signature: string): string[];
 export declare function buildCelEnvironment(handlers?: Partial<CelHandlers>): Environment;
 //# sourceMappingURL=environment.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/cel/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAE/D,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAoBhD;;;;;;;;;;;;;;;yDAeyD;AACzD,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CAYpF"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/cel/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAE/D,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAoBhD;;;;;;;;;;;;;;;yDAeyD;AACzD;;;;;wBAKwB;AACxB,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAyB5D;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,GAAE,OAAO,CAAC,WAAW,CAAM,GAAG,WAAW,CAcpF"}

package/dist/cel/environment.js

@@ -31,14 +31,51 @@ const STUB_HANDLERS = {
  *  no fields, so terminal access (passing the value through CEL) succeeds but
  *  member access raises a CEL error at runtime — matching the analyzer's
  *  static check on `x-telo-stream`-marked properties. */
+/** Expand a documented signature that may contain `type?`-marked optional
+ *  parameters into one cel-js registration signature per arity. For example,
+ *  `"nowIso(string?): string"` produces `["nowIso(): string",
+ *  "nowIso(string): string"]`. Required parameters must precede optional ones.
+ *  Returns `[signature]` unchanged when no `?` is present or the signature
+ *  cannot be parsed. */
+export function deriveSignatures(signature) {
+    const m = signature.match(/^(\w+)\((.*?)\):\s*(.+)$/);
+    if (!m)
+        return [signature];
+    const name = m[1];
+    const paramsStr = m[2].trim();
+    const returnType = m[3].trim();
+    if (!paramsStr.includes("?"))
+        return [signature];
+    const params = paramsStr.split(",").map((p) => p.trim());
+    const required = [];
+    const optional = [];
+    for (const p of params) {
+        if (p.endsWith("?")) {
+            optional.push(p.slice(0, -1));
+        }
+        else {
+            if (optional.length > 0)
+                return [signature];
+            required.push(p);
+        }
+    }
+    if (optional.length === 0)
+        return [signature];
+    return Array.from({ length: optional.length + 1 }, (_, i) => {
+        const allParams = [...required, ...optional.slice(0, i)];
+        return `${name}(${allParams.join(", ")}): ${returnType}`;
+    });
+}
 export function buildCelEnvironment(handlers = {}) {
     const h = { ...STUB_HANDLERS, ...handlers };
     let env = new Environment({ unlistedVariablesAreDyn: true, enableOptionalTypes: true });
     for (const fn of CEL_FUNCTIONS) {
         const impl = fn.build(h);
-        // `register` lists one cel-js signature per arity (overloaded functions);
-        // it falls back to `signature` for the single-arity common case.
-        for (const sig of fn.register ?? [fn.signature]) {
+        // `register` lists one cel-js signature per arity (overloaded functions).
+        // When absent, `deriveSignatures` expands `type?` optional-param notation
+        // into one registration per arity — so `nowIso(string?): string` registers
+        // both `nowIso(): string` and `nowIso(string): string` automatically.
+        for (const sig of fn.register ?? deriveSignatures(fn.signature)) {
             env = env.registerFunction(sig, impl);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/templating",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Telo Templating - Engine registry and shared CEL core for Telo manifests.",
   "keywords": [
     "telo",
@@ -35,7 +35,7 @@
     "src/**"
   ],
   "dependencies": {
-    "@marcbachmann/cel-js": "^7.5.3",
+    "@marcbachmann/cel-js": "^7.6.1",
     "uuid": "^10.0.0",
     "yaml": "^2.8.3"
   },
@@ -44,7 +44,7 @@
     "@types/uuid": "^10.0.0",
     "typescript": "^5.0.0",
     "vitest": "^2.1.8",
-    "@telorun/sdk": "0.21.0"
+    "@telorun/sdk": "0.23.0"
   },
   "peerDependencies": {
     "@telorun/sdk": "*"

package/src/cel/catalog.ts

@@ -38,8 +38,10 @@ export interface CelFunctionDoc {
    *  optional args even though cel-js itself has no optional syntax. */
   readonly signature: string;
   /** Actual cel-js signatures to register — one per arity for an overloaded
-   *  function. Defaults to `[signature]` when omitted (the common single-arity
-   *  case, where `signature` is itself a valid cel-js signature). */
+   *  function. When omitted, `deriveSignatures(signature)` is used: if the
+   *  signature contains `type?`-marked optional params (e.g. `fn(string?): T`),
+   *  it auto-expands to one registration per arity. Set `register` explicitly
+   *  only when the auto-derivation is insufficient. */
   readonly register?: readonly string[];
   readonly category: CelFunctionCategory;
   readonly summary: string;
@@ -423,8 +425,7 @@ export const CEL_FUNCTIONS: readonly CelFunctionDoc[] = [
   // (default "UTC"); epoch values are absolute and take none.
   {
     name: "nowIso",
-    signature: "nowIso(tz?): string",
-    register: ["nowIso(): string", "nowIso(string): string"],
+    signature: "nowIso(string?): string",
     category: "time",
     summary: "Current time as ISO-8601; UTC by default, or in the given IANA timezone.",
     deterministic: false,
@@ -433,8 +434,7 @@ export const CEL_FUNCTIONS: readonly CelFunctionDoc[] = [
   },
   {
     name: "today",
-    signature: "today(tz?): string",
-    register: ["today(): string", "today(string): string"],
+    signature: "today(string?): string",
     category: "time",
     summary: "Current calendar date (YYYY-MM-DD); UTC by default, or in the given IANA timezone.",
     deterministic: false,

package/src/cel/environment.ts

@@ -38,14 +38,49 @@ const STUB_HANDLERS: CelHandlers = {
  *  no fields, so terminal access (passing the value through CEL) succeeds but
  *  member access raises a CEL error at runtime — matching the analyzer's
  *  static check on `x-telo-stream`-marked properties. */
+/** Expand a documented signature that may contain `type?`-marked optional
+ *  parameters into one cel-js registration signature per arity. For example,
+ *  `"nowIso(string?): string"` produces `["nowIso(): string",
+ *  "nowIso(string): string"]`. Required parameters must precede optional ones.
+ *  Returns `[signature]` unchanged when no `?` is present or the signature
+ *  cannot be parsed. */
+export function deriveSignatures(signature: string): string[] {
+  const m = signature.match(/^(\w+)\((.*?)\):\s*(.+)$/);
+  if (!m) return [signature];
+  const name = m[1]!;
+  const paramsStr = m[2]!.trim();
+  const returnType = m[3]!.trim();
+  if (!paramsStr.includes("?")) return [signature];
+
+  const params = paramsStr.split(",").map((p) => p.trim());
+  const required: string[] = [];
+  const optional: string[] = [];
+  for (const p of params) {
+    if (p.endsWith("?")) {
+      optional.push(p.slice(0, -1));
+    } else {
+      if (optional.length > 0) return [signature];
+      required.push(p);
+    }
+  }
+  if (optional.length === 0) return [signature];
+
+  return Array.from({ length: optional.length + 1 }, (_, i) => {
+    const allParams = [...required, ...optional.slice(0, i)];
+    return `${name}(${allParams.join(", ")}): ${returnType}`;
+  });
+}
+
 export function buildCelEnvironment(handlers: Partial<CelHandlers> = {}): Environment {
   const h: CelHandlers = { ...STUB_HANDLERS, ...handlers };
   let env = new Environment({ unlistedVariablesAreDyn: true, enableOptionalTypes: true });
   for (const fn of CEL_FUNCTIONS) {
     const impl = fn.build(h);
-    // `register` lists one cel-js signature per arity (overloaded functions);
-    // it falls back to `signature` for the single-arity common case.
-    for (const sig of fn.register ?? [fn.signature]) {
+    // `register` lists one cel-js signature per arity (overloaded functions).
+    // When absent, `deriveSignatures` expands `type?` optional-param notation
+    // into one registration per arity — so `nowIso(string?): string` registers
+    // both `nowIso(): string` and `nowIso(string): string` automatically.
+    for (const sig of fn.register ?? deriveSignatures(fn.signature)) {
       env = env.registerFunction(sig, impl);
     }
   }