micro-contracts 0.18.17 → 0.19.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 +63 -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.map +1 -1
- package/dist/cli/templates.js +14 -3
- 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 +65 -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 +24 -25
- package/dist/generator/linter.js.map +1 -1
- package/dist/generator/overlayProcessor.d.ts +4 -11
- package/dist/generator/overlayProcessor.d.ts.map +1 -1
- package/dist/generator/overlayProcessor.js +42 -108
- package/dist/generator/overlayProcessor.js.map +1 -1
- package/dist/generator/schemaGenerator.d.ts.map +1 -1
- package/dist/generator/schemaGenerator.js +112 -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 +20 -56
- 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.map +1 -1
- package/dist/generator/templateProcessor.js +38 -55
- package/dist/generator/templateProcessor.js.map +1 -1
- package/dist/generator/typeGenerator.d.ts +2 -2
- package/dist/generator/typeGenerator.d.ts.map +1 -1
- package/dist/generator/typeGenerator.js +37 -32
- package/dist/generator/typeGenerator.js.map +1 -1
- package/dist/generator/typeGenerator.test.js +32 -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 +563 -529
- package/dist/micro-contracts.bundle.mjs.map +4 -4
- package/dist/types.d.ts +101 -9
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +103 -14
- package/dist/types.js.map +1 -1
- package/docs/cli-reference.md +14 -14
- package/docs/development-guardrails.md +40 -31
- package/docs/guardrails-concept.svg +2 -2
- package/docs/overlays-deep-dive.md +6 -8
- package/package.json +3 -3
|
@@ -6,7 +6,8 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import fs from 'fs';
|
|
8
8
|
import Handlebars from 'handlebars';
|
|
9
|
-
import { isReference, getRefName } from '../types.js';
|
|
9
|
+
import { isReference, getRefName, resolveOperation } from '../types.js';
|
|
10
|
+
import { operationTypeNames } from './typeGenerator.js';
|
|
10
11
|
/**
|
|
11
12
|
* Generate service interface files
|
|
12
13
|
* Returns a map of service name to generated content
|
|
@@ -75,64 +76,27 @@ function extractServiceInfo(spec, publicOnly) {
|
|
|
75
76
|
*/
|
|
76
77
|
function extractMethodInfo(path, httpMethod, operation, spec) {
|
|
77
78
|
// Canonical extension names only
|
|
78
|
-
const serviceName = operation['x-micro-contracts-service'];
|
|
79
79
|
const serviceMethod = operation['x-micro-contracts-method'];
|
|
80
80
|
if (!serviceMethod)
|
|
81
81
|
return null;
|
|
82
82
|
const operationId = operation.operationId || serviceMethod;
|
|
83
|
-
// Use service + _ + method for type names (clearer separation)
|
|
84
|
-
const typeNameBase = serviceName && serviceMethod
|
|
85
|
-
? `${serviceName}_${serviceMethod}`
|
|
86
|
-
: operationId.replace(/[^a-zA-Z0-9]/g, '_');
|
|
87
83
|
const isPublished = operation['x-micro-contracts-published'] === true;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
: operation.requestBody;
|
|
94
|
-
if (reqBody) {
|
|
95
|
-
const content = reqBody.content?.['application/json'];
|
|
96
|
-
if (content?.schema) {
|
|
97
|
-
requestType = isReference(content.schema)
|
|
98
|
-
? getRefName(content.schema.$ref)
|
|
99
|
-
: undefined;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
}
|
|
84
|
+
const resolved = resolveOperation(spec, path, httpMethod);
|
|
85
|
+
const typeNames = operationTypeNames(operation, resolved);
|
|
86
|
+
// Request body schema name
|
|
87
|
+
const bodySchema = resolved.requestBody?.content?.['application/json']?.schema;
|
|
88
|
+
const requestType = bodySchema && isReference(bodySchema) ? getRefName(bodySchema.$ref) : undefined;
|
|
103
89
|
// Get response type
|
|
104
90
|
let responseType;
|
|
105
|
-
const successResponse =
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
: successResponse;
|
|
110
|
-
if (resp?.content?.['application/json']?.schema) {
|
|
111
|
-
const schema = resp.content['application/json'].schema;
|
|
112
|
-
responseType = isReference(schema) ? getRefName(schema.$ref) : undefined;
|
|
113
|
-
}
|
|
91
|
+
const successResponse = resolved.responses['200'] || resolved.responses['201'];
|
|
92
|
+
const responseSchema = successResponse?.content?.['application/json']?.schema;
|
|
93
|
+
if (responseSchema) {
|
|
94
|
+
responseType = isReference(responseSchema) ? getRefName(responseSchema.$ref) : undefined;
|
|
114
95
|
}
|
|
115
96
|
// Check for 204 (void response)
|
|
116
|
-
if (
|
|
97
|
+
if (resolved.responses['204'] && !responseType) {
|
|
117
98
|
responseType = 'void';
|
|
118
99
|
}
|
|
119
|
-
// Get all params (path + query combined)
|
|
120
|
-
const allParams = (operation.parameters || []).filter((p) => !isReference(p));
|
|
121
|
-
const queryParams = allParams.filter(p => p.in === 'query');
|
|
122
|
-
const pathParams = allParams.filter(p => p.in === 'path');
|
|
123
|
-
const hasParams = queryParams.length > 0 || pathParams.length > 0;
|
|
124
|
-
const paramsType = hasParams ? `${typeNameBase}Params` : undefined;
|
|
125
|
-
// Request body schema name
|
|
126
|
-
let requestBodySchema;
|
|
127
|
-
if (operation.requestBody) {
|
|
128
|
-
const reqBody = isReference(operation.requestBody)
|
|
129
|
-
? spec.components?.requestBodies?.[getRefName(operation.requestBody.$ref)]
|
|
130
|
-
: operation.requestBody;
|
|
131
|
-
if (reqBody?.content?.['application/json']?.schema) {
|
|
132
|
-
const schema = reqBody.content['application/json'].schema;
|
|
133
|
-
requestBodySchema = isReference(schema) ? getRefName(schema.$ref) : undefined;
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
100
|
// Collect all x-* extensions from the operation
|
|
137
101
|
const extensions = {};
|
|
138
102
|
for (const [key, value] of Object.entries(operation)) {
|
|
@@ -148,9 +112,10 @@ function extractMethodInfo(path, httpMethod, operation, spec) {
|
|
|
148
112
|
isPublished,
|
|
149
113
|
requestType,
|
|
150
114
|
responseType,
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
115
|
+
inputType: typeNames.input,
|
|
116
|
+
paramsType: typeNames.params,
|
|
117
|
+
parameters: resolved.parameters,
|
|
118
|
+
requestBodySchema: requestType,
|
|
154
119
|
extensions,
|
|
155
120
|
};
|
|
156
121
|
}
|
|
@@ -169,8 +134,7 @@ function generateServiceInterface(service, _spec) {
|
|
|
169
134
|
const types = new Set();
|
|
170
135
|
for (const method of service.methods) {
|
|
171
136
|
// Always use Input type (even for parameterless operations)
|
|
172
|
-
|
|
173
|
-
types.add(inputTypeName);
|
|
137
|
+
types.add(method.inputType);
|
|
174
138
|
if (method.responseType && method.responseType !== 'void')
|
|
175
139
|
types.add(method.responseType);
|
|
176
140
|
}
|
|
@@ -193,7 +157,7 @@ function generateServiceInterface(service, _spec) {
|
|
|
193
157
|
}
|
|
194
158
|
lines.push(' */');
|
|
195
159
|
// Method signature with single Input parameter (always present)
|
|
196
|
-
const inputTypeName =
|
|
160
|
+
const inputTypeName = method.inputType;
|
|
197
161
|
const returnType = method.responseType || 'void';
|
|
198
162
|
const returnTypeStr = returnType === 'void' ? 'Promise<void>' : `Promise<${returnType}>`;
|
|
199
163
|
lines.push(` ${method.name}(input: ${inputTypeName}): ${returnTypeStr};`);
|
|
@@ -208,7 +172,7 @@ function generateServiceInterface(service, _spec) {
|
|
|
208
172
|
function generateServiceInterfaceFromTemplate(template, service, spec) {
|
|
209
173
|
const imports = collectImportsForService(service);
|
|
210
174
|
const methods = service.methods.map(method => {
|
|
211
|
-
const inputType =
|
|
175
|
+
const inputType = method.inputType;
|
|
212
176
|
const returnType = method.responseType || 'void';
|
|
213
177
|
const returnTypeStr = returnType === 'void' ? 'Promise<void>' : `Promise<${returnType}>`;
|
|
214
178
|
return {
|
|
@@ -239,7 +203,7 @@ function generateServiceInterfaceFromTemplate(template, service, spec) {
|
|
|
239
203
|
function collectImportsForService(service) {
|
|
240
204
|
const types = new Set();
|
|
241
205
|
for (const method of service.methods) {
|
|
242
|
-
types.add(
|
|
206
|
+
types.add(method.inputType);
|
|
243
207
|
if (method.responseType && method.responseType !== 'void') {
|
|
244
208
|
types.add(method.responseType);
|
|
245
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceGenerator.js","sourceRoot":"","sources":["../../src/generator/serviceGenerator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"serviceGenerator.js","sourceRoot":"","sources":["../../src/generator/serviceGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Reading OpenAPI documents from disk.
|
|
3
|
+
*
|
|
4
|
+
* A spec may reference components held in another file, such as
|
|
5
|
+
* `../../_shared/openapi/problem-details.yaml#/components/responses/NotFound`.
|
|
6
|
+
* Every generator reads a component by its local name, so each component reached
|
|
7
|
+
* through such a reference is brought into the spec's own `components` here, and
|
|
8
|
+
* the reference rewritten to `#/components/<section>/<name>`. After loading, a
|
|
9
|
+
* spec references nothing outside itself.
|
|
10
|
+
*
|
|
11
|
+
* Reading only the name off the end of the reference instead binds it to
|
|
12
|
+
* whatever the spec happens to define under that name, or to nothing at all.
|
|
13
|
+
*/
|
|
14
|
+
import type { OpenAPISpec } from '../types.js';
|
|
15
|
+
/**
|
|
16
|
+
* Load an OpenAPI spec, with every component it references in another file
|
|
17
|
+
* brought into its own `components`.
|
|
18
|
+
*/
|
|
19
|
+
export declare function loadOpenAPISpec(filePath: string): OpenAPISpec;
|
|
20
|
+
/**
|
|
21
|
+
* Copy `value`, read from `file`, with every reference into another file
|
|
22
|
+
* rewritten as a local one, adding the components they reach to `spec`.
|
|
23
|
+
*
|
|
24
|
+
* For content merged into a loaded spec from elsewhere, such as an overlay:
|
|
25
|
+
* its references are relative to the file that holds it.
|
|
26
|
+
*/
|
|
27
|
+
export declare function bundleExternalRefs<T>(value: T, file: string, spec: OpenAPISpec): T;
|
|
28
|
+
/**
|
|
29
|
+
* Every file `filePath` reaches through references into other files,
|
|
30
|
+
* transitively: what loading it, or merging its content, reads.
|
|
31
|
+
*/
|
|
32
|
+
export declare function referencedFiles(filePath: string): string[];
|
|
33
|
+
//# sourceMappingURL=specLoader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"specLoader.d.ts","sourceRoot":"","sources":["../../src/generator/specLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAMH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA+J/C;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAM7D;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,CAAC,CAKlF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAK1D"}
|
|
@@ -0,0 +1,175 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Reading OpenAPI documents from disk.
|
|
3
|
+
*
|
|
4
|
+
* A spec may reference components held in another file, such as
|
|
5
|
+
* `../../_shared/openapi/problem-details.yaml#/components/responses/NotFound`.
|
|
6
|
+
* Every generator reads a component by its local name, so each component reached
|
|
7
|
+
* through such a reference is brought into the spec's own `components` here, and
|
|
8
|
+
* the reference rewritten to `#/components/<section>/<name>`. After loading, a
|
|
9
|
+
* spec references nothing outside itself.
|
|
10
|
+
*
|
|
11
|
+
* Reading only the name off the end of the reference instead binds it to
|
|
12
|
+
* whatever the spec happens to define under that name, or to nothing at all.
|
|
13
|
+
*/
|
|
14
|
+
import fs from 'fs';
|
|
15
|
+
import path from 'path';
|
|
16
|
+
import { isDeepStrictEqual } from 'util';
|
|
17
|
+
import yaml from 'js-yaml';
|
|
18
|
+
import { parseComponentRef } from '../types.js';
|
|
19
|
+
/** Parse a YAML or JSON document. */
|
|
20
|
+
function readDocument(filePath) {
|
|
21
|
+
const content = fs.readFileSync(filePath, 'utf-8');
|
|
22
|
+
if (filePath.endsWith('.yaml') || filePath.endsWith('.yml')) {
|
|
23
|
+
return yaml.load(content);
|
|
24
|
+
}
|
|
25
|
+
else if (filePath.endsWith('.json')) {
|
|
26
|
+
return JSON.parse(content);
|
|
27
|
+
}
|
|
28
|
+
throw new Error(`Unsupported file format: ${filePath}`);
|
|
29
|
+
}
|
|
30
|
+
/** A path for messages: relative to the working directory, as the user wrote it. */
|
|
31
|
+
function display(filePath) {
|
|
32
|
+
return path.relative(process.cwd(), filePath) || filePath;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Rewrites references into other files as local ones, collecting the components
|
|
36
|
+
* they reach.
|
|
37
|
+
*/
|
|
38
|
+
class ExternalRefBundler {
|
|
39
|
+
/** Every file read through a reference into another file. */
|
|
40
|
+
files = new Set();
|
|
41
|
+
documents = new Map();
|
|
42
|
+
/** `<file>#<pointer>` of every component already brought in (or being brought in). */
|
|
43
|
+
reached = new Set();
|
|
44
|
+
/** Components brought in, keyed `<section>/<name>`. */
|
|
45
|
+
imported = new Map();
|
|
46
|
+
/**
|
|
47
|
+
* Copy `node` with every reference into another file rewritten as a local one.
|
|
48
|
+
*
|
|
49
|
+
* `file` is the file holding `node`. When `node` belongs to the spec being
|
|
50
|
+
* loaded (`ownComponents`), its local references already name the spec's own
|
|
51
|
+
* components; inside another file they name that file's components, which
|
|
52
|
+
* are brought in as well.
|
|
53
|
+
*/
|
|
54
|
+
bundle(node, file, ownComponents) {
|
|
55
|
+
if (Array.isArray(node)) {
|
|
56
|
+
return node.map(item => this.bundle(item, file, ownComponents));
|
|
57
|
+
}
|
|
58
|
+
if (node === null || typeof node !== 'object') {
|
|
59
|
+
return node;
|
|
60
|
+
}
|
|
61
|
+
const result = {};
|
|
62
|
+
for (const [key, value] of Object.entries(node)) {
|
|
63
|
+
result[key] = key === '$ref' && typeof value === 'string'
|
|
64
|
+
? this.rewrite(value, file, ownComponents)
|
|
65
|
+
: this.bundle(value, file, ownComponents);
|
|
66
|
+
}
|
|
67
|
+
return result;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Add the components brought in to `spec`. A name the spec already uses for
|
|
71
|
+
* a different component is an error: either binding would be a silent guess.
|
|
72
|
+
*/
|
|
73
|
+
mergeInto(spec) {
|
|
74
|
+
for (const component of this.imported.values()) {
|
|
75
|
+
const components = (spec.components ??= {});
|
|
76
|
+
const section = (components[component.section] ??= {});
|
|
77
|
+
const existing = section[component.name];
|
|
78
|
+
if (existing === undefined) {
|
|
79
|
+
section[component.name] = component.value;
|
|
80
|
+
}
|
|
81
|
+
else if (!isDeepStrictEqual(existing, component.value)) {
|
|
82
|
+
throw new Error(`$ref '${component.origin}' brings in components.${component.section}.${component.name}, ` +
|
|
83
|
+
`but the spec already defines a different components.${component.section}.${component.name}. ` +
|
|
84
|
+
`Rename one of them.`);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
rewrite(ref, file, ownComponents) {
|
|
89
|
+
const hash = ref.indexOf('#');
|
|
90
|
+
const filePart = hash < 0 ? ref : ref.slice(0, hash);
|
|
91
|
+
const pointer = hash < 0 ? '' : ref.slice(hash + 1);
|
|
92
|
+
if (!filePart && ownComponents) {
|
|
93
|
+
return ref;
|
|
94
|
+
}
|
|
95
|
+
const targetFile = filePart ? path.resolve(path.dirname(file), filePart) : file;
|
|
96
|
+
const localRef = `#${pointer}`;
|
|
97
|
+
const parsed = parseComponentRef(localRef);
|
|
98
|
+
if (parsed?.name === undefined) {
|
|
99
|
+
throw new Error(`Unsupported $ref '${ref}' in ${display(file)}: a reference into another file must point at ` +
|
|
100
|
+
`a component, #/components/<section>/<name>.`);
|
|
101
|
+
}
|
|
102
|
+
const section = parsed.section;
|
|
103
|
+
const name = parsed.name;
|
|
104
|
+
const key = `${targetFile}#${pointer}`;
|
|
105
|
+
if (this.reached.has(key)) {
|
|
106
|
+
return localRef;
|
|
107
|
+
}
|
|
108
|
+
this.reached.add(key);
|
|
109
|
+
const document = this.read(targetFile, ref, file);
|
|
110
|
+
const component = document?.components?.[section]?.[name];
|
|
111
|
+
if (component === undefined) {
|
|
112
|
+
throw new Error(`$ref '${ref}' in ${display(file)} does not resolve: ` +
|
|
113
|
+
`${display(targetFile)} has no components.${section}.${name}.`);
|
|
114
|
+
}
|
|
115
|
+
const value = this.bundle(component, targetFile, false);
|
|
116
|
+
const origin = `${display(targetFile)}#${pointer}`;
|
|
117
|
+
const existing = this.imported.get(`${section}/${name}`);
|
|
118
|
+
if (!existing) {
|
|
119
|
+
this.imported.set(`${section}/${name}`, { section, name, value, origin });
|
|
120
|
+
}
|
|
121
|
+
else if (!isDeepStrictEqual(existing.value, value)) {
|
|
122
|
+
throw new Error(`$ref '${origin}' and '${existing.origin}' both bring in components.${section}.${name}, ` +
|
|
123
|
+
`with different definitions. Rename one of them.`);
|
|
124
|
+
}
|
|
125
|
+
return localRef;
|
|
126
|
+
}
|
|
127
|
+
read(targetFile, ref, file) {
|
|
128
|
+
if (!this.documents.has(targetFile)) {
|
|
129
|
+
try {
|
|
130
|
+
this.documents.set(targetFile, readDocument(targetFile));
|
|
131
|
+
}
|
|
132
|
+
catch (error) {
|
|
133
|
+
throw new Error(`Cannot read $ref '${ref}' in ${display(file)}: ` +
|
|
134
|
+
(error instanceof Error ? error.message : String(error)));
|
|
135
|
+
}
|
|
136
|
+
this.files.add(targetFile);
|
|
137
|
+
}
|
|
138
|
+
return this.documents.get(targetFile);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Load an OpenAPI spec, with every component it references in another file
|
|
143
|
+
* brought into its own `components`.
|
|
144
|
+
*/
|
|
145
|
+
export function loadOpenAPISpec(filePath) {
|
|
146
|
+
const file = path.resolve(filePath);
|
|
147
|
+
const bundler = new ExternalRefBundler();
|
|
148
|
+
const spec = bundler.bundle(readDocument(file), file, true);
|
|
149
|
+
bundler.mergeInto(spec);
|
|
150
|
+
return spec;
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* Copy `value`, read from `file`, with every reference into another file
|
|
154
|
+
* rewritten as a local one, adding the components they reach to `spec`.
|
|
155
|
+
*
|
|
156
|
+
* For content merged into a loaded spec from elsewhere, such as an overlay:
|
|
157
|
+
* its references are relative to the file that holds it.
|
|
158
|
+
*/
|
|
159
|
+
export function bundleExternalRefs(value, file, spec) {
|
|
160
|
+
const bundler = new ExternalRefBundler();
|
|
161
|
+
const result = bundler.bundle(value, path.resolve(file), true);
|
|
162
|
+
bundler.mergeInto(spec);
|
|
163
|
+
return result;
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* Every file `filePath` reaches through references into other files,
|
|
167
|
+
* transitively: what loading it, or merging its content, reads.
|
|
168
|
+
*/
|
|
169
|
+
export function referencedFiles(filePath) {
|
|
170
|
+
const file = path.resolve(filePath);
|
|
171
|
+
const bundler = new ExternalRefBundler();
|
|
172
|
+
bundler.bundle(readDocument(file), file, true);
|
|
173
|
+
return [...bundler.files];
|
|
174
|
+
}
|
|
175
|
+
//# sourceMappingURL=specLoader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"specLoader.js","sourceRoot":"","sources":["../../src/generator/specLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templateProcessor.d.ts","sourceRoot":"","sources":["../../src/generator/templateProcessor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"templateProcessor.d.ts","sourceRoot":"","sources":["../../src/generator/templateProcessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ import fs from 'fs';
|
|
|
8
8
|
import path from 'path';
|
|
9
9
|
import Handlebars from 'handlebars';
|
|
10
10
|
import { operationKey } from './overlayProcessor.js';
|
|
11
|
-
import { isReference, getRefName } from '../types.js';
|
|
11
|
+
import { isReference, getRefName, parseComponentRef, resolveOperation } from '../types.js';
|
|
12
|
+
import { operationTypeNames } from './typeGenerator.js';
|
|
12
13
|
// =============================================================================
|
|
13
14
|
// Template Processor
|
|
14
15
|
// =============================================================================
|
|
@@ -117,11 +118,11 @@ function extractSchemaTypes(routes) {
|
|
|
117
118
|
}
|
|
118
119
|
}
|
|
119
120
|
// Add params type (path + query parameters) for templates that need it
|
|
120
|
-
if (route.
|
|
121
|
-
types.add(
|
|
121
|
+
if (route.paramsType) {
|
|
122
|
+
types.add(route.paramsType);
|
|
122
123
|
}
|
|
123
124
|
// Add unified input type (for service-aligned templates)
|
|
124
|
-
types.add(
|
|
125
|
+
types.add(route.inputType);
|
|
125
126
|
}
|
|
126
127
|
return Array.from(types).sort();
|
|
127
128
|
}
|
|
@@ -172,7 +173,9 @@ function extractRoutes(spec, extensionInfo) {
|
|
|
172
173
|
if (!service || !serviceMethod)
|
|
173
174
|
continue;
|
|
174
175
|
const operationId = operation.operationId || `${method}${apiPath.replace(/[^a-zA-Z0-9]/g, '')}`;
|
|
175
|
-
const
|
|
176
|
+
const resolved = resolveOperation(spec, apiPath, method);
|
|
177
|
+
const typeNames = operationTypeNames(operation, resolved);
|
|
178
|
+
const typeNameBase = typeNames.base;
|
|
176
179
|
const fastifyPath = apiPath.replace(/\{([^}]+)\}/g, ':$1');
|
|
177
180
|
const serviceKey = service.charAt(0).toLowerCase() + service.slice(1);
|
|
178
181
|
// Extract extensions and their parameters
|
|
@@ -208,33 +211,22 @@ function extractRoutes(spec, extensionInfo) {
|
|
|
208
211
|
}
|
|
209
212
|
}
|
|
210
213
|
// Extract parameters
|
|
211
|
-
const
|
|
212
|
-
|
|
213
|
-
.filter((p) => !isReference(p) && p.in === 'query')
|
|
214
|
+
const queryParams = resolved.parameters
|
|
215
|
+
.filter(p => p.in === 'query')
|
|
214
216
|
.map(p => ({ name: p.name, required: p.required || false }));
|
|
215
|
-
const pathParams =
|
|
216
|
-
.filter(
|
|
217
|
+
const pathParams = resolved.parameters
|
|
218
|
+
.filter(p => p.in === 'path')
|
|
217
219
|
.map(p => ({ name: p.name, required: true }));
|
|
218
|
-
// Extract request body
|
|
220
|
+
// Extract request body, under the name types.ts and validators.ts give it
|
|
219
221
|
let requestBody;
|
|
220
|
-
if (
|
|
221
|
-
|
|
222
|
-
? null // Simplified - would need to resolve
|
|
223
|
-
: operation.requestBody;
|
|
224
|
-
if (reqBody?.content?.['application/json']?.schema) {
|
|
225
|
-
const schema = reqBody.content['application/json'].schema;
|
|
226
|
-
const schemaName = isReference(schema)
|
|
227
|
-
? getRefName(schema.$ref)
|
|
228
|
-
: operationId + 'Body';
|
|
229
|
-
requestBody = { schemaName, required: reqBody.required || false };
|
|
230
|
-
}
|
|
222
|
+
if (resolved.requestBody && typeNames.body) {
|
|
223
|
+
requestBody = { schemaName: typeNames.body, required: resolved.requestBody.required || false };
|
|
231
224
|
}
|
|
232
225
|
// Extract responses
|
|
233
226
|
const responses = [];
|
|
234
|
-
for (const [statusCode, response] of Object.entries(
|
|
235
|
-
const
|
|
236
|
-
if (
|
|
237
|
-
const schema = resp.content['application/json'].schema;
|
|
227
|
+
for (const [statusCode, response] of Object.entries(resolved.responses)) {
|
|
228
|
+
const schema = response.content?.['application/json']?.schema;
|
|
229
|
+
if (schema) {
|
|
238
230
|
const schemaName = isReference(schema) ? getRefName(schema.$ref) : undefined;
|
|
239
231
|
responses.push({ statusCode, schemaName });
|
|
240
232
|
}
|
|
@@ -252,9 +244,9 @@ function extractRoutes(spec, extensionInfo) {
|
|
|
252
244
|
: 'void';
|
|
253
245
|
const requestType = requestBody?.schemaName;
|
|
254
246
|
// Params type combines both path and query parameters
|
|
255
|
-
const paramsType =
|
|
247
|
+
const paramsType = typeNames.params;
|
|
256
248
|
// Unified input type name (matches contract service API)
|
|
257
|
-
const inputType =
|
|
249
|
+
const inputType = typeNames.input;
|
|
258
250
|
routes.push({
|
|
259
251
|
path: apiPath,
|
|
260
252
|
fastifyPath,
|
|
@@ -359,14 +351,16 @@ function resolveInlineEvent(raw, eventDefs, defaultType) {
|
|
|
359
351
|
}
|
|
360
352
|
if (typeof raw === 'object' && '$ref' in raw && typeof raw.$ref === 'string') {
|
|
361
353
|
const ref = raw.$ref;
|
|
362
|
-
|
|
354
|
+
const parsed = parseComponentRef(ref);
|
|
355
|
+
if (parsed?.section !== 'x-event-defs') {
|
|
363
356
|
return { name: ref, type: defaultType };
|
|
364
357
|
}
|
|
365
|
-
const defName =
|
|
366
|
-
const resolved = eventDefs[defName];
|
|
367
|
-
if (!resolved) {
|
|
358
|
+
const defName = parsed.name;
|
|
359
|
+
const resolved = defName === undefined ? undefined : eventDefs[defName];
|
|
360
|
+
if (defName === undefined || !resolved) {
|
|
368
361
|
// Using the ref name as the event name would turn a typo into an event.
|
|
369
|
-
throw new Error(`x-event references '${ref}' but components.x-event-defs has no
|
|
362
|
+
throw new Error(`x-event references '${ref}' but components.x-event-defs has no ` +
|
|
363
|
+
`${defName === undefined ? 'entry by that reference' : `'${defName}'`}. ` +
|
|
370
364
|
`Defined: ${Object.keys(eventDefs).join(', ') || '(none)'}.`);
|
|
371
365
|
}
|
|
372
366
|
return {
|
|
@@ -400,17 +394,9 @@ function deriveEventParams(event, placement, context) {
|
|
|
400
394
|
/**
|
|
401
395
|
* Extract schema $ref name from a mutation operation's request body.
|
|
402
396
|
*/
|
|
403
|
-
function extractSchemaRef(
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
if (isReference(operation.requestBody)) {
|
|
407
|
-
return getRefName(operation.requestBody.$ref);
|
|
408
|
-
}
|
|
409
|
-
const jsonContent = operation.requestBody.content?.['application/json'];
|
|
410
|
-
if (jsonContent?.schema && isReference(jsonContent.schema)) {
|
|
411
|
-
return getRefName(jsonContent.schema.$ref);
|
|
412
|
-
}
|
|
413
|
-
return '';
|
|
397
|
+
function extractSchemaRef(resolved) {
|
|
398
|
+
const schema = resolved.requestBody?.content?.['application/json']?.schema;
|
|
399
|
+
return schema && isReference(schema) ? getRefName(schema.$ref) : '';
|
|
414
400
|
}
|
|
415
401
|
/**
|
|
416
402
|
* Extract screen contexts from OpenAPI spec.
|
|
@@ -442,20 +428,17 @@ function extractScreens(spec) {
|
|
|
442
428
|
const requiresAuth = Array.isArray(operation.security)
|
|
443
429
|
? operation.security.length > 0 && operation.security.some(s => Object.keys(s).length > 0)
|
|
444
430
|
: false;
|
|
431
|
+
const response200 = resolveOperation(spec, apiPath, 'get').responses['200'];
|
|
445
432
|
let viewModelSchema = operation['x-view-model'] || '';
|
|
446
433
|
if (!viewModelSchema) {
|
|
447
|
-
const
|
|
448
|
-
if (
|
|
449
|
-
|
|
450
|
-
if (jsonContent?.schema && isReference(jsonContent.schema)) {
|
|
451
|
-
viewModelSchema = getRefName(jsonContent.schema.$ref);
|
|
452
|
-
}
|
|
434
|
+
const jsonContent = response200?.content?.['application/json'];
|
|
435
|
+
if (jsonContent?.schema && isReference(jsonContent.schema)) {
|
|
436
|
+
viewModelSchema = getRefName(jsonContent.schema.$ref);
|
|
453
437
|
}
|
|
454
438
|
}
|
|
455
439
|
// Navigation links from 200 response (with optional inline x-event)
|
|
456
440
|
const links = [];
|
|
457
|
-
|
|
458
|
-
if (response200 && !isReference(response200)) {
|
|
441
|
+
if (response200) {
|
|
459
442
|
const responseLinks = response200.links;
|
|
460
443
|
if (responseLinks) {
|
|
461
444
|
for (const [linkName, linkObj] of Object.entries(responseLinks)) {
|
|
@@ -487,7 +470,7 @@ function extractScreens(spec) {
|
|
|
487
470
|
method,
|
|
488
471
|
operationId: mutationOp.operationId ?? '',
|
|
489
472
|
summary: mutationOp.summary ?? '',
|
|
490
|
-
schemaRef: extractSchemaRef(
|
|
473
|
+
schemaRef: extractSchemaRef(resolveOperation(spec, apiPath, method)),
|
|
491
474
|
event: actionEvent,
|
|
492
475
|
});
|
|
493
476
|
}
|
|
@@ -564,9 +547,9 @@ Handlebars.registerHelper('kebabCase', (str) => {
|
|
|
564
547
|
Handlebars.registerHelper('snakeCase', (str) => {
|
|
565
548
|
return str?.replace(/([a-z])([A-Z])/g, '$1_$2').replace(/-/g, '_').toLowerCase();
|
|
566
549
|
});
|
|
567
|
-
// Ref helper
|
|
550
|
+
// Ref helper: the component name of a reference; no reference, no name
|
|
568
551
|
Handlebars.registerHelper('refName', (ref) => {
|
|
569
|
-
return typeof ref === 'string' ? ref
|
|
552
|
+
return typeof ref === 'string' && ref ? getRefName(ref) : '';
|
|
570
553
|
});
|
|
571
554
|
// JSON helper
|
|
572
555
|
Handlebars.registerHelper('json', (obj) => JSON.stringify(obj, null, 2));
|