@ama-sdk/schematics 9.1.0-alpha.30 → 9.1.0-alpha.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "9.1.0-alpha.30",
+  "version": "9.1.0-alpha.34",
   "description": "Swagger specification SDK Generator by schematics",
   "scripts": {
     "nx": "nx",
@@ -38,7 +38,7 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^9.1.0-alpha.30",
+    "@ama-sdk/core": "^9.1.0-alpha.34",
     "@angular-devkit/core": "^16.0.5",
     "@angular-devkit/schematics": "^16.0.5",
     "@angular-devkit/schematics-cli": "^16.0.5",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
-    "@o3r/dev-tools": "^9.1.0-alpha.30",
+    "@o3r/dev-tools": "^9.1.0-alpha.34",
     "js-yaml": "^4.1.0",
     "minimatch": "^9.0.0",
     "rxjs": "^7.8.1",
@@ -57,14 +57,14 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^9.1.0-alpha.30",
+    "@ama-sdk/core": "^9.1.0-alpha.34",
     "@angular-devkit/schematics-cli": "~16.0.5",
     "@angular-eslint/eslint-plugin": "~16.0.3",
     "@angular/cli": "~16.0.5",
     "@nx/jest": "~16.5.0",
-    "@o3r/build-helpers": "^9.1.0-alpha.30",
-    "@o3r/eslint-plugin": "^9.1.0-alpha.30",
-    "@o3r/schematics": "^9.1.0-alpha.30",
+    "@o3r/build-helpers": "^9.1.0-alpha.34",
+    "@o3r/eslint-plugin": "^9.1.0-alpha.34",
+    "@o3r/schematics": "^9.1.0-alpha.34",
     "@openapitools/openapi-generator-cli": "~2.7.0",
     "@schematics/angular": "~16.0.5",
     "@types/jest": "~29.5.2",

package/schematics/typescript/core/index.js

@@ -24,7 +24,7 @@ const getPathObjectTemplate = (pathObj) => {
  */
 function ngGenerateTypescriptSDK(options) {
     const specPath = path.resolve(process.cwd(), options.specPath);
-    const targetPath = options.directory || '/';
+    const targetPath = options.directory || '';
     const globalProperty = options.globalProperty;
     const generateOperationFinder = async () => {
         const swayOptions = {
@@ -51,10 +51,10 @@ function ngGenerateTypescriptSDK(options) {
      * @param _context
      */
     const clearGeneratedCode = (tree, _context) => {
-        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
-        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
-        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'models', 'base', '**', '!(index).ts')).forEach((file) => tree.delete(file));
-        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'spec', '!(operation-adapter|index).ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.posix.join(targetPath, 'src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.posix.join(targetPath, 'src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.posix.join(targetPath, 'src', 'models', 'base', '**', '!(index).ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.posix.join(targetPath, 'src', 'spec', '!(operation-adapter|index).ts')).forEach((file) => tree.delete(file));
         return tree;
     };
     /**

package/schematics/typescript/shell/index.d.ts.map

@@ -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;AAGpC,OAAO,KAAK,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAI7E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CAiFnG"}
+{"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"}

package/schematics/typescript/shell/index.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateTypescriptSDK = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const js_yaml_1 = require("js-yaml");
-const read_package_1 = require("../../helpers/read-package");
 const node_path_1 = require("node:path");
 const node_install_1 = require("../../helpers/node-install");
+const read_package_1 = require("../../helpers/read-package");
 /**
  * @param options
  */
@@ -47,6 +47,7 @@ function ngGenerateTypescriptSDK(options) {
             projectName: options.name,
             projectPackageName: options.package,
             projectDescription: options.description,
+            packageManager: (0, node_install_1.getPackageManagerName)(options.packageManager),
             projectHosting: options.hosting,
             sdkCoreVersion: amaSdkSchematicsPackageJson.version,
             angularVersion: amaSdkSchematicsPackageJson.dependencies['@angular-devkit/core'],
@@ -56,20 +57,22 @@ function ngGenerateTypescriptSDK(options) {
             engineVersions,
             empty: ''
         };
-        const yarnrcPath = '.yarnrc.yml';
-        const yarnrc = ((0, js_yaml_1.load)(tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '') || {});
-        yarnrc.nodeLinker ||= 'pnp';
-        yarnrc.packageExtensions ||= {};
-        yarnrc.packageExtensions['@ama-sdk/schematics@*'] = {
-            dependencies: {
-                'isomorphic-fetch': '~2.2.1'
+        if (properties.packageManager === 'yarn') {
+            const yarnrcPath = '.yarnrc.yml';
+            const yarnrc = ((0, js_yaml_1.load)(tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '') || {});
+            yarnrc.nodeLinker ||= 'pnp';
+            yarnrc.packageExtensions ||= {};
+            yarnrc.packageExtensions['@ama-sdk/schematics@*'] = {
+                dependencies: {
+                    'isomorphic-fetch': '~2.2.1'
+                }
+            };
+            if (tree.exists(yarnrcPath)) {
+                tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
+            }
+            else {
+                tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
             }
-        };
-        if (tree.exists(yarnrcPath)) {
-            tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
-        }
-        else {
-            tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
         }
         const targetPath = options.directory || tree.root.path;
         const baseRule = (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates/base'), [

package/schematics/typescript/shell/schema.json

@@ -36,7 +36,7 @@
         "yarn"
       ],
       "description": "Package manager to be used in the generated SDK",
-      "default": ""
+      "x-prompt": "Packaged manager used in the generated SDK ?"
     }
   },
   "additionalProperties": true,

package/schematics/typescript/shell/templates/base/.gitignore.template

@@ -6,9 +6,6 @@
 /generated-*
 /build
 
-# Local configurations
-.custom.yo-rc.json
-
 # Open API
 .openapi-generator
 
@@ -38,6 +35,7 @@
 .history
 .ionide
 
+<% if (packageManager === 'yarn') { %>
 # Support for Project snippet scope
 
 ### yarn ###
@@ -56,10 +54,8 @@
 
 # and uncomment the following lines
 .pnp.*
-
-### Yeoman ###
+<% } %>
 node_modules/
-bower_components/
 *.log
 
 build/

package/schematics/typescript/shell/templates/base/.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn commitlint --edit $1
+<%=packageManager%> exec commitlint --edit $1

package/schematics/typescript/shell/templates/base/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint-staged
+<%=packageManager%> exec lint-staged

package/schematics/typescript/shell/templates/base/.renovaterc.json

@@ -26,7 +26,7 @@
   ],
   "updateInternalDeps": true,
   "postUpdateOptions": [
-    "yarnDedupeHighest"
+    <% if (packageManager === 'yarn') { %>"yarnDedupeHighest",<% } %>
   ],
   "rangeStrategy": "replace",
   "automerge": true,
@@ -39,8 +39,8 @@
       ],
       "postUpgradeTasks": {
         "commands": [
-          "yarn install",
-          "yarn run swagger:generate"
+          "<%=packageManager%> install",
+          "<%=packageManager%> run generate"
         ],
         "executionMode": "branch"
       }

package/schematics/typescript/shell/templates/base/.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "typescript.preferences.importModuleSpecifier": "relative",
   "typescript.preferences.quoteStyle": "single",
-  "jest.jestCommandLine": "yarn jest",
+  "jest.jestCommandLine": "<%=packageManager%> exec jest",
   "jest.autoRun": {
     "watch": false,
     "onSave": "test-file"
@@ -9,8 +9,10 @@
   "files.readonlyFromPermissions": true,
   "files.readonlyInclude": {
     "**/.cache/**": true,
+    <% if (packageManager === 'yarn') { %>
     "**/.pnp.*": true,
     "**/.yarn/**": true,
+    <% } %>
     "**/node_modules/**": true,
     "src/base/*/*.ts": true
   },

package/schematics/typescript/shell/templates/base/package.json.template

@@ -32,15 +32,15 @@
     "clean": "rimraf test/ test-dev/ dist/ dist-dev/ dist-test/ build/",
     "lint:ci": "eslint '**/*[jt]s' --quiet --format junit --output-file ./dist-lint/result.xml",
     "lint": "eslint '**/*[jt]s' --cache",
-    "start": "tsc-watch -b tsconfigs/esm2020 --noClear --onFirstSuccess \"yarn files:pack --watch\"",
-    "build": "yarn build:cjs && yarn build:esm2015 && yarn build:esm2020 && yarn files:pack",
+    "start": "tsc-watch -b tsconfigs/esm2020 --noClear --onFirstSuccess \"<%=packageManager%> run files:pack --watch\"",
+    "build": "<%=packageManager%> run build:cjs && <%=packageManager%> run build:esm2015 && <%=packageManager%> run build:esm2020 && <%=packageManager%> run files:pack",
     "build:cjs": "swc src -d dist/cjs -C module.type=commonjs -q",
     "build:esm2015": "swc src -d dist/esm2015 -C module.type=es6 -q",
     "build:esm2020": "tsc -b tsconfigs/esm2020",
     "set:version": "set-version --placeholder 0.0.0",
     "resolve": "node -e 'process.stdout.write(require.resolve(process.argv[1]));'",
     "generate": "schematics @ama-sdk/schematics:typescript-core --spec-path ./swagger-spec.yaml",
-    "spec:regen": "schematics @ama-sdk/schematics:typescript-core --spec-path ./swagger-spec.yaml && yarn clear-index",
+    "spec:regen": "<%=packageManager%> run generate && <%=packageManager%> exec clear-index",
     "clear-index": "node scripts/clear-index.js",
     "files:pack": "node scripts/files-pack.js",
     "test": "jest --passWithNoTests",
@@ -52,7 +52,7 @@
   },
   "lint-staged": {
     "**/*.(js|ts)": [
-      "yarn eslint --quiet --fix --global fast"
+      "<%=packageManager%> exec eslint --quiet --fix --global fast"
     ]
   },
   "dependencies": {
@@ -115,6 +115,5 @@
     "node": "<%= engineVersions['node'] %>",
     "npm": "<%= engineVersions['npm'] %>",
     "yarn": "<%= engineVersions['yarn'] %>"
-  },
-  "packageManager": "yarn@3.6.1"
+  }
 }

package/schematics/typescript/shell/templates/base/readme.md

@@ -22,6 +22,7 @@ The Code can be regenerated by running the following command:
 ```shell
 yarn schematics @ama-sdk/sdk:typescript-core --spec-path [path to your swagger file]
 ```
+Note that you can use ```npm exec``` instead of ```yarn``` for every command specified in this documentation.
 
 ***
 

package/schematics/typescript/shell/templates/base/src/api/fixtures.jest.ts

@@ -0,0 +1,2 @@
+// This contains testing helpers for api endpoints, will be filled when the sdk is generated from a spec.
+export type { };

package/schematics/typescript/shell/templates/base/src/api/index.ts

@@ -0,0 +1 @@
+export type { };

package/schematics/typescript/shell/templates/base/src/models/base/enums.ts

@@ -0,0 +1,2 @@
+// This contains enums from the spec, will be filled when the sdk is generated.
+export { };

package/schematics/typescript/shell/templates/base/src/models/base/index.ts

@@ -0,0 +1 @@
+export type { };

package/schematics/typescript/shell/templates/base/src/models/base/patterns.ts

@@ -0,0 +1,2 @@
+// This contains patterns from the spec, will be filled when the sdk is generated.
+export { };

package/schematics/typescript/shell/templates/base/src/spec/api-mock.ts

@@ -0,0 +1,2 @@
+// This contains testing helpers for api endpoints, will be filled when the sdk is generated from a spec.
+export { };