@ama-sdk/client-beacon 12.3.0-prerelease.9 → 12.4.0-prerelease.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.
- package/cjs/api-beacon-client.js +2 -1
- package/esm2015/api-beacon-client.js +2 -1
- package/package.json +15 -15
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +11 -21
- package/src/api-beacon-client.d.ts +1 -1
- package/src/api-beacon-client.d.ts.map +1 -1
- package/src/api-beacon-client.js +2 -1
- package/src/api-beacon-client.js.map +1 -1
package/cjs/api-beacon-client.js
CHANGED
|
@@ -90,7 +90,8 @@ function _object_spread_props(target, source) {
|
|
|
90
90
|
var DEFAULT_OPTIONS = {
|
|
91
91
|
replyPlugins: [],
|
|
92
92
|
requestPlugins: [],
|
|
93
|
-
enableTokenization: false
|
|
93
|
+
enableTokenization: false,
|
|
94
|
+
enableParameterSerialization: false
|
|
94
95
|
};
|
|
95
96
|
/**
|
|
96
97
|
* Determine if the given value is a promise
|
|
@@ -80,7 +80,8 @@ import { extractQueryParams, filterUndefinedValues, getPropertiesFromData, prepa
|
|
|
80
80
|
var DEFAULT_OPTIONS = {
|
|
81
81
|
replyPlugins: [],
|
|
82
82
|
requestPlugins: [],
|
|
83
|
-
enableTokenization: false
|
|
83
|
+
enableTokenization: false,
|
|
84
|
+
enableParameterSerialization: false
|
|
84
85
|
};
|
|
85
86
|
/**
|
|
86
87
|
* Determine if the given value is a promise
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-sdk/client-beacon",
|
|
3
|
-
"version": "12.
|
|
3
|
+
"version": "12.4.0-prerelease.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,16 +38,17 @@
|
|
|
38
38
|
"build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
+
"@o3r/schematics": "^12.4.0-prerelease.0",
|
|
41
42
|
"@swc/helpers": "~0.5.0",
|
|
42
43
|
"tslib": "^2.6.2",
|
|
43
44
|
"uuid": "^11.0.5"
|
|
44
45
|
},
|
|
45
46
|
"peerDependencies": {
|
|
46
|
-
"@ama-sdk/core": "^12.
|
|
47
|
+
"@ama-sdk/core": "^12.4.0-prerelease.0",
|
|
47
48
|
"@angular-devkit/schematics": "^19.0.0",
|
|
48
49
|
"@angular/cli": "^19.0.0",
|
|
49
50
|
"@angular/common": "^19.0.0",
|
|
50
|
-
"@o3r/schematics": "^12.
|
|
51
|
+
"@o3r/schematics": "^12.4.0-prerelease.0",
|
|
51
52
|
"@schematics/angular": "^19.0.0",
|
|
52
53
|
"typescript": "^5.5.4"
|
|
53
54
|
},
|
|
@@ -72,30 +73,29 @@
|
|
|
72
73
|
}
|
|
73
74
|
},
|
|
74
75
|
"devDependencies": {
|
|
75
|
-
"@ama-sdk/core": "^12.
|
|
76
|
+
"@ama-sdk/core": "^12.4.0-prerelease.0",
|
|
76
77
|
"@angular-devkit/core": "~19.2.0",
|
|
77
78
|
"@angular-devkit/schematics": "~19.2.0",
|
|
78
79
|
"@angular/common": "~19.2.0",
|
|
79
80
|
"@angular/core": "~19.2.0",
|
|
80
81
|
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
|
|
81
|
-
"@nx/eslint-plugin": "~20.
|
|
82
|
-
"@nx/jest": "~20.
|
|
83
|
-
"@o3r/build-helpers": "^12.
|
|
84
|
-
"@o3r/eslint-plugin": "^12.
|
|
85
|
-
"@o3r/
|
|
86
|
-
"@o3r/test-helpers": "^12.3.0-prerelease.9",
|
|
82
|
+
"@nx/eslint-plugin": "~20.8.0",
|
|
83
|
+
"@nx/jest": "~20.8.0",
|
|
84
|
+
"@o3r/build-helpers": "^12.4.0-prerelease.0",
|
|
85
|
+
"@o3r/eslint-plugin": "^12.4.0-prerelease.0",
|
|
86
|
+
"@o3r/test-helpers": "^12.4.0-prerelease.0",
|
|
87
87
|
"@schematics/angular": "~19.2.0",
|
|
88
88
|
"@stylistic/eslint-plugin": "~3.1.0",
|
|
89
89
|
"@stylistic/eslint-plugin-ts": "~3.1.0",
|
|
90
|
-
"@swc/cli": "~0.
|
|
90
|
+
"@swc/cli": "~0.7.7",
|
|
91
91
|
"@swc/core": "~1.11.0",
|
|
92
92
|
"@types/jest": "~29.5.2",
|
|
93
93
|
"@types/node": "^20.0.0",
|
|
94
94
|
"@types/uuid": "^10.0.0",
|
|
95
|
-
"@typescript-eslint/parser": "~8.
|
|
96
|
-
"angular-eslint": "~19.
|
|
95
|
+
"@typescript-eslint/parser": "~8.32.0",
|
|
96
|
+
"angular-eslint": "~19.4.0",
|
|
97
97
|
"cpy-cli": "^5.0.0",
|
|
98
|
-
"eslint": "~9.
|
|
98
|
+
"eslint": "~9.26.0",
|
|
99
99
|
"eslint-import-resolver-node": "~0.3.9",
|
|
100
100
|
"eslint-import-resolver-typescript": "~3.10.0",
|
|
101
101
|
"eslint-plugin-import": "~2.31.0",
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
"ts-node": "~10.9.2",
|
|
118
118
|
"type-fest": "^4.30.1",
|
|
119
119
|
"typescript": "~5.8.2",
|
|
120
|
-
"typescript-eslint": "~8.
|
|
120
|
+
"typescript-eslint": "~8.32.0",
|
|
121
121
|
"zone.js": "~0.15.0"
|
|
122
122
|
},
|
|
123
123
|
"engines": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAmDlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -3,37 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
4
|
const path = require("node:path");
|
|
5
5
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
|
+
const schematics_2 = require("@o3r/schematics");
|
|
6
7
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
7
8
|
const import_map_1 = require("./migration/import-map");
|
|
8
9
|
const devDependenciesToInstall = [];
|
|
9
|
-
const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
10
|
-
logger.error(`[ERROR]: Adding @ama-sdk/client-beacon has failed.
|
|
11
|
-
If the error is related to missing @o3r dependencies you need to install '@o3r/schematics' as devDependency to be able to use this schematics. Please run 'ng add @o3r/schematics'.
|
|
12
|
-
Otherwise, use the error message as guidance.`);
|
|
13
|
-
throw reason;
|
|
14
|
-
};
|
|
15
10
|
/**
|
|
16
11
|
* Add SDk Beacon Client to an Otter Project
|
|
17
12
|
* @param options
|
|
18
13
|
*/
|
|
19
14
|
function ngAddFn(options) {
|
|
20
|
-
return
|
|
21
|
-
|
|
22
|
-
const { getPackageInstallConfig, applyEsLintFix, setupDependencies, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, getExternalDependenciesVersionRange, updateImports } = await Promise.resolve().then(() => require('@o3r/schematics'));
|
|
23
|
-
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
15
|
+
return (tree, context) => {
|
|
16
|
+
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
24
17
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
25
|
-
const depsInfo = getO3rPeerDeps(packageJsonPath);
|
|
18
|
+
const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
|
|
26
19
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
27
20
|
acc[dep] = {
|
|
28
21
|
inManifest: [{
|
|
29
22
|
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
30
|
-
types: getProjectNewDependenciesTypes(workspaceProject)
|
|
23
|
+
types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
|
|
31
24
|
}],
|
|
32
25
|
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
33
26
|
};
|
|
34
27
|
return acc;
|
|
35
|
-
}, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
36
|
-
Object.entries(getExternalDependenciesVersionRange(devDependenciesToInstall, packageJsonPath, context.logger))
|
|
28
|
+
}, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
29
|
+
Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
|
|
37
30
|
.forEach(([dep, range]) => {
|
|
38
31
|
dependencies[dep] = {
|
|
39
32
|
inManifest: [{
|
|
@@ -44,14 +37,14 @@ function ngAddFn(options) {
|
|
|
44
37
|
});
|
|
45
38
|
return (0, schematics_1.chain)([
|
|
46
39
|
// optional custom action dedicated to this module
|
|
47
|
-
options.skipLinter ? (0, schematics_1.noop)() : applyEsLintFix(),
|
|
40
|
+
options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
|
|
48
41
|
// add the missing Otter modules in the current project
|
|
49
|
-
setupDependencies({
|
|
42
|
+
(0, schematics_2.setupDependencies)({
|
|
50
43
|
projectName: options.projectName,
|
|
51
44
|
dependencies,
|
|
52
45
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
53
46
|
}),
|
|
54
|
-
updateImports(import_map_1.mapMigrationFromCoreImports)
|
|
47
|
+
(0, schematics_2.updateImports)(import_map_1.mapMigrationFromCoreImports)
|
|
55
48
|
]);
|
|
56
49
|
};
|
|
57
50
|
}
|
|
@@ -59,9 +52,6 @@ function ngAddFn(options) {
|
|
|
59
52
|
* Add SDk Beacon Client to an Otter Project
|
|
60
53
|
* @param options
|
|
61
54
|
*/
|
|
62
|
-
const ngAdd = (options) =>
|
|
63
|
-
const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
|
|
64
|
-
return createOtterSchematic(ngAddFn)(options);
|
|
65
|
-
};
|
|
55
|
+
const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
|
|
66
56
|
exports.ngAdd = ngAdd;
|
|
67
57
|
//# sourceMappingURL=index.js.map
|
|
@@ -56,7 +56,7 @@ export declare class ApiBeaconClient implements ApiClient {
|
|
|
56
56
|
[key: string]: string;
|
|
57
57
|
}): string;
|
|
58
58
|
/** @inheritdoc */
|
|
59
|
-
prepareUrlWithQueryParams(url: string, serializedQueryParams
|
|
59
|
+
prepareUrlWithQueryParams(url: string, serializedQueryParams?: {
|
|
60
60
|
[key: string]: string;
|
|
61
61
|
}): string;
|
|
62
62
|
/** @inheritdoc */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-beacon-client.d.ts","sourceRoot":"","sources":["../../src/api-beacon-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,QAAQ,EACR,oBAAoB,EACpB,kBAAkB,EAClB,aAAa,EACb,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAcvB,gCAAgC;AAChC,MAAM,WAAW,0BAA2B,SAAQ,oBAAoB;IACtE,kBAAkB;IAClB,YAAY,EAAE,KAAK,EAAE,CAAC;CACvB;AAED,8BAA8B;AAC9B,MAAM,WAAW,8BAA+B,SAAQ,aAAa,CAAC,IAAI,CAAC,0BAA0B,EAAE,cAAc,CAAC,EAAE,UAAU,CAAC;CAClI;
|
|
1
|
+
{"version":3,"file":"api-beacon-client.d.ts","sourceRoot":"","sources":["../../src/api-beacon-client.ts"],"names":[],"mappings":"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"}
|
package/src/api-beacon-client.js
CHANGED
|
@@ -2,7 +2,8 @@ import { extractQueryParams, filterUndefinedValues, getPropertiesFromData, prepa
|
|
|
2
2
|
const DEFAULT_OPTIONS = {
|
|
3
3
|
replyPlugins: [],
|
|
4
4
|
requestPlugins: [],
|
|
5
|
-
enableTokenization: false
|
|
5
|
+
enableTokenization: false,
|
|
6
|
+
enableParameterSerialization: false
|
|
6
7
|
};
|
|
7
8
|
/**
|
|
8
9
|
* Determine if the given value is a promise
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-beacon-client.js","sourceRoot":"","sources":["../../src/api-beacon-client.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,EACrB,UAAU,EACV,yBAAyB,EACzB,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,GACvB,MAAM,eAAe,CAAC;AAYvB,MAAM,eAAe,GAAG;IACtB,YAAY,EAAE,EAAa;IAC3B,cAAc,EAAE,EAAE;IAClB,kBAAkB,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"api-beacon-client.js","sourceRoot":"","sources":["../../src/api-beacon-client.ts"],"names":[],"mappings":"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"}
|