@ama-sdk/core 11.0.0-prerelease.3 → 11.0.0-prerelease.6

package/cjs/fwk/core/base-api-constructor.js

@@ -8,6 +8,10 @@ Object.defineProperty(exports, "isConstructorObject", {
         return isConstructorObject;
     }
 });
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function isConstructorObject(args) {
-    return !!args && args.length === 1 && !!args[0] && typeof args[0] === 'object';
+    return !!args && args.length === 1 && !!args[0] && _type_of(args[0]) === 'object';
 }

package/cjs/plugins/abort/abort.fetch.js

@@ -40,8 +40,12 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var isPromise = function(result) {
-    if (typeof result !== 'object') {
+    if ((typeof result === "undefined" ? "undefined" : _type_of(result)) !== 'object') {
         return false;
     }
     return true;

package/cjs/utils/generators.js

@@ -0,0 +1,25 @@
+// TODO: Change to `openapi` in v11 (ref: #1745)
+/** Name of the specification file copied locally (without extension) */ "use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    LOCAL_SPEC_FILENAME: function() {
+        return LOCAL_SPEC_FILENAME;
+    },
+    SPEC_JSON_EXTENSION: function() {
+        return SPEC_JSON_EXTENSION;
+    },
+    SPEC_YAML_EXTENSION: function() {
+        return SPEC_YAML_EXTENSION;
+    }
+});
+var LOCAL_SPEC_FILENAME = 'swagger-spec';
+var SPEC_YAML_EXTENSION = 'yaml';
+var SPEC_JSON_EXTENSION = 'yaml';

package/cjs/utils/index.js

@@ -8,6 +8,7 @@ _export_star(require("./ie11"), exports);
 _export_star(require("./json-token"), exports);
 _export_star(require("./mime-types"), exports);
 _export_star(require("./generic-api"), exports);
+_export_star(require("./generators"), exports);
 function _export_star(from, to) {
     Object.keys(from).forEach(function(k) {
         if (k !== "default" && !Object.prototype.hasOwnProperty.call(to, k)) {

package/cli/update-spec-from-npm.cjs

@@ -9,13 +9,16 @@ const node_fs_1 = require("node:fs");
 const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const promises_1 = require("node:fs/promises");
+const core_1 = require("@ama-sdk/core");
 const argv = minimist(process.argv.slice(2));
 const packageName = argv._[0];
 const { help, output, 'package-path': packagePath, quiet } = argv;
 const openApiConfigDefaultPath = './openapitools.json';
-const supportedExtensions = ['json', 'yaml', 'yml'];
 const noop = () => undefined;
 const logger = quiet ? { error: noop, warn: noop, log: noop, info: noop, debug: noop } : console;
+const SPEC_YML_EXTENSION = 'yml';
+const DEFAULT_SPEC_EXPORT_PATH_IN_NPM_MODULE = 'openapi';
+const supportedExtensions = [core_1.SPEC_JSON_EXTENSION, core_1.SPEC_YAML_EXTENSION, SPEC_YML_EXTENSION];
 if (help) {
     // eslint-disable-next-line no-console
     console.log(`This script can be used to update your local spec file from a given locally installed npm package.
@@ -23,7 +26,7 @@ if (help) {
 
     package-name      The full identifier of the npm package (e.g. @my-scope/my-package)
     --package-path    The relative path inside the npm package where to find the spec file (default: './openapi.yml')
-    --output          The path where the spec file should be copied (default: './openapi.yml')
+    --output          The path where the spec file should be copied (default: './${core_1.LOCAL_SPEC_FILENAME}.${core_1.SPEC_YAML_EXTENSION}')
     --quiet           Don't log anything
   `);
     process.exit(0);
@@ -34,14 +37,14 @@ if (!packageName) {
 }
 void (async () => {
     let specSourcePath;
-    const appRequire = (0, node_module_1.createRequire)((0, node_path_1.join)(process.cwd(), 'package.json'));
+    const appRequire = (0, node_module_1.createRequire)(node_path_1.posix.join(process.cwd(), 'package.json'));
     const packageJsonPath = appRequire.resolve(`${packageName}/package.json`);
     if (!packagePath) {
         const packageJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
-        const exportMatcher = new RegExp(`openapi\\.(?:${supportedExtensions.join('|')})$`);
+        const exportMatcher = new RegExp(`^\\./${DEFAULT_SPEC_EXPORT_PATH_IN_NPM_MODULE}\\.(?:${supportedExtensions.join('|')})$`);
         const matchingExport = packageJson.exports && Object.keys(packageJson.exports).find((exportPath) => exportMatcher.test(exportPath));
         if (matchingExport) {
-            specSourcePath = appRequire.resolve(`${packageName}/${matchingExport}`);
+            specSourcePath = appRequire.resolve(node_path_1.posix.join(packageName, matchingExport));
         }
     }
     else {
@@ -53,8 +56,11 @@ void (async () => {
     }
     let specDestinationPath = output;
     if (!specDestinationPath) {
-        const specSourceExtension = (0, node_path_1.extname)(specSourcePath);
-        specDestinationPath = `./openapi${specSourceExtension}`;
+        let specSourceExtension = (0, node_path_1.extname)(specSourcePath);
+        if (specSourceExtension === `.${SPEC_YML_EXTENSION}`) {
+            specSourceExtension = `.${core_1.SPEC_YAML_EXTENSION}`;
+        }
+        specDestinationPath = `./${core_1.LOCAL_SPEC_FILENAME}${specSourceExtension}`;
         if ((0, node_fs_1.existsSync)(openApiConfigDefaultPath)) {
             const openApiConfig = JSON.parse(await (0, promises_1.readFile)(openApiConfigDefaultPath, { encoding: 'utf8' }));
             const generators = Object.values(openApiConfig['generator-cli']?.generators ?? {});

package/esm2015/fwk/core/base-api-constructor.js

@@ -1,6 +1,10 @@
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 /**
  * Determine if object passed to the constructor is valid
  * @param args
  */ export function isConstructorObject(args) {
-    return !!args && args.length === 1 && !!args[0] && typeof args[0] === 'object';
+    return !!args && args.length === 1 && !!args[0] && _type_of(args[0]) === 'object';
 }

package/esm2015/plugins/abort/abort.fetch.js

@@ -30,8 +30,12 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 var isPromise = function(result) {
-    if (typeof result !== 'object') {
+    if ((typeof result === "undefined" ? "undefined" : _type_of(result)) !== 'object') {
         return false;
     }
     return true;

package/esm2015/utils/generators.js

@@ -0,0 +1,5 @@
+// TODO: Change to `openapi` in v11 (ref: #1745)
+/** Name of the specification file copied locally (without extension) */ export var LOCAL_SPEC_FILENAME = 'swagger-spec';
+/** Extension of the Specification file in YAML format */ export var SPEC_YAML_EXTENSION = 'yaml';
+// TODO: Change to `json` in v11 (ref: #1745)
+/** Extension of the Specification file in JSON format */ export var SPEC_JSON_EXTENSION = 'yaml';

package/esm2015/utils/index.js

@@ -4,3 +4,4 @@ export * from './ie11';
 export * from './json-token';
 export * from './mime-types';
 export * from './generic-api';
+export * from './generators';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/core",
-  "version": "11.0.0-prerelease.3",
+  "version": "11.0.0-prerelease.6",
   "publishConfig": {
     "access": "public"
   },
@@ -72,7 +72,7 @@
     "prepare:publish": "prepare-publish ./dist"
   },
   "dependencies": {
-    "@swc/helpers": "^0.5.0",
+    "@swc/helpers": "~0.5.0",
     "tslib": "^2.6.2",
     "uuid": "^9.0.0"
   },
@@ -80,7 +80,7 @@
     "@angular-devkit/schematics": "~17.3.0",
     "@angular/cli": "~17.3.0",
     "@angular/common": "~17.3.0",
-    "@o3r/schematics": "^11.0.0-prerelease.3",
+    "@o3r/schematics": "^11.0.0-prerelease.6",
     "@schematics/angular": "~17.3.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
@@ -126,13 +126,13 @@
     "@angular/core": "~17.3.0",
     "@nx/eslint-plugin": "~18.3.0",
     "@nx/jest": "~18.3.0",
-    "@o3r/build-helpers": "^11.0.0-prerelease.3",
-    "@o3r/eslint-plugin": "^11.0.0-prerelease.3",
-    "@o3r/test-helpers": "^11.0.0-prerelease.3",
+    "@o3r/build-helpers": "^11.0.0-prerelease.6",
+    "@o3r/eslint-plugin": "^11.0.0-prerelease.6",
+    "@o3r/test-helpers": "^11.0.0-prerelease.6",
     "@schematics/angular": "~17.3.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
-    "@swc/cli": "^0.3.0",
-    "@swc/core": "1.5.7",
+    "@swc/cli": "~0.3.0",
+    "@swc/core": "~1.5.24",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/node": "^20.0.0",

package/src/utils/generators.d.ts

@@ -0,0 +1,7 @@
+/** Name of the specification file copied locally (without extension) */
+export declare const LOCAL_SPEC_FILENAME = "swagger-spec";
+/** Extension of the Specification file in YAML format */
+export declare const SPEC_YAML_EXTENSION = "yaml";
+/** Extension of the Specification file in JSON format */
+export declare const SPEC_JSON_EXTENSION = "yaml";
+//# sourceMappingURL=generators.d.ts.map

package/src/utils/generators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators.d.ts","sourceRoot":"","sources":["../../../src/utils/generators.ts"],"names":[],"mappings":"AACA,wEAAwE;AACxE,eAAO,MAAM,mBAAmB,iBAAiB,CAAC;AAElD,yDAAyD;AACzD,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAG1C,yDAAyD;AACzD,eAAO,MAAM,mBAAmB,SAAS,CAAC"}

package/src/utils/generators.js

@@ -0,0 +1,9 @@
+// TODO: Change to `openapi` in v11 (ref: #1745)
+/** Name of the specification file copied locally (without extension) */
+export const LOCAL_SPEC_FILENAME = 'swagger-spec';
+/** Extension of the Specification file in YAML format */
+export const SPEC_YAML_EXTENSION = 'yaml';
+// TODO: Change to `json` in v11 (ref: #1745)
+/** Extension of the Specification file in JSON format */
+export const SPEC_JSON_EXTENSION = 'yaml';
+//# sourceMappingURL=generators.js.map

package/src/utils/generators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../../src/utils/generators.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,wEAAwE;AACxE,MAAM,CAAC,MAAM,mBAAmB,GAAG,cAAc,CAAC;AAElD,yDAAyD;AACzD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAE1C,6CAA6C;AAC7C,yDAAyD;AACzD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC"}

package/src/utils/index.d.ts

@@ -4,4 +4,5 @@ export * from './ie11';
 export * from './json-token';
 export * from './mime-types';
 export * from './generic-api';
+export * from './generators';
 //# sourceMappingURL=index.d.ts.map

package/src/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}

package/src/utils/index.js

@@ -4,4 +4,5 @@ export * from './ie11';
 export * from './json-token';
 export * from './mime-types';
 export * from './generic-api';
+export * from './generators';
 //# sourceMappingURL=index.js.map

package/src/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}