@ama-sdk/schematics 10.0.0-prerelease.3 → 10.0.0-prerelease.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "10.0.0-prerelease.3",
+  "version": "10.0.0-prerelease.30",
   "description": "Swagger specification SDK Generator by schematics",
   "typings": "./src/public_api.d.ts",
   "scripts": {
@@ -34,6 +34,9 @@
     "@angular-devkit/schematics-cli": {
       "optional": true
     },
+    "@angular/cli": {
+      "optional": true
+    },
     "@angular/compiler": {
       "optional": true
     },
@@ -42,11 +45,13 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^10.0.0-prerelease.3",
+    "@ama-sdk/core": "^10.0.0-prerelease.30",
     "@angular-devkit/core": "~17.0.0",
     "@angular-devkit/schematics": "~17.0.0",
     "@angular-devkit/schematics-cli": "^17.0.1",
-    "@openapitools/openapi-generator-cli": "~2.7.0",
+    "@angular/cli": "^17.0.1",
+    "@o3r/schematics": "^10.0.0-prerelease.30",
+    "@openapitools/openapi-generator-cli": "~2.9.0",
     "@schematics/angular": "~17.0.0"
   },
   "dependencies": {
@@ -60,16 +65,16 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^10.0.0-prerelease.3",
+    "@ama-sdk/core": "^10.0.0-prerelease.30",
     "@angular-devkit/schematics-cli": "~17.0.3",
     "@angular-eslint/eslint-plugin": "~17.2.0",
     "@angular/cli": "~17.0.3",
     "@nx/eslint-plugin": "~17.2.0",
     "@nx/jest": "~17.2.0",
-    "@o3r/build-helpers": "^10.0.0-prerelease.3",
-    "@o3r/eslint-plugin": "^10.0.0-prerelease.3",
-    "@o3r/schematics": "^10.0.0-prerelease.3",
-    "@openapitools/openapi-generator-cli": "~2.7.0",
+    "@o3r/build-helpers": "^10.0.0-prerelease.30",
+    "@o3r/eslint-plugin": "^10.0.0-prerelease.30",
+    "@o3r/schematics": "^10.0.0-prerelease.30",
+    "@openapitools/openapi-generator-cli": "~2.9.0",
     "@schematics/angular": "~17.0.3",
     "@types/jest": "~29.5.2",
     "@types/js-yaml": "^4.0.5",
@@ -100,6 +105,7 @@
     "pid-from-port": "^1.1.3",
     "semver": "^7.5.2",
     "ts-jest": "~29.1.1",
+    "ts-node": "~10.9.1",
     "type-fest": "^4.3.1",
     "typescript": "~5.2.2"
   },

package/schematics/api-extension/index.d.ts

@@ -4,5 +4,5 @@ import { NgGenerateApiExtensionSchematicsSchema } from './schema';
  * Generate a Extension of a API core definition
  * @param options
  */
-export declare function ngGenerateApiExtension(options: NgGenerateApiExtensionSchematicsSchema): Rule;
+export declare const ngGenerateApiExtension: (opts: NgGenerateApiExtensionSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/api-extension/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/api-extension/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAGL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,sCAAsC,EAAE,MAAM,UAAU,CAAC;AAElE;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,sCAAsC,GAAG,IAAI,CAW5F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/api-extension/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,sCAAsC,EAAE,MAAM,UAAU,CAAC;AAmBlE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,wDAAkE,CAAC"}

package/schematics/api-extension/index.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateApiExtension = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Generate a Extension of a API core definition
  * @param options
  */
-function ngGenerateApiExtension(options) {
+function ngGenerateApiExtensionFn(options) {
     return (tree) => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
         (0, schematics_1.template)({
             ...options,
@@ -16,5 +17,9 @@ function ngGenerateApiExtension(options) {
         (0, schematics_1.renameTemplateFiles)()
     ]), schematics_1.MergeStrategy.Overwrite);
 }
-exports.ngGenerateApiExtension = ngGenerateApiExtension;
+/**
+ * Generate a Extension of a API core definition
+ * @param options
+ */
+exports.ngGenerateApiExtension = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngGenerateApiExtensionFn);
 //# sourceMappingURL=index.js.map

package/schematics/java/client-core/index.d.ts

@@ -4,5 +4,5 @@ import { NgGenerateJavaClientCoreSchematicsSchema } from './schema';
  * Generate a Java client SDK source code base on swagger specification
  * @param options
  */
-export declare function ngGenerateJavaClientCore(options: NgGenerateJavaClientCoreSchematicsSchema): Rule;
+export declare const ngGenerateJavaClientCore: (opts: NgGenerateJavaClientCoreSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/java/client-core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/java/client-core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EAEC,MAAM,4BAA4B,CAAC;AAI1C,OAAO,EAAE,wCAAwC,EAAE,MAAM,UAAU,CAAC;AAMpE;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,wCAAwC,GAAG,IAAI,CAmEhG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/java/client-core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAAE,wCAAwC,EAAE,MAAM,UAAU,CAAC;AAgFpE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,0DAAoE,CAAC"}

package/schematics/java/client-core/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateJavaClientCore = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const node_fs_1 = require("node:fs");
 const path = require("node:path");
 const tree_glob_1 = require("../../helpers/tree-glob");
@@ -12,7 +13,7 @@ const jarBasePath = path.resolve(__dirname, 'swagger-codegen-java-client', 'targ
  * Generate a Java client SDK source code base on swagger specification
  * @param options
  */
-function ngGenerateJavaClientCore(options) {
+function ngGenerateJavaClientCoreFn(options) {
     const specPath = path.resolve(process.cwd(), options.specPath);
     /**
      * rule to clear previous SDK generation
@@ -73,5 +74,9 @@ function ngGenerateJavaClientCore(options) {
         })
     ]);
 }
-exports.ngGenerateJavaClientCore = ngGenerateJavaClientCore;
+/**
+ * Generate a Java client SDK source code base on swagger specification
+ * @param options
+ */
+exports.ngGenerateJavaClientCore = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngGenerateJavaClientCoreFn);
 //# sourceMappingURL=index.js.map

package/schematics/ng-add/index.d.ts

@@ -7,7 +7,6 @@ import { Rule } from '@angular-devkit/schematics';
 export declare const updatePackageJsonScripts: Rule;
 /**
  * Add Otter ama-sdk-schematics to a Project
- * @param options
  */
-export declare function ngAdd(): Rule;
+export declare const ngAdd: (opts: unknown) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAYpG;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAkDtC,CAAC;AA2FF;;;GAGG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAW5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAapG;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAkDtC,CAAC;AA2GF;;GAEG;AACH,eAAO,MAAM,KAAK,yBAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = exports.updatePackageJsonScripts = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const path = require("node:path");
 const node_fs_1 = require("node:fs");
 const rxjs_1 = require("rxjs");
@@ -138,9 +139,8 @@ const registerPackageSchematics = async (tree, context) => {
 };
 /**
  * Add Otter ama-sdk-schematics to a Project
- * @param options
  */
-function ngAdd() {
+function ngAddFn() {
     return (tree, context) => (0, schematics_1.chain)([
         registerPackageSchematics,
         exports.updatePackageJsonScripts,
@@ -151,5 +151,8 @@ function ngAdd() {
         }
     ])(tree, context);
 }
-exports.ngAdd = ngAdd;
+/**
+ * Add Otter ama-sdk-schematics to a Project
+ */
+exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
 //# sourceMappingURL=index.js.map

package/schematics/typescript/core/index.d.ts

@@ -4,5 +4,5 @@ import { NgGenerateTypescriptSDKCoreSchematicsSchema } from './schema';
  * Generate a typescript SDK source code base on swagger specification
  * @param options
  */
-export declare function ngGenerateTypescriptSDK(options: NgGenerateTypescriptSDKCoreSchematicsSchema): Rule;
+export declare const ngGenerateTypescriptSDK: (opts: NgGenerateTypescriptSDKCoreSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAgBvE;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,2CAA2C,GAAG,IAAI,CA8GlG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAoIvE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,6DAAmE,CAAC"}

package/schematics/typescript/core/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateTypescriptSDK = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const node_fs_1 = require("node:fs");
 const path = require("node:path");
 const semver = require("semver");
@@ -21,7 +22,7 @@ const getPathObjectTemplate = (pathObj) => {
  * Generate a typescript SDK source code base on swagger specification
  * @param options
  */
-function ngGenerateTypescriptSDK(options) {
+function ngGenerateTypescriptSDKFn(options) {
     const specPath = path.resolve(process.cwd(), options.specPath);
     const targetPath = options.directory || '';
     const globalProperty = options.globalProperty;
@@ -123,5 +124,9 @@ function ngGenerateTypescriptSDK(options) {
         runGeneratorRule
     ]);
 }
-exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
+/**
+ * Generate a typescript SDK source code base on swagger specification
+ * @param options
+ */
+exports.ngGenerateTypescriptSDK = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngGenerateTypescriptSDKFn);
 //# sourceMappingURL=index.js.map

package/schematics/typescript/mock/index.d.ts

@@ -9,5 +9,5 @@ export declare function getDasherizeModelName(modelName: string): string;
  * Add mock
  * @param options
  */
-export declare function ngGenerateMock(options: NgGenerateMockSchematicsSchema): Rule;
+export declare const ngGenerateMock: (opts: NgGenerateMockSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/mock/index.ts"],"names":[],"mappings":"AACA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAC,8BAA8B,EAAC,MAAM,UAAU,CAAC;AA+BxD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,8BAA8B,GAAG,IAAI,CAwC5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/mock/index.ts"],"names":[],"mappings":"AACA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAC,8BAA8B,EAAC,MAAM,UAAU,CAAC;AA+BxD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE/D;AAgDD;;;GAGG;AACH,eAAO,MAAM,cAAc,gDAA0D,CAAC"}

package/schematics/typescript/mock/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateMock = exports.getDasherizeModelName = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const path = require("node:path");
 /**
  * @param singular
@@ -43,7 +44,7 @@ exports.getDasherizeModelName = getDasherizeModelName;
  * Add mock
  * @param options
  */
-function ngGenerateMock(options) {
+function ngGenerateMockFn(options) {
     const dasherizeModelName = getDasherizeModelName(options.apiModel);
     const generateRootBarrel = (tree) => {
         let currentComponentIndex = '';
@@ -78,5 +79,9 @@ function ngGenerateMock(options) {
     ];
     return (0, schematics_1.chain)(rules);
 }
-exports.ngGenerateMock = ngGenerateMock;
+/**
+ * Add mock
+ * @param options
+ */
+exports.ngGenerateMock = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngGenerateMockFn);
 //# sourceMappingURL=index.js.map

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

@@ -1,7 +1,8 @@
 import { Rule } from '@angular-devkit/schematics';
 import type { NgGenerateTypescriptSDKShellSchematicsSchema } from './schema';
 /**
+ * Generate Typescript SDK shell
  * @param options
  */
-export declare function ngGenerateTypescriptSDK(options: NgGenerateTypescriptSDKShellSchematicsSchema): Rule;
+export declare const ngGenerateTypescriptSDK: (opts: NgGenerateTypescriptSDKShellSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

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;AAKpC,OAAO,KAAK,EAAC,4CAA4C,EAAC,MAAM,UAAU,CAAC;AAE3E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CAwFnG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EAAC,4CAA4C,EAAC,MAAM,UAAU,CAAC;AAiG3E;;;GAGG;AACH,eAAO,MAAM,uBAAuB,8DAAmE,CAAC"}

package/schematics/typescript/shell/index.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateTypescriptSDK = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const js_yaml_1 = require("js-yaml");
 const node_path_1 = require("node:path");
 const node_install_1 = require("../../helpers/node-install");
 const read_package_1 = require("../../helpers/read-package");
 /**
+ * Generate Typescript SDK shell
  * @param options
  */
-function ngGenerateTypescriptSDK(options) {
+function ngGenerateTypescriptSDKFn(options) {
     const installRule = (_tree, context) => {
         const workingDirectory = options.directory ? ((0, node_path_1.isAbsolute)(options.directory) ? (0, node_path_1.relative)(process.cwd(), options.directory) : options.directory) : '.';
         const installTask = new node_install_1.NpmInstall({ workingDirectory, packageManager: options.packageManager, allowScripts: false });
@@ -36,7 +38,8 @@ function ngGenerateTypescriptSDK(options) {
             'ts-jest': amaSdkSchematicsPackageJson.devDependencies['ts-jest'],
             'globby': amaSdkSchematicsPackageJson.devDependencies.globby,
             'typescript': amaSdkSchematicsPackageJson.devDependencies.typescript,
-            '@openapitools/openapi-generator-cli': amaSdkSchematicsPackageJson.devDependencies['@openapitools/openapi-generator-cli']
+            '@openapitools/openapi-generator-cli': amaSdkSchematicsPackageJson.devDependencies['@openapitools/openapi-generator-cli'],
+            'rxjs': amaSdkSchematicsPackageJson.dependencies.rxjs
         };
         const openApiSupportedVersion = typeof amaSdkSchematicsPackageJson.openApiSupportedVersion === 'string' &&
             amaSdkSchematicsPackageJson.openApiSupportedVersion.replace(/\^|~/, '');
@@ -90,5 +93,9 @@ function ngGenerateTypescriptSDK(options) {
         ...(options.skipInstall ? [] : [installRule])
     ]);
 }
-exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
+/**
+ * Generate Typescript SDK shell
+ * @param options
+ */
+exports.ngGenerateTypescriptSDK = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngGenerateTypescriptSDKFn);
 //# sourceMappingURL=index.js.map

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

@@ -30,8 +30,8 @@
   },
   "scripts": {
     "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",
+    "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 \"<%=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",
@@ -71,6 +71,7 @@
     "@angular-eslint/eslint-plugin-template": "<%= angularEslintVersion %>",
     "@angular-eslint/utils": "<%= angularEslintVersion %>",
     "@angular/compiler": "<%= angularVersion %>",
+    "@angular/cli": "<%= angularVersion %>",
     "@commitlint/cli": "^17.0.0",
     "@schematics/angular": "<%= angularVersion %>",
     "@commitlint/config-conventional": "^17.0.0",
@@ -102,6 +103,7 @@
     "lint-staged": "^13.0.0",
     "minimist": "^1.2.6",
     "rimraf": "^5.0.1",
+    "rxjs": "<%= versions['rxjs'] %>",
     "standard-version": "^9.0.0",
     "ts-jest": "<%= versions['ts-jest'] %>",
     "typedoc": "~0.25.0",