@ama-sdk/schematics 10.4.0-prerelease.9 → 10.5.0-prerelease.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 +12 -0
- package/collection.json +5 -0
- package/package.json +9 -9
- package/schematics/helpers/is-typescript-project.d.ts +8 -0
- package/schematics/helpers/is-typescript-project.d.ts.map +1 -0
- package/schematics/helpers/is-typescript-project.js +15 -0
- package/schematics/helpers/is-typescript-project.js.map +1 -0
- 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/migrate/index.d.ts +8 -0
- package/schematics/migrate/index.d.ts.map +1 -0
- package/schematics/migrate/index.js +36 -0
- package/schematics/migrate/index.js.map +1 -0
- package/schematics/migrate/schema.d.ts +10 -0
- package/schematics/migrate/schema.d.ts.map +1 -0
- package/schematics/migrate/schema.js +3 -0
- package/schematics/migrate/schema.js.map +1 -0
- package/schematics/migrate/schema.json +28 -0
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +1 -1
- package/schematics/ng-add/index.js.map +1 -1
- package/schematics/ng-update/index.d.ts +1 -1
- package/schematics/ng-update/index.d.ts.map +1 -1
- package/schematics/ng-update/index.js +2 -8
- package/schematics/ng-update/index.js.map +1 -1
- package/schematics/typescript/core/index.d.ts.map +1 -1
- package/schematics/typescript/core/index.js +12 -7
- 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/shell/index.d.ts.map +1 -1
- package/schematics/typescript/shell/index.js +26 -2
- package/schematics/typescript/shell/index.js.map +1 -1
- package/schematics/typescript/shell/schema.d.ts +8 -0
- package/schematics/typescript/shell/schema.d.ts.map +1 -1
- package/schematics/typescript/shell/schema.json +18 -0
- package/schematics/typescript/shell/templates/base/{.renovaterc.json → .renovaterc.json.template} +0 -1
- package/schematics/typescript/shell/templates/base/package.json.template +7 -4
package/README.md
CHANGED
|
@@ -242,6 +242,18 @@ yarn schematics @ama-sdk/schematics:typescript-core --generator-key example-sdk
|
|
|
242
242
|
> The values provided by the parameter `--global-property` will actually be merged with the values of `globalProperty` from
|
|
243
243
|
> `openapitools.json` (rather than override them like the other properties).
|
|
244
244
|
|
|
245
|
+
### Migration
|
|
246
|
+
|
|
247
|
+
To help to apply changes on the Shell part of the SDK repository, a `migrate` schematic is exposed:
|
|
248
|
+
|
|
249
|
+
```shell
|
|
250
|
+
yarn schematics @ama-sdk/schematics:migrate --from 10.0.0 [--to 11.0.0]
|
|
251
|
+
```
|
|
252
|
+
|
|
253
|
+
> [!NOTE]
|
|
254
|
+
> - The `--from` parameter is mandatory to provide the version of the original `@ama-sdk/schematics` package from which the rules should be run.
|
|
255
|
+
> - The *optional* `--to` parameter allows to indicate a version until which the rules should be run. The current installed version will be used if not provided.
|
|
256
|
+
|
|
245
257
|
### Debug
|
|
246
258
|
|
|
247
259
|
The OpenApi generator extracts an enhanced JSON data model from the specification YAML and uses this data model to feed the templates to generate the code.
|
package/collection.json
CHANGED
|
@@ -7,6 +7,11 @@
|
|
|
7
7
|
"schema": "./schematics/ng-add/schema.json",
|
|
8
8
|
"aliases": ["install", "i"]
|
|
9
9
|
},
|
|
10
|
+
"migrate": {
|
|
11
|
+
"description": "Execute migration scripts between 2 versions.",
|
|
12
|
+
"factory": "./schematics/migrate/index#migrate",
|
|
13
|
+
"schema": "./schematics/migrate/schema.json"
|
|
14
|
+
},
|
|
10
15
|
"typescript-mock": {
|
|
11
16
|
"description": "Generate an api mock into the project.",
|
|
12
17
|
"factory": "./schematics/typescript/mock/index#ngGenerateMock",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-sdk/schematics",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.5.0-prerelease.0",
|
|
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.
|
|
51
|
+
"@ama-sdk/core": "^10.5.0-prerelease.0",
|
|
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.
|
|
56
|
+
"@o3r/schematics": "^10.5.0-prerelease.0",
|
|
57
57
|
"@openapitools/openapi-generator-cli": "~2.13.0",
|
|
58
58
|
"@schematics/angular": "~17.3.0"
|
|
59
59
|
},
|
|
@@ -67,16 +67,16 @@
|
|
|
67
67
|
"tslib": "^2.6.2"
|
|
68
68
|
},
|
|
69
69
|
"devDependencies": {
|
|
70
|
-
"@ama-sdk/core": "^10.
|
|
70
|
+
"@ama-sdk/core": "^10.5.0-prerelease.0",
|
|
71
71
|
"@angular-devkit/schematics-cli": "~17.3.0",
|
|
72
72
|
"@angular-eslint/eslint-plugin": "~17.3.0",
|
|
73
73
|
"@angular/cli": "~17.3.0",
|
|
74
74
|
"@nx/eslint-plugin": "~18.3.0",
|
|
75
75
|
"@nx/jest": "~18.3.0",
|
|
76
|
-
"@o3r/build-helpers": "^10.
|
|
77
|
-
"@o3r/eslint-plugin": "^10.
|
|
78
|
-
"@o3r/schematics": "^10.
|
|
79
|
-
"@o3r/test-helpers": "^10.
|
|
76
|
+
"@o3r/build-helpers": "^10.5.0-prerelease.0",
|
|
77
|
+
"@o3r/eslint-plugin": "^10.5.0-prerelease.0",
|
|
78
|
+
"@o3r/schematics": "^10.5.0-prerelease.0",
|
|
79
|
+
"@o3r/test-helpers": "^10.5.0-prerelease.0",
|
|
80
80
|
"@openapitools/openapi-generator-cli": "~2.13.0",
|
|
81
81
|
"@schematics/angular": "~17.3.0",
|
|
82
82
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
@@ -88,6 +88,7 @@
|
|
|
88
88
|
"@types/semver": "^7.3.13",
|
|
89
89
|
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
|
90
90
|
"@typescript-eslint/parser": "^7.2.0",
|
|
91
|
+
"commit-and-tag-version": "^9.5.0",
|
|
91
92
|
"copyfiles": "^2.4.1",
|
|
92
93
|
"cpy-cli": "^5.0.0",
|
|
93
94
|
"eslint": "^8.57.0",
|
|
@@ -104,7 +105,6 @@
|
|
|
104
105
|
"mem-fs": "^4.0.0",
|
|
105
106
|
"npm-run-all2": "^6.0.0",
|
|
106
107
|
"nx": "~18.3.0",
|
|
107
|
-
"onchange": "^7.0.2",
|
|
108
108
|
"openapi-types": "^12.0.0",
|
|
109
109
|
"pid-from-port": "^1.1.3",
|
|
110
110
|
"semver": "^7.5.2",
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Tree } from '@angular-devkit/schematics';
|
|
2
|
+
/**
|
|
3
|
+
* Determine if the targeted SDK is typescript based
|
|
4
|
+
* @param tree Schematic Tree
|
|
5
|
+
* @param pathInTree Path to the SDK in the tree
|
|
6
|
+
*/
|
|
7
|
+
export declare const isTypescriptSdk: (tree: Tree, pathInTree?: string) => boolean;
|
|
8
|
+
//# sourceMappingURL=is-typescript-project.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"is-typescript-project.d.ts","sourceRoot":"","sources":["../../../schematics/helpers/is-typescript-project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,eAAe,SAAU,IAAI,iCAIzC,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isTypescriptSdk = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Determine if the targeted SDK is typescript based
|
|
6
|
+
* @param tree Schematic Tree
|
|
7
|
+
* @param pathInTree Path to the SDK in the tree
|
|
8
|
+
*/
|
|
9
|
+
const isTypescriptSdk = (tree, pathInTree = '/') => {
|
|
10
|
+
return tree.getDir(pathInTree)
|
|
11
|
+
.subfiles
|
|
12
|
+
.some((filePath) => /tsconfig[^/\\]*\.json$/.test(filePath));
|
|
13
|
+
};
|
|
14
|
+
exports.isTypescriptSdk = isTypescriptSdk;
|
|
15
|
+
//# sourceMappingURL=is-typescript-project.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"is-typescript-project.js","sourceRoot":"","sources":["../../../schematics/helpers/is-typescript-project.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACI,MAAM,eAAe,GAAG,CAAC,IAAU,EAAE,UAAU,GAAG,GAAG,EAAE,EAAE;IAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;SAC3B,QAAQ;SACR,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Rule } from '@angular-devkit/schematics';
|
|
2
|
+
import { MigrateSchematicsSchemaOptions } from './schema';
|
|
3
|
+
/**
|
|
4
|
+
* Facilitate the migration of a version to another by the run of migration rules
|
|
5
|
+
* @param options
|
|
6
|
+
*/
|
|
7
|
+
export declare const migrate: (options: MigrateSchematicsSchemaOptions) => () => Promise<Rule>;
|
|
8
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AA8B1D;;;GAGG;AACH,eAAO,MAAM,OAAO,YAAa,8BAA8B,wBAG9D,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.migrate = void 0;
|
|
4
|
+
const schematics_1 = require("@o3r/schematics");
|
|
5
|
+
const node_path_1 = require("node:path");
|
|
6
|
+
const semver_1 = require("semver");
|
|
7
|
+
const is_typescript_project_1 = require("../helpers/is-typescript-project");
|
|
8
|
+
const tsMigrationMap = {};
|
|
9
|
+
/**
|
|
10
|
+
* Facilitate the migration of a version to another by the run of migration rules
|
|
11
|
+
* @param options
|
|
12
|
+
*/
|
|
13
|
+
function migrateFn(options) {
|
|
14
|
+
const currentVersion = JSON.parse(require((0, node_path_1.resolve)(__dirname, '..', '..', 'package.json'))).version;
|
|
15
|
+
const to = options.to || currentVersion;
|
|
16
|
+
const minimumVersion = (0, semver_1.minVersion)(to);
|
|
17
|
+
return (tree, context) => {
|
|
18
|
+
if (minimumVersion && (0, semver_1.gt)(minimumVersion, currentVersion)) {
|
|
19
|
+
context.logger.warn(`The specified range "${to}" has a minimum supported version higher than the current version of @ama-sdk/schematics (${currentVersion}).` +
|
|
20
|
+
' The migration may not have any effect.');
|
|
21
|
+
}
|
|
22
|
+
const workingDirectory = options?.projectName && (0, schematics_1.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '/';
|
|
23
|
+
const runMigrateSchematic = (0, is_typescript_project_1.isTypescriptSdk)(tree, workingDirectory) ? (0, schematics_1.getMigrationRuleRunner)(tsMigrationMap, { logger: context.logger }) : undefined;
|
|
24
|
+
return runMigrateSchematic?.({ from: options.from, to });
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* Facilitate the migration of a version to another by the run of migration rules
|
|
29
|
+
* @param options
|
|
30
|
+
*/
|
|
31
|
+
const migrate = (options) => async () => {
|
|
32
|
+
const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
33
|
+
return createSchematicWithMetricsIfInstalled(migrateFn)(options);
|
|
34
|
+
};
|
|
35
|
+
exports.migrate = migrate;
|
|
36
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":";;;AAEA,gDAAqG;AACrG,yCAAoC;AACpC,mCAAwC;AACxC,4EAAmE;AAEnE,MAAM,cAAc,GAAsB,EAEzC,CAAC;AACF;;;GAGG;AACH,SAAS,SAAS,CAAC,OAAuC;IAExD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACnG,MAAM,EAAE,GAAW,OAAO,CAAC,EAAE,IAAI,cAAc,CAAC;IAChD,MAAM,cAAc,GAAG,IAAA,mBAAU,EAAC,EAAE,CAAC,CAAC;IAEtC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,cAAc,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,6FAA6F,cAAc,IAAI;gBAC7J,yCAAyC,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,IAAI,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,GAAG,CAAC;QACtH,MAAM,mBAAmB,GAAG,IAAA,uCAAe,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,mCAAsB,EAAC,cAAc,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrJ,OAAO,mBAAmB,EAAE,CAAC,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,OAAO,GAAG,CAAC,OAAuC,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;IAC7E,MAAM,EAAE,qCAAqC,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;IAClF,OAAO,qCAAqC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;AACnE,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/** Schematic Option */
|
|
2
|
+
export interface MigrateSchematicsSchemaOptions {
|
|
3
|
+
/** Starting version from which the migration scripts are executed */
|
|
4
|
+
from: string;
|
|
5
|
+
/** Version of the package to migrate to (will use the current version if not specified) */
|
|
6
|
+
to?: string;
|
|
7
|
+
/** Project name */
|
|
8
|
+
projectName?: string | undefined;
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/schema.ts"],"names":[],"mappings":"AAAA,uBAAuB;AACvB,MAAM,WAAW,8BAA8B;IAC7C,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,2FAA2F;IAC3F,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/migrate/schema.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/draft-07/schema",
|
|
3
|
+
"$id": "MigrateSchematicsSchema",
|
|
4
|
+
"title": "Execute migration scripts between 2 versions",
|
|
5
|
+
"description": "Schematics to migrate from a specific version to another one",
|
|
6
|
+
"properties": {
|
|
7
|
+
"from": {
|
|
8
|
+
"type": "string",
|
|
9
|
+
"description": "Starting version from which the migration scripts are executed",
|
|
10
|
+
"x-prompt": "What was the original version before migration?"
|
|
11
|
+
},
|
|
12
|
+
"to": {
|
|
13
|
+
"type": "string",
|
|
14
|
+
"description": "Version of the package to migrate to (will use the current version if not specified)"
|
|
15
|
+
},
|
|
16
|
+
"projectName": {
|
|
17
|
+
"type": "string",
|
|
18
|
+
"description": "Project name (in case it is applied to a module from an Angular Project)",
|
|
19
|
+
"$default": {
|
|
20
|
+
"$source": "projectName"
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
"additionalProperties": true,
|
|
25
|
+
"required": [
|
|
26
|
+
"from"
|
|
27
|
+
]
|
|
28
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4B,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAYpG;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAkDtC,CAAC;AA2GF;;GAEG;AACH,eAAO,MAAM,KAAK,QAAO,IAGxB,CAAC"}
|
|
@@ -61,7 +61,7 @@ const createOpenApiToolsConfig = (tree) => {
|
|
|
61
61
|
const openApiDefaultStorageDir = '.openapi-generator';
|
|
62
62
|
if (tree.exists(openApiConfigPath)) {
|
|
63
63
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
64
|
-
const openapitoolsConfig = tree.readJson(openApiConfigPath)
|
|
64
|
+
const openapitoolsConfig = tree.readJson(openApiConfigPath);
|
|
65
65
|
openapitoolsConfig['generator-cli'] = { storageDir: openApiDefaultStorageDir, ...openapitoolsConfig['generator-cli'], version: openApiGeneratorVersion };
|
|
66
66
|
tree.overwrite(openApiConfigPath, JSON.stringify(openapitoolsConfig));
|
|
67
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AACA,+CAAoD;AACpD,2DAAoG;AACpG,kCAAkC;AAClC,qCAAuC;AACvC,+BAAqC;AAErC,0DAAqD;AAErD,MAAM,eAAe,GAAG,eAAe,CAAC;AACxC,MAAM,iBAAiB,GAAG,0BAA0B,CAAC;AACrD,MAAM,iBAAiB,GAAG,4BAA4B,CAAC;AACvD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAE9C;;;;GAIG;AACI,MAAM,wBAAwB,GAAS,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,CAAC,IAAA,mBAAY,EAAC,WAAW,CAAC,EAAE,CAAC;QAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,IAAA,mBAAY,EAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,0DAA0D,CAC3D,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CACxD,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,EAAE,EAAE;QACzB,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,GAAG,CAAC,UAAU,CAAC,GAAG,GAAG;iBAClB,OAAO;YACN,wDAAwD;YACxD,mCAAmC;YACnC,6MAA6M,EAC7M,EAAE,CACH;iBACA,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,oCAAoC;iBACrE,OAAO;YACN,sDAAsD;YACtD,2GAA2G,EAC3G,0BAA0B,CAC3B;iBACA,OAAO,CACN,8CAA8C,EAC9C,gCAAgC,CACjC,CAAC,6CAA6C;iBAC9C,OAAO,CACN,uDAAuD,EACvD,oBAAoB,CACrB,CAAC,+BAA+B;iBAChC,OAAO,CACN,gEAAgE,EAChE,mCAAmC,CACpC,CAAC,oCAAoC;iBACrC,UAAU,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC,4CAA4C;iBAChH,UAAU,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAC,CAAC,4CAA4C;QAC1G,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,WAAW,CAAC,OAAO,CACpB,CAAC;IACF,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;IAC9B,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACtE,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAlDW,QAAA,wBAAwB,4BAkDnC;AAEF;;;;GAIG;AACH,MAAM,wBAAwB,GAAS,CAAC,IAAI,EAAE,EAAE;IAC9C,MAAM,kCAAkC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAsD,CAAC;IACnM,MAAM,uBAAuB,GAAG,kCAAkC,CAAC,uBAAuB,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC/G,MAAM,wBAAwB,GAAG,oBAAoB,CAAC;IACtD,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACnC,gEAAgE;QAChE,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAA2C,CAAC;QACtG,kBAAkB,CAAC,eAAe,CAAC,GAAG,EAAC,UAAU,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAC,CAAC;QACvJ,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC;IACxE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC;YAC5C,OAAO,EAAE,uHAAuH;YAChI,MAAM,EAAE,CAAC;YACT,gEAAgE;YAChE,eAAe,EAAE;gBACf,OAAO,EAAE,uBAAuB;gBAChC,UAAU,EAAE,wBAAwB;aACrC;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,sBAAsB,GAAS,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAC3D,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAgB,CAAC;IACzE,MAAM,kCAAkC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAsD,CAAC;IACnM,MAAM,iCAAiC,GAAG,kCAAkC,CAAC,gBAAgB,EAAE,CAAC,qCAAqC,CAAC,IAAI,EAAE,CAAC;IAC7I,gEAAgE;IAChE,kBAAkB,CAAC,eAAe,GAAG,EAAC,GAAG,kBAAkB,CAAC,eAAe,EAAE,qCAAqC,EAAE,iCAAiC,EAAC,CAAC;IACvJ,OAAO,CAAC,OAAO,CAAC,IAAI,yBAAU,CAAC;QAC7B,WAAW,EAAE,uCAAuC,iCAAiC,EAAE;QACvF,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,KAAK;KACN,CAAC,CAAC,CAAC;IACX,MAAM,IAAA,oBAAa,EAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7E,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;AACpB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,oBAAoB,GAAS,CAAC,IAAI,EAAE,EAAE;IAC1C,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAChG,IAAI,oBAAoB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;IAChF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IACpB,CAAC;IACD,MAAM,kCAAkC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAgB,CAAC;IAC7J,MAAM,uBAAuB,GAAG,kCAAkC,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9F,MAAM,sBAAsB,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACnD,KAAK,MAAM,UAAU,IAAI,sBAAsB,EAAE,CAAC;QAChD,OAAO,CAAC,OAAO,CAAC,IAAI,yBAAU,CAAC;YAC7B,WAAW,EAAE,UAAU,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxF,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,KAAK;SACN,CAAC,CAAC,CAAC;QACX,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAgB,CAAC;QACxE,kBAAkB,CAAC,eAAe,GAAG,EAAC,GAAG,kBAAkB,CAAC,eAAe,EAAE,CAAC,UAAU,CAAC,EAAE,uBAAuB,EAAC,CAAC;QACpH,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5E,MAAM,IAAA,oBAAa,EAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;QACjB,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,8BAAiB,EAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC5E,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;YACb,MAAM,EAAC,mCAAmC,EAAC,GAAG,2CAAa,iBAAiB,EAAC,CAAC;YAC9E,OAAO,GAAG,EAAE,CAAC,mCAAmC,CAAC,kCAAkC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7F,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,SAAS,OAAO;IAEd,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,kBAAK,EAAC;QAC9B,yBAAyB;QACzB,gCAAwB;QACxB,CAAC,CAAC,EAAE,EAAE;YACJ,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YACnD,MAAM,iCAAiC,GAAG,kCAAkC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC/F,OAAO,iCAAiC,CAAC,CAAC,CAAC,IAAA,kBAAK,EAAC,CAAC,oBAAoB,EAAE,sBAAsB,EAAE,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjI,CAAC;KACF,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACpB,CAAC;AAED;;GAEG;AACI,MAAM,KAAK,GAAG,GAAS,EAAE,CAAC,KAAK,IAAI,EAAE;IAC1C,MAAM,EAAE,qCAAqC,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;IAClF,OAAO,qCAAqC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;AACnE,CAAC,CAAC;AAHW,QAAA,KAAK,SAGhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIvD;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAQlC"}
|
|
@@ -4,19 +4,13 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.updateV10_0 = void 0;
|
|
6
6
|
const typescript_1 = require("./typescript");
|
|
7
|
-
|
|
8
|
-
* Determine if the script is run in a Typescript SDK
|
|
9
|
-
* @param tree
|
|
10
|
-
*/
|
|
11
|
-
const isTypescriptSdk = (tree) => {
|
|
12
|
-
return tree.exists('/tsconfig.json');
|
|
13
|
-
};
|
|
7
|
+
const is_typescript_project_1 = require("../helpers/is-typescript-project");
|
|
14
8
|
/**
|
|
15
9
|
* update of Otter library V10.0
|
|
16
10
|
*/
|
|
17
11
|
function updateV10_0() {
|
|
18
12
|
return (tree, context) => {
|
|
19
|
-
if (isTypescriptSdk(tree)) {
|
|
13
|
+
if ((0, is_typescript_project_1.isTypescriptSdk)(tree)) {
|
|
20
14
|
return (0, typescript_1.updateV10_0)()(tree, context);
|
|
21
15
|
}
|
|
22
16
|
return tree;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAG9B,6CAA4D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAG9B,6CAA4D;AAC5D,4EAAmE;AAEnE;;GAEG;AACH,SAAgB,WAAW;IACzB,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,IAAA,uCAAe,EAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAA,wBAAa,GAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AARD,kCAQC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AACA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAQvE,wEAAwE;AACxE,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAClD,yDAAyD;AACzD,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAE1C,yDAAyD;AACzD,eAAO,MAAM,mBAAmB,SAAS,CAAC;AA2O1C;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,2CAA2C,wBAG3F,CAAC"}
|
|
@@ -102,7 +102,7 @@ const getGeneratorOptions = (tree, context, options) => {
|
|
|
102
102
|
}
|
|
103
103
|
const openapiNormalizer = Array.from(openapiNormalizerMap).map(([key, value]) => `${key}=${value}`).join(',');
|
|
104
104
|
// log warning of options that won't be taken into account if generator key and other options are provided in the command
|
|
105
|
-
if (options.generatorKey && openApiToolsJsonGenerator && JAVA_OPTIONS.some((optionName) => typeof options[optionName] !== undefined)) {
|
|
105
|
+
if (options.generatorKey && openApiToolsJsonGenerator && JAVA_OPTIONS.some((optionName) => typeof options[optionName] !== 'undefined')) {
|
|
106
106
|
Object.keys(openApiToolsJsonGenerator).filter((option) => !OPEN_API_TOOLS_OPTIONS.includes(option))
|
|
107
107
|
.forEach((ignoredOption) => context.logger.warn(`Option ${ignoredOption} from ${openApiToolsPath} will not be taken into account`));
|
|
108
108
|
}
|
|
@@ -132,7 +132,9 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
132
132
|
specContent = await (await fetch(generatorOptions.specPath)).text();
|
|
133
133
|
}
|
|
134
134
|
else {
|
|
135
|
-
|
|
135
|
+
const specPath = path.isAbsolute(generatorOptions.specPath) || !options.directory ?
|
|
136
|
+
generatorOptions.specPath : path.join(options.directory, generatorOptions.specPath);
|
|
137
|
+
specContent = (0, node_fs_1.readFileSync)(specPath, { encoding: 'utf-8' }).toString();
|
|
136
138
|
}
|
|
137
139
|
try {
|
|
138
140
|
JSON.parse(specContent);
|
|
@@ -143,7 +145,7 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
143
145
|
}
|
|
144
146
|
const defaultFileName = `${exports.LOCAL_SPEC_FILENAME}.${isJson ? exports.SPEC_JSON_EXTENSION : exports.SPEC_YAML_EXTENSION}`;
|
|
145
147
|
specDefaultPath = path.posix.join(targetPath, defaultFileName);
|
|
146
|
-
generatorOptions.specPath =
|
|
148
|
+
generatorOptions.specPath = defaultFileName;
|
|
147
149
|
if (tree.exists(specDefaultPath)) {
|
|
148
150
|
tree.overwrite(specDefaultPath, specContent);
|
|
149
151
|
}
|
|
@@ -198,10 +200,13 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
198
200
|
const openApiToolsPath = path.posix.join(targetPath, 'openapitools.json');
|
|
199
201
|
if (tree.exists(openApiToolsPath)) {
|
|
200
202
|
const openApiTools = tree.readJson(openApiToolsPath);
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
.
|
|
204
|
-
|
|
203
|
+
const generators = openApiTools['generator-cli']?.generators;
|
|
204
|
+
if (generators) {
|
|
205
|
+
Object.keys(generators)
|
|
206
|
+
.filter((key) => !openApiTools['generator-cli'].generators[key].inputSpec)
|
|
207
|
+
.forEach((key) => openApiTools['generator-cli'].generators[key].inputSpec = `./${defaultFileName}`);
|
|
208
|
+
tree.overwrite(openApiToolsPath, JSON.stringify(openApiTools, null, 2));
|
|
209
|
+
}
|
|
205
210
|
}
|
|
206
211
|
return tree;
|
|
207
212
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
Binary file
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EAAC,4CAA4C,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EAAC,4CAA4C,EAAC,MAAM,UAAU,CAAC;AA0H3E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,4CAA4C,wBAG5F,CAAC"}
|
|
@@ -38,7 +38,8 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
38
38
|
'typescript': amaSdkSchematicsPackageJson.devDependencies.typescript,
|
|
39
39
|
'@openapitools/openapi-generator-cli': amaSdkSchematicsPackageJson.devDependencies['@openapitools/openapi-generator-cli'],
|
|
40
40
|
'@stylistic/eslint-plugin-ts': amaSdkSchematicsPackageJson.devDependencies['@stylistic/eslint-plugin-ts'],
|
|
41
|
-
'rxjs': amaSdkSchematicsPackageJson.dependencies.rxjs
|
|
41
|
+
'rxjs': amaSdkSchematicsPackageJson.dependencies.rxjs,
|
|
42
|
+
'commit-and-tag-version': amaSdkSchematicsPackageJson.devDependencies['commit-and-tag-version']
|
|
42
43
|
};
|
|
43
44
|
const openApiSupportedVersion = typeof amaSdkSchematicsPackageJson.openApiSupportedVersion === 'string' &&
|
|
44
45
|
amaSdkSchematicsPackageJson.openApiSupportedVersion.replace(/\^|~/, '');
|
|
@@ -55,6 +56,9 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
55
56
|
packageManager: (0, node_install_1.getPackageManagerName)(options.packageManager),
|
|
56
57
|
projectHosting: options.hosting,
|
|
57
58
|
exactO3rVersion: options.exactO3rVersion,
|
|
59
|
+
specPackageName: options.specPackageName,
|
|
60
|
+
specPackagePath: options.specPackagePath,
|
|
61
|
+
specPackageVersion: options.specPackageVersion,
|
|
58
62
|
sdkCoreRange: `${options.exactO3rVersion ? '' : '~'}${amaSdkSchematicsPackageJson.version}`,
|
|
59
63
|
sdkCoreVersion: amaSdkSchematicsPackageJson.version,
|
|
60
64
|
angularVersion: amaSdkSchematicsPackageJson.dependencies['@angular-devkit/core'],
|
|
@@ -65,8 +69,9 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
65
69
|
empty: ''
|
|
66
70
|
};
|
|
67
71
|
const targetPath = options.directory || tree.root.path;
|
|
72
|
+
const specScope = options.specPackageName?.startsWith('@') ? options.specPackageName.substring(1).split('/')[0] : undefined;
|
|
68
73
|
if (properties.packageManager === 'yarn') {
|
|
69
|
-
const yarnrcPath = node_path_1.posix.join(
|
|
74
|
+
const yarnrcPath = node_path_1.posix.join(tree.root.path, '.yarnrc.yml');
|
|
70
75
|
const yarnrc = ((0, js_yaml_1.load)(tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '') || {});
|
|
71
76
|
yarnrc.nodeLinker ||= 'pnp';
|
|
72
77
|
yarnrc.packageExtensions ||= {};
|
|
@@ -75,6 +80,12 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
75
80
|
'isomorphic-fetch': amaSdkSchematicsPackageJson.devDependencies['isomorphic-fetch']
|
|
76
81
|
}
|
|
77
82
|
};
|
|
83
|
+
if (options.specPackageRegistry && specScope) {
|
|
84
|
+
yarnrc.npmScopes ||= {};
|
|
85
|
+
yarnrc.npmScopes[specScope] = {
|
|
86
|
+
npmRegistryServer: options.specPackageRegistry
|
|
87
|
+
};
|
|
88
|
+
}
|
|
78
89
|
if (tree.exists(yarnrcPath)) {
|
|
79
90
|
tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
|
|
80
91
|
}
|
|
@@ -82,6 +93,19 @@ function ngGenerateTypescriptSDKFn(options) {
|
|
|
82
93
|
tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
|
|
83
94
|
}
|
|
84
95
|
}
|
|
96
|
+
else if (properties.packageManager === 'npm') {
|
|
97
|
+
if (options.specPackageRegistry && specScope) {
|
|
98
|
+
const npmrcPath = node_path_1.posix.join(tree.root.path, '.npmrc');
|
|
99
|
+
let npmrc = tree.exists(npmrcPath) ? tree.readText(npmrcPath) : '';
|
|
100
|
+
npmrc += `\n@${specScope}:registry=${options.specPackageRegistry}\n`;
|
|
101
|
+
if (tree.exists(npmrcPath)) {
|
|
102
|
+
tree.overwrite(npmrcPath, npmrc);
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
tree.create(npmrcPath, npmrc);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
85
109
|
const baseRule = (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates/base'), [
|
|
86
110
|
(0, schematics_1.template)(properties),
|
|
87
111
|
(0, schematics_1.move)(targetPath),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":";;;AAAA,2DAWoC;AACpC,qCAAmC;AACnC,yCAAsD;AACtD,6DAA6E;AAC7E,6DAA2D;AAG3D;;;GAGG;AACH,SAAS,yBAAyB,CAAC,OAAqD;IAEtF,MAAM,WAAW,GAAG,CAAC,KAAW,EAAE,OAAyB,EAAE,EAAE;QAC7D,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,sBAAU,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAQ,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACpJ,MAAM,WAAW,GAAG,IAAI,yBAAU,CAAC,EAAC,gBAAgB,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,EAAC,CAAC,CAAC;QACpH,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QAChE,MAAM,2BAA2B,GAAG,MAAM,IAAA,8BAAe,GAAE,CAAC;QAE5D,yDAAyD;QACzD,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,2BAA2B,CAAC,YAAa,CAAC,KAAK;YACxD,aAAa,EAAE,2BAA2B,CAAC,eAAgB,CAAC,aAAa,CAAC;YAC1E,aAAa,EAAE,2BAA2B,CAAC,eAAgB,CAAC,aAAa,CAAC;YAC1E,kCAAkC,EAAE,2BAA2B,CAAC,eAAgB,CAAC,kCAAkC,CAAC;YACpH,2BAA2B,EAAE,2BAA2B,CAAC,eAAgB,CAAC,2BAA2B,CAAC;YACtG,QAAQ,EAAE,2BAA2B,CAAC,eAAgB,CAAC,MAAM;YAC7D,oBAAoB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,oBAAoB,CAAC;YACxF,qBAAqB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,qBAAqB,CAAC;YAC1F,4BAA4B,EAAE,2BAA2B,CAAC,eAAgB,CAAC,4BAA4B,CAAC;YACxG,uBAAuB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,uBAAuB,CAAC;YAC9F,kBAAkB,EAAE,2BAA2B,CAAC,eAAgB,CAAC,kBAAkB,CAAC;YACpF,SAAS,EAAE,2BAA2B,CAAC,eAAgB,CAAC,SAAS,CAAC;YAClE,MAAM,EAAE,2BAA2B,CAAC,eAAgB,CAAC,IAAI;YACzD,SAAS,EAAE,2BAA2B,CAAC,eAAgB,CAAC,SAAS,CAAC;YAClE,QAAQ,EAAE,2BAA2B,CAAC,eAAgB,CAAC,MAAM;YAC7D,YAAY,EAAE,2BAA2B,CAAC,eAAgB,CAAC,UAAU;YACrE,qCAAqC,EAAE,2BAA2B,CAAC,eAAgB,CAAC,qCAAqC,CAAC;YAC1H,6BAA6B,EAAE,2BAA2B,CAAC,eAAgB,CAAC,6BAA6B,CAAC;YAC1G,MAAM,EAAE,2BAA2B,CAAC,YAAa,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,14 @@ export interface NgGenerateTypescriptSDKShellSchematicsSchema extends SchematicO
|
|
|
8
8
|
description?: string | undefined;
|
|
9
9
|
/** Directory where to generate the SDK */
|
|
10
10
|
directory?: string | undefined;
|
|
11
|
+
/** The npm package name where the spec file can be fetched */
|
|
12
|
+
specPackageName?: string;
|
|
13
|
+
/** The npm registry where the spec file can be fetched */
|
|
14
|
+
specPackageRegistry?: string;
|
|
15
|
+
/** The path inside the package where to find the spec file */
|
|
16
|
+
specPackagePath: string;
|
|
17
|
+
/** The version to target for the npm package where the spec file can be fetched */
|
|
18
|
+
specPackageVersion?: string;
|
|
11
19
|
/** Package manager to be used in the generated SDK */
|
|
12
20
|
packageManager?: 'npm' | 'yarn' | undefined;
|
|
13
21
|
/** Skip NPM install */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,4CAA6C,SAAQ,qBAAqB;IACzF,+FAA+F;IAC/F,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAEhB,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,sDAAsD;IACtD,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;IAE5C,uBAAuB;IACvB,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,4CAA6C,SAAQ,qBAAqB;IACzF,+FAA+F;IAC/F,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAEhB,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE/B,8DAA8D;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,0DAA0D;IAC1D,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,8DAA8D;IAC9D,eAAe,EAAE,MAAM,CAAC;IAExB,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,sDAAsD;IACtD,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;IAE5C,uBAAuB;IACvB,WAAW,EAAE,OAAO,CAAC;IAErB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
|
|
@@ -23,6 +23,24 @@
|
|
|
23
23
|
"type": "string",
|
|
24
24
|
"description": "Directory where to generate the SDK"
|
|
25
25
|
},
|
|
26
|
+
"specPackageName": {
|
|
27
|
+
"type": "string",
|
|
28
|
+
"description": "The npm package name where the spec file can be fetched"
|
|
29
|
+
},
|
|
30
|
+
"specPackageRegistry": {
|
|
31
|
+
"type": "string",
|
|
32
|
+
"description": "The npm registry where the spec file can be fetched"
|
|
33
|
+
},
|
|
34
|
+
"specPackagePath": {
|
|
35
|
+
"type": "string",
|
|
36
|
+
"description": "The path inside the package where to find the spec file",
|
|
37
|
+
"default": "openapi.yml"
|
|
38
|
+
},
|
|
39
|
+
"specPackageVersion": {
|
|
40
|
+
"type": "string",
|
|
41
|
+
"description": "The version to target for the npm package where the spec file can be fetched",
|
|
42
|
+
"default": "latest"
|
|
43
|
+
},
|
|
26
44
|
"skipInstall": {
|
|
27
45
|
"type": "boolean",
|
|
28
46
|
"description": "Skip NPM install",
|
package/schematics/typescript/shell/templates/base/{.renovaterc.json → .renovaterc.json.template}
RENAMED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
3
3
|
"extends": [
|
|
4
|
-
"config:base",
|
|
5
4
|
"github>AmadeusITGroup/otter//tools/renovate/base",
|
|
6
5
|
"github>AmadeusITGroup/otter//tools/renovate/sdk",
|
|
7
6
|
"github>AmadeusITGroup/otter//tools/renovate/sdk-spec-upgrade(my-specification-package)"
|
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
}
|
|
30
30
|
},
|
|
31
31
|
"scripts": {
|
|
32
|
+
"schematics": "schematics",
|
|
32
33
|
"clean": "rimraf test/ test-dev/ dist/ dist-dev/ dist-test/ build/",
|
|
33
34
|
"lint:ci": "eslint \"**/*[jt]s\" --quiet --format junit --output-file ./dist-lint/result.xml",
|
|
34
35
|
"lint": "eslint \"**/*[jt]s\" --cache",
|
|
@@ -41,12 +42,13 @@
|
|
|
41
42
|
"resolve": "node -e 'process.stdout.write(require.resolve(process.argv[1]));'",
|
|
42
43
|
"generate": "schematics @ama-sdk/schematics:typescript-core",
|
|
43
44
|
"spec:regen": "<%=packageManager%> run generate <% if (packageManager === 'npm') {%>-- <%}%>--generator-key <%=projectName%>-<%=projectPackageName%> && amasdk-clear-index",
|
|
45
|
+
"spec:upgrade": "<% if (specPackageName) { %>amasdk-update-spec-from-npm <%=specPackageName%> --package-path=\"<%=specPackagePath%>\" && <% } %><%=packageManager%> run spec:regen",
|
|
44
46
|
"files:pack": "amasdk-files-pack",
|
|
45
47
|
"test": "jest --passWithNoTests",
|
|
46
48
|
"publish:package": "npm publish ./dist",
|
|
47
49
|
"generate:mock": "schematics @ama-sdk/schematics:mock",
|
|
48
50
|
"doc:generate": "typedoc",
|
|
49
|
-
"tools:changelog": "
|
|
51
|
+
"tools:changelog": "commit-and-tag-version"
|
|
50
52
|
},
|
|
51
53
|
"lint-staged": {
|
|
52
54
|
"**/*.(js|ts)": [
|
|
@@ -82,7 +84,7 @@
|
|
|
82
84
|
"@openapitools/openapi-generator-cli": "<%= versions['@openapitools/openapi-generator-cli'] %>",
|
|
83
85
|
"@stylistic/eslint-plugin-ts": "<%= versions['@stylistic/eslint-plugin-ts'] %>",
|
|
84
86
|
"@swc/cli": "^0.1.57",
|
|
85
|
-
"@swc/core": "
|
|
87
|
+
"@swc/core": "1.5.7",
|
|
86
88
|
"@types/jest": "<%= versions['@types/jest'] %>",
|
|
87
89
|
"@types/node": "<%= versions['@types/node'] %>",
|
|
88
90
|
"@typescript-eslint/eslint-plugin": "<%= versions['@typescript-eslint/eslint-plugin'] %>",
|
|
@@ -102,11 +104,12 @@
|
|
|
102
104
|
"minimist": "^1.2.6",
|
|
103
105
|
"rimraf": "^5.0.1",
|
|
104
106
|
"rxjs": "<%= versions['rxjs'] %>",
|
|
105
|
-
"
|
|
107
|
+
"commit-and-tag-version": "<%= versions['commit-and-tag-version'] %>",
|
|
106
108
|
"ts-jest": "<%= versions['ts-jest'] %>",
|
|
107
109
|
"typedoc": "~0.25.0",
|
|
108
110
|
"tsc-watch": "^6.0.0",
|
|
109
|
-
"typescript": "<%= versions['typescript'] %>"
|
|
111
|
+
"typescript": "<%= versions['typescript'] %>"<% if (specPackageName) { %>,
|
|
112
|
+
"<%=specPackageName%>": "<%=specPackageVersion%>"<% } %>
|
|
110
113
|
},<% if (exactO3rVersion) { %>
|
|
111
114
|
"<%= packageManager == 'yarn' ? 'resolutions' : 'overrides' %>": {
|
|
112
115
|
"@o3r/schematics": "<%= sdkCoreRange %>"
|