micro-contracts 0.18.18 → 0.20.0
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/README.md +120 -5
- package/cli-contract.yaml +29 -17
- package/dist/agents/context-builder.d.ts.map +1 -1
- package/dist/agents/context-builder.js +3 -3
- package/dist/agents/context-builder.js.map +1 -1
- package/dist/cli/templates.d.ts +2 -1
- package/dist/cli/templates.d.ts.map +1 -1
- package/dist/cli/templates.js +173 -80
- package/dist/cli/templates.js.map +1 -1
- package/dist/cli.js +85 -54
- package/dist/cli.js.map +1 -1
- package/dist/generated/contract.d.ts.map +1 -1
- package/dist/generated/contract.js +2 -2
- package/dist/generated/contract.js.map +1 -1
- package/dist/generated/dsl/dsl-data.js +1 -1
- package/dist/generated/dsl/dsl-data.js.map +1 -1
- package/dist/generated/policy-runtime.d.ts +19 -5
- package/dist/generated/policy-runtime.d.ts.map +1 -1
- package/dist/generated/policy-runtime.js +65 -40
- package/dist/generated/policy-runtime.js.map +1 -1
- package/dist/generated/policy.d.ts +0 -4
- package/dist/generated/policy.d.ts.map +1 -1
- package/dist/generated/policy.js +6 -28
- package/dist/generated/policy.js.map +1 -1
- package/dist/generated/program.d.ts.map +1 -1
- package/dist/generated/program.js +14 -8
- package/dist/generated/program.js.map +1 -1
- package/dist/generator/index.d.ts +15 -5
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +71 -33
- package/dist/generator/index.js.map +1 -1
- package/dist/generator/inputHash.d.ts.map +1 -1
- package/dist/generator/inputHash.js +3 -57
- package/dist/generator/inputHash.js.map +1 -1
- package/dist/generator/linter.d.ts.map +1 -1
- package/dist/generator/linter.js +23 -25
- package/dist/generator/linter.js.map +1 -1
- package/dist/generator/overlayProcessor.d.ts +15 -11
- package/dist/generator/overlayProcessor.d.ts.map +1 -1
- package/dist/generator/overlayProcessor.js +63 -124
- package/dist/generator/overlayProcessor.js.map +1 -1
- package/dist/generator/schemaGenerator.d.ts.map +1 -1
- package/dist/generator/schemaGenerator.js +124 -140
- package/dist/generator/schemaGenerator.js.map +1 -1
- package/dist/generator/schemaGenerator.test.js +109 -0
- package/dist/generator/schemaGenerator.test.js.map +1 -1
- package/dist/generator/serviceGenerator.d.ts.map +1 -1
- package/dist/generator/serviceGenerator.js +18 -70
- package/dist/generator/serviceGenerator.js.map +1 -1
- package/dist/generator/specLoader.d.ts +33 -0
- package/dist/generator/specLoader.d.ts.map +1 -0
- package/dist/generator/specLoader.js +175 -0
- package/dist/generator/specLoader.js.map +1 -0
- package/dist/generator/templateProcessor.d.ts +35 -3
- package/dist/generator/templateProcessor.d.ts.map +1 -1
- package/dist/generator/templateProcessor.js +84 -77
- package/dist/generator/templateProcessor.js.map +1 -1
- package/dist/generator/typeGenerator.d.ts +42 -4
- package/dist/generator/typeGenerator.d.ts.map +1 -1
- package/dist/generator/typeGenerator.js +83 -72
- package/dist/generator/typeGenerator.js.map +1 -1
- package/dist/generator/typeGenerator.test.js +16 -0
- package/dist/generator/typeGenerator.test.js.map +1 -1
- package/dist/guardrails/allowlist.d.ts.map +1 -1
- package/dist/guardrails/allowlist.js +2 -1
- package/dist/guardrails/allowlist.js.map +1 -1
- package/dist/guardrails/config.js +3 -3
- package/dist/guardrails/config.js.map +1 -1
- package/dist/guardrails/drift.d.ts +5 -2
- package/dist/guardrails/drift.d.ts.map +1 -1
- package/dist/guardrails/drift.js +20 -15
- package/dist/guardrails/drift.js.map +1 -1
- package/dist/guardrails/index.d.ts +2 -2
- package/dist/guardrails/index.d.ts.map +1 -1
- package/dist/guardrails/index.js +1 -1
- package/dist/guardrails/index.js.map +1 -1
- package/dist/guardrails/lint.d.ts.map +1 -1
- package/dist/guardrails/lint.js +5 -6
- package/dist/guardrails/lint.js.map +1 -1
- package/dist/guardrails/manifest.d.ts +52 -8
- package/dist/guardrails/manifest.d.ts.map +1 -1
- package/dist/guardrails/manifest.js +157 -34
- package/dist/guardrails/manifest.js.map +1 -1
- package/dist/guardrails/types.d.ts +3 -1
- package/dist/guardrails/types.d.ts.map +1 -1
- package/dist/micro-contracts.bundle.mjs +640 -526
- package/dist/micro-contracts.bundle.mjs.map +4 -4
- package/dist/types.d.ts +135 -12
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +175 -14
- package/dist/types.js.map +1 -1
- package/docs/cli-reference.md +14 -14
- package/docs/development-guardrails.md +45 -31
- package/docs/guardrails-concept.svg +2 -2
- package/docs/overlays-deep-dive.md +14 -9
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inputHash.js","sourceRoot":"","sources":["../../src/generator/inputHash.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"inputHash.js","sourceRoot":"","sources":["../../src/generator/inputHash.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/generator/linter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,WAAW,EAGX,SAAS,EAEV,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,WAAW;IAC1B,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8EAA8E;IAC9E,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,WAAgB,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"linter.d.ts","sourceRoot":"","sources":["../../src/generator/linter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,WAAW,EAGX,SAAS,EAEV,MAAM,aAAa,CAAC;AAGrB,MAAM,WAAW,WAAW;IAC1B,+BAA+B;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,8EAA8E;IAC9E,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,GAAE,WAAgB,GAAG,UAAU,CA4NjF;AAqPD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CA+B5D"}
|
package/dist/generator/linter.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Validates x-public/x-private constraints
|
|
5
5
|
*/
|
|
6
|
-
import { isReference,
|
|
6
|
+
import { isReference, hasPrivateProperties, collectReferencedSchemas, collectReachableComponents, isTsIdentifier, parseComponentRef, resolveOperation } from '../types.js';
|
|
7
7
|
/**
|
|
8
8
|
* Lint OpenAPI specification for x-public/x-private violations
|
|
9
9
|
*/
|
|
@@ -18,6 +18,7 @@ export function lintSpec(spec, options = {}) {
|
|
|
18
18
|
if (!operation)
|
|
19
19
|
continue;
|
|
20
20
|
const location = `${method.toUpperCase()} ${path}`;
|
|
21
|
+
const resolved = resolveOperation(spec, path, method);
|
|
21
22
|
// Routes, service interfaces and template contexts are all keyed by these
|
|
22
23
|
// extensions: an operation without them is dropped from every artifact.
|
|
23
24
|
// In screen mode operations are consumed via ScreenContext instead.
|
|
@@ -141,8 +142,8 @@ export function lintSpec(spec, options = {}) {
|
|
|
141
142
|
}
|
|
142
143
|
// Validate x-event on links (200 response only, GET operations)
|
|
143
144
|
if (method === 'get') {
|
|
144
|
-
const resp200 =
|
|
145
|
-
if (resp200
|
|
145
|
+
const resp200 = resolved.responses['200'];
|
|
146
|
+
if (resp200) {
|
|
146
147
|
const responseLinks = resp200.links;
|
|
147
148
|
if (responseLinks) {
|
|
148
149
|
for (const [linkName, linkObj] of Object.entries(responseLinks)) {
|
|
@@ -184,10 +185,10 @@ export function lintSpec(spec, options = {}) {
|
|
|
184
185
|
}
|
|
185
186
|
// Check public endpoints for private schema references
|
|
186
187
|
if (operation['x-micro-contracts-published'] === true) {
|
|
187
|
-
const privateErrors = checkPublicEndpointForPrivate(path, method, operation, spec);
|
|
188
|
+
const privateErrors = checkPublicEndpointForPrivate(path, method, operation, resolved, spec);
|
|
188
189
|
errors.push(...privateErrors);
|
|
189
190
|
// Check for allOf/oneOf/anyOf in public endpoint schemas
|
|
190
|
-
const compositionWarnings = checkPublicEndpointComposition(path, method,
|
|
191
|
+
const compositionWarnings = checkPublicEndpointComposition(path, method, resolved, spec);
|
|
191
192
|
warnings.push(...compositionWarnings);
|
|
192
193
|
}
|
|
193
194
|
}
|
|
@@ -207,16 +208,16 @@ export function lintSpec(spec, options = {}) {
|
|
|
207
208
|
/**
|
|
208
209
|
* Check if a public endpoint references schemas with x-private properties
|
|
209
210
|
*/
|
|
210
|
-
function checkPublicEndpointForPrivate(path, method, operation, spec) {
|
|
211
|
+
function checkPublicEndpointForPrivate(path, method, operation, resolved, spec) {
|
|
211
212
|
const errors = [];
|
|
212
213
|
const location = `${method.toUpperCase()} ${path}`;
|
|
213
214
|
// Every part of the operation that reaches a schema is checked, through
|
|
214
215
|
// $ref into any component section, and for every status code: whatever the
|
|
215
216
|
// published contract pulls in must be visible here.
|
|
216
217
|
const sections = [
|
|
217
|
-
{ code: 'PUBLIC_ENDPOINT_PRIVATE_REQUEST', label: 'request', root:
|
|
218
|
-
{ code: 'PUBLIC_ENDPOINT_PRIVATE_RESPONSE', label: 'response', root:
|
|
219
|
-
{ code: 'PUBLIC_ENDPOINT_PRIVATE_PARAMETER', label: 'parameter', root:
|
|
218
|
+
{ code: 'PUBLIC_ENDPOINT_PRIVATE_REQUEST', label: 'request', root: resolved.requestBody },
|
|
219
|
+
{ code: 'PUBLIC_ENDPOINT_PRIVATE_RESPONSE', label: 'response', root: resolved.responses },
|
|
220
|
+
{ code: 'PUBLIC_ENDPOINT_PRIVATE_PARAMETER', label: 'parameter', root: resolved.parameters },
|
|
220
221
|
];
|
|
221
222
|
// An operation cannot be both published and non-exportable.
|
|
222
223
|
if (operation['x-micro-contracts-non-exportable']) {
|
|
@@ -304,23 +305,18 @@ function collectInlineSchemas(root) {
|
|
|
304
305
|
/**
|
|
305
306
|
* Check for allOf/oneOf/anyOf in public endpoint schemas (warning)
|
|
306
307
|
*/
|
|
307
|
-
function checkPublicEndpointComposition(path, method,
|
|
308
|
+
function checkPublicEndpointComposition(path, method, resolved, spec) {
|
|
308
309
|
const warnings = [];
|
|
309
310
|
const location = `${method.toUpperCase()} ${path}`;
|
|
310
311
|
// Collect all referenced schemas
|
|
311
312
|
const referencedSchemas = new Set();
|
|
312
|
-
if (
|
|
313
|
-
|
|
314
|
-
if (content?.schema) {
|
|
315
|
-
collectReferencedSchemas(content.schema, spec, referencedSchemas);
|
|
316
|
-
}
|
|
313
|
+
if (resolved.body) {
|
|
314
|
+
collectReferencedSchemas(resolved.body.schema, spec, referencedSchemas);
|
|
317
315
|
}
|
|
318
|
-
for (const response of
|
|
319
|
-
const
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
if (resp?.content?.['application/json']?.schema) {
|
|
323
|
-
collectReferencedSchemas(resp.content['application/json'].schema, spec, referencedSchemas);
|
|
316
|
+
for (const response of [resolved.success, ...resolved.otherResponses]) {
|
|
317
|
+
const schema = response.body?.schema;
|
|
318
|
+
if (schema) {
|
|
319
|
+
collectReferencedSchemas(schema, spec, referencedSchemas);
|
|
324
320
|
}
|
|
325
321
|
}
|
|
326
322
|
// Check each referenced schema for composition
|
|
@@ -389,13 +385,15 @@ function validateInlineEvent(raw, path, location, errors, eventDefs = {}) {
|
|
|
389
385
|
});
|
|
390
386
|
return;
|
|
391
387
|
}
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
388
|
+
const parsed = typeof obj.$ref === 'string' ? parseComponentRef(obj.$ref) : null;
|
|
389
|
+
if (parsed?.section === 'x-event-defs') {
|
|
390
|
+
const defName = parsed.name;
|
|
391
|
+
if (defName === undefined || !(defName in eventDefs)) {
|
|
395
392
|
errors.push({
|
|
396
393
|
type: 'error',
|
|
397
394
|
code: 'SCREEN_UNKNOWN_EVENT_REF',
|
|
398
|
-
message: `x-event references '${obj.$ref}' but components.x-event-defs has no
|
|
395
|
+
message: `x-event references '${obj.$ref}' but components.x-event-defs has no ` +
|
|
396
|
+
`${defName === undefined ? 'entry by that reference' : `'${defName}'`} ` +
|
|
399
397
|
`(defined: ${Object.keys(eventDefs).join(', ') || 'none'})`,
|
|
400
398
|
path,
|
|
401
399
|
location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/generator/linter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"linter.js","sourceRoot":"","sources":["../../src/generator/linter.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,21 +53,14 @@ export interface OverlayConfig {
|
|
|
53
53
|
/**
|
|
54
54
|
* Process overlays and apply to OpenAPI spec
|
|
55
55
|
*
|
|
56
|
+
* A `$ref` into another file in an overlay is relative to the overlay file;
|
|
57
|
+
* the component it reaches is brought into the spec.
|
|
58
|
+
*
|
|
56
59
|
* @param spec - Source OpenAPI spec
|
|
57
60
|
* @param overlayConfig - Overlay configuration
|
|
58
61
|
* @param basePath - Base path for resolving overlay file paths
|
|
59
|
-
* @param specPath - Path to the source spec file (for $ref rebasing)
|
|
60
|
-
*/
|
|
61
|
-
export declare function processOverlays(spec: OpenAPISpec, overlayConfig: OverlayConfig, basePath?: string, specPath?: string): OverlayResult;
|
|
62
|
-
/**
|
|
63
|
-
* Rebase $ref paths in an object from source directory to target directory
|
|
64
|
-
*
|
|
65
|
-
* @param obj - Object that may contain $ref properties
|
|
66
|
-
* @param sourceDir - Directory where the source file is located (e.g., overlay or OpenAPI source)
|
|
67
|
-
* @param targetDir - Directory where the output file will be written
|
|
68
|
-
* @returns Object with rebased $ref paths
|
|
69
62
|
*/
|
|
70
|
-
export declare function
|
|
63
|
+
export declare function processOverlays(spec: OpenAPISpec, overlayConfig: OverlayConfig, basePath?: string): OverlayResult;
|
|
71
64
|
/**
|
|
72
65
|
* Generate TypeScript interfaces for overlays
|
|
73
66
|
*
|
|
@@ -75,6 +68,17 @@ export declare function rebaseRefs<T>(obj: T, sourceDir?: string, targetDir?: st
|
|
|
75
68
|
* extracts parameters from the request and passes them to overlay handlers.
|
|
76
69
|
*/
|
|
77
70
|
export declare function generateExtensionInterfaces(extensionInfo: Map<string, ExtensionInfo>): string;
|
|
71
|
+
/**
|
|
72
|
+
* The stem of the type names generated for an overlay (and its marker): the
|
|
73
|
+
* name's words — the runs of characters an identifier can hold — each
|
|
74
|
+
* capitalized and joined. 'tenant-isolation' -> 'TenantIsolation',
|
|
75
|
+
* 'requireAuth' -> 'RequireAuth'.
|
|
76
|
+
*
|
|
77
|
+
* The one place an overlay name becomes part of a type name: the overlay
|
|
78
|
+
* interfaces and the templates (through the `overlayTypeName` helper) both
|
|
79
|
+
* use it, so a template names exactly the types generated.
|
|
80
|
+
*/
|
|
81
|
+
export declare function overlayTypeName(name: string): string;
|
|
78
82
|
/**
|
|
79
83
|
* Format overlay application log for console output
|
|
80
84
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"overlayProcessor.d.ts","sourceRoot":"","sources":["../../src/generator/overlayProcessor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAmB,eAAe,
|
|
1
|
+
{"version":3,"file":"overlayProcessor.d.ts","sourceRoot":"","sources":["../../src/generator/overlayProcessor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAmB,eAAe,EAAmB,cAAc,EAAE,MAAM,aAAa,CAAC;AA4BlH,MAAM,WAAW,aAAa;IAC5B,8DAA8D;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,gGAAgG;IAChG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,4CAA4C;IAC5C,kBAAkB,EAAE,eAAe,EAAE,CAAC;IACtC,2CAA2C;IAC3C,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CACnD;AAED;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpE;AAED,MAAM,WAAW,aAAa;IAC5B,+BAA+B;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,oDAAoD;IACpD,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC1C,+BAA+B;IAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,sBAAsB;IACtB,GAAG,EAAE,qBAAqB,EAAE,CAAC;CAC9B;AAED,UAAU,qBAAqB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,iDAAiD;IACjD,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,WAAW,CAAC;IAC3C,sCAAsC;IACtC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAMD;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,WAAW,EACjB,aAAa,EAAE,aAAa,EAC5B,QAAQ,GAAE,MAAsB,GAC/B,aAAa,CAuCf;AAiTD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,GACxC,MAAM,CAoIR;AAoED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOpD;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,MAAM,CAa9D"}
|
|
@@ -7,7 +7,9 @@
|
|
|
7
7
|
import fs from 'fs';
|
|
8
8
|
import path from 'path';
|
|
9
9
|
import yaml from 'js-yaml';
|
|
10
|
-
import { MICRO_CONTRACTS_OPERATION_EXTENSIONS } from '../types.js';
|
|
10
|
+
import { MICRO_CONTRACTS_OPERATION_EXTENSIONS, resolveParameter } from '../types.js';
|
|
11
|
+
import { bundleExternalRefs } from './specLoader.js';
|
|
12
|
+
import { formatPropertyKey } from './typeGenerator.js';
|
|
11
13
|
/** Every key an overlay action may carry. Anything else is a typo or an invented setting. */
|
|
12
14
|
const ACTION_KEYS = ['target', 'description', 'update', 'x-micro-contracts-overlay-name'];
|
|
13
15
|
/**
|
|
@@ -28,12 +30,14 @@ export function operationKey(apiPath, method) {
|
|
|
28
30
|
/**
|
|
29
31
|
* Process overlays and apply to OpenAPI spec
|
|
30
32
|
*
|
|
33
|
+
* A `$ref` into another file in an overlay is relative to the overlay file;
|
|
34
|
+
* the component it reaches is brought into the spec.
|
|
35
|
+
*
|
|
31
36
|
* @param spec - Source OpenAPI spec
|
|
32
37
|
* @param overlayConfig - Overlay configuration
|
|
33
38
|
* @param basePath - Base path for resolving overlay file paths
|
|
34
|
-
* @param specPath - Path to the source spec file (for $ref rebasing)
|
|
35
39
|
*/
|
|
36
|
-
export function processOverlays(spec, overlayConfig, basePath = process.cwd()
|
|
40
|
+
export function processOverlays(spec, overlayConfig, basePath = process.cwd()) {
|
|
37
41
|
const result = {
|
|
38
42
|
spec: JSON.parse(JSON.stringify(spec)), // Deep clone
|
|
39
43
|
extensionInfo: new Map(),
|
|
@@ -42,8 +46,6 @@ export function processOverlays(spec, overlayConfig, basePath = process.cwd(), s
|
|
|
42
46
|
};
|
|
43
47
|
const collision = overlayConfig.collision || 'error';
|
|
44
48
|
const injectedKeys = new Map();
|
|
45
|
-
// Target directory for $ref rebasing (where transformed spec will be written)
|
|
46
|
-
const targetDir = specPath ? path.dirname(path.resolve(basePath, specPath)) : undefined;
|
|
47
49
|
for (const overlayFile of overlayConfig.files) {
|
|
48
50
|
const overlayPath = path.resolve(basePath, overlayFile);
|
|
49
51
|
if (!fs.existsSync(overlayPath)) {
|
|
@@ -53,10 +55,9 @@ export function processOverlays(spec, overlayConfig, basePath = process.cwd(), s
|
|
|
53
55
|
}
|
|
54
56
|
const overlayContent = fs.readFileSync(overlayPath, 'utf-8');
|
|
55
57
|
const overlay = yaml.load(overlayContent);
|
|
56
|
-
const overlayDir = path.dirname(overlayPath);
|
|
57
58
|
result.appliedOverlays.push(overlayFile);
|
|
58
59
|
for (const action of overlay.actions) {
|
|
59
|
-
applyAction(result, overlay, action, overlayFile, collision, injectedKeys
|
|
60
|
+
applyAction(result, overlay, action, overlayFile, overlayPath, collision, injectedKeys);
|
|
60
61
|
}
|
|
61
62
|
}
|
|
62
63
|
return result;
|
|
@@ -64,7 +65,7 @@ export function processOverlays(spec, overlayConfig, basePath = process.cwd(), s
|
|
|
64
65
|
/**
|
|
65
66
|
* Apply a single overlay action
|
|
66
67
|
*/
|
|
67
|
-
function applyAction(result, _overlay, action, overlayFile, collision, injectedKeys
|
|
68
|
+
function applyAction(result, _overlay, action, overlayFile, overlayPath, collision, injectedKeys) {
|
|
68
69
|
const { target, update } = action;
|
|
69
70
|
validateAction(action, overlayFile);
|
|
70
71
|
// Parse the target JSONPath pattern
|
|
@@ -79,47 +80,49 @@ function applyAction(result, _overlay, action, overlayFile, collision, injectedK
|
|
|
79
80
|
for (const match of matches) {
|
|
80
81
|
const { path: apiPath, method, operation } = match;
|
|
81
82
|
const changes = [];
|
|
83
|
+
// The injected parameters as they resolve, for the overlay's handler input
|
|
84
|
+
const declaredParams = [];
|
|
82
85
|
if (update) {
|
|
83
86
|
// Apply updates (parameters, responses)
|
|
84
|
-
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
operation.parameters = [];
|
|
93
|
-
}
|
|
94
|
-
// Avoid duplicates
|
|
95
|
-
const existing = operation.parameters.findIndex(p => !('$ref' in p) && p.name === rebasedParam.name && p.in === rebasedParam.in);
|
|
96
|
-
if (existing >= 0) {
|
|
97
|
-
operation.parameters[existing] = rebasedParam;
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
operation.parameters.push(rebasedParam);
|
|
101
|
-
}
|
|
102
|
-
changes.push(`+${rebasedParam.name} (${rebasedParam.in})`);
|
|
87
|
+
for (const param of (update.parameters ?? [])) {
|
|
88
|
+
const injected = bundleExternalRefs(param, overlayPath, result.spec);
|
|
89
|
+
const declared = resolveParameter(injected, result.spec, `overlay ${overlayFile}`);
|
|
90
|
+
declaredParams.push(declared);
|
|
91
|
+
const key = `${apiPath}:${method}:param:${declared.name}`;
|
|
92
|
+
checkCollision(key, injected, overlayFile, collision, injectedKeys);
|
|
93
|
+
if (!operation.parameters) {
|
|
94
|
+
operation.parameters = [];
|
|
103
95
|
}
|
|
96
|
+
// Replace the operation's parameter of the same name and location
|
|
97
|
+
const existing = operation.parameters.findIndex(p => {
|
|
98
|
+
const current = resolveParameter(p, result.spec, `${method.toUpperCase()} ${apiPath}`);
|
|
99
|
+
return current.name === declared.name && current.in === declared.in;
|
|
100
|
+
});
|
|
101
|
+
if (existing >= 0) {
|
|
102
|
+
operation.parameters[existing] = injected;
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
operation.parameters.push(injected);
|
|
106
|
+
}
|
|
107
|
+
changes.push(`+${declared.name} (${declared.in})`);
|
|
104
108
|
}
|
|
105
109
|
if (update.responses) {
|
|
106
110
|
const responses = update.responses;
|
|
107
111
|
for (const [statusCode, response] of Object.entries(responses)) {
|
|
108
|
-
|
|
109
|
-
const rebasedResponse = rebaseRefs(response, overlayDir, targetDir);
|
|
112
|
+
const injectedResponse = bundleExternalRefs(response, overlayPath, result.spec);
|
|
110
113
|
const key = `${apiPath}:${method}:response:${statusCode}`;
|
|
111
|
-
checkCollision(key,
|
|
112
|
-
operation.responses[statusCode] =
|
|
114
|
+
checkCollision(key, injectedResponse, overlayFile, collision, injectedKeys);
|
|
115
|
+
operation.responses[statusCode] = injectedResponse;
|
|
113
116
|
changes.push(`+${statusCode}`);
|
|
114
117
|
}
|
|
115
118
|
}
|
|
116
119
|
for (const [key, value] of Object.entries(update)) {
|
|
117
120
|
if (key === 'parameters' || key === 'responses')
|
|
118
121
|
continue;
|
|
119
|
-
const
|
|
122
|
+
const injectedValue = bundleExternalRefs(value, overlayPath, result.spec);
|
|
120
123
|
const collisionKey = `${apiPath}:${method}:${key}`;
|
|
121
|
-
checkCollision(collisionKey,
|
|
122
|
-
operation[key] =
|
|
124
|
+
checkCollision(collisionKey, injectedValue, overlayFile, collision, injectedKeys);
|
|
125
|
+
operation[key] = injectedValue;
|
|
123
126
|
changes.push(`+${key}`);
|
|
124
127
|
}
|
|
125
128
|
}
|
|
@@ -132,7 +135,7 @@ function applyAction(result, _overlay, action, overlayFile, collision, injectedK
|
|
|
132
135
|
changes,
|
|
133
136
|
});
|
|
134
137
|
// Extract extension info
|
|
135
|
-
extractExtensionInfo(result.extensionInfo, parsed, action, apiPath, method);
|
|
138
|
+
extractExtensionInfo(result.extensionInfo, parsed, action, declaredParams, apiPath, method);
|
|
136
139
|
}
|
|
137
140
|
}
|
|
138
141
|
/**
|
|
@@ -210,71 +213,6 @@ function findMatchingOperations(spec, parsed) {
|
|
|
210
213
|
}
|
|
211
214
|
return matches;
|
|
212
215
|
}
|
|
213
|
-
/**
|
|
214
|
-
* Rebase $ref paths in an object from source directory to target directory
|
|
215
|
-
*
|
|
216
|
-
* @param obj - Object that may contain $ref properties
|
|
217
|
-
* @param sourceDir - Directory where the source file is located (e.g., overlay or OpenAPI source)
|
|
218
|
-
* @param targetDir - Directory where the output file will be written
|
|
219
|
-
* @returns Object with rebased $ref paths
|
|
220
|
-
*/
|
|
221
|
-
export function rebaseRefs(obj, sourceDir, targetDir) {
|
|
222
|
-
if (!sourceDir || !targetDir) {
|
|
223
|
-
return obj;
|
|
224
|
-
}
|
|
225
|
-
// Deep clone and rebase
|
|
226
|
-
return rebaseRefsRecursive(JSON.parse(JSON.stringify(obj)), sourceDir, targetDir);
|
|
227
|
-
}
|
|
228
|
-
function rebaseRefsRecursive(obj, overlayDir, targetDir) {
|
|
229
|
-
if (obj === null || obj === undefined) {
|
|
230
|
-
return obj;
|
|
231
|
-
}
|
|
232
|
-
if (Array.isArray(obj)) {
|
|
233
|
-
return obj.map(item => rebaseRefsRecursive(item, overlayDir, targetDir));
|
|
234
|
-
}
|
|
235
|
-
if (typeof obj === 'object') {
|
|
236
|
-
const result = {};
|
|
237
|
-
for (const [key, value] of Object.entries(obj)) {
|
|
238
|
-
if (key === '$ref' && typeof value === 'string') {
|
|
239
|
-
// Rebase the $ref path
|
|
240
|
-
result[key] = rebaseRefPath(value, overlayDir, targetDir);
|
|
241
|
-
}
|
|
242
|
-
else {
|
|
243
|
-
result[key] = rebaseRefsRecursive(value, overlayDir, targetDir);
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
return result;
|
|
247
|
-
}
|
|
248
|
-
return obj;
|
|
249
|
-
}
|
|
250
|
-
/**
|
|
251
|
-
* Rebase a single $ref path from overlay directory to target directory
|
|
252
|
-
*
|
|
253
|
-
* @param refPath - The $ref value (e.g., '../openapi/problem-details.yaml#/components/schemas/X')
|
|
254
|
-
* @param overlayDir - Directory where the overlay file is located
|
|
255
|
-
* @param targetDir - Directory where the transformed spec will be written
|
|
256
|
-
* @returns Rebased $ref path
|
|
257
|
-
*/
|
|
258
|
-
function rebaseRefPath(refPath, overlayDir, targetDir) {
|
|
259
|
-
// Handle internal references (start with #)
|
|
260
|
-
if (refPath.startsWith('#')) {
|
|
261
|
-
return refPath;
|
|
262
|
-
}
|
|
263
|
-
// Split $ref into file path and JSON pointer
|
|
264
|
-
const [filePath, jsonPointer] = refPath.split('#');
|
|
265
|
-
// If no file path, it's a pure JSON pointer
|
|
266
|
-
if (!filePath) {
|
|
267
|
-
return refPath;
|
|
268
|
-
}
|
|
269
|
-
// Resolve the absolute path of the referenced file
|
|
270
|
-
const absoluteRefPath = path.resolve(overlayDir, filePath);
|
|
271
|
-
// Calculate the relative path from target directory
|
|
272
|
-
const relativePath = path.relative(targetDir, absoluteRefPath);
|
|
273
|
-
// Normalize to forward slashes (for cross-platform compatibility)
|
|
274
|
-
const normalizedPath = relativePath.split(path.sep).join('/');
|
|
275
|
-
// Reconstruct the $ref
|
|
276
|
-
return jsonPointer ? `${normalizedPath}#${jsonPointer}` : normalizedPath;
|
|
277
|
-
}
|
|
278
216
|
/**
|
|
279
217
|
* Check for collision and handle according to policy
|
|
280
218
|
*/
|
|
@@ -304,7 +242,7 @@ function checkCollision(key, content, overlayFile, collision, injectedKeys) {
|
|
|
304
242
|
/**
|
|
305
243
|
* Extract extension information from overlay action
|
|
306
244
|
*/
|
|
307
|
-
function extractExtensionInfo(extensionInfo, parsed, action, apiPath, method) {
|
|
245
|
+
function extractExtensionInfo(extensionInfo, parsed, action, injectedParameters, apiPath, method) {
|
|
308
246
|
const { update } = action;
|
|
309
247
|
if (!update)
|
|
310
248
|
return;
|
|
@@ -328,13 +266,10 @@ function extractExtensionInfo(extensionInfo, parsed, action, apiPath, method) {
|
|
|
328
266
|
}
|
|
329
267
|
const info = extensionInfo.get(key);
|
|
330
268
|
info.appliesTo.add(operationKey(apiPath, method));
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
if (!info.injectedParameters.find(p => p.name === param.name)) {
|
|
336
|
-
info.injectedParameters.push(param);
|
|
337
|
-
}
|
|
269
|
+
for (const param of injectedParameters) {
|
|
270
|
+
// Avoid duplicates
|
|
271
|
+
if (!info.injectedParameters.find(p => p.name === param.name)) {
|
|
272
|
+
info.injectedParameters.push(param);
|
|
338
273
|
}
|
|
339
274
|
}
|
|
340
275
|
if (update.responses) {
|
|
@@ -399,7 +334,8 @@ export function generateExtensionInterfaces(extensionInfo) {
|
|
|
399
334
|
}
|
|
400
335
|
// Generate interfaces for each marker
|
|
401
336
|
for (const [marker, extensions] of byMarker) {
|
|
402
|
-
|
|
337
|
+
// A marker like 'x-middleware' names its types without the 'x-' prefix: 'Middleware'
|
|
338
|
+
const markerName = overlayTypeName(marker.replace(/^x-/, ''));
|
|
403
339
|
lines.push(`// =============================================================================`);
|
|
404
340
|
lines.push(`// ${markerName} Overlays`);
|
|
405
341
|
lines.push(`// =============================================================================`);
|
|
@@ -419,8 +355,7 @@ export function generateExtensionInterfaces(extensionInfo) {
|
|
|
419
355
|
lines.push(` */`);
|
|
420
356
|
lines.push(`export interface ${registryName} {`);
|
|
421
357
|
for (const ext of extensions) {
|
|
422
|
-
|
|
423
|
-
lines.push(` ${ext.name}: ${handlerName};`);
|
|
358
|
+
lines.push(` ${formatPropertyKey(ext.name)}: ${overlayTypeName(ext.name)}Overlay;`);
|
|
424
359
|
}
|
|
425
360
|
lines.push(`}`);
|
|
426
361
|
lines.push('');
|
|
@@ -446,8 +381,7 @@ export function generateExtensionInterfaces(extensionInfo) {
|
|
|
446
381
|
lines.push(' */');
|
|
447
382
|
lines.push('export interface OverlayRegistry {');
|
|
448
383
|
for (const ext of allExtensions) {
|
|
449
|
-
|
|
450
|
-
lines.push(` ${ext.name}: ${handlerName};`);
|
|
384
|
+
lines.push(` ${formatPropertyKey(ext.name)}: ${overlayTypeName(ext.name)}Overlay;`);
|
|
451
385
|
}
|
|
452
386
|
lines.push('}');
|
|
453
387
|
lines.push('');
|
|
@@ -477,8 +411,8 @@ export function generateExtensionInterfaces(extensionInfo) {
|
|
|
477
411
|
* Every overlay gets these, whether a marker or `$.paths[*][*]` selected it.
|
|
478
412
|
*/
|
|
479
413
|
function pushOverlayTypes(lines, ext) {
|
|
480
|
-
const inputName = `${
|
|
481
|
-
const handlerName = `${
|
|
414
|
+
const inputName = `${overlayTypeName(ext.name)}OverlayInput`;
|
|
415
|
+
const handlerName = `${overlayTypeName(ext.name)}Overlay`;
|
|
482
416
|
// Generate input type from injected parameters
|
|
483
417
|
lines.push(`/**`);
|
|
484
418
|
lines.push(` * Input for ${ext.name} overlay`);
|
|
@@ -534,17 +468,22 @@ function parameterToTsType(param) {
|
|
|
534
468
|
}
|
|
535
469
|
}
|
|
536
470
|
/**
|
|
537
|
-
*
|
|
471
|
+
* The stem of the type names generated for an overlay (and its marker): the
|
|
472
|
+
* name's words — the runs of characters an identifier can hold — each
|
|
473
|
+
* capitalized and joined. 'tenant-isolation' -> 'TenantIsolation',
|
|
474
|
+
* 'requireAuth' -> 'RequireAuth'.
|
|
475
|
+
*
|
|
476
|
+
* The one place an overlay name becomes part of a type name: the overlay
|
|
477
|
+
* interfaces and the templates (through the `overlayTypeName` helper) both
|
|
478
|
+
* use it, so a template names exactly the types generated.
|
|
538
479
|
*/
|
|
539
|
-
function
|
|
540
|
-
|
|
541
|
-
.
|
|
542
|
-
.
|
|
543
|
-
.map(
|
|
480
|
+
export function overlayTypeName(name) {
|
|
481
|
+
const stem = name
|
|
482
|
+
.split(/[^A-Za-z0-9_$]+/)
|
|
483
|
+
.filter(Boolean)
|
|
484
|
+
.map(word => word.charAt(0).toUpperCase() + word.slice(1))
|
|
544
485
|
.join('');
|
|
545
|
-
}
|
|
546
|
-
function capitalize(str) {
|
|
547
|
-
return str.charAt(0).toUpperCase() + str.slice(1);
|
|
486
|
+
return /^[0-9]/.test(stem) ? `_${stem}` : stem;
|
|
548
487
|
}
|
|
549
488
|
// =============================================================================
|
|
550
489
|
// Utility Functions
|