@ama-sdk/schematics 9.5.0-alpha.9 → 9.6.0-alpha.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.
Files changed (14) hide show
  1. package/package.json +8 -8
  2. package/schematics/api-extension/schema.json +1 -1
  3. package/schematics/java/client-core/schema.json +1 -1
  4. package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen-tests.jar +0 -0
  5. package/schematics/java/client-core/swagger-codegen-java-client/target/javaClient-swagger-codegen.jar +0 -0
  6. package/schematics/ng-add/schema.json +2 -2
  7. package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator-tests.jar +0 -0
  8. package/schematics/typescript/core/openapi-codegen-typescript/target/typescriptFetch-openapi-generator.jar +0 -0
  9. package/schematics/typescript/core/schema.json +1 -1
  10. package/schematics/typescript/mock/schema.json +1 -1
  11. package/schematics/typescript/shell/index.d.ts.map +1 -1
  12. package/schematics/typescript/shell/index.js +3 -3
  13. package/schematics/typescript/shell/schema.json +1 -1
  14. package/schematics/typescript/shell/templates/base/package.json.template +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ama-sdk/schematics",
3
- "version": "9.5.0-alpha.9",
3
+ "version": "9.6.0-alpha.0",
4
4
  "description": "Swagger specification SDK Generator by schematics",
5
5
  "typings": "./src/public_api.d.ts",
6
6
  "scripts": {
@@ -36,7 +36,7 @@
36
36
  }
37
37
  },
38
38
  "peerDependencies": {
39
- "@ama-sdk/core": "^9.5.0-alpha.9",
39
+ "@ama-sdk/core": "^9.6.0-alpha.0",
40
40
  "@angular-devkit/core": "^16.0.5",
41
41
  "@angular-devkit/schematics": "^16.0.5",
42
42
  "@angular-devkit/schematics-cli": "^16.0.5",
@@ -46,7 +46,7 @@
46
46
  "dependencies": {
47
47
  "@angular-devkit/core": "~16.2.0",
48
48
  "@angular-devkit/schematics": "~16.2.0",
49
- "@o3r/dev-tools": "^9.5.0-alpha.9",
49
+ "@o3r/dev-tools": "^9.6.0-alpha.0",
50
50
  "js-yaml": "^4.1.0",
51
51
  "minimatch": "~9.0.3",
52
52
  "rxjs": "^7.8.1",
@@ -55,15 +55,15 @@
55
55
  "tslib": "^2.5.3"
56
56
  },
57
57
  "devDependencies": {
58
- "@ama-sdk/core": "^9.5.0-alpha.9",
58
+ "@ama-sdk/core": "^9.6.0-alpha.0",
59
59
  "@angular-devkit/schematics-cli": "~16.2.0",
60
60
  "@angular-eslint/eslint-plugin": "~16.2.0",
61
61
  "@angular/cli": "~16.2.0",
62
62
  "@nx/eslint-plugin": "~16.10.0",
63
63
  "@nx/jest": "~16.10.0",
64
- "@o3r/build-helpers": "^9.5.0-alpha.9",
65
- "@o3r/eslint-plugin": "^9.5.0-alpha.9",
66
- "@o3r/schematics": "^9.5.0-alpha.9",
64
+ "@o3r/build-helpers": "^9.6.0-alpha.0",
65
+ "@o3r/eslint-plugin": "^9.6.0-alpha.0",
66
+ "@o3r/schematics": "^9.6.0-alpha.0",
67
67
  "@openapitools/openapi-generator-cli": "~2.7.0",
68
68
  "@schematics/angular": "~16.2.0",
69
69
  "@types/jest": "~29.5.2",
@@ -79,7 +79,7 @@
79
79
  "eslint": "^8.42.0",
80
80
  "eslint-import-resolver-node": "^0.3.4",
81
81
  "eslint-plugin-jest": "~27.6.0",
82
- "eslint-plugin-jsdoc": "~46.8.0",
82
+ "eslint-plugin-jsdoc": "~46.9.0",
83
83
  "eslint-plugin-prefer-arrow": "~1.2.3",
84
84
  "eslint-plugin-unicorn": "^47.0.0",
85
85
  "isomorphic-fetch": "~3.0.0",
package/schematics/api-extension/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
3
  "$id": "NgGenerateApiExtensionSchematicsSchema",
4
4
  "title": "Generate Api Extension",
5
5
  "description": "ng generate api-extension",
package/schematics/java/client-core/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
3
  "$id": "NgGenerateJavaClientCoreSchematicsSchema",
4
4
  "title": "Generate Java Client",
5
5
  "description": "ng generate java-client-core",
package/schematics/ng-add/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
3
  "$id": "ngAddSchematicsSchema",
4
4
  "title": "Add Otter ama-sdk-schematics ",
5
5
  "description": "ngAdd Otter ama-sdk-schematics ",
@@ -12,7 +12,7 @@
12
12
  }
13
13
  }
14
14
  },
15
- "additionalProperties": false,
15
+ "additionalProperties": true,
16
16
  "required": [
17
17
  ]
18
18
  }
package/schematics/typescript/core/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
3
  "$id": "NgGenerateTypescriptSDKSchematicsSchema",
4
4
  "title": "Generate Typescript SDK",
5
5
  "description": "ng generate typescript-core",
package/schematics/typescript/mock/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
3
  "$id": "NgGenerateMockSchematicsSchema",
4
4
  "title": "Generate Mock",
5
5
  "description": "ng generate mock",
package/schematics/typescript/shell/index.d.ts.map CHANGED
@@ -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;AAE3E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CAoFnG"}
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;AAE3E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CAqFnG"}
package/schematics/typescript/shell/index.js CHANGED
@@ -57,14 +57,15 @@ function ngGenerateTypescriptSDK(options) {
57
57
  engineVersions,
58
58
  empty: ''
59
59
  };
60
+ const targetPath = options.directory || tree.root.path;
60
61
  if (properties.packageManager === 'yarn') {
61
- const yarnrcPath = '.yarnrc.yml';
62
+ const yarnrcPath = node_path_1.posix.join(targetPath, '.yarnrc.yml');
62
63
  const yarnrc = ((0, js_yaml_1.load)(tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '') || {});
63
64
  yarnrc.nodeLinker ||= 'pnp';
64
65
  yarnrc.packageExtensions ||= {};
65
66
  yarnrc.packageExtensions['@ama-sdk/schematics@*'] = {
66
67
  dependencies: {
67
- 'isomorphic-fetch': '~2.2.1'
68
+ 'isomorphic-fetch': amaSdkSchematicsPackageJson.devDependencies['isomorphic-fetch']
68
69
  }
69
70
  };
70
71
  if (tree.exists(yarnrcPath)) {
@@ -74,7 +75,6 @@ function ngGenerateTypescriptSDK(options) {
74
75
  tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
75
76
  }
76
77
  }
77
- const targetPath = options.directory || tree.root.path;
78
78
  const baseRule = (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates/base'), [
79
79
  (0, schematics_1.template)(properties),
80
80
  (0, schematics_1.move)(targetPath),
package/schematics/typescript/shell/schema.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "$schema": "http://json-schema.org/schema",
2
+ "$schema": "http://json-schema.org/draft-07/schema",
3
3
  "$id": "NgGenerateTypescriptSDKSchematicsSchema",
4
4
  "title": "Generate Typescript SDK",
5
5
  "description": "ng generate typescript-shell",
package/schematics/typescript/shell/templates/base/package.json.template CHANGED
@@ -39,8 +39,8 @@
39
39
  "build:esm2020": "tsc -b tsconfigs/esm2020",
40
40
  "set:version": "set-version --placeholder 0.0.0-placeholder",
41
41
  "resolve": "node -e 'process.stdout.write(require.resolve(process.argv[1]));'",
42
- "generate": "schematics @ama-sdk/schematics:typescript-core --spec-path ./swagger-spec.yaml",
43
- "spec:regen": "<%=packageManager%> run generate && <%=packageManager%> run clear-index",
42
+ "generate": "schematics @ama-sdk/schematics:typescript-core",
43
+ "spec:regen": "<%=packageManager%> run generate <% if (packageManager === 'npm') {%>-- <%}%>--spec-path ./swagger-spec.yaml && <%=packageManager%> run clear-index",
44
44
  "clear-index": "node scripts/clear-index.js",
45
45
  "files:pack": "node scripts/files-pack.js",
46
46
  "test": "jest --passWithNoTests",