@o3r/workspace 10.4.0-prerelease.8 → 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/package.json +7 -7
- package/schematics/ng-add/helpers/npm-workspace.d.ts.map +1 -1
- package/schematics/ng-add/helpers/npm-workspace.js +1 -1
- package/schematics/ng-add/helpers/npm-workspace.js.map +1 -1
- package/schematics/ng-add/project-setup.d.ts.map +1 -1
- package/schematics/ng-add/project-setup.js +1 -0
- package/schematics/ng-add/project-setup.js.map +1 -1
- package/schematics/sdk/index.d.ts.map +1 -1
- package/schematics/sdk/index.js +16 -12
- package/schematics/sdk/index.js.map +1 -1
- package/schematics/sdk/schema.d.ts +8 -0
- package/schematics/sdk/schema.d.ts.map +1 -1
- package/schematics/sdk/schema.json +23 -4
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.5.0-prerelease.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^10.
|
|
41
|
+
"@o3r/schematics": "^10.5.0-prerelease.0",
|
|
42
42
|
"commander": "^12.0.0",
|
|
43
43
|
"globby": "^11.1.0",
|
|
44
44
|
"semver": "^7.5.2",
|
|
@@ -69,11 +69,11 @@
|
|
|
69
69
|
"@nx/eslint-plugin": "~18.3.0",
|
|
70
70
|
"@nx/jest": "~18.3.0",
|
|
71
71
|
"@nx/js": "~18.3.0",
|
|
72
|
-
"@o3r/build-helpers": "^10.
|
|
73
|
-
"@o3r/core": "^10.
|
|
74
|
-
"@o3r/eslint-plugin": "^10.
|
|
75
|
-
"@o3r/schematics": "^10.
|
|
76
|
-
"@o3r/test-helpers": "^10.
|
|
72
|
+
"@o3r/build-helpers": "^10.5.0-prerelease.0",
|
|
73
|
+
"@o3r/core": "^10.5.0-prerelease.0",
|
|
74
|
+
"@o3r/eslint-plugin": "^10.5.0-prerelease.0",
|
|
75
|
+
"@o3r/schematics": "^10.5.0-prerelease.0",
|
|
76
|
+
"@o3r/test-helpers": "^10.5.0-prerelease.0",
|
|
77
77
|
"@schematics/angular": "~17.3.0",
|
|
78
78
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
79
79
|
"@types/jest": "~29.5.2",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-workspace.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAG/E,OAAO,
|
|
1
|
+
{"version":3,"file":"npm-workspace.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAG/E,OAAO,EAAsE,eAAe,EAAuB,MAAM,iBAAiB,CAAC;AAE3I;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,GAAE,eAAsC,GAAG,IAAI,CAqChG;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,gEAoB9E"}
|
|
@@ -23,7 +23,7 @@ function addWorkspacesToProject(directories = schematics_3.DEFAULT_ROOT_FOLDERS)
|
|
|
23
23
|
return tree;
|
|
24
24
|
};
|
|
25
25
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
26
|
-
const updateAngularJson = (0, schematics_3.
|
|
26
|
+
const updateAngularJson = (0, schematics_3.setupSchematicsParamsForProject)({ '*:*': directories });
|
|
27
27
|
const updateNxWorkspaceLayout = (tree, _context) => {
|
|
28
28
|
const nxJson = tree.readJson('/nx.json');
|
|
29
29
|
nxJson.workspaceLayout ||= {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":";;;AAAA,2DAAmD;AAEnD,2DAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"npm-workspace.js","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/npm-workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAItD;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,
|
|
1
|
+
{"version":3,"file":"project-setup.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAc/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAItD;;;;GAIG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,KAAG,IAwD/D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project-setup.js","sourceRoot":"","sources":["../../../schematics/ng-add/project-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAkD,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAW9L,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AA4E/C;;;GAGG;AACH,eAAO,MAAM,WAAW,wCAAuD,CAAC"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -36,6 +36,8 @@ function generateSdkFn(options) {
|
|
|
36
36
|
(0, schematics_1.renameTemplateFiles)()
|
|
37
37
|
]), schematics_1.MergeStrategy.Overwrite);
|
|
38
38
|
const packageManager = (0, schematics_2.getPackageManager)({ workspaceConfig });
|
|
39
|
+
const specExtension = options.specPackagePath ? path.extname(options.specPackagePath) : '.yml';
|
|
40
|
+
const specPath = options.specPackageName ? `openapi${specExtension}` : options.specPath;
|
|
39
41
|
return (0, schematics_1.chain)([
|
|
40
42
|
(0, schematics_1.externalSchematic)('@ama-sdk/schematics', 'typescript-shell', {
|
|
41
43
|
...options,
|
|
@@ -45,26 +47,28 @@ function generateSdkFn(options) {
|
|
|
45
47
|
packageManager,
|
|
46
48
|
skipInstall: !!options.specPath || options.skipInstall
|
|
47
49
|
}),
|
|
48
|
-
packageManager === 'yarn' ? (t) => {
|
|
49
|
-
const yarnrcPath = path.posix.join(targetPath, '.yarnrc.yml');
|
|
50
|
-
// delete yarnrc created by sdk shell generator standalone
|
|
51
|
-
if (tree.exists(yarnrcPath)) {
|
|
52
|
-
tree.delete(yarnrcPath);
|
|
53
|
-
}
|
|
54
|
-
return t;
|
|
55
|
-
} : schematics_1.noop,
|
|
56
50
|
isNx ? (0, rules_nx_1.nxRegisterProjectTasks)(options, targetPath, cleanName) : (0, rules_ng_1.ngRegisterProjectTasks)(options, targetPath, cleanName),
|
|
57
51
|
(0, update_ts_paths_rule_1.updateTsConfig)(targetPath, projectName, scope),
|
|
58
52
|
(0, clean_standalone_rule_1.cleanStandaloneFiles)(targetPath),
|
|
59
53
|
addModuleSpecificFiles(),
|
|
60
|
-
|
|
61
|
-
const
|
|
54
|
+
specPath ? (_host, c) => {
|
|
55
|
+
const installTask = c.addTask(new tasks_1.NodePackageInstallTask());
|
|
56
|
+
const specUpgradeTask = options.specPackageName ? [
|
|
57
|
+
c.addTask(new schematics_2.NpmExecTask('amasdk-update-spec-from-npm', [
|
|
58
|
+
options.specPackageName,
|
|
59
|
+
...options.specPackagePath ? ['--package-path', options.specPackagePath] : [],
|
|
60
|
+
'--output', path.join(process.cwd(), targetPath, `openapi${specExtension}`)
|
|
61
|
+
], targetPath), [installTask])
|
|
62
|
+
] : [];
|
|
62
63
|
c.addTask(new tasks_1.RunSchematicTask('@ama-sdk/schematics', 'typescript-core', {
|
|
63
64
|
...options,
|
|
64
|
-
specPath
|
|
65
|
+
specPath,
|
|
65
66
|
directory: targetPath,
|
|
66
67
|
packageManager
|
|
67
|
-
}), [
|
|
68
|
+
}), [
|
|
69
|
+
installTask,
|
|
70
|
+
...specUpgradeTask
|
|
71
|
+
]);
|
|
68
72
|
} : schematics_1.noop
|
|
69
73
|
])(tree, context);
|
|
70
74
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,2DAA8L;AAC9L,kCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,5 +12,13 @@ export interface NgGenerateSdkSchema extends SchematicOptionObject {
|
|
|
12
12
|
skipInstall: boolean;
|
|
13
13
|
/** Path to the swagger specification used to generate the SDK; If not provided, sdk shell will be generated */
|
|
14
14
|
specPath?: string | undefined;
|
|
15
|
+
/** The npm package name where the spec file can be fetched */
|
|
16
|
+
specPackageName?: string;
|
|
17
|
+
/** The path inside the package where to find the spec file */
|
|
18
|
+
specPackagePath?: string;
|
|
19
|
+
/** The version to target for the npm package where the spec file can be fetched */
|
|
20
|
+
specPackageVersion?: string;
|
|
21
|
+
/** The npm registry where the spec file can be fetched */
|
|
22
|
+
specPackageRegistry?: string;
|
|
15
23
|
}
|
|
16
24
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAChE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,+GAA+G;IAC/G,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/sdk/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,mBAAoB,SAAQ,qBAAqB;IAChE,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IAEb,8CAA8C;IAC9C,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,oCAAoC;IACpC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,0CAA0C;IAC1C,WAAW,EAAE,OAAO,CAAC;IAErB,+GAA+G;IAC/G,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B,8DAA8D;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,8DAA8D;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,mFAAmF;IACnF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,0DAA0D;IAC1D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B"}
|
|
@@ -26,10 +26,6 @@
|
|
|
26
26
|
"type": "string",
|
|
27
27
|
"description": "Target directory to generate the module"
|
|
28
28
|
},
|
|
29
|
-
"specPath": {
|
|
30
|
-
"type": "string",
|
|
31
|
-
"description": "Path to the swagger specification used to generate the SDK; If not provided, sdk shell will be generated"
|
|
32
|
-
},
|
|
33
29
|
"skipLinter": {
|
|
34
30
|
"type": "boolean",
|
|
35
31
|
"description": "Skip the linter process",
|
|
@@ -39,8 +35,31 @@
|
|
|
39
35
|
"description": "Do not install dependency packages.",
|
|
40
36
|
"type": "boolean",
|
|
41
37
|
"default": false
|
|
38
|
+
},
|
|
39
|
+
"specPath": {
|
|
40
|
+
"type": "string",
|
|
41
|
+
"description": "Path to the swagger specification used to generate the SDK; If not provided, sdk shell will be generated"
|
|
42
|
+
},
|
|
43
|
+
"specPackageName": {
|
|
44
|
+
"type": "string",
|
|
45
|
+
"description": "The npm package name where the spec file can be fetched"
|
|
46
|
+
},
|
|
47
|
+
"specPackagePath": {
|
|
48
|
+
"type": "string",
|
|
49
|
+
"description": "The path inside the package where to find the spec file"
|
|
50
|
+
},
|
|
51
|
+
"specPackageVersion": {
|
|
52
|
+
"type": "string",
|
|
53
|
+
"description": "The version to target for the npm package where the spec file can be fetched"
|
|
54
|
+
},
|
|
55
|
+
"specPackageRegistry": {
|
|
56
|
+
"type": "string",
|
|
57
|
+
"description": "The npm registry where the spec file can be fetched"
|
|
42
58
|
}
|
|
43
59
|
},
|
|
60
|
+
"not": {
|
|
61
|
+
"required": ["specPath", "specPackageName"]
|
|
62
|
+
},
|
|
44
63
|
"required": ["name"],
|
|
45
64
|
"additionalProperties": true
|
|
46
65
|
}
|