@o3r/schematics 10.1.0-prerelease.3 → 10.1.0-prerelease.30
Sign up to get free protection for your applications and to get access to all the features.
- package/package.json +8 -6
- package/schematics/package.json +3 -0
- package/src/rule-factories/ng-add/dependencies.d.ts +17 -2
- package/src/rule-factories/ng-add/dependencies.d.ts.map +1 -1
- package/src/rule-factories/ng-add/dependencies.js +25 -7
- package/src/rule-factories/ng-add/dependencies.js.map +1 -1
- package/src/utility/update-imports.d.ts.map +1 -1
- package/src/utility/update-imports.js +4 -3
- package/src/utility/update-imports.js.map +1 -1
- package/src/utility/wrapper.d.ts.map +1 -1
- package/src/utility/wrapper.js +58 -39
- package/src/utility/wrapper.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "10.1.0-prerelease.
|
|
3
|
+
"version": "10.1.0-prerelease.30",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@angular-devkit/core": "~17.2.0",
|
|
31
31
|
"@angular-devkit/schematics": "~17.2.0",
|
|
32
32
|
"@angular/cli": "~17.2.0",
|
|
33
|
-
"@o3r/telemetry": "^10.1.0-prerelease.
|
|
33
|
+
"@o3r/telemetry": "^10.1.0-prerelease.30",
|
|
34
34
|
"@schematics/angular": "~17.2.0",
|
|
35
35
|
"eslint": "^8.42.0",
|
|
36
36
|
"rxjs": "^7.8.1",
|
|
@@ -54,6 +54,7 @@
|
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"chalk": "^4.1.2",
|
|
56
56
|
"globby": "^11.1.0",
|
|
57
|
+
"inquirer": "~8.2.6",
|
|
57
58
|
"minimatch": "~9.0.3",
|
|
58
59
|
"semver": "^7.5.2",
|
|
59
60
|
"tslib": "^2.5.3"
|
|
@@ -71,18 +72,19 @@
|
|
|
71
72
|
"@angular/core": "~17.2.0",
|
|
72
73
|
"@angular/platform-browser": "~17.2.0",
|
|
73
74
|
"@angular/platform-browser-dynamic": "~17.2.0",
|
|
74
|
-
"@babel/core": "~7.
|
|
75
|
+
"@babel/core": "~7.24.0",
|
|
75
76
|
"@babel/preset-typescript": "~7.23.0",
|
|
76
77
|
"@compodoc/compodoc": "^1.1.19",
|
|
77
78
|
"@nx/eslint": "~18.0.2",
|
|
78
79
|
"@nx/eslint-plugin": "~18.0.2",
|
|
79
80
|
"@nx/jest": "~18.0.2",
|
|
80
81
|
"@nx/js": "~18.0.2",
|
|
81
|
-
"@o3r/build-helpers": "^10.1.0-prerelease.
|
|
82
|
-
"@o3r/eslint-plugin": "^10.1.0-prerelease.
|
|
83
|
-
"@o3r/telemetry": "^10.1.0-prerelease.
|
|
82
|
+
"@o3r/build-helpers": "^10.1.0-prerelease.30",
|
|
83
|
+
"@o3r/eslint-plugin": "^10.1.0-prerelease.30",
|
|
84
|
+
"@o3r/telemetry": "^10.1.0-prerelease.30",
|
|
84
85
|
"@schematics/angular": "~17.2.0",
|
|
85
86
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
87
|
+
"@types/inquirer": "~8.2.10",
|
|
86
88
|
"@types/jest": "~29.5.2",
|
|
87
89
|
"@types/node": "^20.0.0",
|
|
88
90
|
"@types/semver": "^7.3.13",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Rule, type TaskId, Tree } from '@angular-devkit/schematics';
|
|
1
|
+
import { Rule, type SchematicContext, type TaskId, Tree } from '@angular-devkit/schematics';
|
|
2
2
|
import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
|
|
3
3
|
import { SupportedPackageManagers } from '../../utility';
|
|
4
4
|
/**
|
|
@@ -59,7 +59,21 @@ export interface SetupDependenciesOptions {
|
|
|
59
59
|
runAfterTasks?: TaskId[];
|
|
60
60
|
/** Callback to run after the task ID is calculated */
|
|
61
61
|
scheduleTaskCallback?: (taskIds?: TaskId[]) => void;
|
|
62
|
+
/** Working directory for the installation process only */
|
|
63
|
+
workingDirectory?: string;
|
|
62
64
|
}
|
|
65
|
+
/** Result of the Setup Dependencies task scheduling process */
|
|
66
|
+
export interface SetupDependenciesResult {
|
|
67
|
+
/** List of the task ID resulting of the install process */
|
|
68
|
+
taskIds: TaskId[];
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Determine if the context has information regarding the setup dependencies process
|
|
72
|
+
* @param context Schematic context
|
|
73
|
+
*/
|
|
74
|
+
export declare const hasSetupInformation: (context: SchematicContext) => context is SchematicContext & {
|
|
75
|
+
setupDependencies: SetupDependenciesResult;
|
|
76
|
+
};
|
|
63
77
|
/**
|
|
64
78
|
* Retrieve the package install configuration
|
|
65
79
|
* This is a workaround to ng-add to add the dependency to the sub-package
|
|
@@ -67,8 +81,9 @@ export interface SetupDependenciesOptions {
|
|
|
67
81
|
* @param tree Tree to read the file
|
|
68
82
|
* @param projectName Name of the project
|
|
69
83
|
* @param devDependencyOnly If true, the dependency will be added as devDependency
|
|
84
|
+
* @param exactO3rVersion Use a pinned version of the o3r package
|
|
70
85
|
*/
|
|
71
|
-
export declare const getPackageInstallConfig: (packageJsonPath: string, tree: Tree, projectName?: string, devDependencyOnly?: boolean) => Record<string, DependencyToAdd>;
|
|
86
|
+
export declare const getPackageInstallConfig: (packageJsonPath: string, tree: Tree, projectName?: string, devDependencyOnly?: boolean, exactO3rVersion?: boolean) => Record<string, DependencyToAdd>;
|
|
72
87
|
/**
|
|
73
88
|
* Setup dependency to a repository.
|
|
74
89
|
* Will run manually the ngAdd schematics according to the parameters and install the packages if required
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAa,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAa,KAAK,gBAAgB,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAC9G,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAI9E,OAAO,EAAyE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAIhI;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,gCAAgC;IAChC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,yEAAyE;IACzE,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iDAAiD;IACjD,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,uDAAuD;IACvD,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,0DAA0D;IAC1D,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,qCAAqC;IACrC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAC9C;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACjC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,sCAAsC;IACtC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,sCAAsC;IACtC,cAAc,CAAC,EAAE,wBAAwB,CAAC;IAC1C,2DAA2D;IAC3D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,sDAAsD;IACtD,oBAAoB,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACpD,0DAA0D;IAC1D,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,+DAA+D;AAC/D,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB;uBAAmF,uBAAuB;CAEzI,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,oBAAqB,MAAM,QAAQ,IAAI,gBAAgB,MAAM,sBAAsB,OAAO,oBAAoB,OAAO,KAAG,OAAO,MAAM,EAAE,eAAe,CAiBzL,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,YAAa,wBAAwB,KAAG,IAoIrE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setupDependencies = exports.getPackageInstallConfig = void 0;
|
|
3
|
+
exports.setupDependencies = exports.getPackageInstallConfig = exports.hasSetupInformation = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
6
6
|
const path = require("node:path");
|
|
@@ -8,6 +8,14 @@ const semver = require("semver");
|
|
|
8
8
|
const utility_1 = require("../../utility");
|
|
9
9
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
10
10
|
const node_fs_1 = require("node:fs");
|
|
11
|
+
/**
|
|
12
|
+
* Determine if the context has information regarding the setup dependencies process
|
|
13
|
+
* @param context Schematic context
|
|
14
|
+
*/
|
|
15
|
+
const hasSetupInformation = (context) => {
|
|
16
|
+
return !!context.setupDependencies;
|
|
17
|
+
};
|
|
18
|
+
exports.hasSetupInformation = hasSetupInformation;
|
|
11
19
|
/**
|
|
12
20
|
* Retrieve the package install configuration
|
|
13
21
|
* This is a workaround to ng-add to add the dependency to the sub-package
|
|
@@ -15,8 +23,9 @@ const node_fs_1 = require("node:fs");
|
|
|
15
23
|
* @param tree Tree to read the file
|
|
16
24
|
* @param projectName Name of the project
|
|
17
25
|
* @param devDependencyOnly If true, the dependency will be added as devDependency
|
|
26
|
+
* @param exactO3rVersion Use a pinned version of the o3r package
|
|
18
27
|
*/
|
|
19
|
-
const getPackageInstallConfig = (packageJsonPath, tree, projectName, devDependencyOnly) => {
|
|
28
|
+
const getPackageInstallConfig = (packageJsonPath, tree, projectName, devDependencyOnly, exactO3rVersion) => {
|
|
20
29
|
if (!projectName) {
|
|
21
30
|
return {};
|
|
22
31
|
}
|
|
@@ -25,10 +34,11 @@ const getPackageInstallConfig = (packageJsonPath, tree, projectName, devDependen
|
|
|
25
34
|
return {
|
|
26
35
|
[packageJson.name]: {
|
|
27
36
|
inManifest: [{
|
|
28
|
-
range:
|
|
37
|
+
range: `${exactO3rVersion ? '' : '~'}${packageJson.version}`,
|
|
29
38
|
types: devDependencyOnly ? [dependencies_1.NodeDependencyType.Dev] : (0, utility_1.getProjectNewDependenciesTypes)(workspaceProject)
|
|
30
39
|
}],
|
|
31
|
-
requireInstall: true
|
|
40
|
+
requireInstall: true,
|
|
41
|
+
ngAddOptions: { exactO3rVersion: exactO3rVersion }
|
|
32
42
|
}
|
|
33
43
|
};
|
|
34
44
|
};
|
|
@@ -116,7 +126,9 @@ const setupDependencies = (options) => {
|
|
|
116
126
|
};
|
|
117
127
|
const runNgAddSchematics = (_, context) => {
|
|
118
128
|
const packageManager = options.packageManager || (0, utility_1.getPackageManager)();
|
|
119
|
-
const installId = isInstallNeeded() ? [
|
|
129
|
+
const installId = isInstallNeeded() ? [
|
|
130
|
+
context.addTask(new tasks_1.NodePackageInstallTask({ packageManager, quiet: true, workingDirectory: options.workingDirectory }), options.runAfterTasks)
|
|
131
|
+
] : undefined;
|
|
120
132
|
if (installId !== undefined) {
|
|
121
133
|
context.logger.debug(`Schedule the installation of the workspace (${ngAddToRun.size > 0 ? 'for: ' + [...ngAddToRun].join(', ') : options.skipInstall ? 'skipped' : 'forced'})`);
|
|
122
134
|
}
|
|
@@ -125,7 +137,7 @@ const setupDependencies = (options) => {
|
|
|
125
137
|
return Object.fromEntries(Object.entries({ projectName: options.projectName, ...options.ngAddOptions, ...options.dependencies[packageName].ngAddOptions })
|
|
126
138
|
.filter(([key]) => !schemaOptions || !!schemaOptions[key]));
|
|
127
139
|
};
|
|
128
|
-
const
|
|
140
|
+
const finalTaskIds = [...ngAddToRun]
|
|
129
141
|
.map((packageName) => {
|
|
130
142
|
let schematic;
|
|
131
143
|
try {
|
|
@@ -142,8 +154,14 @@ const setupDependencies = (options) => {
|
|
|
142
154
|
context.logger.debug(`Schedule the schematic ng-add for ${packageName}`);
|
|
143
155
|
return [...ids, context.addTask(new tasks_1.RunSchematicTask(packageName, 'ng-add', schematicOptions), ids)];
|
|
144
156
|
}, [...(installId || []), ...(options.runAfterTasks || [])]);
|
|
157
|
+
if ((0, exports.hasSetupInformation)(context)) {
|
|
158
|
+
context.setupDependencies.taskIds.push(...finalTaskIds);
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
context.setupDependencies = { taskIds: finalTaskIds };
|
|
162
|
+
}
|
|
145
163
|
if (options.scheduleTaskCallback) {
|
|
146
|
-
options.scheduleTaskCallback(
|
|
164
|
+
options.scheduleTaskCallback(finalTaskIds);
|
|
147
165
|
}
|
|
148
166
|
};
|
|
149
167
|
return (0, schematics_1.chain)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.d.ts","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"update-imports.d.ts","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAgBvD,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,CAAC,WAAW,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC5F;AAGD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,CAAC,SAAS,EACzB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,GAAE,cAAmB,EAC/B,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,UAoG7C"}
|
|
@@ -31,9 +31,10 @@ function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePack
|
|
|
31
31
|
// We store the import line to be able to remove it afterwards
|
|
32
32
|
importNodes.push(imp);
|
|
33
33
|
// We retrieve all the symbols listed in the import statement
|
|
34
|
-
const namedImport = imp.importClause
|
|
34
|
+
const namedImport = imp.importClause?.namedBindings;
|
|
35
|
+
const isTypeOnlyImport = !!imp.importClause && ts.isTypeOnlyImportDeclaration(imp.importClause);
|
|
35
36
|
const imports = namedImport && ts.isNamedImports(namedImport) ?
|
|
36
|
-
namedImport.elements.map((element) => ({ symbol: element.getText(), location: importFrom })) :
|
|
37
|
+
namedImport.elements.map((element) => ({ symbol: element.getText(), isTypeOnlyImport, location: importFrom })) :
|
|
37
38
|
[];
|
|
38
39
|
// And associate them to the Otter package
|
|
39
40
|
oldImportedSymbolsPerPackage[otterPackage].push(...imports);
|
|
@@ -62,7 +63,7 @@ function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePack
|
|
|
62
63
|
acc[importFrom] = [];
|
|
63
64
|
}
|
|
64
65
|
const newNameForExportedValue = mapImports[oldPackageName]?.[importSymbol.symbol]?.newValue;
|
|
65
|
-
acc[importFrom].push(newNameForExportedValue || importSymbol.symbol);
|
|
66
|
+
acc[importFrom].push(`${importSymbol.isTypeOnlyImport ? 'type ' : ''}${newNameForExportedValue || importSymbol.symbol}`);
|
|
66
67
|
});
|
|
67
68
|
return acc;
|
|
68
69
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AAEjC,qEAAkE;
|
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AA0CvD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBA4CnD,CAAC"}
|
package/src/utility/wrapper.js
CHANGED
|
@@ -1,13 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createSchematicWithMetricsIfInstalled = void 0;
|
|
4
|
-
const
|
|
4
|
+
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
6
|
+
const inquirer_1 = require("inquirer");
|
|
6
7
|
const node_fs_1 = require("node:fs");
|
|
7
8
|
const path = require("node:path");
|
|
8
|
-
const
|
|
9
|
-
const index_1 = require("../tasks/index");
|
|
9
|
+
const rule_factories_1 = require("../rule-factories");
|
|
10
10
|
const noopSchematicWrapper = (fn) => fn;
|
|
11
|
+
const PACKAGE_JSON_PATH = 'package.json';
|
|
12
|
+
const setupO3rMetricsInPackageJson = (activated) => (tree) => {
|
|
13
|
+
if (tree.exists(PACKAGE_JSON_PATH)) {
|
|
14
|
+
const packageJson = tree.readJson(PACKAGE_JSON_PATH);
|
|
15
|
+
packageJson.config ||= {};
|
|
16
|
+
packageJson.config.o3rMetrics = activated;
|
|
17
|
+
tree.overwrite(PACKAGE_JSON_PATH, JSON.stringify(packageJson, null, 2));
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
const setupTelemetry = ({ workingDirectory, runNgAdd, exactO3rVersion }) => (_, context) => {
|
|
21
|
+
const taskIdsFromContext = (0, rule_factories_1.hasSetupInformation)(context) ? context.setupDependencies.taskIds : undefined;
|
|
22
|
+
const version = JSON.parse((0, node_fs_1.readFileSync)(path.join(__dirname, '..', '..', 'package.json'), 'utf-8')).version;
|
|
23
|
+
return (0, rule_factories_1.setupDependencies)({
|
|
24
|
+
dependencies: {
|
|
25
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
26
|
+
'@o3r/telemetry': {
|
|
27
|
+
inManifest: [{
|
|
28
|
+
range: `${exactO3rVersion ? '' : '~'}${version}`,
|
|
29
|
+
types: [dependencies_1.NodeDependencyType.Dev]
|
|
30
|
+
}],
|
|
31
|
+
ngAddOptions: { exactO3rVersion }
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
ngAddToRun: runNgAdd ? ['@o3r/telemetry'] : [],
|
|
35
|
+
runAfterTasks: taskIdsFromContext,
|
|
36
|
+
workingDirectory
|
|
37
|
+
});
|
|
38
|
+
};
|
|
11
39
|
/**
|
|
12
40
|
* Wrapper method of a schematic to retrieve some metrics around the schematic run
|
|
13
41
|
* if @o3r/telemetry is installed
|
|
@@ -15,54 +43,45 @@ const noopSchematicWrapper = (fn) => fn;
|
|
|
15
43
|
*/
|
|
16
44
|
const createSchematicWithMetricsIfInstalled = (schematicFn) => (opts) => async (tree, context) => {
|
|
17
45
|
let wrapper = noopSchematicWrapper;
|
|
18
|
-
|
|
19
|
-
const packageJson = tree.exists(
|
|
46
|
+
let shouldInstallTelemetry;
|
|
47
|
+
const packageJson = tree.exists(PACKAGE_JSON_PATH) ? tree.readJson(PACKAGE_JSON_PATH) : {};
|
|
20
48
|
try {
|
|
21
49
|
const { createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/telemetry'));
|
|
22
|
-
|
|
23
|
-
wrapper = createSchematicWithMetrics;
|
|
24
|
-
}
|
|
50
|
+
wrapper = createSchematicWithMetrics;
|
|
25
51
|
}
|
|
26
52
|
catch (e) {
|
|
27
53
|
// Do not throw if `@o3r/telemetry is not installed
|
|
28
|
-
if (
|
|
29
|
-
context.logger.warn('`config.o3rMetrics` is set to true in your package.json, please install the telemetry package with `ng add @o3r/telemetry` to enable the collection of metrics.');
|
|
30
|
-
}
|
|
31
|
-
else if ((process.env.NX_CLI_SET !== 'true' || process.env.NX_INTERACTIVE === 'true')
|
|
54
|
+
if ((process.env.NX_CLI_SET !== 'true' || process.env.NX_INTERACTIVE === 'true')
|
|
32
55
|
&& context.interactive
|
|
33
|
-
&& packageJson.config?.o3rMetrics
|
|
56
|
+
&& typeof packageJson.config?.o3rMetrics === 'undefined'
|
|
57
|
+
&& process.env.O3R_METRICS !== 'false'
|
|
58
|
+
&& opts.o3rMetrics !== false
|
|
59
|
+
&& (!process.env.CI || process.env.CI === 'false')) {
|
|
34
60
|
context.logger.debug('`@o3r/telemetry` is not available.\nAsking to add the dependency\n' + e.toString());
|
|
35
|
-
const
|
|
61
|
+
const question = {
|
|
62
|
+
type: 'confirm',
|
|
63
|
+
name: 'isReplyPositive',
|
|
64
|
+
message: `
|
|
36
65
|
Would you like to share anonymous data about the usage of Otter builders and schematics with the Otter Team at Amadeus ?
|
|
37
66
|
It will help us to improve our tools.
|
|
38
67
|
For more details and instructions on how to change these settings, see https://github.com/AmadeusITGroup/otter/blob/main/docs/telemetry/README.md.
|
|
39
|
-
`,
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
version
|
|
45
|
-
}));
|
|
46
|
-
await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
|
|
47
|
-
try {
|
|
48
|
-
const { createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/telemetry'));
|
|
49
|
-
wrapper = createSchematicWithMetrics;
|
|
50
|
-
}
|
|
51
|
-
catch {
|
|
52
|
-
// If pnp context package installed in the same process will not be available
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
context.logger.info('You can activate it at any time by running `ng add @o3r/telemetry`.');
|
|
57
|
-
packageJson.config ||= {};
|
|
58
|
-
packageJson.config.o3rMetrics = false;
|
|
59
|
-
if (tree.exists(packageJsonPath)) {
|
|
60
|
-
tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
|
|
61
|
-
}
|
|
62
|
-
}
|
|
68
|
+
`,
|
|
69
|
+
default: false
|
|
70
|
+
};
|
|
71
|
+
const { isReplyPositive } = await (0, inquirer_1.prompt)([question]);
|
|
72
|
+
shouldInstallTelemetry = isReplyPositive;
|
|
63
73
|
}
|
|
64
74
|
}
|
|
65
|
-
|
|
75
|
+
const subtreeDirectory = context.schematic.description.name === 'typescript-shell' ? opts.directory.split(path.posix.sep).join(path.sep) ?? '' : '';
|
|
76
|
+
const rule = (0, schematics_1.chain)([
|
|
77
|
+
typeof shouldInstallTelemetry !== 'undefined' ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [setupO3rMetricsInPackageJson(!!shouldInstallTelemetry)]) : (0, schematics_1.noop)(),
|
|
78
|
+
schematicFn(opts),
|
|
79
|
+
shouldInstallTelemetry ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [
|
|
80
|
+
setupTelemetry({ workingDirectory: subtreeDirectory || undefined, runNgAdd: !subtreeDirectory, exactO3rVersion: opts.exactO3rVersion })
|
|
81
|
+
]) : (0, schematics_1.noop)(),
|
|
82
|
+
typeof shouldInstallTelemetry !== 'undefined' && subtreeDirectory ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [setupO3rMetricsInPackageJson(shouldInstallTelemetry)]) : (0, schematics_1.noop)()
|
|
83
|
+
]);
|
|
84
|
+
return wrapper(() => rule)(opts);
|
|
66
85
|
};
|
|
67
86
|
exports.createSchematicWithMetricsIfInstalled = createSchematicWithMetricsIfInstalled;
|
|
68
87
|
//# sourceMappingURL=wrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"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"}
|