@ama-sdk/schematics 10.2.0-prerelease.62 → 10.2.0-prerelease.64
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 +8 -1
- package/package.json +11 -11
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.generator.d.ts.map +1 -1
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.generator.js +1 -0
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.generator.js.map +1 -1
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.d.ts +5 -0
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.d.ts.map +1 -1
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.js +2 -1
- package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.js.map +1 -1
- package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen-tests.jar +0 -0
- package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen.jar +0 -0
- package/schematics/typescript/core/index.d.ts.map +1 -1
- package/schematics/typescript/core/index.js +16 -8
- package/schematics/typescript/core/index.js.map +1 -1
- package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator-tests.jar +0 -0
- package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator.jar +0 -0
- package/schematics/typescript/core/schema.d.ts +2 -0
- package/schematics/typescript/core/schema.d.ts.map +1 -1
- package/schematics/typescript/core/schema.json +4 -0
package/README.md
CHANGED
|
@@ -136,6 +136,13 @@ The available parameters are:
|
|
|
136
136
|
- `--output-path`: Output path for the generated SDK
|
|
137
137
|
- `--generator-custom-path`: Path to a custom generator
|
|
138
138
|
|
|
139
|
+
Also, another parameter is available called OpenAPI Normalizer which transforms the input OpenAPI specification (which may not perfectly conform) to make it workable
|
|
140
|
+
with OpenAPI Generator. There are several rules that are supported which can be found [here](https://openapi-generator.tech/docs/customization/#openapi-normalizer).
|
|
141
|
+
|
|
142
|
+
This parameter can be passed with `--openapi-normalizer` followed by the rules to be enabled in OpenAPI normalizer in the form of `RULE_1=true,RULE_2=original`.
|
|
143
|
+
|
|
144
|
+
Example: `--openapi-normalizer REFACTOR_ALLOF_WITH_PROPERTIES_ONLY=true`
|
|
145
|
+
|
|
139
146
|
#### openapitools.json
|
|
140
147
|
|
|
141
148
|
There is also a possibility to configure the SDK code generation in `openapitools.json`. The structure for this file looks something like this:
|
|
@@ -202,7 +209,7 @@ yarn schematics @ama-sdk/schematics:typescript-core --generator-key example-sdk
|
|
|
202
209
|
> overridden with the parameters `--output-path`, `--spec-path`, `--spec-config-path`, and `--global-property`.
|
|
203
210
|
|
|
204
211
|
> [!NOTE]
|
|
205
|
-
> The
|
|
212
|
+
> The parameters `--generator-custom-path` and `--openapi-normalizer` are not impacted and will always be taken into account if provided.
|
|
206
213
|
|
|
207
214
|
> [!NOTE]
|
|
208
215
|
> The values provided by the parameter `--global-property` will actually be merged with the values of `globalProperty` from
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-sdk/schematics",
|
|
3
|
-
"version": "10.2.0-prerelease.
|
|
3
|
+
"version": "10.2.0-prerelease.64",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -48,12 +48,12 @@
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
|
-
"@ama-sdk/core": "^10.2.0-prerelease.
|
|
51
|
+
"@ama-sdk/core": "^10.2.0-prerelease.64",
|
|
52
52
|
"@angular-devkit/core": "~17.3.0",
|
|
53
53
|
"@angular-devkit/schematics": "~17.3.0",
|
|
54
54
|
"@angular-devkit/schematics-cli": "^17.0.1",
|
|
55
55
|
"@angular/cli": "^17.0.1",
|
|
56
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
56
|
+
"@o3r/schematics": "^10.2.0-prerelease.64",
|
|
57
57
|
"@openapitools/openapi-generator-cli": "~2.13.0",
|
|
58
58
|
"@schematics/angular": "~17.3.0"
|
|
59
59
|
},
|
|
@@ -68,16 +68,16 @@
|
|
|
68
68
|
"tslib": "^2.6.2"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
|
-
"@ama-sdk/core": "^10.2.0-prerelease.
|
|
71
|
+
"@ama-sdk/core": "^10.2.0-prerelease.64",
|
|
72
72
|
"@angular-devkit/schematics-cli": "~17.3.0",
|
|
73
73
|
"@angular-eslint/eslint-plugin": "~17.3.0",
|
|
74
74
|
"@angular/cli": "~17.3.0",
|
|
75
|
-
"@nx/eslint-plugin": "~18.
|
|
76
|
-
"@nx/jest": "~18.
|
|
77
|
-
"@o3r/build-helpers": "^10.2.0-prerelease.
|
|
78
|
-
"@o3r/eslint-plugin": "^10.2.0-prerelease.
|
|
79
|
-
"@o3r/schematics": "^10.2.0-prerelease.
|
|
80
|
-
"@o3r/test-helpers": "^10.2.0-prerelease.
|
|
75
|
+
"@nx/eslint-plugin": "~18.2.0",
|
|
76
|
+
"@nx/jest": "~18.2.0",
|
|
77
|
+
"@o3r/build-helpers": "^10.2.0-prerelease.64",
|
|
78
|
+
"@o3r/eslint-plugin": "^10.2.0-prerelease.64",
|
|
79
|
+
"@o3r/schematics": "^10.2.0-prerelease.64",
|
|
80
|
+
"@o3r/test-helpers": "^10.2.0-prerelease.64",
|
|
81
81
|
"@openapitools/openapi-generator-cli": "~2.13.0",
|
|
82
82
|
"@schematics/angular": "~17.3.0",
|
|
83
83
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
@@ -104,7 +104,7 @@
|
|
|
104
104
|
"jsonc-eslint-parser": "~2.4.0",
|
|
105
105
|
"mem-fs": "^4.0.0",
|
|
106
106
|
"npm-run-all2": "^6.0.0",
|
|
107
|
-
"nx": "~18.
|
|
107
|
+
"nx": "~18.2.0",
|
|
108
108
|
"onchange": "^7.0.2",
|
|
109
109
|
"pid-from-port": "^1.1.3",
|
|
110
110
|
"semver": "^7.5.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-api-cli.generator.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAoC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAI5F;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,iBAAiB,CAAC;IAEvE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,GAAG,MAAM,CAAC;IAClD,SAAS,KAAK,oBAAoB,IAAI,KAAK,GAAG,MAAM,CAEnD;IAED,kBAAkB;IAClB,SAAS,CAAC,QAAQ,CAAC,aAAa,6BAA6B;gBAEjD,OAAO,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,EAAE,CAAA;KAAE;IAK9D;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAelC;;;;OAIG;IACH,OAAO,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"open-api-cli.generator.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAoC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAI5F;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,iBAAiB,CAAC;IAEvE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,GAAG,MAAM,CAAC;IAClD,SAAS,KAAK,oBAAoB,IAAI,KAAK,GAAG,MAAM,CAEnD;IAED,kBAAkB;IAClB,SAAS,CAAC,QAAQ,CAAC,aAAa,6BAA6B;gBAEjD,OAAO,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,EAAE,CAAA;KAAE;IAK9D;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAelC;;;;OAIG;IACH,OAAO,CAAC,YAAY;IA2BpB,kBAAkB;IAClB,SAAS,CAAC,iBAAiB,0BAA2C;IAEtE,kBAAkB;IAClB,SAAS,CAAC,uBAAuB,oBAAoB;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,yBAI5C,iBAAiB,wBAclD;CACH"}
|
|
@@ -68,6 +68,7 @@ class OpenApiCliGenerator extends code_generator_1.CodeGenerator {
|
|
|
68
68
|
'openapi-generator-cli',
|
|
69
69
|
'generate',
|
|
70
70
|
generatorOptions.generatorCustomPath ? `--custom-generator=${generatorOptions.generatorCustomPath}` : '',
|
|
71
|
+
...generatorOptions.openapiNormalizer ? ['--openapi-normalizer', generatorOptions.openapiNormalizer] : [],
|
|
71
72
|
...generatorOptions.generatorKey ? ['--generator-key', generatorOptions.generatorKey] :
|
|
72
73
|
[
|
|
73
74
|
'-g', generatorOptions.generatorName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-api-cli.generator.js","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.generator.ts"],"names":[],"mappings":";;;AAAA,sDAAgD;AAChD,2DAAuD;AACvD,iEAA4F;AAC5F,kCAAkC;AAClC,6DAAmE;AAEnE;;GAEG;AACH,MAAa,mBAAoB,SAAQ,8BAAgC;IAGvE,IAAc,oBAAoB;QAChC,OAAO,IAAI,CAAC,cAAc,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACxD,CAAC;IAKD,YAAY,OAAkD;QAC5D,KAAK,EAAE,CAAC;QAJV,kBAAkB;QACC,kBAAa,GAAG,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"open-api-cli.generator.js","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,11 @@ export type OpenApiCliOptions = CodegenTaskOptions & {
|
|
|
48
48
|
* @default ''
|
|
49
49
|
*/
|
|
50
50
|
generatorKey: string;
|
|
51
|
+
/**
|
|
52
|
+
* Specifies the rules to be enabled in OpenAPI normalizer
|
|
53
|
+
* @default ''
|
|
54
|
+
*/
|
|
55
|
+
openapiNormalizer: string;
|
|
51
56
|
};
|
|
52
57
|
/**
|
|
53
58
|
* Default options to run our custom typescript generator
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-api-cli.options.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAGrD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,GAAG;IACnD;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;;;;;;;;;;;;;OAmBG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"open-api-cli.options.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAGrD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,GAAG;IACnD;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;;;;;;;;;;;;;OAmBG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,iBAU/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-api-cli.options.js","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.options.ts"],"names":[],"mappings":";;;AACA,kCAAkC;
|
|
1
|
+
{"version":3,"file":"open-api-cli.options.js","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.options.ts"],"names":[],"mappings":";;;AACA,kCAAkC;AA0DlC;;GAEG;AACU,QAAA,iCAAiC,GAAsB;IAClE,gBAAgB,EAAE,EAAE;IACpB,aAAa,EAAE,iBAAiB;IAChC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,4BAA4B,EAAE,QAAQ,EAAE,uCAAuC,CAAC;IAC5J,QAAQ,EAAE,mBAAmB;IAC7B,UAAU,EAAE,GAAG;IACf,cAAc,EAAE,EAAE;IAClB,cAAc,EAAE,EAAE;IAClB,YAAY,EAAE,EAAE;IAChB,iBAAiB,EAAE,EAAE;CACtB,CAAC"}
|
|
Binary file
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAwOvE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,2CAA2C,wBAG3F,CAAC"}
|
|
@@ -19,13 +19,13 @@ const getPathObjectTemplate = (pathObj) => {
|
|
|
19
19
|
}).join(',')}
|
|
20
20
|
}`;
|
|
21
21
|
};
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
|
|
22
|
+
const getProperties = (propertyMap, properties) => {
|
|
23
|
+
const propertiesArray = properties.split(',');
|
|
24
|
+
propertiesArray.forEach((property) => {
|
|
25
25
|
const [propName, propValue] = property.split('=');
|
|
26
|
-
|
|
26
|
+
propertyMap.set(propName, propValue ?? true);
|
|
27
27
|
});
|
|
28
|
-
return
|
|
28
|
+
return propertyMap;
|
|
29
29
|
};
|
|
30
30
|
const getGeneratorOptions = (tree, context, options) => {
|
|
31
31
|
let openApiToolsJson;
|
|
@@ -79,13 +79,19 @@ const getGeneratorOptions = (tree, context, options) => {
|
|
|
79
79
|
Object.entries(openApiToolsJsonGenerator.globalProperty).forEach(([key, value]) => globalPropertyMap.set(key, value));
|
|
80
80
|
}
|
|
81
81
|
else {
|
|
82
|
-
globalPropertyMap =
|
|
82
|
+
globalPropertyMap = getProperties(globalPropertyMap, openApiToolsJsonGenerator.globalProperty);
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
if (options.globalProperty) {
|
|
86
|
-
globalPropertyMap =
|
|
86
|
+
globalPropertyMap = getProperties(globalPropertyMap, options.globalProperty);
|
|
87
87
|
}
|
|
88
88
|
const globalProperty = Array.from(globalPropertyMap).map(([key, value]) => `${key}=${value}`).join(',');
|
|
89
|
+
// get openApi normalizer properties from options
|
|
90
|
+
let openapiNormalizerMap = new Map();
|
|
91
|
+
if (options.openapiNormalizer) {
|
|
92
|
+
openapiNormalizerMap = getProperties(openapiNormalizerMap, options.openapiNormalizer);
|
|
93
|
+
}
|
|
94
|
+
const openapiNormalizer = Array.from(openapiNormalizerMap).map(([key, value]) => `${key}=${value}`).join(',');
|
|
89
95
|
// log warning of options that won't be taken into account if generator key and other options are provided in the command
|
|
90
96
|
if (options.generatorKey && openApiToolsJsonGenerator && JAVA_OPTIONS.some((optionName) => typeof options[optionName] !== undefined)) {
|
|
91
97
|
Object.keys(openApiToolsJsonGenerator).filter((option) => !OPEN_API_TOOLS_OPTIONS.includes(option))
|
|
@@ -96,6 +102,7 @@ const getGeneratorOptions = (tree, context, options) => {
|
|
|
96
102
|
...(outputPath ? { outputPath } : {}),
|
|
97
103
|
...(specConfigPath ? { specConfigPath } : {}),
|
|
98
104
|
...(globalProperty ? { globalProperty } : {}),
|
|
105
|
+
...(openapiNormalizer ? { openapiNormalizer } : {}),
|
|
99
106
|
...(options.generatorCustomPath ? { generatorCustomPath: options.generatorCustomPath } : {})
|
|
100
107
|
};
|
|
101
108
|
};
|
|
@@ -166,7 +173,8 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
166
173
|
return () => tree;
|
|
167
174
|
};
|
|
168
175
|
const runGeneratorRule = () => {
|
|
169
|
-
return () => (new open_api_cli_generator_1.OpenApiCliGenerator(options)).getGeneratorRunSchematic((options.generatorKey && JAVA_OPTIONS.every((optionName) => options[optionName] === undefined)) ?
|
|
176
|
+
return () => (new open_api_cli_generator_1.OpenApiCliGenerator(options)).getGeneratorRunSchematic((options.generatorKey && JAVA_OPTIONS.every((optionName) => options[optionName] === undefined)) ?
|
|
177
|
+
{ generatorKey: options.generatorKey, ...(options.openapiNormalizer ? { openapiNormalizer: options.openapiNormalizer } : {}) } : generatorOptions, { rootDirectory: options.directory || undefined });
|
|
170
178
|
};
|
|
171
179
|
return (0, schematics_1.chain)([
|
|
172
180
|
clearGeneratedCode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":";;;AAAA,2DAYoC;AAEpC,qCAAuC;AACvC,kCAAkC;AAClC,iCAAiC;AACjC,6BAA6B;AAG7B,uDAAmD;AAEnD,+GAAyG;AAEzG,MAAM,YAAY,GAAG,CAAC,UAAU,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;AACpF,MAAM,sBAAsB,GAAG,CAAC,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;AA6BpG,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,eAAe,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC;AAEnI,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAE,EAAE;IACpD,OAAO;QAEN,MAAM,CAAC,IAAI,CAAC,OAAO,CAA0B,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC9D,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QACjH,OAAO,GAAG,QAAkB,KAAK,KAAK,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CACb;MACM,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
Binary file
|
|
@@ -34,5 +34,7 @@ export interface NgGenerateTypescriptSDKCoreSchematicsSchema extends SchematicOp
|
|
|
34
34
|
outputPath: string | undefined;
|
|
35
35
|
/** Path to a custom generator */
|
|
36
36
|
generatorCustomPath: string | undefined;
|
|
37
|
+
/** Specifies the rules to be enabled in OpenAPI normalizer */
|
|
38
|
+
openapiNormalizer: string | undefined;
|
|
37
39
|
}
|
|
38
40
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2CAA4C,SAAQ,qBAAqB;IACxF,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,sDAAsD;IACtD,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3C,gDAAgD;IAChD,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;;;;;;;;;;;;;;;;;OAkBG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC,oDAAoD;IACpD,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,wCAAwC;IACxC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,iCAAiC;IACjC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,2CAA4C,SAAQ,qBAAqB;IACxF,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,sDAAsD;IACtD,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3C,gDAAgD;IAChD,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;;;;;;;;;;;;;;;;;OAkBG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC,oDAAoD;IACpD,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,wCAAwC;IACxC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,iCAAiC;IACjC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IAExC,8DAA8D;IAC9D,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC"}
|
|
@@ -43,6 +43,10 @@
|
|
|
43
43
|
"generatorCustomPath": {
|
|
44
44
|
"type": "string",
|
|
45
45
|
"description": "Path to a custom generator"
|
|
46
|
+
},
|
|
47
|
+
"openapiNormalizer": {
|
|
48
|
+
"type": "string",
|
|
49
|
+
"description": "Specifies the rules to be enabled in OpenAPI normalizer"
|
|
46
50
|
}
|
|
47
51
|
},
|
|
48
52
|
"additionalProperties": true
|