@o3r/schematics 9.0.0-rc.5 → 9.0.0-rc.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "9.0.0-rc.5",
+  "version": "9.0.0-rc.6",
   "description": "Schematics module of the Otter framework",
   "main": "./src/index.js",
   "keywords": [
@@ -59,9 +59,9 @@
     "@nx/jest": "~16.5.0",
     "@nx/js": "~16.5.0",
     "@nx/linter": "~16.5.0",
-    "@o3r/build-helpers": "^9.0.0-rc.5",
-    "@o3r/dev-tools": "^9.0.0-rc.5",
-    "@o3r/eslint-plugin": "^9.0.0-rc.5",
+    "@o3r/build-helpers": "^9.0.0-rc.6",
+    "@o3r/dev-tools": "^9.0.0-rc.6",
+    "@o3r/eslint-plugin": "^9.0.0-rc.6",
     "@schematics/angular": "~16.0.5",
     "@types/jest": "~29.5.2",
     "@types/node": "^18.0.0",

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":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AA+B/E;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAsB5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAO/E;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAsB5B"}

package/schematics/ng-add/index.js

@@ -1,33 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const fs = require("node:fs");
 const path = require("node:path");
 const rxjs_1 = require("rxjs");
-const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
-/**
- * Install dev dependency on your application
- *
- * Note: it should not be moved to other packages as it should run before the installation
- * of peer dependencies
- */
-class DevInstall extends tasks_1.NodePackageInstallTask {
-    /** @inheritDoc */
-    toConfiguration() {
-        const installOptions = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
-        return {
-            name: options_1.NodePackageName,
-            options: {
-                command: 'install',
-                quiet: this.quiet,
-                workingDirectory: this.workingDirectory,
-                packageName: `${this.packageName} ${installOptions === 'yarn' ? '--prefer-dev' : '-D'}`,
-                packageManager: installOptions
-            }
-        };
-    }
-}
+const schematics_1 = require("@o3r/schematics");
 /**
  * Add Otter schematics to an Angular Project
  */
@@ -43,7 +20,7 @@ function ngAdd() {
             const version = getDependencyVersion(dependency);
             context.logger.info(`Installing ${dependency}${version || ''}`);
             treePackageJson.devDependencies = { ...treePackageJson.devDependencies, [dependency]: version };
-            context.addTask(new DevInstall({
+            context.addTask(new schematics_1.AddDevInstall({
                 hideOutput: false,
                 packageName: `${dependency}${version ? '@' + version : ''}`,
                 quiet: false

package/src/interfaces/angular-workspace.d.ts

@@ -39,6 +39,9 @@ export interface WorkspaceSchematics extends SchematicOptions {
     '@o3r/core:schematics'?: {
         path: string;
     };
+    '*:ng-add'?: {
+        enableMetadataExtract?: boolean;
+    };
 }
 export interface WorkspaceProject extends NgWorkspaceProject {
     architect?: WorkspaceTool;

package/src/interfaces/angular-workspace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-workspace.d.ts","sourceRoot":"","sources":["../../../src/interfaces/angular-workspace.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,IAAI,kBAAkB,EAC9B,MAAM,IAAI,iBAAiB,EAC3B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,kBAAkB;IAClB,6BAA6B,CAAC,EAAE;QAC9B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,yBAAyB,CAAC,EAAE;QAC1B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,4BAA4B,CAAC,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB,CAAC,EAAE;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,sBAAsB,CAAC,EAAE;QACvB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CAEH;AACD,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,QAAQ,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;KACjC,CAAC;IACF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC"}
+{"version":3,"file":"angular-workspace.d.ts","sourceRoot":"","sources":["../../../src/interfaces/angular-workspace.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,QAAQ,IAAI,kBAAkB,EAC9B,MAAM,IAAI,iBAAiB,EAC3B,gBAAgB,EACjB,MAAM,0CAA0C,CAAC;AAElD,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AACD,MAAM,WAAW,aAAa;IAC5B,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAClB;AAED,MAAM,WAAW,mBAAoB,SAAQ,gBAAgB;IAC3D,kBAAkB;IAClB,6BAA6B,CAAC,EAAE;QAC9B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,yBAAyB,CAAC,EAAE;QAC1B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB;IAClB,4BAA4B,CAAC,EAAE;QAC7B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,2BAA2B,CAAC,EAAE;QAC5B,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,uBAAuB,CAAC,EAAE;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,kBAAkB,CAAC,EAAE;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,sBAAsB,CAAC,EAAE;QACvB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,UAAU,CAAC,EAAE;QACX,qBAAqB,CAAC,EAAE,OAAO,CAAC;KACjC,CAAC;CACH;AACD,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB;AAED,MAAM,WAAW,eAAgB,SAAQ,iBAAiB;IACxD,QAAQ,EAAE;QACN,CAAC,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC;KACjC,CAAC;IACF,UAAU,CAAC,EAAE,mBAAmB,CAAC;CAClC"}

package/src/rule-factories/eslint-fix/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKpF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IAEH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAqE5G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKpF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IAEH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,UAAU,SAAM,EAAE,SAAS,GAAE,MAAM,EAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CAoE5G"}

package/src/rule-factories/eslint-fix/index.js

@@ -50,8 +50,7 @@ You can consider to run later the following command to add otter linter rules: n
             return acc;
         }, new Set());
         try {
-            const packageManager = (0, package_manager_runner_1.getPackageManager)();
-            (0, node_child_process_1.exec)(`${packageManager} ${(0, package_manager_runner_1.getPackageManagerRunner)()} eslint ` +
+            (0, node_child_process_1.exec)(`${(0, package_manager_runner_1.getPackageManagerExecutor)()} eslint ` +
                 Array.from(files).map((file) => `"${file}"`).join(' ') +
                 ' --fix --color' +
                 (linterOptions.hideWarnings ? ' --quiet' : '') +

package/src/rule-factories/eslint-fix/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}

package/src/rule-factories/ng-add/index.d.ts

@@ -1,3 +1,4 @@
+import type { JsonValue } from '@angular-devkit/core';
 import { Rule } from '@angular-devkit/schematics';
 import { NodeDependencyType } from '@schematics/angular/utility/dependencies';
 import type { PackageJson } from 'type-fest';
@@ -33,5 +34,5 @@ export declare function registerPackageCollectionSchematics(packageJson: Package
  * @param schematicsDefaultParams default params to setup by schematic
  * @param angularJsonFile Path to the Angular.json file. Will use the workspace root's angular.json if not specified
  */
-export declare function setupSchematicsDefaultParams(schematicsDefaultParams: Record<string, Record<string, any>>, angularJsonFile?: string): Rule;
+export declare function setupSchematicsDefaultParams(schematicsDefaultParams: Record<string, Record<string, JsonValue>>, angularJsonFile?: string): Rule;
 //# sourceMappingURL=index.d.ts.map

package/src/rule-factories/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAG5H,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,EAAE,eAAe,SAAkB,GAAG,IAAI,CAsFxH;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,gCAAiD,EAC5I,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,EAAE,MAAM,QAezD;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAQ5G;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAsBzI"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAA4B,IAAI,EAAkD,MAAM,4BAA4B,CAAC;AAG5H,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,EAAE,eAAe,SAAkB,GAAG,IAAI,CAsFxH;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,gCAAiD,EAC5I,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,EAAE,MAAM,QAezD;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,WAAW,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAQ5G;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAsB/I"}

package/src/rule-factories/ng-add/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"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"}

package/src/tasks/index.d.ts

@@ -1,4 +1,5 @@
 export * from './eslint/index';
 export * from './link/index';
 export * from './ng-add/index';
+export * from './package-manager/index';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tasks/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tasks/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,yBAAyB,CAAC"}

package/src/tasks/index.js

@@ -4,4 +4,5 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./eslint/index"), exports);
 tslib_1.__exportStar(require("./link/index"), exports);
 tslib_1.__exportStar(require("./ng-add/index"), exports);
+tslib_1.__exportStar(require("./package-manager/index"), exports);
 //# sourceMappingURL=index.js.map

package/src/tasks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tasks/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,uDAA6B;AAC7B,yDAA+B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tasks/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,uDAA6B;AAC7B,yDAA+B;AAC/B,kEAAwC"}

package/src/tasks/package-manager/add-dev-dependency.d.ts

@@ -0,0 +1,24 @@
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import { NodePackageInstallTaskOptions } from './interfaces';
+/**
+ * Install new dev dependency on your package
+ */
+export declare class AddDevInstall extends NodePackageInstallTask {
+    quiet: boolean;
+    constructor(options?: NodePackageInstallTaskOptions);
+    /** @inheritdoc */
+    toConfiguration(): {
+        name: string;
+        options: {
+            command: string;
+            packageName: string;
+            quiet?: boolean | undefined;
+            hideOutput?: boolean | undefined;
+            workingDirectory?: string | undefined;
+            packageManager?: string | undefined;
+            allowScripts?: boolean | undefined;
+        };
+        dependencies?: import("@angular-devkit/schematics").TaskId[] | undefined;
+    };
+}
+//# sourceMappingURL=add-dev-dependency.d.ts.map

package/src/tasks/package-manager/add-dev-dependency.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-dev-dependency.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/add-dev-dependency.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAG1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAE7D;;GAEG;AACH,qBAAa,aAAc,SAAQ,sBAAsB;IAChD,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IASnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAYvB"}

package/src/tasks/package-manager/add-dev-dependency.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddDevInstall = void 0;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
+const utility_1 = require("../../utility");
+/**
+ * Install new dev dependency on your package
+ */
+class AddDevInstall extends tasks_1.NodePackageInstallTask {
+    constructor(options) {
+        super(options);
+        this.quiet = false;
+        this.packageManager = (0, utility_1.getPackageManager)({
+            workspaceConfig: options?.tree && (0, utility_1.getWorkspaceConfig)(options.tree),
+            enforcedNpmManager: options?.packageName
+        });
+    }
+    /** @inheritdoc */
+    toConfiguration() {
+        const defaultConfig = super.toConfiguration();
+        return {
+            ...defaultConfig,
+            name: options_1.NodePackageName,
+            options: {
+                ...defaultConfig.options,
+                command: 'install',
+                packageName: `${this.packageName} ${this.packageManager === 'yarn' ? '--prefer-dev' : '--save-dev'}`
+            }
+        };
+    }
+}
+exports.AddDevInstall = AddDevInstall;
+//# sourceMappingURL=add-dev-dependency.js.map

package/src/tasks/package-manager/add-dev-dependency.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-dev-dependency.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/add-dev-dependency.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAC1E,sFAA2F;AAC3F,2CAAsE;AAGtE;;GAEG;AACH,MAAa,aAAc,SAAQ,8BAAsB;IAGvD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAHjB,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,2BAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;IACL,CAAC;IAGD,kBAAkB;IACX,eAAe;QACpB,MAAM,aAAa,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QAC9C,OAAO;YACL,GAAG,aAAa;YAChB,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,aAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,SAAS;gBAClB,WAAW,EAAE,GAAG,IAAI,CAAC,WAAY,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,EAAE;aACtG;SACF,CAAC;IACJ,CAAC;CACF;AAzBD,sCAyBC"}

package/src/tasks/package-manager/index.d.ts

@@ -0,0 +1,4 @@
+export * from './add-dev-dependency';
+export * from './interfaces';
+export * from './npm-install';
+//# sourceMappingURL=index.d.ts.map

package/src/tasks/package-manager/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC"}

package/src/tasks/package-manager/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./add-dev-dependency"), exports);
+tslib_1.__exportStar(require("./interfaces"), exports);
+tslib_1.__exportStar(require("./npm-install"), exports);
+//# sourceMappingURL=index.js.map

package/src/tasks/package-manager/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/index.ts"],"names":[],"mappings":";;;AAAA,+DAAqC;AACrC,uDAA6B;AAC7B,wDAA8B"}

package/src/tasks/package-manager/interfaces.d.ts

@@ -0,0 +1,14 @@
+import { Tree } from '@angular-devkit/schematics';
+/**
+ * Duplication of the interface not exposed by the @angular-devkit/schematics
+ */
+export interface NodePackageInstallTaskOptions {
+    tree?: Tree;
+    packageManager?: 'yarn' | 'npm' | '';
+    packageName?: string;
+    workingDirectory?: string;
+    quiet?: boolean;
+    hideOutput?: boolean;
+    allowScripts?: boolean;
+}
+//# sourceMappingURL=interfaces.d.ts.map

package/src/tasks/package-manager/interfaces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB"}

package/src/tasks/package-manager/interfaces.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interfaces.js.map

package/src/tasks/package-manager/interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/interfaces.ts"],"names":[],"mappings":""}

package/src/tasks/package-manager/npm-install.d.ts

@@ -0,0 +1,24 @@
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import type { NodePackageInstallTaskOptions } from './interfaces';
+/**
+ * Run NPM Install
+ */
+export declare class NpmInstall extends NodePackageInstallTask {
+    quiet: boolean;
+    constructor(options?: NodePackageInstallTaskOptions);
+    /** @inheritdoc */
+    toConfiguration(): {
+        name: string;
+        options: {
+            command: string;
+            quiet: boolean;
+            packageManager: string | undefined;
+            hideOutput?: boolean | undefined;
+            workingDirectory?: string | undefined;
+            packageName?: string | undefined;
+            allowScripts?: boolean | undefined;
+        };
+        dependencies?: import("@angular-devkit/schematics").TaskId[] | undefined;
+    };
+}
+//# sourceMappingURL=npm-install.d.ts.map

package/src/tasks/package-manager/npm-install.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"npm-install.d.ts","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAIlE;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IAQnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAavB"}

package/src/tasks/package-manager/npm-install.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NpmInstall = void 0;
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+const utility_1 = require("../../utility");
+const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
+/**
+ * Run NPM Install
+ */
+class NpmInstall extends tasks_1.NodePackageInstallTask {
+    constructor(options) {
+        super(options);
+        this.quiet = false;
+        this.packageManager = (0, utility_1.getPackageManager)({
+            workspaceConfig: options?.tree && (0, utility_1.getWorkspaceConfig)(options.tree),
+            enforcedNpmManager: options?.packageName
+        });
+    }
+    /** @inheritdoc */
+    toConfiguration() {
+        const config = super.toConfiguration();
+        return {
+            ...config,
+            name: options_1.NodePackageName,
+            options: {
+                ...config.options,
+                command: 'install',
+                quiet: this.quiet,
+                packageManager: this.packageManager
+            }
+        };
+    }
+}
+exports.NpmInstall = NpmInstall;
+//# sourceMappingURL=npm-install.js.map

package/src/tasks/package-manager/npm-install.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"npm-install.js","sourceRoot":"","sources":["../../../../src/tasks/package-manager/npm-install.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAE1E,2CAAsE;AACtE,sFAA2F;AAE3F;;GAEG;AACH,MAAa,UAAW,SAAQ,8BAAsB;IAGpD,YAAY,OAAuC;QACjD,KAAK,CAAC,OAAc,CAAC,CAAC;QAHjB,UAAK,GAAG,KAAK,CAAC;QAInB,IAAI,CAAC,cAAc,GAAG,IAAA,2BAAiB,EAAC;YACtC,eAAe,EAAE,OAAO,EAAE,IAAI,IAAI,IAAA,4BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC;YAClE,kBAAkB,EAAE,OAAO,EAAE,WAAW;SACzC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IACX,eAAe;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QACvC,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,yBAAe;YACrB,OAAO,EAAE;gBACP,GAAG,MAAM,CAAC,OAAO;gBACjB,OAAO,EAAE,SAAS;gBAClB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC;SACF,CAAC;IACJ,CAAC;CACF;AAzBD,gCAyBC"}

package/src/utility/loaders.d.ts

@@ -8,8 +8,17 @@ import type { WorkspaceProject, WorkspaceSchema } from '../interfaces/index';
  * @param tree File tree
  * @param angularJsonFile Angular.json file path
  * @throws Angular JSON invalid or non exist
+ * @deprecate use {@link getWorkspaceConfig} function instead, will be removed in Otter v10
  */
 export declare function readAngularJson(tree: Tree, angularJsonFile?: string): WorkspaceSchema;
+/**
+ * Load the Workspace configuration object
+ *
+ * @param tree File tree
+ * @param workspaceConfigFile Workspace config file path, /angular.json in an Angular project
+ * @returns null if the given config file does not exist
+ */
+export declare function getWorkspaceConfig<T extends WorkspaceSchema = WorkspaceSchema>(tree: Tree, workspaceConfigFile?: string): WorkspaceSchema | null;
 /**
  * Update angular.json file
  *

package/src/utility/loaders.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAK9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,SAAkB,GAAG,eAAe,CAO9F;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,SAAkB,gEAGzG;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,eAQ7E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,gBAAgB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAkBpK;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,wDAI3C;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE7G;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,SAAc,UAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,SAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CAS/F;AAED;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAS3G;AAED;;;;;;GAMG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAGD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAK1E;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAGD;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D"}
+{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAK9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,SAAkB,GAAG,eAAe,CAO9F;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,mBAAmB,SAAkB,GAAG,eAAe,GAAG,IAAI,CAKzJ;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,SAAkB,gEAGzG;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,eAQ7E;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,gBAAgB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAkBpK;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,wDAI3C;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE7G;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,SAAc,UAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,SAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CAS/F;AAED;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAS3G;AAED;;;;;;GAMG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAGD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAK1E;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAGD;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D"}

package/src/utility/loaders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.getFilesInFolderFromWorkspaceProjects = exports.getAllFilesInTree = exports.getTemplateFolder = exports.getDefaultProjectName = exports.getProjectDepType = exports.getProjectFromTree = exports.readPackageJson = exports.writeAngularJson = exports.readAngularJson = void 0;
+exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProjects = exports.getFilesFromRootOfWorkspaceProjects = exports.getFilesWithExtensionFromTree = exports.getFilesInFolderFromWorkspaceProjectsInTree = exports.getFilesInFolderFromWorkspaceProjects = exports.getAllFilesInTree = exports.getTemplateFolder = exports.getDefaultProjectName = exports.getProjectDepType = exports.getProjectFromTree = exports.readPackageJson = exports.writeAngularJson = exports.getWorkspaceConfig = exports.readAngularJson = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const commentJson = require("comment-json");
@@ -13,6 +13,7 @@ const path = require("node:path");
  * @param tree File tree
  * @param angularJsonFile Angular.json file path
  * @throws Angular JSON invalid or non exist
+ * @deprecate use {@link getWorkspaceConfig} function instead, will be removed in Otter v10
  */
 function readAngularJson(tree, angularJsonFile = '/angular.json') {
     const workspaceConfig = tree.read(angularJsonFile);
@@ -22,6 +23,20 @@ function readAngularJson(tree, angularJsonFile = '/angular.json') {
     return commentJson.parse(workspaceConfig.toString());
 }
 exports.readAngularJson = readAngularJson;
+/**
+ * Load the Workspace configuration object
+ *
+ * @param tree File tree
+ * @param workspaceConfigFile Workspace config file path, /angular.json in an Angular project
+ * @returns null if the given config file does not exist
+ */
+function getWorkspaceConfig(tree, workspaceConfigFile = '/angular.json') {
+    if (!tree.exists(workspaceConfigFile)) {
+        return null;
+    }
+    return tree.readJson(workspaceConfigFile);
+}
+exports.getWorkspaceConfig = getWorkspaceConfig;
 /**
  * Update angular.json file
  *
@@ -182,7 +197,7 @@ exports.getFilesWithExtensionFromTree = getFilesWithExtensionFromTree;
  * @param extension
  */
 function getFilesFromRootOfWorkspaceProjects(tree, extension) {
-    return getFilesInFolderFromWorkspaceProjects(tree, '', extension);
+    return getFilesInFolderFromWorkspaceProjectsInTree(tree, '', extension);
 }
 exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProjects;
 /**
@@ -192,7 +207,7 @@ exports.getFilesFromRootOfWorkspaceProjects = getFilesFromRootOfWorkspaceProject
  * @param extension
  */
 function getFilesFromWorkspaceProjects(tree, extension) {
-    return getFilesInFolderFromWorkspaceProjects(tree, 'src', extension);
+    return getFilesInFolderFromWorkspaceProjectsInTree(tree, 'src', extension);
 }
 exports.getFilesFromWorkspaceProjects = getFilesFromWorkspaceProjects;
 /**

package/src/utility/loaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}

package/src/utility/package-manager-runner.d.ts

@@ -1,22 +1,34 @@
+import { WorkspaceSchema } from '../interfaces';
 /** Npm packageManager */
 export type SupportedPackageManagers = 'npm' | 'yarn';
 /**
- * Get the Package Manager
+ * Determine if the given packager manager is supported
  *
- * @param enforcedNpmManager package manager to enforce
+ * @param name Name of the package manager
  */
-export declare function getPackageManagerName(enforcedNpmManager?: SupportedPackageManagers | '' | undefined | null): SupportedPackageManagers;
+export declare function isSupportedPackageManager(name?: any): name is SupportedPackageManagers;
 /**
  * Get package manager used in runs
  * Defaults to the package manager setup in process.env if no package manager set in angular.json
  *
- * @param angularJsonString Content of angular.json file
+ * @param options.workspaceConfig Workspace configuration
+ * @param options.enforcedNpmManager  package manager to enforce, will be used if supported
+ * @param options
  */
-export declare function getPackageManager(angularJsonString?: string | null): string;
+export declare function getPackageManager(options?: {
+    workspaceConfig?: WorkspaceSchema | string | null;
+    enforcedNpmManager?: string | null;
+}): SupportedPackageManagers;
 /**
- * Get command to execute scripts with your package manager
+ * Get command to run scripts with your package manager
  *
- * @param angularJsonString
+ * @param workspaceConfig Workspace configuration
  */
-export declare function getPackageManagerRunner(angularJsonString?: string | null): "yarn" | "npx";
+export declare function getPackageManagerRunner(workspaceConfig?: WorkspaceSchema | string | null): string;
+/**
+ * Get command to execute bin command with your package manager
+ *
+ * @param workspaceConfig Workspace configuration
+ */
+export declare function getPackageManagerExecutor(workspaceConfig?: WorkspaceSchema | string | null): string;
 //# sourceMappingURL=package-manager-runner.d.ts.map

package/src/utility/package-manager-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-manager-runner.d.ts","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":"AAEA,yBAAyB;AACzB,MAAM,MAAM,wBAAwB,GAAG,KAAK,GAAG,MAAM,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,wBAAwB,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,GAAG,wBAAwB,CAErI;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,UASlE;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,kBAExE"}
+{"version":3,"file":"package-manager-runner.d.ts","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAEhD,yBAAyB;AACzB,MAAM,MAAM,wBAAwB,GAAG,KAAK,GAAG,MAAM,CAAC;AAEtD;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,IAAI,wBAAwB,CAEtF;AAaD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE;IAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAC,4BAWlI;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,UAExF;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,eAAe,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,UAE1F"}

package/src/utility/package-manager-runner.js

@@ -1,40 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackageManagerRunner = exports.getPackageManager = exports.getPackageManagerName = void 0;
+exports.getPackageManagerExecutor = exports.getPackageManagerRunner = exports.getPackageManager = exports.isSupportedPackageManager = void 0;
 const commentJson = require("comment-json");
+/**
+ * Determine if the given packager manager is supported
+ *
+ * @param name Name of the package manager
+ */
+function isSupportedPackageManager(name) {
+    return name === 'yarn' || name === 'npm';
+}
+exports.isSupportedPackageManager = isSupportedPackageManager;
 /**
  * Get the Package Manager
  *
  * @param enforcedNpmManager package manager to enforce
  */
 function getPackageManagerName(enforcedNpmManager) {
-    return enforcedNpmManager || (process.env?.npm_execpath?.includes('yarn') ? 'yarn' : 'npm');
+    const envCustomPackageManager = isSupportedPackageManager(process.env?.ENFORCED_PACKAGE_MANAGER) && process.env.ENFORCED_PACKAGE_MANAGER;
+    const envNodePackageManager = process.env?.npm_execpath?.includes('yarn') && 'yarn';
+    return enforcedNpmManager || envCustomPackageManager || envNodePackageManager || 'npm';
 }
-exports.getPackageManagerName = getPackageManagerName;
 /**
  * Get package manager used in runs
  * Defaults to the package manager setup in process.env if no package manager set in angular.json
  *
- * @param angularJsonString Content of angular.json file
+ * @param options.workspaceConfig Workspace configuration
+ * @param options.enforcedNpmManager  package manager to enforce, will be used if supported
+ * @param options
  */
-function getPackageManager(angularJsonString) {
-    let packageManager = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
-    if (angularJsonString) {
-        const angularJsonObj = commentJson.parse(angularJsonString);
+function getPackageManager(options) {
+    let packageManagerFromWorkspace;
+    if (options?.workspaceConfig) {
+        const angularJsonObj = (typeof options?.workspaceConfig === 'string' ? commentJson.parse(options?.workspaceConfig) : options?.workspaceConfig);
         if (angularJsonObj?.cli?.packageManager) {
-            packageManager = angularJsonObj.cli.packageManager;
+            packageManagerFromWorkspace = angularJsonObj.cli.packageManager;
         }
     }
-    return packageManager;
+    const enforcedNpmManager = options?.enforcedNpmManager && isSupportedPackageManager(options.enforcedNpmManager) ? options.enforcedNpmManager : undefined;
+    const workspaceNpmManager = isSupportedPackageManager(packageManagerFromWorkspace) ? packageManagerFromWorkspace : undefined;
+    return getPackageManagerName(enforcedNpmManager || workspaceNpmManager);
 }
 exports.getPackageManager = getPackageManager;
 /**
- * Get command to execute scripts with your package manager
+ * Get command to run scripts with your package manager
  *
- * @param angularJsonString
+ * @param workspaceConfig Workspace configuration
  */
-function getPackageManagerRunner(angularJsonString) {
-    return getPackageManager(angularJsonString) === 'yarn' ? 'yarn' : 'npx';
+function getPackageManagerRunner(workspaceConfig) {
+    return getPackageManager({ workspaceConfig }) + ' run';
 }
 exports.getPackageManagerRunner = getPackageManagerRunner;
+/**
+ * Get command to execute bin command with your package manager
+ *
+ * @param workspaceConfig Workspace configuration
+ */
+function getPackageManagerExecutor(workspaceConfig) {
+    return getPackageManager({ workspaceConfig }) + ' exec';
+}
+exports.getPackageManagerExecutor = getPackageManagerExecutor;
 //# sourceMappingURL=package-manager-runner.js.map

package/src/utility/package-manager-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-manager-runner.js","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAK5C;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,kBAAqE;IACzG,OAAO,kBAAkB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC9F,CAAC;AAFD,sDAEC;AAED;;;;;GAKG;AACH,SAAgB,iBAAiB,CAAC,iBAAiC;IACjE,IAAI,cAAc,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IACjI,IAAI,iBAAiB,EAAE;QACrB,MAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,iBAAiB,CAAQ,CAAC;QACnE,IAAI,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;YACvC,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC;SACpD;KACF;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AATD,8CASC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,iBAAiC;IACvE,OAAO,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1E,CAAC;AAFD,0DAEC"}
+{"version":3,"file":"package-manager-runner.js","sourceRoot":"","sources":["../../../src/utility/package-manager-runner.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAM5C;;;;GAIG;AACH,SAAgB,yBAAyB,CAAC,IAAU;IAClD,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,CAAC;AAC3C,CAAC;AAFD,8DAEC;AAED;;;;GAIG;AACH,SAAS,qBAAqB,CAAC,kBAA6C;IAC1E,MAAM,uBAAuB,GAAG,yBAAyB,CAAC,OAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IACzI,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC;IACpF,OAAO,kBAAkB,IAAI,uBAAuB,IAAI,qBAAqB,IAAI,KAAK,CAAC;AACzF,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,iBAAiB,CAAC,OAAiG;IACjI,IAAI,2BAA+C,CAAC;IACpD,IAAI,OAAO,EAAE,eAAe,EAAE;QAC5B,MAAM,cAAc,GAAG,CAAC,OAAO,OAAO,EAAE,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAE,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,eAAe,CAAgC,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAC/K,IAAI,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;YACvC,2BAA2B,GAAG,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC;SACjE;KACF;IACD,MAAM,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,yBAAyB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC;IACzJ,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7H,OAAO,qBAAqB,CAAC,kBAAkB,IAAI,mBAAmB,CAAC,CAAC;AAC1E,CAAC;AAXD,8CAWC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,eAAiD;IACvF,OAAO,iBAAiB,CAAC,EAAC,eAAe,EAAC,CAAC,GAAG,MAAM,CAAC;AACvD,CAAC;AAFD,0DAEC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CAAC,eAAiD;IACzF,OAAO,iBAAiB,CAAC,EAAC,eAAe,EAAC,CAAC,GAAG,OAAO,CAAC;AACxD,CAAC;AAFD,8DAEC"}