@ama-terasu/cli 8.2.0-alpha.90 → 8.2.0-rc.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/package.json +13 -13
- package/src/helpers/module.helper.d.ts +2 -1
- package/src/helpers/module.helper.d.ts.map +1 -1
- package/src/helpers/module.helper.js +11 -4
- package/src/helpers/module.helper.js.map +1 -1
- package/src/helpers/version.helper.js +1 -1
- package/src/helpers/version.helper.js.map +1 -1
- package/src/modules/base-yargs.js +1 -1
- package/src/modules/base-yargs.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ama-terasu/cli",
|
|
3
|
-
"version": "8.2.0-
|
|
3
|
+
"version": "8.2.0-rc.0",
|
|
4
4
|
"description": "Command Line Interface to administrate a Digital Experience Suite projects",
|
|
5
5
|
"main": "./src/cli/ama.js",
|
|
6
6
|
"scripts": {
|
|
@@ -20,13 +20,13 @@
|
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@angular-eslint/eslint-plugin": "~15.2.0",
|
|
22
22
|
"@nrwl/jest": "~15.9.0",
|
|
23
|
-
"@o3r/amaterasu-api-spec": "^8.2.0-
|
|
24
|
-
"@o3r/amaterasu-dodo": "^8.2.0-
|
|
25
|
-
"@o3r/amaterasu-otter": "^8.2.0-
|
|
26
|
-
"@o3r/amaterasu-sdk": "^8.2.0-
|
|
27
|
-
"@o3r/build-helpers": "^8.2.0-
|
|
28
|
-
"@o3r/dev-tools": "^8.2.0-
|
|
29
|
-
"@o3r/eslint-plugin": "^8.2.0-
|
|
23
|
+
"@o3r/amaterasu-api-spec": "^8.2.0-rc.0",
|
|
24
|
+
"@o3r/amaterasu-dodo": "^8.2.0-rc.0",
|
|
25
|
+
"@o3r/amaterasu-otter": "^8.2.0-rc.0",
|
|
26
|
+
"@o3r/amaterasu-sdk": "^8.2.0-rc.0",
|
|
27
|
+
"@o3r/build-helpers": "^8.2.0-rc.0",
|
|
28
|
+
"@o3r/dev-tools": "^8.2.0-rc.0",
|
|
29
|
+
"@o3r/eslint-plugin": "^8.2.0-rc.0",
|
|
30
30
|
"@types/jest": "~28.1.2",
|
|
31
31
|
"@types/minimist": "^1.2.2",
|
|
32
32
|
"@types/node": "^17.0.45",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"webpack-cli": "~5.1.0"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@ama-terasu/core": "^8.2.0-
|
|
58
|
+
"@ama-terasu/core": "^8.2.0-rc.0",
|
|
59
59
|
"chalk": "^4.1.2",
|
|
60
60
|
"loglevel": "^1.8.0",
|
|
61
61
|
"minimist": "^1.2.6",
|
|
@@ -66,10 +66,10 @@
|
|
|
66
66
|
"yargs": "^17.6.2"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@o3r/amaterasu-api-spec": "^8.2.0-
|
|
70
|
-
"@o3r/amaterasu-dodo": "^8.2.0-
|
|
71
|
-
"@o3r/amaterasu-otter": "^8.2.0-
|
|
72
|
-
"@o3r/amaterasu-sdk": "^8.2.0-
|
|
69
|
+
"@o3r/amaterasu-api-spec": "^8.2.0-rc.0",
|
|
70
|
+
"@o3r/amaterasu-dodo": "^8.2.0-rc.0",
|
|
71
|
+
"@o3r/amaterasu-otter": "^8.2.0-rc.0",
|
|
72
|
+
"@o3r/amaterasu-sdk": "^8.2.0-rc.0"
|
|
73
73
|
},
|
|
74
74
|
"peerDependenciesMeta": {
|
|
75
75
|
"@o3r/amaterasu-api-spec": {
|
|
@@ -54,10 +54,11 @@ export declare const getDepPackage: (packageName: string) => PackageJson | undef
|
|
|
54
54
|
* Get the path to the installed package
|
|
55
55
|
*
|
|
56
56
|
* @param dep dependency to retrieve in the installed packages
|
|
57
|
+
* @param useFsToSearch Use File System access to search for the package instead of Node resolve mechanism
|
|
57
58
|
*/
|
|
58
59
|
export declare const getInstalledInformation: (dep: MinimalPackageInformation & {
|
|
59
60
|
name: string;
|
|
60
|
-
}) => Promise<InstalledModuleInformation | undefined>;
|
|
61
|
+
}, useFsToSearch?: boolean) => Promise<InstalledModuleInformation | undefined>;
|
|
61
62
|
/**
|
|
62
63
|
* Get the module simplified name
|
|
63
64
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.helper.d.ts","sourceRoot":"","sources":["../../../src/helpers/module.helper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAG7C,2FAA2F;AAC3F,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,GAAG,UAAU,GAAG,aAAa,GAAG,SAAS,CAAC,CAAC;AAE3H,kEAAkE;AAClE,MAAM,WAAW,4BAA4B;IAC3C,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,IAAI,EAAE,IAAI,CAAC;IACX,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,4DAA4D;AAC5D,MAAM,MAAM,YAAY,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;AAEpF,gDAAgD;AAChD,MAAM,WAAW,uBAAuB;IACtC,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAC;IAEnB,2FAA2F;IAC3F,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,oCAAoC;AACpC,MAAM,WAAW,0BAA0B;IACzC,qGAAqG;IACrG,cAAc,EAAE,MAAM,CAAC;IAEvB,yBAAyB;IACzB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,wBAAwB;AACxB,MAAM,MAAM,eAAe,GAAG,yBAAyB,GAAG,uBAAuB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAExH,mCAAmC;AACnC,eAAO,MAAM,eAAe,qBAAqB,CAAC;AAElD,mFAAmF;AACnF,eAAO,MAAM,sBAAsB,oDAAqD,CAAC;AAGzF,6DAA6D;AAC7D,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAGzD;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAQrE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,gBAAiB,MAAM,KAAG,WAAW,GAAG,SAOjE,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"module.helper.d.ts","sourceRoot":"","sources":["../../../src/helpers/module.helper.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAG7C,2FAA2F;AAC3F,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,aAAa,GAAG,UAAU,GAAG,aAAa,GAAG,SAAS,CAAC,CAAC;AAE3H,kEAAkE;AAClE,MAAM,WAAW,4BAA4B;IAC3C,+BAA+B;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sDAAsD;IACtD,IAAI,EAAE,IAAI,CAAC;IACX,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,4DAA4D;AAC5D,MAAM,MAAM,YAAY,GAAG,yBAAyB,GAAG,4BAA4B,CAAC;AAEpF,gDAAgD;AAChD,MAAM,WAAW,uBAAuB;IACtC,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAC;IAEnB,2FAA2F;IAC3F,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED,oCAAoC;AACpC,MAAM,WAAW,0BAA0B;IACzC,qGAAqG;IACrG,cAAc,EAAE,MAAM,CAAC;IAEvB,yBAAyB;IACzB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,wBAAwB;AACxB,MAAM,MAAM,eAAe,GAAG,yBAAyB,GAAG,uBAAuB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAExH,mCAAmC;AACnC,eAAO,MAAM,eAAe,qBAAqB,CAAC;AAElD,mFAAmF;AACnF,eAAO,MAAM,sBAAsB,oDAAqD,CAAC;AAGzF,6DAA6D;AAC7D,eAAO,MAAM,2BAA2B,gBAAgB,CAAC;AAGzD;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,KAAG,MAAM,GAAG,SAQrE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,aAAa,gBAAiB,MAAM,KAAG,WAAW,GAAG,SAOjE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAAe,yBAAyB,GAAG;IAAE,MAAM,MAAM,CAAA;CAAE,8BAA0B,QAAQ,0BAA0B,GAAG,SAAS,CA0BtK,CAAC;AAGF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,QAAS,yBAAyB,GAAG;IAAE,MAAM,MAAM,CAAA;CAAE,WAElF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAS,yBAAyB,GAAG;IAAE,MAAM,MAAM,CAAA;CAAE,YAEjF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,QAAa,QAAQ,OAAO,MAAM,EAAE,MAAM,CAAC,CAS3E,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,aAAmB;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,KAA0B,QAAQ,eAAe,EAAE,CAkCrH,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,WAAW,QAAS,eAAe,kIAE/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,QAAS,eAAe,KAAG,MAE9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,QAAe,eAAe,YAAY,MAAM,kBAQ7E,CAAC"}
|
|
@@ -50,12 +50,19 @@ exports.getDepPackage = getDepPackage;
|
|
|
50
50
|
* Get the path to the installed package
|
|
51
51
|
*
|
|
52
52
|
* @param dep dependency to retrieve in the installed packages
|
|
53
|
+
* @param useFsToSearch Use File System access to search for the package instead of Node resolve mechanism
|
|
53
54
|
*/
|
|
54
|
-
const getInstalledInformation = async (dep) => {
|
|
55
|
+
const getInstalledInformation = async (dep, useFsToSearch = false) => {
|
|
56
|
+
const dynModule = (0, node_path_1.resolve)(dynamicDependenciesPath, 'node_modules');
|
|
55
57
|
try {
|
|
56
|
-
|
|
58
|
+
let fsDiscoveredPath;
|
|
59
|
+
if (useFsToSearch) {
|
|
60
|
+
const localPath = (0, node_path_1.resolve)(dynModule, dep.name, 'package.json');
|
|
61
|
+
fsDiscoveredPath = (0, node_fs_1.existsSync)(localPath) ? (0, node_path_1.resolve)(dynModule, dep.name, JSON.parse(await node_fs_1.promises.readFile(localPath, { encoding: 'utf-8' })).main) : undefined;
|
|
62
|
+
}
|
|
63
|
+
const resolutionPath = fsDiscoveredPath || require.resolve(dep.name, {
|
|
57
64
|
paths: [
|
|
58
|
-
|
|
65
|
+
dynModule,
|
|
59
66
|
...module.paths
|
|
60
67
|
]
|
|
61
68
|
});
|
|
@@ -160,7 +167,7 @@ exports.isInstalled = isInstalled;
|
|
|
160
167
|
* @param pck package to get name from
|
|
161
168
|
*/
|
|
162
169
|
const getFormattedDescription = (pck) => {
|
|
163
|
-
return ((0, exports.isInstalled)(pck) ? '' : `${chalk.grey.italic('(remote)')} `) + (pck.description || '<Missing description>') + (pck.isOfficialModule ? chalk.blue(String.fromCharCode(0x00AE)) : '');
|
|
170
|
+
return ((0, exports.isInstalled)(pck) ? '' : `${chalk.grey.italic('(remote)')} `) + (pck.description || '<Missing description>') + (pck.isOfficialModule ? ` ${chalk.blue(String.fromCharCode(0x00AE))}` : '');
|
|
164
171
|
};
|
|
165
172
|
exports.getFormattedDescription = getFormattedDescription;
|
|
166
173
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.helper.js","sourceRoot":"","sources":["../../../src/helpers/module.helper.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,2DAA0C;AAC1C,qCAAqD;AACrD,yCAAmD;AACnD,yCAAsC;AAEtC,qDAAqF;AA0CrF,mCAAmC;AACtB,QAAA,eAAe,GAAG,kBAAkB,CAAC;AAElD,mFAAmF;AACtE,QAAA,sBAAsB,GAAG,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAU,CAAC;AACzF,MAAM,0BAA0B,GAAG,8BAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAE5F,6DAA6D;AAChD,QAAA,2BAA2B,GAAG,aAAa,CAAC;AACzD,MAAM,uBAAuB,GAAG,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,mCAA2B,CAAC,CAAC;AAE5F;;;;;GAKG;AACI,MAAM,sBAAsB,GAAG,CAAC,WAAmB,EAAsB,EAAE;IAChF,MAAM,GAAG,GAAG,IAAA,mBAAO,EAAC,WAAW,CAAC,CAAC;IACjC,IAAI,GAAG,KAAK,WAAW,EAAE;QACvB,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,eAAe,GAAG,IAAA,gBAAI,EAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAClD,OAAO,IAAA,oBAAU,EAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAA,8BAAsB,EAAC,GAAG,CAAC,CAAC;AACrF,CAAC,CAAC;AARW,QAAA,sBAAsB,0BAQjC;AAEF;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAAC,WAAmB,EAA2B,EAAE;IAC5E,IAAI;QACF,MAAM,eAAe,GAAG,IAAA,8BAAsB,EAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;QAC7E,OAAO,eAAe,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;KACpD;IAAC,MAAM;QACN,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AAPW,QAAA,aAAa,iBAOxB;AAEF
|
|
1
|
+
{"version":3,"file":"module.helper.js","sourceRoot":"","sources":["../../../src/helpers/module.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const module_helper_1 = require("./module.helper");
|
|
|
13
13
|
* @returns the package version or undefined if not found
|
|
14
14
|
*/
|
|
15
15
|
const getPackageFormattedVersion = (pck) => {
|
|
16
|
-
const officialMark = pck.isOfficialModule ? chalk.blue(String.fromCharCode(0x00AE)) : '';
|
|
16
|
+
const officialMark = pck.isOfficialModule ? `${chalk.blue(String.fromCharCode(0x00AE))} ` : '';
|
|
17
17
|
if ((0, module_helper_1.isInstalled)(pck)) {
|
|
18
18
|
const isOutdated = pck.version && pck.version !== pck.package.version;
|
|
19
19
|
return `${pck.name}${officialMark}: ${(isOutdated ? chalk.yellow : chalk.green).bold(pck.package.version)}${isOutdated ? chalk.grey.italic(` (${pck.version} available)`) : ''}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.helper.js","sourceRoot":"","sources":["../../../src/helpers/version.helper.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,qCAA8B;AAC9B,qDAAmD;AACnD,mDAA8C;AAC9C,mDAA+D;AAE/D;;;;;GAKG;AACI,MAAM,0BAA0B,GAAG,CAAC,GAAoB,EAAU,EAAE;IACzE,MAAM,YAAY,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"version.helper.js","sourceRoot":"","sources":["../../../src/helpers/version.helper.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,qCAA8B;AAC9B,qDAAmD;AACnD,mDAA8C;AAC9C,mDAA+D;AAE/D;;;;;GAKG;AACI,MAAM,0BAA0B,GAAG,CAAC,GAAoB,EAAU,EAAE;IACzE,MAAM,YAAY,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/F,IAAI,IAAA,2BAAW,EAAC,GAAG,CAAC,EAAE;QACpB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;QACtE,OAAO,GAAG,GAAG,CAAC,IAAI,GAAG,YAAY,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,OAAQ,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;KACnL;SAAM;QACL,OAAO,GAAG,GAAG,CAAC,IAAI,GAAG,YAAY,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;KAC9G;AACH,CAAC,CAAC;AARW,QAAA,0BAA0B,8BAQrC;AAGF;;;;;;GAMG;AACI,MAAM,iBAAiB,GAAG,CAAC,UAA6B,EAAE,EAAE;IACjE,MAAM,KAAK,GAAG;QACZ,KAAK,CAAC,IAAI,CAAC,GAAG,mBAAI,KAAK,KAAK,CAAC,IAAI,CAAC,sBAAO,CAAC,EAAE,CAAC;QAC7C,EAAE;KACH,CAAC;IACF,MAAM,OAAO,GAAG,UAAU;SACvB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,kCAA0B,EAAC,OAAO,CAAC,CAAC;SACrD,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAE5C,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,KAAK,CAAC,IAAI,CACR,IAAA,2BAAW,EAAC,SAAS,CAAC,EACtB,GAAG,OAAO,EACV,EAAE,CACH,CAAC;KACH;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,aAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAlBW,QAAA,iBAAiB,qBAkB5B"}
|
|
@@ -90,7 +90,7 @@ const amaYargs = async (argv) => {
|
|
|
90
90
|
.command(mod.moduleName, (0, module_helper_1.getFormattedDescription)(mod), async (yargsInstance) => {
|
|
91
91
|
if (!(0, module_helper_1.isInstalled)(mod)) {
|
|
92
92
|
await base_context_1.baseContext.getSpinner(`Installing ${chalk.bold(mod.name)} module...`).fromPromise((0, module_helper_1.installDependency)(mod), `${mod.name} has been installed`, `Failed to install ${mod.name} module`);
|
|
93
|
-
const information = await (0, module_helper_1.getInstalledInformation)(mod);
|
|
93
|
+
const information = await (0, module_helper_1.getInstalledInformation)(mod, true);
|
|
94
94
|
Object.assign(mod, information);
|
|
95
95
|
if (!(0, module_helper_1.isInstalled)(mod)) {
|
|
96
96
|
throw new Error(`Something went wrong with the installation of ${mod.name}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-yargs.js","sourceRoot":"","sources":["../../../src/modules/base-yargs.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"base-yargs.js","sourceRoot":"","sources":["../../../src/modules/base-yargs.ts"],"names":[],"mappings":"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"}
|