@telorun/analyzer 0.48.0 → 0.49.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analysis-registry.d.ts +22 -11
- package/dist/analysis-registry.d.ts.map +1 -1
- package/dist/analysis-registry.js +36 -39
- package/dist/analyzer.d.ts +38 -1
- package/dist/analyzer.d.ts.map +1 -1
- package/dist/analyzer.js +115 -83
- package/dist/builtins.d.ts.map +1 -1
- package/dist/builtins.js +72 -1
- package/dist/extends-resolution.d.ts +41 -0
- package/dist/extends-resolution.d.ts.map +1 -1
- package/dist/extends-resolution.js +68 -0
- package/dist/index.d.ts +4 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/invocation-contract.d.ts +100 -0
- package/dist/invocation-contract.d.ts.map +1 -0
- package/dist/invocation-contract.js +208 -0
- package/dist/manifest-loader.d.ts +11 -0
- package/dist/manifest-loader.d.ts.map +1 -1
- package/dist/manifest-loader.js +20 -0
- package/dist/schema-compat.d.ts +12 -4
- package/dist/schema-compat.d.ts.map +1 -1
- package/dist/schema-compat.js +185 -9
- package/dist/validate-base-mapping.js +11 -1
- package/dist/validate-cel-context.d.ts +0 -6
- package/dist/validate-cel-context.d.ts.map +1 -1
- package/dist/validate-cel-context.js +51 -4
- package/dist/validate-invocation-contract.d.ts +30 -0
- package/dist/validate-invocation-contract.d.ts.map +1 -0
- package/dist/validate-invocation-contract.js +394 -0
- package/dist/validate-step-inputs.d.ts +24 -0
- package/dist/validate-step-inputs.d.ts.map +1 -0
- package/dist/validate-step-inputs.js +87 -0
- package/dist/validate-throws-coverage.d.ts +1 -1
- package/dist/validate-throws-coverage.d.ts.map +1 -1
- package/dist/validate-throws-coverage.js +9 -1
- package/package.json +3 -3
- package/src/analysis-registry.ts +44 -34
- package/src/analyzer.ts +171 -100
- package/src/builtins.ts +74 -1
- package/src/extends-resolution.ts +86 -0
- package/src/index.ts +13 -1
- package/src/invocation-contract.ts +275 -0
- package/src/manifest-loader.ts +20 -0
- package/src/schema-compat.ts +191 -8
- package/src/validate-base-mapping.ts +14 -1
- package/src/validate-cel-context.ts +49 -4
- package/src/validate-invocation-contract.ts +450 -0
- package/src/validate-step-inputs.ts +117 -0
- package/src/validate-throws-coverage.ts +12 -2
package/dist/schema-compat.d.ts
CHANGED
|
@@ -49,14 +49,22 @@ export declare function brandOfSchema(schema: Record<string, any> | undefined):
|
|
|
49
49
|
export declare function jsonSchemaToCelType(schema: Record<string, any> | undefined): string;
|
|
50
50
|
/** Check whether a CEL return type is compatible with a JSON Schema type constraint. */
|
|
51
51
|
export declare function celTypeSatisfiesJsonSchema(celType: string, schema: Record<string, any>): boolean;
|
|
52
|
-
|
|
53
|
-
export declare function celPlaceholderForSchema(schema: Record<string, any>): unknown;
|
|
52
|
+
export declare function celPlaceholderForSchema(rawSchema: Record<string, any>): unknown;
|
|
54
53
|
/** Resolve a `$ref` (only `#/$defs/...` form) against the root schema. */
|
|
55
54
|
export declare function resolveRef(schema: Record<string, any>, root: Record<string, any>): Record<string, any>;
|
|
56
|
-
/** Collect property schemas from top-level `properties` and all `oneOf`/`anyOf` sub-schemas. */
|
|
57
55
|
export declare function collectProperties(schema: Record<string, any>): Record<string, any>;
|
|
58
56
|
/** Deep-clone `data`, replacing every pure CEL template string (`${{ expr }}`) with a
|
|
59
57
|
* schema-appropriate placeholder so AJV can validate non-CEL fields without false positives. */
|
|
60
|
-
export declare function substituteCelFields(data: unknown, schema: Record<string, any>, rootSchema?: Record<string, any
|
|
58
|
+
export declare function substituteCelFields(data: unknown, schema: Record<string, any>, rootSchema?: Record<string, any>,
|
|
59
|
+
/** Called with the dotted path of every value replaced by a placeholder.
|
|
60
|
+
*
|
|
61
|
+
* A placeholder is a stand-in for something only known at runtime, so its
|
|
62
|
+
* VALUE says nothing: a caller that judges constraints at these paths reports
|
|
63
|
+
* against a value no author wrote. Some constraints cannot be satisfied by
|
|
64
|
+
* construction at all (`pattern`, `format`, a `oneOf` of unrelated shapes),
|
|
65
|
+
* so making every placeholder acceptable is not achievable in general —
|
|
66
|
+
* knowing where not to look is. Structural findings survive because they are
|
|
67
|
+
* located at the CONTAINER, not at the substituted leaf. */
|
|
68
|
+
onSubstitute?: (path: string) => void, path?: string): unknown;
|
|
61
69
|
export {};
|
|
62
70
|
//# sourceMappingURL=schema-compat.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-compat.d.ts","sourceRoot":"","sources":["../src/schema-compat.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,GAAG,KAA0C,CAAC;AAEpD;;;;;;;mCAOmC;AACnC,wBAAgB,SAAS,IAAI,YAAY,CAAC,OAAO,GAAG,CAAC,CAOpD;AAKD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;oEAEoE;AACpE,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,mBAAmB,CAIrB;AAiDD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAelD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAGxE;AAuBD,mFAAmF;AACnF,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;CACd;AAaD,0GAA0G;AAC1G,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,WAAW,EAAE,CA2B/F;AAED;qFACqF;AACrF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAQ7E;AAED;;;;6DAI6D;AAC7D,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,GACX,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAsBjC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGnD,CAAC;AAEF,wEAAwE;AACxE,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGzF;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,MAAM,CAyBnF;AAED,wFAAwF;AACxF,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAiChG;
|
|
1
|
+
{"version":3,"file":"schema-compat.d.ts","sourceRoot":"","sources":["../src/schema-compat.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,GAAG,KAA0C,CAAC;AAEpD;;;;;;;mCAOmC;AACnC,wBAAgB,SAAS,IAAI,YAAY,CAAC,OAAO,GAAG,CAAC,CAOpD;AAKD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;oEAEoE;AACpE,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,mBAAmB,CAIrB;AAiDD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAelD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAGxE;AAuBD,mFAAmF;AACnF,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;CACd;AAaD,0GAA0G;AAC1G,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,WAAW,EAAE,CA2B/F;AAED;qFACqF;AACrF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAQ7E;AAED;;;;6DAI6D;AAC7D,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,GACX,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAsBjC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGnD,CAAC;AAEF,wEAAwE;AACxE,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAGzF;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,MAAM,CAyBnF;AAED,wFAAwF;AACxF,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAiChG;AAkED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAqC/E;AAqBD,0EAA0E;AAC1E,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAOtG;AAyDD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAwBlF;AAED;iGACiG;AACjG,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;AAChC;;;;;;;;6DAQ6D;AAC7D,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EACrC,IAAI,SAAK,GACR,OAAO,CAgDT"}
|
package/dist/schema-compat.js
CHANGED
|
@@ -282,7 +282,76 @@ export function celTypeSatisfiesJsonSchema(celType, schema) {
|
|
|
282
282
|
return compatibleWith.some((t) => schemaTypes.includes(t));
|
|
283
283
|
}
|
|
284
284
|
/** Return a literal placeholder value of the correct schema type for AJV. */
|
|
285
|
-
|
|
285
|
+
/** A number inside the schema's declared bounds. The placeholder stands in for a
|
|
286
|
+
* value only known at runtime, so its single job is to be ACCEPTABLE — a bare 0
|
|
287
|
+
* into an `exclusiveMinimum: 0` field (a scale, a positive dimension) would
|
|
288
|
+
* report a violation against a value the author never wrote. Bounds are read in
|
|
289
|
+
* the order that pins the value: an inclusive minimum is usable as-is, an
|
|
290
|
+
* exclusive one needs a step past it, and a wholly-negative range needs the
|
|
291
|
+
* maximum end instead. */
|
|
292
|
+
function numericPlaceholder(schema) {
|
|
293
|
+
const isInteger = schema.type === "integer";
|
|
294
|
+
// One step past an exclusive bound. Integral for both `integer` and `number`:
|
|
295
|
+
// any value inside the band will do, and a whole number is inside it whenever
|
|
296
|
+
// a fractional one is (the narrow-band case below handles when it is not).
|
|
297
|
+
const step = 1;
|
|
298
|
+
if (typeof schema.minimum === "number")
|
|
299
|
+
return schema.minimum;
|
|
300
|
+
if (typeof schema.exclusiveMinimum === "number") {
|
|
301
|
+
const candidate = schema.exclusiveMinimum + step;
|
|
302
|
+
if (typeof schema.maximum === "number" && candidate > schema.maximum) {
|
|
303
|
+
// A narrow band (0 < x <= 0.5) has no integral step; take the midpoint,
|
|
304
|
+
// which the band's own definition guarantees is inside it.
|
|
305
|
+
return isInteger ? schema.maximum : (schema.exclusiveMinimum + schema.maximum) / 2;
|
|
306
|
+
}
|
|
307
|
+
return candidate;
|
|
308
|
+
}
|
|
309
|
+
if (typeof schema.maximum === "number" && schema.maximum < 0)
|
|
310
|
+
return schema.maximum;
|
|
311
|
+
if (typeof schema.exclusiveMaximum === "number" && schema.exclusiveMaximum <= 0) {
|
|
312
|
+
return schema.exclusiveMaximum - step;
|
|
313
|
+
}
|
|
314
|
+
return 0;
|
|
315
|
+
}
|
|
316
|
+
/** The constraints a placeholder must satisfy, folded across `allOf` branches.
|
|
317
|
+
* Inheritance between types is expressed by intersecting `allOf`, so a bound a
|
|
318
|
+
* parent declared lives in a branch rather than on the property itself — a
|
|
319
|
+
* placeholder that reads only the top level would violate it and report against
|
|
320
|
+
* a value the author never wrote. The tightest bound wins, which is what the
|
|
321
|
+
* intersection means. */
|
|
322
|
+
function foldedConstraints(schema) {
|
|
323
|
+
const branches = Array.isArray(schema.allOf) ? schema.allOf : [];
|
|
324
|
+
if (branches.length === 0)
|
|
325
|
+
return schema;
|
|
326
|
+
const out = { ...schema };
|
|
327
|
+
for (const branch of branches) {
|
|
328
|
+
const folded = foldedConstraints(branch);
|
|
329
|
+
for (const key of ["minimum", "exclusiveMinimum", "minLength", "minItems"]) {
|
|
330
|
+
if (typeof folded[key] === "number" && (typeof out[key] !== "number" || folded[key] > out[key])) {
|
|
331
|
+
out[key] = folded[key];
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
for (const key of ["maximum", "exclusiveMaximum"]) {
|
|
335
|
+
if (typeof folded[key] === "number" && (typeof out[key] !== "number" || folded[key] < out[key])) {
|
|
336
|
+
out[key] = folded[key];
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
if (out.type === undefined && folded.type !== undefined)
|
|
340
|
+
out.type = folded.type;
|
|
341
|
+
if (out.enum === undefined && folded.enum !== undefined)
|
|
342
|
+
out.enum = folded.enum;
|
|
343
|
+
if (out.default === undefined && folded.default !== undefined)
|
|
344
|
+
out.default = folded.default;
|
|
345
|
+
if (folded.required) {
|
|
346
|
+
out.required = [...new Set([...(out.required ?? []), ...folded.required])];
|
|
347
|
+
}
|
|
348
|
+
if (folded.properties)
|
|
349
|
+
out.properties = { ...folded.properties, ...(out.properties ?? {}) };
|
|
350
|
+
}
|
|
351
|
+
return out;
|
|
352
|
+
}
|
|
353
|
+
export function celPlaceholderForSchema(rawSchema) {
|
|
354
|
+
const schema = foldedConstraints(rawSchema);
|
|
286
355
|
if (schema.default !== undefined)
|
|
287
356
|
return schema.default;
|
|
288
357
|
// An enum-constrained field needs a placeholder drawn from the enum: the
|
|
@@ -296,19 +365,46 @@ export function celPlaceholderForSchema(schema) {
|
|
|
296
365
|
switch (schema.type) {
|
|
297
366
|
case "integer":
|
|
298
367
|
case "number":
|
|
299
|
-
return schema
|
|
368
|
+
return numericPlaceholder(schema);
|
|
300
369
|
case "string":
|
|
301
|
-
|
|
370
|
+
// `minLength` is the string analogue of `minimum`: a bare "" into a
|
|
371
|
+
// `minLength: 1` field would report a violation against a value the author
|
|
372
|
+
// never wrote. Any string of the right length will do.
|
|
373
|
+
return typeof schema.minLength === "number" && schema.minLength > 0
|
|
374
|
+
? "x".repeat(schema.minLength)
|
|
375
|
+
: "";
|
|
302
376
|
case "boolean":
|
|
303
377
|
return false;
|
|
304
378
|
case "array":
|
|
305
|
-
|
|
379
|
+
// `minItems` is the array analogue of `minimum` / `minLength`: an empty
|
|
380
|
+
// array into a `minItems: 1` field would report a violation against a
|
|
381
|
+
// value the author never wrote.
|
|
382
|
+
return typeof schema.minItems === "number" && schema.minItems > 0
|
|
383
|
+
? Array.from({ length: schema.minItems }, () => celPlaceholderForSchema((schema.items ?? {})))
|
|
384
|
+
: [];
|
|
306
385
|
case "object":
|
|
307
|
-
return
|
|
386
|
+
return objectPlaceholder(schema);
|
|
308
387
|
default:
|
|
309
388
|
return null;
|
|
310
389
|
}
|
|
311
390
|
}
|
|
391
|
+
/** An object satisfying the schema's `required` list. A bare `{}` would report
|
|
392
|
+
* every required property as missing against a value the author never wrote —
|
|
393
|
+
* the case where a whole map is produced by one expression (`inputs: !cel
|
|
394
|
+
* "buildRequest(...)"`), which is exactly when the analyzer knows least and
|
|
395
|
+
* should say least. Members are filled recursively by the same rule, so a
|
|
396
|
+
* required nested object is satisfied too. */
|
|
397
|
+
function objectPlaceholder(schema) {
|
|
398
|
+
const required = Array.isArray(schema.required) ? schema.required : [];
|
|
399
|
+
if (required.length === 0)
|
|
400
|
+
return {};
|
|
401
|
+
const properties = (schema.properties ?? {});
|
|
402
|
+
const out = {};
|
|
403
|
+
for (const key of required) {
|
|
404
|
+
out[key] = celPlaceholderForSchema(properties[key] ?? {});
|
|
405
|
+
}
|
|
406
|
+
return out;
|
|
407
|
+
}
|
|
312
408
|
const CEL_PURE_RE = /^\s*\$\{\{[^}]*\}\}\s*$/;
|
|
313
409
|
/** Resolve a `$ref` (only `#/$defs/...` form) against the root schema. */
|
|
314
410
|
export function resolveRef(schema, root) {
|
|
@@ -321,8 +417,75 @@ export function resolveRef(schema, root) {
|
|
|
321
417
|
return schema;
|
|
322
418
|
}
|
|
323
419
|
/** Collect property schemas from top-level `properties` and all `oneOf`/`anyOf` sub-schemas. */
|
|
420
|
+
/**
|
|
421
|
+
* The `oneOf` / `anyOf` branch a value is written against, when exactly one fits.
|
|
422
|
+
*
|
|
423
|
+
* A union carries no `type` / `properties` / `items` of its own, so a walker that
|
|
424
|
+
* ignores it descends with an empty schema and hands every CEL leaf underneath a
|
|
425
|
+
* `null` placeholder — which then fails every branch and reports a pile of
|
|
426
|
+
* violations against a value that is perfectly valid. Picking the branch first
|
|
427
|
+
* is what lets the leaves be typed.
|
|
428
|
+
*
|
|
429
|
+
* Selection is structural and conservative: a branch must agree with the data's
|
|
430
|
+
* kind, and for an object every `required` key must be present (which is what
|
|
431
|
+
* separates a `{type, text}` part from a `{type, data, mediaType}` one). If that
|
|
432
|
+
* leaves anything other than exactly one branch, the union is returned unchanged
|
|
433
|
+
* — an ambiguous union is one the analyzer should not resolve on the author's
|
|
434
|
+
* behalf.
|
|
435
|
+
*/
|
|
436
|
+
function selectUnionBranch(schema, data, root) {
|
|
437
|
+
const branches = (schema.oneOf ?? schema.anyOf);
|
|
438
|
+
if (!Array.isArray(branches) || branches.length === 0)
|
|
439
|
+
return schema;
|
|
440
|
+
if (schema.type !== undefined || schema.properties !== undefined)
|
|
441
|
+
return schema;
|
|
442
|
+
const kind = Array.isArray(data)
|
|
443
|
+
? "array"
|
|
444
|
+
: data === null
|
|
445
|
+
? "null"
|
|
446
|
+
: typeof data === "object"
|
|
447
|
+
? "object"
|
|
448
|
+
: typeof data === "string"
|
|
449
|
+
? "string"
|
|
450
|
+
: typeof data === "number"
|
|
451
|
+
? "number"
|
|
452
|
+
: typeof data === "boolean"
|
|
453
|
+
? "boolean"
|
|
454
|
+
: undefined;
|
|
455
|
+
if (!kind)
|
|
456
|
+
return schema;
|
|
457
|
+
const fits = branches
|
|
458
|
+
.map((b) => resolveRef(b, root))
|
|
459
|
+
.filter((b) => {
|
|
460
|
+
const types = Array.isArray(b.type) ? b.type : b.type ? [b.type] : [];
|
|
461
|
+
if (types.length > 0 && !types.includes(kind))
|
|
462
|
+
return false;
|
|
463
|
+
if (kind === "object" && Array.isArray(b.required)) {
|
|
464
|
+
const keys = Object.keys(data);
|
|
465
|
+
if (!b.required.every((r) => keys.includes(r)))
|
|
466
|
+
return false;
|
|
467
|
+
}
|
|
468
|
+
return true;
|
|
469
|
+
});
|
|
470
|
+
return fits.length === 1 ? fits[0] : schema;
|
|
471
|
+
}
|
|
324
472
|
export function collectProperties(schema) {
|
|
325
473
|
const props = { ...(schema.properties ?? {}) };
|
|
474
|
+
// `allOf` INTERSECTS, so a branch constraining a property constrains the
|
|
475
|
+
// property itself — type inheritance expresses an inherited bound exactly this
|
|
476
|
+
// way (`allOf: [{ properties: { score: { minimum: 10 } } }]`). Merging the
|
|
477
|
+
// branch's constraints into the property is what lets a placeholder for that
|
|
478
|
+
// property be built from the bound the value must actually satisfy; reading
|
|
479
|
+
// only the top level would produce one that violates it.
|
|
480
|
+
for (const sub of (schema.allOf ?? [])) {
|
|
481
|
+
if (!sub || typeof sub !== "object" || !sub.properties)
|
|
482
|
+
continue;
|
|
483
|
+
for (const [k, v] of Object.entries(sub.properties)) {
|
|
484
|
+
props[k] = k in props ? { ...props[k], ...v } : v;
|
|
485
|
+
}
|
|
486
|
+
}
|
|
487
|
+
// `oneOf` / `anyOf` are alternatives, not constraints: a property seen in one
|
|
488
|
+
// branch is contributed only when no branch already declared it.
|
|
326
489
|
for (const sub of schema.oneOf ?? schema.anyOf ?? []) {
|
|
327
490
|
if (sub && typeof sub === "object" && sub.properties) {
|
|
328
491
|
for (const [k, v] of Object.entries(sub.properties)) {
|
|
@@ -335,10 +498,22 @@ export function collectProperties(schema) {
|
|
|
335
498
|
}
|
|
336
499
|
/** Deep-clone `data`, replacing every pure CEL template string (`${{ expr }}`) with a
|
|
337
500
|
* schema-appropriate placeholder so AJV can validate non-CEL fields without false positives. */
|
|
338
|
-
export function substituteCelFields(data, schema, rootSchema
|
|
501
|
+
export function substituteCelFields(data, schema, rootSchema,
|
|
502
|
+
/** Called with the dotted path of every value replaced by a placeholder.
|
|
503
|
+
*
|
|
504
|
+
* A placeholder is a stand-in for something only known at runtime, so its
|
|
505
|
+
* VALUE says nothing: a caller that judges constraints at these paths reports
|
|
506
|
+
* against a value no author wrote. Some constraints cannot be satisfied by
|
|
507
|
+
* construction at all (`pattern`, `format`, a `oneOf` of unrelated shapes),
|
|
508
|
+
* so making every placeholder acceptable is not achievable in general —
|
|
509
|
+
* knowing where not to look is. Structural findings survive because they are
|
|
510
|
+
* located at the CONTAINER, not at the substituted leaf. */
|
|
511
|
+
onSubstitute, path = "") {
|
|
339
512
|
const root = rootSchema ?? schema;
|
|
340
|
-
const resolved = resolveRef(schema, root);
|
|
513
|
+
const resolved = selectUnionBranch(resolveRef(schema, root), data, root);
|
|
514
|
+
const mark = () => onSubstitute?.(path);
|
|
341
515
|
if (typeof data === "string" && CEL_PURE_RE.test(data)) {
|
|
516
|
+
mark();
|
|
342
517
|
return celPlaceholderForSchema(resolved);
|
|
343
518
|
}
|
|
344
519
|
// `!ref <name>` sentinels are identity markers, not runtime values —
|
|
@@ -352,11 +527,12 @@ export function substituteCelFields(data, schema, rootSchema) {
|
|
|
352
527
|
return data;
|
|
353
528
|
}
|
|
354
529
|
if (isTaggedSentinel(data)) {
|
|
530
|
+
mark();
|
|
355
531
|
return celPlaceholderForSchema(resolved);
|
|
356
532
|
}
|
|
357
533
|
if (Array.isArray(data)) {
|
|
358
534
|
const itemSchema = resolveRef((resolved.items ?? {}), root);
|
|
359
|
-
return data.map((item) => substituteCelFields(item, itemSchema, root));
|
|
535
|
+
return data.map((item, i) => substituteCelFields(item, itemSchema, root, onSubstitute, `${path}[${i}]`));
|
|
360
536
|
}
|
|
361
537
|
if (data !== null && typeof data === "object") {
|
|
362
538
|
const props = collectProperties(resolved);
|
|
@@ -365,7 +541,7 @@ export function substituteCelFields(data, schema, rootSchema) {
|
|
|
365
541
|
: undefined;
|
|
366
542
|
const result = {};
|
|
367
543
|
for (const [k, v] of Object.entries(data)) {
|
|
368
|
-
result[k] = substituteCelFields(v, (props[k] ?? addlProps ?? {}), root);
|
|
544
|
+
result[k] = substituteCelFields(v, (props[k] ?? addlProps ?? {}), root, onSubstitute, path ? `${path}.${k}` : k);
|
|
369
545
|
}
|
|
370
546
|
return result;
|
|
371
547
|
}
|
|
@@ -78,9 +78,19 @@ export function validateBaseMapping(manifests, registry, aliases) {
|
|
|
78
78
|
}
|
|
79
79
|
return diagnostics;
|
|
80
80
|
}
|
|
81
|
+
/** Keys the inherited controller supplies itself when it builds the parent
|
|
82
|
+
* manifest (`{ kind, metadata, ...base }`), so `base:` neither has to set them
|
|
83
|
+
* nor may. Without this exclusion a parent whose schema lists `metadata` in
|
|
84
|
+
* `required` — `JS.Script` does, the most natural parent for a remapping child —
|
|
85
|
+
* is unusable: omitting it is BASE_MISSING_REQUIRED and setting it is
|
|
86
|
+
* BASE_UNKNOWN_FIELD, since `metadata` is required but never a declared
|
|
87
|
+
* property. Only at the top level; a nested `metadata` field is the parent's
|
|
88
|
+
* own and is checked normally. */
|
|
89
|
+
const CONTROLLER_SUPPLIED_KEYS = new Set(["kind", "metadata"]);
|
|
81
90
|
function checkObject(value, schema, path, ctx) {
|
|
82
91
|
const properties = (schema.properties ?? {});
|
|
83
|
-
const
|
|
92
|
+
const isRoot = path === "base";
|
|
93
|
+
const required = (Array.isArray(schema.required) ? schema.required : []).filter((name) => !(isRoot && CONTROLLER_SUPPLIED_KEYS.has(name)));
|
|
84
94
|
const additionalFalse = schema.additionalProperties === false;
|
|
85
95
|
for (const req of required) {
|
|
86
96
|
if (!(req in value)) {
|
|
@@ -14,12 +14,6 @@ export interface ContextResolveOpts {
|
|
|
14
14
|
};
|
|
15
15
|
allManifests?: Record<string, any>[];
|
|
16
16
|
}
|
|
17
|
-
/**
|
|
18
|
-
* Resolve a type field value (string name, inline type, or raw schema) to a JSON Schema.
|
|
19
|
-
* - String: look up the named type in allManifests (Type.JsonSchema resources)
|
|
20
|
-
* - Object with `kind` + `schema`: inline type definition → return the `schema`
|
|
21
|
-
* - Object with `type` or `properties`: raw JSON Schema, return as-is
|
|
22
|
-
*/
|
|
23
17
|
export declare function resolveTypeFieldToSchema(value: unknown, allManifests: Record<string, any>[], ancestry?: ReadonlySet<string>): Record<string, any> | undefined;
|
|
24
18
|
/**
|
|
25
19
|
* Returns true when a CEL expression path (from walkCelExpressions, e.g. "routes[0].inputs.q")
|
|
@@ -1 +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;
|
|
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;AAItF,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;AA4CD,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EACnC,QAAQ,GAAE,WAAW,CAAC,MAAM,CAAa,GACxC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAyCjC;AAuFD;;;;;;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,CA4IrB;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;AAUD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,SAAM,GAAG,MAAM,EAAE,CAqBxF"}
|
|
@@ -1,11 +1,50 @@
|
|
|
1
1
|
export { extractAccessChains, validateChainAgainstSchema } from "@telorun/templating";
|
|
2
2
|
import { mergeTypeSchemas } from "@telorun/sdk";
|
|
3
|
+
import { KERNEL_BUILTINS } from "./builtins.js";
|
|
3
4
|
/**
|
|
4
5
|
* Resolve a type field value (string name, inline type, or raw schema) to a JSON Schema.
|
|
5
6
|
* - String: look up the named type in allManifests (Type.JsonSchema resources)
|
|
6
7
|
* - Object with `kind` + `schema`: inline type definition → return the `schema`
|
|
7
8
|
* - Object with `type` or `properties`: raw JSON Schema, return as-is
|
|
8
9
|
*/
|
|
10
|
+
/**
|
|
11
|
+
* Kind names that DECLARE `capability: Telo.Type` — the kernel built-ins plus
|
|
12
|
+
* every definition in scope.
|
|
13
|
+
*
|
|
14
|
+
* Derived from the declared capability, never from the kind's spelling: which
|
|
15
|
+
* kinds are data shapes is a topology fact the analyzer must read off
|
|
16
|
+
* `Telo.Definition` docs, not guess from a name. A name test would silently miss
|
|
17
|
+
* any third-party type kind and would have to be edited every time one is added.
|
|
18
|
+
*
|
|
19
|
+
* Names, not fully-qualified kinds, because a resource writes its kind through
|
|
20
|
+
* whatever alias its file declares (`Type.JsonSchema`, `Telo.JsonSchema`,
|
|
21
|
+
* `Shapes.JsonSchema`) while the definition knows only its own module and name.
|
|
22
|
+
* Memoized per manifest list — this runs on every type-field resolution.
|
|
23
|
+
*/
|
|
24
|
+
const typeKindNames = new WeakMap();
|
|
25
|
+
function typeCapableNames(allManifests) {
|
|
26
|
+
const cached = typeKindNames.get(allManifests);
|
|
27
|
+
if (cached)
|
|
28
|
+
return cached;
|
|
29
|
+
const names = new Set();
|
|
30
|
+
for (const def of [...KERNEL_BUILTINS, ...allManifests]) {
|
|
31
|
+
if (def?.kind !== "Telo.Definition" && def?.kind !== "Telo.Abstract")
|
|
32
|
+
continue;
|
|
33
|
+
if (def.capability !== "Telo.Type")
|
|
34
|
+
continue;
|
|
35
|
+
const name = def.metadata?.name;
|
|
36
|
+
if (typeof name === "string")
|
|
37
|
+
names.add(name);
|
|
38
|
+
}
|
|
39
|
+
typeKindNames.set(allManifests, names);
|
|
40
|
+
return names;
|
|
41
|
+
}
|
|
42
|
+
function isTypeKind(kind, allManifests) {
|
|
43
|
+
if (typeof kind !== "string")
|
|
44
|
+
return false;
|
|
45
|
+
const suffix = kind.slice(kind.lastIndexOf(".") + 1);
|
|
46
|
+
return typeCapableNames(allManifests).has(suffix);
|
|
47
|
+
}
|
|
9
48
|
export function resolveTypeFieldToSchema(value, allManifests, ancestry = new Set()) {
|
|
10
49
|
if (!value)
|
|
11
50
|
return undefined;
|
|
@@ -15,8 +54,7 @@ export function resolveTypeFieldToSchema(value, allManifests, ancestry = new Set
|
|
|
15
54
|
return undefined;
|
|
16
55
|
// Named type reference — find a Telo.Type resource by name
|
|
17
56
|
const typeManifest = allManifests.find((m) => m.metadata?.name === value &&
|
|
18
|
-
|
|
19
|
-
/\bType\b/.test(m.kind) &&
|
|
57
|
+
isTypeKind(m.kind, allManifests) &&
|
|
20
58
|
typeof m.schema === "object" &&
|
|
21
59
|
m.schema !== null);
|
|
22
60
|
if (!typeManifest)
|
|
@@ -209,11 +247,20 @@ export function resolveContextAnnotations(schema, manifestItem, opts) {
|
|
|
209
247
|
const { manifestRoot = manifestItem, defs, aliases, allManifests } = normalizedOpts;
|
|
210
248
|
const from = schema["x-telo-context-from"];
|
|
211
249
|
if (from) {
|
|
212
|
-
const
|
|
213
|
-
//
|
|
250
|
+
const navigated = navigatePath(manifestItem, from.split("/"));
|
|
251
|
+
// The navigated value is either a plain map of property names → sub-schemas
|
|
252
|
+
// (a transport scope's `request/schema` → `{ query, body, params }`), or a
|
|
253
|
+
// `telo#Type` field naming one contract (`inputType:`). The second form has
|
|
254
|
+
// to be resolved first: the standard library writes it as the inline
|
|
255
|
+
// `{ kind: Type.JsonSchema, schema: … }` wrapper, so merging it verbatim
|
|
256
|
+
// would type the variable as `{ kind, schema }` instead of its properties.
|
|
257
|
+
const asType = resolveTypeFieldToSchema(navigated, allManifests ?? []);
|
|
258
|
+
const resolved = asType?.properties ?? navigated;
|
|
259
|
+
const required = Array.isArray(asType?.required) ? asType.required : undefined;
|
|
214
260
|
return {
|
|
215
261
|
...schema,
|
|
216
262
|
properties: { ...(schema.properties ?? {}), ...(resolved ?? {}) },
|
|
263
|
+
...(required ? { required } : {}),
|
|
217
264
|
additionalProperties: false,
|
|
218
265
|
};
|
|
219
266
|
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { ResourceManifest } from "@telorun/sdk";
|
|
2
|
+
import type { AliasResolver } from "./alias-resolver.js";
|
|
3
|
+
import type { DefinitionRegistry } from "./definition-registry.js";
|
|
4
|
+
import { type AnalysisDiagnostic } from "./types.js";
|
|
5
|
+
/**
|
|
6
|
+
* Phase 3 — static checks on declared invocation contracts.
|
|
7
|
+
*
|
|
8
|
+
* The runtime binds a contract to every instance and enforces it at dispatch;
|
|
9
|
+
* these are the failures worth catching before anything runs, and the ones the
|
|
10
|
+
* runtime cannot see at all (a declaration that is inert, an input nobody can
|
|
11
|
+
* supply).
|
|
12
|
+
*
|
|
13
|
+
* Diagnostics:
|
|
14
|
+
* - CONTRACT_MISSING_MAPPING: a definition that inherits its controller declares
|
|
15
|
+
* its own `inputType` / `outputType` without the `inputs:` / `result:` mapping
|
|
16
|
+
* that bridges it back to the inherited controller.
|
|
17
|
+
* - CONTRACT_INPUTS_SCHEMA_FORM: a leftover `inputs:` property map on a kind
|
|
18
|
+
* whose input contract is now `inputType:`.
|
|
19
|
+
* - CONTRACT_TYPE_NOT_FOUND: a contract names a type that is not declared in
|
|
20
|
+
* scope, so every call through it would fail at dispatch.
|
|
21
|
+
*
|
|
22
|
+
* Deliberately NOT diagnosed: an input that is neither `required:` nor
|
|
23
|
+
* defaulted. It is indistinguishable from a genuinely optional one — `Ai.Text`
|
|
24
|
+
* takes `prompt` OR `messages`, and `system` is optional on purpose — so the
|
|
25
|
+
* check fired ~40 times across the standard library on correct manifests with no
|
|
26
|
+
* way for an author to record the intent. A warning that cannot be silenced on
|
|
27
|
+
* correct code teaches people to ignore warnings.
|
|
28
|
+
*/
|
|
29
|
+
export declare function validateInvocationContract(manifests: ResourceManifest[], registry: DefinitionRegistry, aliases: AliasResolver, aliasesByModule?: Map<string, AliasResolver>): AnalysisDiagnostic[];
|
|
30
|
+
//# sourceMappingURL=validate-invocation-contract.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validate-invocation-contract.d.ts","sourceRoot":"","sources":["../src/validate-invocation-contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AASnE,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIzE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,gBAAgB,EAAE,EAC7B,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,aAAa,EACtB,eAAe,GAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAa,GACtD,kBAAkB,EAAE,CA4CtB"}
|