@o3r/workspace 11.0.0-prerelease.3 → 11.0.0-prerelease.6
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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/workspace",
|
|
3
|
-
"version": "11.0.0-prerelease.
|
|
3
|
+
"version": "11.0.0-prerelease.6",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@o3r/schematics": "^11.0.0-prerelease.
|
|
41
|
+
"@o3r/schematics": "^11.0.0-prerelease.6",
|
|
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": "^11.0.0-prerelease.
|
|
73
|
-
"@o3r/core": "^11.0.0-prerelease.
|
|
74
|
-
"@o3r/eslint-plugin": "^11.0.0-prerelease.
|
|
75
|
-
"@o3r/schematics": "^11.0.0-prerelease.
|
|
76
|
-
"@o3r/test-helpers": "^11.0.0-prerelease.
|
|
72
|
+
"@o3r/build-helpers": "^11.0.0-prerelease.6",
|
|
73
|
+
"@o3r/core": "^11.0.0-prerelease.6",
|
|
74
|
+
"@o3r/eslint-plugin": "^11.0.0-prerelease.6",
|
|
75
|
+
"@o3r/schematics": "^11.0.0-prerelease.6",
|
|
76
|
+
"@o3r/test-helpers": "^11.0.0-prerelease.6",
|
|
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":"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;
|
|
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;AA8E/C;;;GAGG;AACH,eAAO,MAAM,WAAW,wCAAuD,CAAC"}
|
package/schematics/sdk/index.js
CHANGED
|
@@ -36,8 +36,9 @@ 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) : '.
|
|
40
|
-
|
|
39
|
+
const specExtension = options.specPackagePath ? path.extname(options.specPackagePath) : '.yaml';
|
|
40
|
+
// TODO: Change `swagger-spec` to `openapi` in v11 (ref: #1745)
|
|
41
|
+
const specPath = options.specPackageName ? `swagger-spec${specExtension}` : options.specPath;
|
|
41
42
|
return (0, schematics_1.chain)([
|
|
42
43
|
(0, schematics_1.externalSchematic)('@ama-sdk/schematics', 'typescript-shell', {
|
|
43
44
|
...options,
|
|
@@ -57,7 +58,8 @@ function generateSdkFn(options) {
|
|
|
57
58
|
c.addTask(new schematics_2.NpmExecTask('amasdk-update-spec-from-npm', [
|
|
58
59
|
options.specPackageName,
|
|
59
60
|
...options.specPackagePath ? ['--package-path', options.specPackagePath] : [],
|
|
60
|
-
|
|
61
|
+
// TODO: Change `swagger-spec` to `openapi` in v11 (ref: #1745)
|
|
62
|
+
'--output', path.join(process.cwd(), targetPath, `swagger-spec${specExtension}`)
|
|
61
63
|
], targetPath), [installTask])
|
|
62
64
|
] : [];
|
|
63
65
|
c.addTask(new tasks_1.RunSchematicTask('@ama-sdk/schematics', 'typescript-core', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":";;;AAAA,2DAA8L;AAC9L,kCAAkC;AAClC,gDAQyB;AAEzB,+CAA0D;AAC1D,+CAA0D;AAC1D,uEAA8D;AAC9D,yEAAqE;AACrE,4DAA4F;AAE5F;;;GAGG;AACH,SAAS,aAAa,CAAC,OAA4B;IACjD,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzE,MAAM,WAAW,GAAG,oBAAO,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7F,MAAM,SAAS,GAAG,oBAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAE3F,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,IAAA,wBAAW,EAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,eAAe,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,wBAAW,CAAC,uCAAuC,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,sCAAyB,EAAC,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;QAEzF,oDAAoD;QACpD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,EAAE,SAAS,CAAC,CAAC;QAE3E,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,aAAa,CAAC,EAAE;YACvE,IAAA,qBAAQ,EAAC;gBACP,GAAG,OAAO;gBACV,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aACvF,CAAC;YACF,IAAA,iBAAI,EAAC,UAAU,CAAC;YAChB,IAAA,gCAAmB,GAAE;SACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;QAE7B,MAAM,cAAc,GAAG,IAAA,8BAAiB,EAAC,EAAE,eAAe,EAAE,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/sdk/index.ts"],"names":[],"mappings":"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"}
|