ts-openapi-codegen 2.1.0-beta.8 → 2.1.0-beta.9
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 +4 -0
- package/README.rus.md +4 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiff.cli.test.js +31 -24
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffLomMiracles.test.d.ts +2 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffLomMiracles.test.d.ts.map +1 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffLomMiracles.test.js +47 -0
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffRenameAndInvalidRegex.test.js +8 -7
- package/dist/cli/analyzeDiff/__tests__/analyzeDiffTypeCoercion.test.js +8 -7
- package/dist/cli/analyzeDiff/analyzeDiff.d.ts +14 -2
- package/dist/cli/analyzeDiff/analyzeDiff.d.ts.map +1 -1
- package/dist/cli/analyzeDiff/analyzeDiff.js +56 -13
- package/dist/cli/analyzeDiff/ciSummary.d.ts +6 -3
- package/dist/cli/analyzeDiff/ciSummary.d.ts.map +1 -1
- package/dist/cli/analyzeDiff/ciSummary.js +10 -6
- package/dist/cli/analyzeDiff/report.d.ts +0 -1
- package/dist/cli/analyzeDiff/report.d.ts.map +1 -1
- package/dist/cli/analyzeDiff/report.js +1 -3
- package/dist/cli/analyzeDiff/writeLegacyReport.d.ts +2 -0
- package/dist/cli/analyzeDiff/writeLegacyReport.d.ts.map +1 -1
- package/dist/cli/analyzeDiff/writeLegacyReport.js +2 -0
- package/dist/cli/analyzeUsage/core/Scanner.d.ts +8 -0
- package/dist/cli/analyzeUsage/core/Scanner.d.ts.map +1 -1
- package/dist/cli/analyzeUsage/core/Scanner.js +10 -0
- package/dist/cli/analyzeUsage/rules/ClientRule.d.ts +8 -0
- package/dist/cli/analyzeUsage/rules/ClientRule.d.ts.map +1 -1
- package/dist/cli/analyzeUsage/rules/ClientRule.js +10 -0
- package/dist/cli/analyzeUsage/rules/ServiceRule.d.ts +8 -0
- package/dist/cli/analyzeUsage/rules/ServiceRule.d.ts.map +1 -1
- package/dist/cli/analyzeUsage/rules/ServiceRule.js +10 -0
- package/dist/common/LoggerMessages.d.ts +5 -0
- package/dist/common/LoggerMessages.d.ts.map +1 -1
- package/dist/common/LoggerMessages.js +4 -0
- package/dist/core/OpenApiClient.d.ts +8 -0
- package/dist/core/OpenApiClient.d.ts.map +1 -1
- package/dist/core/OpenApiClient.js +16 -2
- package/dist/core/WriteClient.d.ts +52 -15
- package/dist/core/WriteClient.d.ts.map +1 -1
- package/dist/core/WriteClient.js +36 -4
- package/dist/core/semanticDiff/__tests__/analyzeOpenApiDiff.test.js +72 -0
- package/dist/core/semanticDiff/__tests__/semanticDiffReportSchema.test.js +20 -1
- package/dist/core/semanticDiff/analyzeOpenApiDiff.d.ts +58 -6
- package/dist/core/semanticDiff/analyzeOpenApiDiff.d.ts.map +1 -1
- package/dist/core/semanticDiff/analyzeOpenApiDiff.js +47 -19
- package/dist/core/semanticDiff/semanticDiffReportSchema.d.ts +11 -1
- package/dist/core/semanticDiff/semanticDiffReportSchema.d.ts.map +1 -1
- package/dist/core/semanticDiff/semanticDiffReportSchema.js +140 -50
- package/dist/core/types/DiffReport.model.d.ts +101 -0
- package/dist/core/types/DiffReport.model.d.ts.map +1 -0
- package/dist/core/types/DiffReport.model.js +5 -0
- package/dist/core/types/shared/Model.model.d.ts +36 -0
- package/dist/core/types/shared/Model.model.d.ts.map +1 -1
- package/dist/core/utils/__tests__/applyDiffReportToClient.test.js +182 -0
- package/dist/core/utils/__tests__/buildMiraclesFromSemanticChanges.test.d.ts +2 -0
- package/dist/core/utils/__tests__/buildMiraclesFromSemanticChanges.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/buildMiraclesFromSemanticChanges.test.js +77 -0
- package/dist/core/utils/__tests__/expandOpenApiRefsForSemanticDiff.test.d.ts +2 -0
- package/dist/core/utils/__tests__/expandOpenApiRefsForSemanticDiff.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/expandOpenApiRefsForSemanticDiff.test.js +159 -0
- package/dist/core/utils/__tests__/loadDiffReport.test.js +131 -0
- package/dist/core/utils/__tests__/modelHelpers.test.js +27 -9
- package/dist/core/utils/__tests__/prepareDtoModels.test.js +74 -2
- package/dist/core/utils/__tests__/resolveClassesModeTypes.test.d.ts +2 -0
- package/dist/core/utils/__tests__/resolveClassesModeTypes.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/resolveClassesModeTypes.test.js +111 -0
- package/dist/core/utils/__tests__/semanticChangesToDiffEntries.test.d.ts +2 -0
- package/dist/core/utils/__tests__/semanticChangesToDiffEntries.test.d.ts.map +1 -0
- package/dist/core/utils/__tests__/semanticChangesToDiffEntries.test.js +68 -0
- package/dist/core/utils/__tests__/serviceHelpers.test.js +10 -11
- package/dist/core/utils/__tests__/templateRendering.test.js +71 -0
- package/dist/core/utils/adapters/__tests__/semanticToStructural.test.d.ts +2 -0
- package/dist/core/utils/adapters/__tests__/semanticToStructural.test.d.ts.map +1 -0
- package/dist/core/utils/adapters/__tests__/semanticToStructural.test.js +63 -0
- package/dist/core/utils/adapters/extractMiraclesFromSemantic.d.ts +10 -0
- package/dist/core/utils/adapters/extractMiraclesFromSemantic.d.ts.map +1 -0
- package/dist/core/utils/adapters/extractMiraclesFromSemantic.js +13 -0
- package/dist/core/utils/adapters/index.d.ts +4 -0
- package/dist/core/utils/adapters/index.d.ts.map +1 -0
- package/dist/core/utils/adapters/index.js +8 -0
- package/dist/core/utils/adapters/semanticToStructural.d.ts +12 -0
- package/dist/core/utils/adapters/semanticToStructural.d.ts.map +1 -0
- package/dist/core/utils/adapters/semanticToStructural.js +36 -0
- package/dist/core/utils/applyDiffReportToClient.d.ts +13 -1
- package/dist/core/utils/applyDiffReportToClient.d.ts.map +1 -1
- package/dist/core/utils/applyDiffReportToClient.js +187 -107
- package/dist/core/utils/buildMiraclesFromSemanticChanges.d.ts +25 -0
- package/dist/core/utils/buildMiraclesFromSemanticChanges.d.ts.map +1 -0
- package/dist/core/utils/buildMiraclesFromSemanticChanges.js +146 -0
- package/dist/core/utils/expandOpenApiRefsForSemanticDiff.d.ts +23 -0
- package/dist/core/utils/expandOpenApiRefsForSemanticDiff.d.ts.map +1 -0
- package/dist/core/utils/expandOpenApiRefsForSemanticDiff.js +163 -0
- package/dist/core/utils/getOpenApiSpec.d.ts +18 -0
- package/dist/core/utils/getOpenApiSpec.d.ts.map +1 -1
- package/dist/core/utils/getOpenApiSpec.js +35 -0
- package/dist/core/utils/loadDiffReport.d.ts +11 -30
- package/dist/core/utils/loadDiffReport.d.ts.map +1 -1
- package/dist/core/utils/loadDiffReport.js +69 -3
- package/dist/core/utils/loadSemanticOpenApiSpec.d.ts +15 -0
- package/dist/core/utils/loadSemanticOpenApiSpec.d.ts.map +1 -0
- package/dist/core/utils/loadSemanticOpenApiSpec.js +61 -0
- package/dist/core/utils/modelHelpers.d.ts +13 -5
- package/dist/core/utils/modelHelpers.d.ts.map +1 -1
- package/dist/core/utils/modelHelpers.js +28 -23
- package/dist/core/utils/prepareDtoModels.d.ts +5 -0
- package/dist/core/utils/prepareDtoModels.d.ts.map +1 -1
- package/dist/core/utils/prepareDtoModels.js +55 -12
- package/dist/core/utils/resolveClassesModeTypes.d.ts +8 -0
- package/dist/core/utils/resolveClassesModeTypes.d.ts.map +1 -0
- package/dist/core/utils/resolveClassesModeTypes.js +77 -0
- package/dist/core/utils/semanticChangesToDiffEntries.d.ts +37 -0
- package/dist/core/utils/semanticChangesToDiffEntries.d.ts.map +1 -0
- package/dist/core/utils/semanticChangesToDiffEntries.js +99 -0
- package/dist/core/utils/semanticPointerToJsonPath.d.ts +7 -0
- package/dist/core/utils/semanticPointerToJsonPath.d.ts.map +1 -0
- package/dist/core/utils/semanticPointerToJsonPath.js +67 -0
- package/dist/core/utils/serviceHelpers.d.ts +6 -7
- package/dist/core/utils/serviceHelpers.d.ts.map +1 -1
- package/dist/core/utils/serviceHelpers.js +8 -25
- package/dist/core/utils/writeClientServices.d.ts +14 -14
- package/dist/core/utils/writeClientServices.d.ts.map +1 -1
- package/dist/core/utils/writeClientServices.js +4 -8
- package/dist/templatesCompiled/client/exportModels.d.ts +17 -11
- package/dist/templatesCompiled/client/exportModels.d.ts.map +1 -1
- package/dist/templatesCompiled/client/exportModels.js +96 -49
- package/dist/templatesCompiled/client/exportService.d.ts +13 -10
- package/dist/templatesCompiled/client/exportService.d.ts.map +1 -1
- package/dist/templatesCompiled/client/exportService.js +95 -67
- package/package.json +1 -3
- package/dist/cli/analyzeDiff/buildLegacyReport.d.ts +0 -17
- package/dist/cli/analyzeDiff/buildLegacyReport.d.ts.map +0 -1
- package/dist/cli/analyzeDiff/buildLegacyReport.js +0 -54
- package/dist/cli/analyzeDiff/diffEngine.d.ts +0 -54
- package/dist/cli/analyzeDiff/diffEngine.d.ts.map +0 -1
- package/dist/cli/analyzeDiff/diffEngine.js +0 -209
|
@@ -84,6 +84,137 @@ const createLogger = () => new Logger_1.Logger({
|
|
|
84
84
|
});
|
|
85
85
|
node_assert_1.default.strictEqual(loaded, null);
|
|
86
86
|
});
|
|
87
|
+
(0, node_test_1.test)('loads semantic report (schemaVersion 1.1.0) and converts to legacy diff', async (t) => {
|
|
88
|
+
const dir = createTempDir(t, 'semantic-report-');
|
|
89
|
+
const reportPath = node_path_1.default.join(dir, 'semantic-report.json');
|
|
90
|
+
const semanticReport = {
|
|
91
|
+
schemaVersion: '1.1.0',
|
|
92
|
+
summary: { breaking: 1, nonBreaking: 0, informational: 0 },
|
|
93
|
+
recommendation: {
|
|
94
|
+
semver: 'major',
|
|
95
|
+
confidence: 'high',
|
|
96
|
+
reason: 'Breaking changes detected.',
|
|
97
|
+
reasons: ['HAS_BREAKING_CHANGES'],
|
|
98
|
+
},
|
|
99
|
+
governance: {
|
|
100
|
+
summary: { errors: 0, warnings: 0, info: 0 },
|
|
101
|
+
violations: [],
|
|
102
|
+
},
|
|
103
|
+
changes: [
|
|
104
|
+
{
|
|
105
|
+
type: 'model.property.type.changed',
|
|
106
|
+
severity: 'breaking',
|
|
107
|
+
path: '#/components/schemas/User/properties/age',
|
|
108
|
+
message: 'type changed',
|
|
109
|
+
from: 'string',
|
|
110
|
+
to: 'integer',
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
type: 'model.property.removed',
|
|
114
|
+
severity: 'breaking',
|
|
115
|
+
path: '#/components/schemas/User/properties/first_name',
|
|
116
|
+
message: 'removed',
|
|
117
|
+
from: { type: 'string' },
|
|
118
|
+
},
|
|
119
|
+
{
|
|
120
|
+
type: 'model.property.added',
|
|
121
|
+
severity: 'non-breaking',
|
|
122
|
+
path: '#/components/schemas/User/properties/firstName',
|
|
123
|
+
message: 'added',
|
|
124
|
+
to: { type: 'string' },
|
|
125
|
+
},
|
|
126
|
+
],
|
|
127
|
+
miracles: [
|
|
128
|
+
{
|
|
129
|
+
oldPath: '$.components.schemas.User.properties.age',
|
|
130
|
+
newPath: '$.components.schemas.User.properties.age',
|
|
131
|
+
type: 'TYPE_COERCION',
|
|
132
|
+
confidence: 1,
|
|
133
|
+
status: 'auto-generated',
|
|
134
|
+
},
|
|
135
|
+
{
|
|
136
|
+
oldPath: '$.components.schemas.User.properties.first_name',
|
|
137
|
+
newPath: '$.components.schemas.User.properties.firstName',
|
|
138
|
+
type: 'RENAME',
|
|
139
|
+
confidence: 1,
|
|
140
|
+
status: 'auto-generated',
|
|
141
|
+
},
|
|
142
|
+
],
|
|
143
|
+
};
|
|
144
|
+
node_fs_1.default.writeFileSync(reportPath, JSON.stringify(semanticReport), 'utf-8');
|
|
145
|
+
const loaded = (0, loadDiffReport_1.loadDiffReport)({
|
|
146
|
+
diffReport: reportPath,
|
|
147
|
+
logger: createLogger(),
|
|
148
|
+
});
|
|
149
|
+
node_assert_1.default.ok(loaded);
|
|
150
|
+
node_assert_1.default.strictEqual(loaded?.version, '1.1.0');
|
|
151
|
+
node_assert_1.default.strictEqual(loaded?.diff?.all?.length, 3);
|
|
152
|
+
node_assert_1.default.ok(loaded?.diff?.all?.some(entry => entry.path.endsWith('.type') && entry.action === 'changed'));
|
|
153
|
+
node_assert_1.default.strictEqual(loaded?.miracles?.length, 2);
|
|
154
|
+
node_assert_1.default.ok(loaded?.miracles?.some(miracle => miracle.type === 'RENAME'));
|
|
155
|
+
node_assert_1.default.ok(loaded?.miracles?.some(miracle => miracle.type === 'TYPE_COERCION'));
|
|
156
|
+
});
|
|
157
|
+
(0, node_test_1.test)('loads unified report (schemaVersion 2.0.0) and returns structural legacy diff', async (t) => {
|
|
158
|
+
const dir = createTempDir(t, 'unified-report-');
|
|
159
|
+
const reportPath = node_path_1.default.join(dir, 'unified-report.json');
|
|
160
|
+
const unifiedReport = {
|
|
161
|
+
schemaVersion: '2.0.0',
|
|
162
|
+
timestamp: '2026-01-01T00:00:00.000Z',
|
|
163
|
+
metadata: {
|
|
164
|
+
base: 'old.json',
|
|
165
|
+
target: 'new.json',
|
|
166
|
+
baseHash: 'old-hash',
|
|
167
|
+
targetHash: 'new-hash',
|
|
168
|
+
},
|
|
169
|
+
semantic: {
|
|
170
|
+
summary: { breaking: 1, nonBreaking: 0, informational: 0 },
|
|
171
|
+
recommendation: {
|
|
172
|
+
semver: 'major',
|
|
173
|
+
confidence: 'high',
|
|
174
|
+
reason: 'Breaking changes detected.',
|
|
175
|
+
reasons: ['HAS_BREAKING_CHANGES'],
|
|
176
|
+
},
|
|
177
|
+
governance: {
|
|
178
|
+
summary: { errors: 0, warnings: 0, info: 0 },
|
|
179
|
+
violations: [],
|
|
180
|
+
},
|
|
181
|
+
changes: [
|
|
182
|
+
{
|
|
183
|
+
type: 'model.property.removed',
|
|
184
|
+
severity: 'breaking',
|
|
185
|
+
path: '#/components/schemas/User/properties/name',
|
|
186
|
+
message: 'removed',
|
|
187
|
+
},
|
|
188
|
+
],
|
|
189
|
+
},
|
|
190
|
+
structural: {
|
|
191
|
+
diff: {
|
|
192
|
+
breaking: [{ action: 'removed', path: '$.components.schemas.User.properties.name', severity: 'breaking' }],
|
|
193
|
+
warnings: [],
|
|
194
|
+
info: [],
|
|
195
|
+
all: [{ action: 'removed', path: '$.components.schemas.User.properties.name', severity: 'breaking' }],
|
|
196
|
+
},
|
|
197
|
+
miracles: [],
|
|
198
|
+
stats: {
|
|
199
|
+
totalChanges: 1,
|
|
200
|
+
added: 0,
|
|
201
|
+
removed: 1,
|
|
202
|
+
changed: 0,
|
|
203
|
+
stabilityScore: 0,
|
|
204
|
+
},
|
|
205
|
+
},
|
|
206
|
+
};
|
|
207
|
+
node_fs_1.default.writeFileSync(reportPath, JSON.stringify(unifiedReport), 'utf-8');
|
|
208
|
+
const loaded = (0, loadDiffReport_1.loadDiffReport)({
|
|
209
|
+
diffReport: reportPath,
|
|
210
|
+
logger: createLogger(),
|
|
211
|
+
});
|
|
212
|
+
node_assert_1.default.ok(loaded);
|
|
213
|
+
node_assert_1.default.strictEqual(loaded?.version, '2.0.0');
|
|
214
|
+
node_assert_1.default.strictEqual(loaded?.metadata?.base, 'old.json');
|
|
215
|
+
node_assert_1.default.strictEqual(loaded?.diff?.all?.length, 1);
|
|
216
|
+
node_assert_1.default.strictEqual(loaded?.stats?.stabilityScore, 0);
|
|
217
|
+
});
|
|
87
218
|
(0, node_test_1.test)('returns null when report JSON is invalid', async (t) => {
|
|
88
219
|
const dir = createTempDir(t, 'diff-report-broken-');
|
|
89
220
|
const reportPath = node_path_1.default.join(dir, 'broken.json');
|
|
@@ -29,6 +29,22 @@ function createModel(overrides = {}) {
|
|
|
29
29
|
};
|
|
30
30
|
}
|
|
31
31
|
(0, node_test_1.describe)('@unit: modelHelpers', () => {
|
|
32
|
+
(0, node_test_1.test)('assignDuplicateAliases keeps plain name for a single item and for the first duplicate', () => {
|
|
33
|
+
const single = [{ name: 'Pet', alias: 'old' }];
|
|
34
|
+
(0, modelHelpers_1.assignDuplicateAliases)(single);
|
|
35
|
+
node_assert_1.default.deepStrictEqual(single, [{ name: 'Pet', alias: '' }]);
|
|
36
|
+
const duplicates = [
|
|
37
|
+
{ name: 'Pet', alias: 'old' },
|
|
38
|
+
{ name: 'Pet', alias: 'old' },
|
|
39
|
+
{ name: 'Pet', alias: 'old' },
|
|
40
|
+
];
|
|
41
|
+
(0, modelHelpers_1.assignDuplicateAliases)(duplicates);
|
|
42
|
+
node_assert_1.default.deepStrictEqual(duplicates, [
|
|
43
|
+
{ name: 'Pet', alias: '' },
|
|
44
|
+
{ name: 'Pet', alias: 'Pet$2' },
|
|
45
|
+
{ name: 'Pet', alias: 'Pet$3' },
|
|
46
|
+
]);
|
|
47
|
+
});
|
|
32
48
|
(0, node_test_1.test)('resolveModelImports should propagate duplicate aliases to nested model types', () => {
|
|
33
49
|
const importFooA = { name: 'Foo', alias: '', path: './a/Foo' };
|
|
34
50
|
const importFooB = { name: 'Foo', alias: '', path: './b/Foo' };
|
|
@@ -86,16 +102,18 @@ function createModel(overrides = {}) {
|
|
|
86
102
|
const models = [fooModelA, fooModelB, wrapper];
|
|
87
103
|
(0, modelHelpers_1.setDuplicateModelAliases)(models);
|
|
88
104
|
(0, modelHelpers_1.resolveModelImports)(models, '/tmp/generated/models');
|
|
89
|
-
const wrapperImportAliases = wrapper.imports.map(item => item.alias)
|
|
90
|
-
node_assert_1.default.deepStrictEqual(wrapperImportAliases, ['
|
|
91
|
-
node_assert_1.default.equal(propertyFooA.base, 'Foo
|
|
92
|
-
node_assert_1.default.equal(propertyFooA.type, 'Foo
|
|
105
|
+
const wrapperImportAliases = wrapper.imports.map(item => item.alias);
|
|
106
|
+
node_assert_1.default.deepStrictEqual(wrapperImportAliases, ['', 'Foo$2']);
|
|
107
|
+
node_assert_1.default.equal(propertyFooA.base, 'Foo');
|
|
108
|
+
node_assert_1.default.equal(propertyFooA.type, 'Foo');
|
|
93
109
|
node_assert_1.default.equal(propertyFooBArray.base, 'Foo$2');
|
|
94
110
|
node_assert_1.default.equal(propertyFooBArray.type, 'Foo$2');
|
|
95
111
|
node_assert_1.default.equal(propertyFooBArray.link?.base, 'Foo$2');
|
|
96
112
|
node_assert_1.default.equal(propertyFooBArray.link?.type, 'Foo$2');
|
|
97
|
-
node_assert_1.default.equal(enumRefFooA.base, 'Foo
|
|
98
|
-
node_assert_1.default.equal(enumRefFooA.type, 'Foo
|
|
113
|
+
node_assert_1.default.equal(enumRefFooA.base, 'Foo');
|
|
114
|
+
node_assert_1.default.equal(enumRefFooA.type, 'Foo');
|
|
115
|
+
node_assert_1.default.equal(fooModelA.alias, '');
|
|
116
|
+
node_assert_1.default.equal(fooModelB.alias, 'Foo$2');
|
|
99
117
|
node_assert_1.default.equal(wrapper.alias, '');
|
|
100
118
|
});
|
|
101
119
|
(0, node_test_1.test)('resolveModelImports should propagate alias when nested import object is not reused after dedup', () => {
|
|
@@ -144,8 +162,8 @@ function createModel(overrides = {}) {
|
|
|
144
162
|
(0, modelHelpers_1.setDuplicateModelAliases)(models);
|
|
145
163
|
(0, modelHelpers_1.resolveModelImports)(models, '/tmp/generated/models');
|
|
146
164
|
node_assert_1.default.equal(wrapper.imports[0].path, '../a/Foo');
|
|
147
|
-
node_assert_1.default.equal(wrapper.imports[0].alias, '
|
|
148
|
-
node_assert_1.default.equal(nestedRef.base, 'Foo
|
|
149
|
-
node_assert_1.default.equal(nestedRef.type, 'Foo
|
|
165
|
+
node_assert_1.default.equal(wrapper.imports[0].alias, '');
|
|
166
|
+
node_assert_1.default.equal(nestedRef.base, 'Foo');
|
|
167
|
+
node_assert_1.default.equal(nestedRef.type, 'Foo');
|
|
150
168
|
});
|
|
151
169
|
});
|
|
@@ -81,7 +81,7 @@ const createInterfaceModel = (name, properties) => ({
|
|
|
81
81
|
node_assert_1.default.strictEqual(profileProperty?.dtoToJSON, 'this.profile.toJSON()');
|
|
82
82
|
const profilesProperty = preparedUser?.properties.find(prop => prop.name === 'profiles');
|
|
83
83
|
node_assert_1.default.ok(profilesProperty);
|
|
84
|
-
node_assert_1.default.strictEqual(profilesProperty?.dtoType, 'IProfileDto[]');
|
|
84
|
+
node_assert_1.default.strictEqual(profilesProperty?.dtoType, 'IProfileDto[] | undefined');
|
|
85
85
|
node_assert_1.default.strictEqual(profilesProperty?.rawType, 'IProfileRaw[]');
|
|
86
86
|
node_assert_1.default.strictEqual(profilesProperty?.dtoInit, 'data.profiles ? fromArray(IProfileDto, data.profiles) : undefined');
|
|
87
87
|
node_assert_1.default.strictEqual(profilesProperty?.dtoToJSON, 'this.profiles ? this.profiles.map(item => item.toJSON()) : undefined');
|
|
@@ -194,6 +194,78 @@ const createInterfaceModel = (name, properties) => ({
|
|
|
194
194
|
node_assert_1.default.match(property?.dtoInit ?? '', /\? new IProfileDto/);
|
|
195
195
|
node_assert_1.default.match(property?.dtoToJSON ?? '', /\? this.profile.toJSON/);
|
|
196
196
|
});
|
|
197
|
+
(0, node_test_1.test)('assigns unique raw/dto names for duplicate models with aliases', () => {
|
|
198
|
+
const ingredient1 = createInterfaceModel('IIngredient', [createPrimitiveModel('id', 'string')]);
|
|
199
|
+
ingredient1.path = 'components/schemas-v2/Ingredient';
|
|
200
|
+
const ingredient2 = createInterfaceModel('IIngredient', [createPrimitiveModel('pathwayId', 'string')]);
|
|
201
|
+
ingredient2.alias = 'IIngredient$2';
|
|
202
|
+
ingredient2.path = 'components/schemas/Ingredient';
|
|
203
|
+
const ref = {
|
|
204
|
+
...createPrimitiveModel('items', 'IIngredient'),
|
|
205
|
+
export: 'reference',
|
|
206
|
+
type: 'IIngredient$2',
|
|
207
|
+
isRequired: true,
|
|
208
|
+
};
|
|
209
|
+
const container = createInterfaceModel('IContainer', [ref]);
|
|
210
|
+
const client = {
|
|
211
|
+
version: '1.0.0',
|
|
212
|
+
server: 'http://localhost',
|
|
213
|
+
models: [container, ingredient1, ingredient2],
|
|
214
|
+
services: [],
|
|
215
|
+
};
|
|
216
|
+
const prepared = (0, prepareDtoModels_1.prepareDtoModels)(client);
|
|
217
|
+
const prepared1 = prepared.models.find(model => model.name === 'IIngredient' && !model.alias);
|
|
218
|
+
const prepared2 = prepared.models.find(model => model.alias === 'IIngredient$2');
|
|
219
|
+
node_assert_1.default.strictEqual(prepared1?.rawName, 'IIngredientRaw');
|
|
220
|
+
node_assert_1.default.strictEqual(prepared1?.dtoName, 'IIngredientDto');
|
|
221
|
+
node_assert_1.default.strictEqual(prepared2?.rawName, 'IIngredient$2Raw');
|
|
222
|
+
node_assert_1.default.strictEqual(prepared2?.dtoName, 'IIngredient$2Dto');
|
|
223
|
+
const itemsProperty = prepared.models.find(model => model.name === 'IContainer')?.properties[0];
|
|
224
|
+
node_assert_1.default.strictEqual(itemsProperty?.rawType, 'IIngredient$2Raw');
|
|
225
|
+
node_assert_1.default.strictEqual(itemsProperty?.dtoType, 'IIngredient$2Dto');
|
|
226
|
+
});
|
|
227
|
+
(0, node_test_1.test)('adds undefined fallback for optional dto fields without defaults', () => {
|
|
228
|
+
const optionalProp = createPrimitiveModel('detail', 'string');
|
|
229
|
+
optionalProp.isRequired = false;
|
|
230
|
+
const model = createInterfaceModel('IProblem', [optionalProp]);
|
|
231
|
+
const client = {
|
|
232
|
+
version: '1.0.0',
|
|
233
|
+
server: 'http://localhost',
|
|
234
|
+
models: [model],
|
|
235
|
+
services: [],
|
|
236
|
+
};
|
|
237
|
+
const prepared = (0, prepareDtoModels_1.prepareDtoModels)(client);
|
|
238
|
+
const property = prepared.models[0]?.properties[0];
|
|
239
|
+
node_assert_1.default.match(property?.dtoType ?? '', /undefined/);
|
|
240
|
+
node_assert_1.default.strictEqual(property?.dtoInit, 'data.detail ?? undefined');
|
|
241
|
+
});
|
|
242
|
+
(0, node_test_1.test)('attaches dto getters for aliased duplicate models', () => {
|
|
243
|
+
const sequence = createInterfaceModel('ISequence', [createPrimitiveModel('pathwayId', 'string')]);
|
|
244
|
+
sequence.alias = 'ISequence$2';
|
|
245
|
+
const client = {
|
|
246
|
+
version: '1.0.0',
|
|
247
|
+
server: 'http://localhost',
|
|
248
|
+
models: [sequence],
|
|
249
|
+
services: [],
|
|
250
|
+
miracles: [
|
|
251
|
+
{
|
|
252
|
+
type: 'RENAME',
|
|
253
|
+
oldPath: '$.components.schemas.Sequence.properties.pathway_id',
|
|
254
|
+
newPath: '$.components.schemas.Sequence.properties.pathwayId',
|
|
255
|
+
confidence: 1,
|
|
256
|
+
status: 'confirmed',
|
|
257
|
+
modelName: 'ISequence$2',
|
|
258
|
+
oldProperty: 'pathway_id',
|
|
259
|
+
newProperty: 'pathwayId',
|
|
260
|
+
},
|
|
261
|
+
],
|
|
262
|
+
};
|
|
263
|
+
const prepared = (0, prepareDtoModels_1.prepareDtoModels)(client);
|
|
264
|
+
const preparedSequence = prepared.models.find(model => model.alias === 'ISequence$2');
|
|
265
|
+
node_assert_1.default.ok(preparedSequence?.dtoGetters);
|
|
266
|
+
node_assert_1.default.strictEqual(preparedSequence?.dtoGetters?.[0].oldName, 'pathway_id');
|
|
267
|
+
node_assert_1.default.strictEqual(preparedSequence?.dtoGetters?.[0].newName, 'pathwayId');
|
|
268
|
+
});
|
|
197
269
|
(0, node_test_1.test)('uses bracket accessor for quoted property names', () => {
|
|
198
270
|
const quotedProp = createPrimitiveModel("'weird-name'", 'string');
|
|
199
271
|
const model = createInterfaceModel('IQuoted', [quotedProp]);
|
|
@@ -205,7 +277,7 @@ const createInterfaceModel = (name, properties) => ({
|
|
|
205
277
|
};
|
|
206
278
|
const prepared = (0, prepareDtoModels_1.prepareDtoModels)(client);
|
|
207
279
|
const property = prepared.models[0]?.properties[0];
|
|
208
|
-
node_assert_1.default.strictEqual(property?.dtoInit, "data['weird-name']");
|
|
280
|
+
node_assert_1.default.strictEqual(property?.dtoInit, "data['weird-name'] ?? undefined");
|
|
209
281
|
node_assert_1.default.strictEqual(property?.dtoTarget, "['weird-name']");
|
|
210
282
|
});
|
|
211
283
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveClassesModeTypes.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/resolveClassesModeTypes.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
7
|
+
const node_test_1 = require("node:test");
|
|
8
|
+
const prepareDtoModels_1 = require("../prepareDtoModels");
|
|
9
|
+
const resolveClassesModeTypes_1 = require("../resolveClassesModeTypes");
|
|
10
|
+
const createArrayResult = (itemBase, itemPath) => ({
|
|
11
|
+
in: 'response',
|
|
12
|
+
name: '',
|
|
13
|
+
alias: '',
|
|
14
|
+
path: '',
|
|
15
|
+
code: 200,
|
|
16
|
+
description: null,
|
|
17
|
+
export: 'array',
|
|
18
|
+
type: itemBase,
|
|
19
|
+
base: itemBase,
|
|
20
|
+
template: null,
|
|
21
|
+
link: null,
|
|
22
|
+
isDefinition: false,
|
|
23
|
+
isReadOnly: false,
|
|
24
|
+
isRequired: false,
|
|
25
|
+
isNullable: false,
|
|
26
|
+
imports: [{ name: itemBase, alias: '', path: `./${itemPath}` }],
|
|
27
|
+
enum: [],
|
|
28
|
+
enums: [],
|
|
29
|
+
properties: [],
|
|
30
|
+
});
|
|
31
|
+
(0, node_test_1.describe)('@unit: resolveClassesModeTypes', () => {
|
|
32
|
+
(0, node_test_1.test)('resolves array result types and imports to aliased export names', () => {
|
|
33
|
+
const ingredientCanonical = {
|
|
34
|
+
name: 'IIngredient',
|
|
35
|
+
alias: '',
|
|
36
|
+
path: 'components/schemas-v2/Ingredient',
|
|
37
|
+
export: 'interface',
|
|
38
|
+
type: 'IIngredient',
|
|
39
|
+
base: 'IIngredient',
|
|
40
|
+
template: null,
|
|
41
|
+
link: null,
|
|
42
|
+
description: null,
|
|
43
|
+
isDefinition: true,
|
|
44
|
+
isReadOnly: false,
|
|
45
|
+
isRequired: false,
|
|
46
|
+
isNullable: false,
|
|
47
|
+
imports: [],
|
|
48
|
+
enum: [],
|
|
49
|
+
enums: [],
|
|
50
|
+
properties: [],
|
|
51
|
+
};
|
|
52
|
+
const ingredient = {
|
|
53
|
+
name: 'IIngredient',
|
|
54
|
+
alias: 'IIngredient$2',
|
|
55
|
+
path: 'components/schemas/Ingredient',
|
|
56
|
+
export: 'interface',
|
|
57
|
+
type: 'IIngredient',
|
|
58
|
+
base: 'IIngredient',
|
|
59
|
+
template: null,
|
|
60
|
+
link: null,
|
|
61
|
+
description: null,
|
|
62
|
+
isDefinition: true,
|
|
63
|
+
isReadOnly: false,
|
|
64
|
+
isRequired: false,
|
|
65
|
+
isNullable: false,
|
|
66
|
+
imports: [],
|
|
67
|
+
enum: [],
|
|
68
|
+
enums: [],
|
|
69
|
+
properties: [],
|
|
70
|
+
};
|
|
71
|
+
const service = {
|
|
72
|
+
name: 'IngredientsService',
|
|
73
|
+
originName: 'Ingredients',
|
|
74
|
+
imports: [{ name: 'IIngredient', alias: '', path: './components/schemas/Ingredient' }],
|
|
75
|
+
operations: [
|
|
76
|
+
{
|
|
77
|
+
service: 'IngredientsService',
|
|
78
|
+
name: 'listSequenceIngredients',
|
|
79
|
+
summary: null,
|
|
80
|
+
description: null,
|
|
81
|
+
deprecated: false,
|
|
82
|
+
method: 'GET',
|
|
83
|
+
path: '/sequences/{sequenceId}/ingredients',
|
|
84
|
+
parameters: [],
|
|
85
|
+
parametersPath: [],
|
|
86
|
+
parametersQuery: [],
|
|
87
|
+
parametersForm: [],
|
|
88
|
+
parametersHeader: [],
|
|
89
|
+
parametersCookie: [],
|
|
90
|
+
parametersBody: null,
|
|
91
|
+
imports: [],
|
|
92
|
+
errors: [],
|
|
93
|
+
results: [createArrayResult('IIngredient', 'components/schemas/Ingredient')],
|
|
94
|
+
responseHeader: null,
|
|
95
|
+
responseType: null,
|
|
96
|
+
},
|
|
97
|
+
],
|
|
98
|
+
};
|
|
99
|
+
const client = {
|
|
100
|
+
version: '1.0.0',
|
|
101
|
+
server: 'http://localhost',
|
|
102
|
+
models: [ingredientCanonical, ingredient],
|
|
103
|
+
services: [service],
|
|
104
|
+
};
|
|
105
|
+
const prepared = (0, resolveClassesModeTypes_1.resolveClassesModeTypes)((0, prepareDtoModels_1.prepareDtoModels)(client));
|
|
106
|
+
const operation = prepared.services[0]?.operations[0];
|
|
107
|
+
node_assert_1.default.strictEqual(prepared.services[0]?.imports[0].name, 'IIngredient$2');
|
|
108
|
+
node_assert_1.default.strictEqual(operation?.results[0].base, 'IIngredient$2');
|
|
109
|
+
node_assert_1.default.strictEqual(operation?.results[0].type, 'IIngredient$2');
|
|
110
|
+
});
|
|
111
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"semanticChangesToDiffEntries.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/semanticChangesToDiffEntries.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
7
|
+
const node_test_1 = require("node:test");
|
|
8
|
+
const semanticChangesToDiffEntries_1 = require("../semanticChangesToDiffEntries");
|
|
9
|
+
(0, node_test_1.describe)('@unit: semanticChangesToDiffEntries', () => {
|
|
10
|
+
(0, node_test_1.test)('maps property type change to legacy diff entry', () => {
|
|
11
|
+
const change = {
|
|
12
|
+
type: 'model.property.type.changed',
|
|
13
|
+
severity: 'breaking',
|
|
14
|
+
path: '#/components/schemas/User/properties/age',
|
|
15
|
+
message: 'Property "age" type changed',
|
|
16
|
+
from: 'string',
|
|
17
|
+
to: 'integer',
|
|
18
|
+
};
|
|
19
|
+
const [entry] = (0, semanticChangesToDiffEntries_1.semanticChangesToDiffEntries)([change]);
|
|
20
|
+
node_assert_1.default.strictEqual(entry.action, 'changed');
|
|
21
|
+
node_assert_1.default.strictEqual(entry.severity, 'breaking');
|
|
22
|
+
node_assert_1.default.strictEqual(entry.path, '$.components.schemas.User.properties.age.type');
|
|
23
|
+
node_assert_1.default.strictEqual(entry.from, 'string');
|
|
24
|
+
node_assert_1.default.strictEqual(entry.to, 'integer');
|
|
25
|
+
node_assert_1.default.strictEqual(entry.note, change.message);
|
|
26
|
+
});
|
|
27
|
+
(0, node_test_1.test)('maps operation removed with metadata payload', () => {
|
|
28
|
+
const change = {
|
|
29
|
+
type: 'operation.removed',
|
|
30
|
+
severity: 'breaking',
|
|
31
|
+
path: '#/paths/GET /pets',
|
|
32
|
+
message: 'Operation removed',
|
|
33
|
+
from: {
|
|
34
|
+
operationId: 'listPets',
|
|
35
|
+
summary: 'List pets',
|
|
36
|
+
tags: ['pets'],
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
const [entry] = (0, semanticChangesToDiffEntries_1.semanticChangesToDiffEntries)([change]);
|
|
40
|
+
node_assert_1.default.strictEqual(entry.action, 'removed');
|
|
41
|
+
node_assert_1.default.strictEqual(entry.path, "$.paths['/pets'].get");
|
|
42
|
+
node_assert_1.default.deepStrictEqual(entry.from, change.from);
|
|
43
|
+
});
|
|
44
|
+
(0, node_test_1.test)('maps required flag change via fromRequired/toRequired', () => {
|
|
45
|
+
const change = {
|
|
46
|
+
type: 'model.property.required.changed',
|
|
47
|
+
severity: 'breaking',
|
|
48
|
+
path: '#/components/schemas/User/required/email',
|
|
49
|
+
message: 'required changed',
|
|
50
|
+
fromRequired: false,
|
|
51
|
+
toRequired: true,
|
|
52
|
+
};
|
|
53
|
+
const [entry] = (0, semanticChangesToDiffEntries_1.semanticChangesToDiffEntries)([change]);
|
|
54
|
+
node_assert_1.default.strictEqual(entry.action, 'changed');
|
|
55
|
+
node_assert_1.default.strictEqual(entry.from, false);
|
|
56
|
+
node_assert_1.default.strictEqual(entry.to, true);
|
|
57
|
+
});
|
|
58
|
+
(0, node_test_1.test)('exposes semantic mapping helpers', () => {
|
|
59
|
+
node_assert_1.default.strictEqual((0, semanticChangesToDiffEntries_1.semanticChangeTypeToAction)('model.property.removed'), 'removed');
|
|
60
|
+
node_assert_1.default.strictEqual((0, semanticChangesToDiffEntries_1.semanticSeverityToDiffSeverity)('non-breaking'), 'warning');
|
|
61
|
+
node_assert_1.default.strictEqual((0, semanticChangesToDiffEntries_1.semanticChangeToJsonPath)({
|
|
62
|
+
type: 'model.property.type.changed',
|
|
63
|
+
severity: 'breaking',
|
|
64
|
+
path: '#/components/schemas/User/properties/age',
|
|
65
|
+
message: 'type',
|
|
66
|
+
}), '$.components.schemas.User.properties.age.type');
|
|
67
|
+
});
|
|
68
|
+
});
|
|
@@ -107,16 +107,15 @@ function createOperationResponse(overrides = {}) {
|
|
|
107
107
|
const aliasByPath = new Map(service.imports.map(item => [item.path, item.alias]));
|
|
108
108
|
const aliasA = aliasByPath.get('models/a/Foo');
|
|
109
109
|
const aliasB = aliasByPath.get('models/b/Foo');
|
|
110
|
-
node_assert_1.default.
|
|
111
|
-
node_assert_1.default.
|
|
112
|
-
node_assert_1.default.
|
|
113
|
-
node_assert_1.default.equal(paramFooA.
|
|
114
|
-
node_assert_1.default.equal(
|
|
115
|
-
node_assert_1.default.equal(paramFooBArray.
|
|
116
|
-
node_assert_1.default.equal(paramFooBArray.
|
|
117
|
-
node_assert_1.default.equal(paramFooBArray.link?.
|
|
118
|
-
node_assert_1.default.equal(
|
|
119
|
-
node_assert_1.default.equal(operation.results[0].
|
|
120
|
-
node_assert_1.default.equal(operation.results[0].type, aliasB);
|
|
110
|
+
node_assert_1.default.strictEqual(aliasA, '');
|
|
111
|
+
node_assert_1.default.strictEqual(aliasB, 'Foo$2');
|
|
112
|
+
node_assert_1.default.equal(paramFooA.base, 'Foo');
|
|
113
|
+
node_assert_1.default.equal(paramFooA.type, 'Foo');
|
|
114
|
+
node_assert_1.default.equal(paramFooBArray.base, 'Foo$2');
|
|
115
|
+
node_assert_1.default.equal(paramFooBArray.type, 'Foo$2');
|
|
116
|
+
node_assert_1.default.equal(paramFooBArray.link?.base, 'Foo$2');
|
|
117
|
+
node_assert_1.default.equal(paramFooBArray.link?.type, 'Foo$2');
|
|
118
|
+
node_assert_1.default.equal(operation.results[0].base, 'Foo$2');
|
|
119
|
+
node_assert_1.default.equal(operation.results[0].type, 'Foo$2');
|
|
121
120
|
});
|
|
122
121
|
});
|
|
@@ -100,6 +100,77 @@ const exportModelsContext = {
|
|
|
100
100
|
node_assert_1.default.match(clientOutput, /createClient|RequestExecutor/i);
|
|
101
101
|
node_assert_1.default.match(modelsOutput, /BaseDto|fromArray/);
|
|
102
102
|
});
|
|
103
|
+
(0, node_test_1.test)('renders exportModels with ghost properties and type aliases', () => {
|
|
104
|
+
const modelWithGhost = {
|
|
105
|
+
...schemaModel,
|
|
106
|
+
name: 'IUser',
|
|
107
|
+
type: 'IUser',
|
|
108
|
+
base: 'IUser',
|
|
109
|
+
rawName: 'IUserRaw',
|
|
110
|
+
dtoName: 'IUserDto',
|
|
111
|
+
exportName: 'IUser',
|
|
112
|
+
dtoKind: 'class',
|
|
113
|
+
ghostProperties: [
|
|
114
|
+
{
|
|
115
|
+
name: 'legacyField',
|
|
116
|
+
alias: '',
|
|
117
|
+
path: 'models',
|
|
118
|
+
export: 'generic',
|
|
119
|
+
type: 'unknown',
|
|
120
|
+
base: 'unknown',
|
|
121
|
+
template: null,
|
|
122
|
+
link: null,
|
|
123
|
+
description: null,
|
|
124
|
+
isDefinition: false,
|
|
125
|
+
isReadOnly: false,
|
|
126
|
+
isRequired: false,
|
|
127
|
+
isNullable: false,
|
|
128
|
+
imports: [],
|
|
129
|
+
enum: [],
|
|
130
|
+
enums: [],
|
|
131
|
+
properties: [],
|
|
132
|
+
isGhost: true,
|
|
133
|
+
},
|
|
134
|
+
],
|
|
135
|
+
properties: [
|
|
136
|
+
{
|
|
137
|
+
name: 'id',
|
|
138
|
+
alias: '',
|
|
139
|
+
path: 'models',
|
|
140
|
+
export: 'generic',
|
|
141
|
+
type: 'string',
|
|
142
|
+
base: 'string',
|
|
143
|
+
template: null,
|
|
144
|
+
link: null,
|
|
145
|
+
description: null,
|
|
146
|
+
isDefinition: false,
|
|
147
|
+
isReadOnly: false,
|
|
148
|
+
isRequired: true,
|
|
149
|
+
isNullable: false,
|
|
150
|
+
imports: [],
|
|
151
|
+
enum: [],
|
|
152
|
+
enums: [],
|
|
153
|
+
properties: [],
|
|
154
|
+
rawType: 'string',
|
|
155
|
+
dtoType: 'string',
|
|
156
|
+
dtoInit: 'data.id',
|
|
157
|
+
dtoTarget: '.id',
|
|
158
|
+
},
|
|
159
|
+
],
|
|
160
|
+
};
|
|
161
|
+
const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
|
|
162
|
+
httpClient: HttpClient_enum_1.HttpClient.FETCH,
|
|
163
|
+
useOptions: false,
|
|
164
|
+
useUnionTypes: false,
|
|
165
|
+
validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
|
|
166
|
+
});
|
|
167
|
+
const output = templates.exports.models({
|
|
168
|
+
...exportModelsContext,
|
|
169
|
+
models: [modelWithGhost],
|
|
170
|
+
});
|
|
171
|
+
node_assert_1.default.match(output, /legacyField\?: unknown/);
|
|
172
|
+
node_assert_1.default.match(output, /export type IUser = IUserRaw/);
|
|
173
|
+
});
|
|
103
174
|
(0, node_test_1.test)('renders schema export with validation library context', () => {
|
|
104
175
|
const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
|
|
105
176
|
httpClient: HttpClient_enum_1.HttpClient.FETCH,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"semanticToStructural.test.d.ts","sourceRoot":"","sources":["../../../../../src/core/utils/adapters/__tests__/semanticToStructural.test.ts"],"names":[],"mappings":""}
|