@o3r/core 10.0.0-next.9 → 11.0.0-next.0

package/schematics/page/index.js

@@ -3,36 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGeneratePage = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const path = require("node:path");
 const ts = require("typescript");
-const schematics_2 = require("@o3r/schematics");
 const configuration_1 = require("../rule-factories/component/configuration");
 const theming_1 = require("../rule-factories/component/theming");
 const localization_1 = require("../rule-factories/component/localization");
 const fixture_1 = require("../rule-factories/component/fixture");
-const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 /**
  * Add a Page to an Otter project
- *
  * @param options
  */
 function ngGeneratePage(options) {
     const isApplication = (tree) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, null, 'application');
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
-            throw new Error('Cannot create a page on library');
+            throw new schematics_2.O3rCliError('Cannot create a page on library');
         }
         return tree;
     };
     const pageName = core_1.strings.classify(options.name);
     /**
      * Generates page files.
-     *
      * @param tree File tree
      * @param context Context of the rule
      */
     const generateFiles = (tree, context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, null, 'application');
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
             context.logger.warn('No application detected in this project, the page cannot be generated');
             return schematics_1.noop;
@@ -40,7 +37,7 @@ function ngGeneratePage(options) {
         const destination = (0, schematics_2.getDestinationPath)('@o3r/core:page', options.path, tree, options.projectName);
         const pagePath = path.posix.join(destination, core_1.strings.dasherize(options.scope), core_1.strings.dasherize(options.name));
         const dasherizedPageName = core_1.strings.dasherize(options.name);
-        const projectName = workspaceProject.name;
+        const projectName = options.projectName;
         const componentPath = path.posix.join(pagePath, `${dasherizedPageName}.component.ts`);
         const ngSpecPath = path.posix.join(pagePath, `${dasherizedPageName}.component.spec.ts`);
         const o3rSpecPath = path.posix.join(pagePath, `${dasherizedPageName}.spec.ts`);
@@ -61,8 +58,7 @@ function ngGeneratePage(options) {
                 const sourceFileContent = tree.readText(moduleFilePath);
                 const sourceFile = ts.createSourceFile(moduleFilePath, sourceFileContent, ts.ScriptTarget.ES2015, true);
                 const recorder = tree.beginUpdate(moduleFilePath);
-                const ngModulesMetadata = (0, ast_utils_1.getDecoratorMetadata)(sourceFile, 'NgModule', '@angular/core');
-                const moduleIndex = ngModulesMetadata[0] ? ngModulesMetadata[0].pos - ('NgModule'.length + 1) : sourceFileContent.indexOf('@NgModule');
+                const { moduleIndex } = (0, schematics_2.getModuleIndex)(sourceFile, sourceFileContent);
                 (0, schematics_2.addImportToModuleFile)('RouterModule', '@angular/router', sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, `.forChild([{path: '', component: ${core_1.strings.classify(pageName)}Component}])`, true);
                 tree.commitUpdate(recorder);
                 return tree;
@@ -128,7 +124,6 @@ function ngGeneratePage(options) {
     };
     /**
      * Updates App Routing Module to add the new page route.
-     *
      * @param tree File tree
      * @param context Context of the rule
      */

package/schematics/page/index.js.map

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

package/schematics/page/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ngGeneratePageSchematicsSchema",
   "title": "Generate Otter Page",
   "description": "ng generate Otter Page",

package/schematics/renovate/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgGenerateRenovateBotSchematicsSchema",
   "title": "Generate Renovate Bot",
   "description": "ng generate Renovate bot",

package/schematics/renovate/templates/azure-pipelines.ugrade.yml

@@ -16,7 +16,7 @@ variables:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: '16.x'
+      versionSpec: '18.x'
     displayName: 'Install Node.js'
 
   - task: Cache@2

package/schematics/rule-factories/additional-modules/index.d.ts

@@ -1,7 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
  * Add additional modules for dev only
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param options.workingDirectory the directory where to execute the rule factory

package/schematics/rule-factories/additional-modules/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAiBjF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA6MrJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAiBjF;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAwMrJ"}

package/schematics/rule-factories/additional-modules/index.js

@@ -4,6 +4,7 @@ exports.updateAdditionalModules = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const ts = require("typescript");
+const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
 const path = require("node:path");
@@ -11,7 +12,6 @@ const packageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json'
 const ngrxStoreDevtoolsDep = '@ngrx/store-devtools';
 /**
  * Add additional modules for dev only
- *
  * @param options @see RuleFactory.options
  * @param options.projectName
  * @param options.workingDirectory the directory where to execute the rule factory
@@ -20,12 +20,12 @@ const ngrxStoreDevtoolsDep = '@ngrx/store-devtools';
 function updateAdditionalModules(options, _rootPath) {
     /**
      * Update package.json to add additional modules dependencies
-     *
      * @param tree
      * @param context
      */
     const updatePackageJson = (tree, context) => {
-        const type = (0, schematics_2.getProjectDepType)(tree);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const type = (0, schematics_2.getProjectNewDependenciesType)(workspaceProject);
         const generatorDependencies = [ngrxStoreDevtoolsDep];
         try {
             return (0, schematics_2.ngAddPeerDependencyPackages)(generatorDependencies, packageJsonPath, type, { ...options, skipNgAddSchematicRun: true });
@@ -37,11 +37,11 @@ function updateAdditionalModules(options, _rootPath) {
     };
     /**
      * Import additional modules in AppModule
-     *
      * @param tree
      * @param context
      */
     const registerModules = (tree, context) => {
+        const additionalRules = [];
         const moduleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, options.projectName);
         if (!moduleFilePath) {
             return tree;
@@ -52,17 +52,12 @@ function updateAdditionalModules(options, _rootPath) {
         if ((0, ast_utils_1.isImported)(sourceFile, 'StoreDevtoolsModule', ngrxStoreDevtoolsDep) || (0, ast_utils_1.isImported)(sourceFile, 'additionalModules', '../environments/environment')) {
             return tree;
         }
-        const recorder = tree.beginUpdate(moduleFilePath);
-        const ngModulesMetadata = (0, ast_utils_1.getDecoratorMetadata)(sourceFile, 'NgModule', '@angular/core');
-        const moduleIndex = ngModulesMetadata[0] ? ngModulesMetadata[0].pos - ('NgModule'.length + 1) : sourceFileContent.indexOf('@NgModule');
-        const addImportToModuleFile = (name, file, moduleFunction) => (0, schematics_2.addImportToModuleFile)(name, file, sourceFile, sourceFileContent, context, recorder, moduleFilePath, moduleIndex, moduleFunction);
+        const addImportToModuleFile = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `${external(name, file)}${moduleFunction}`));
         addImportToModuleFile('additionalModules', '../environments/environment');
-        tree.commitUpdate(recorder);
-        return tree;
+        return (0, schematics_1.chain)(additionalRules)(tree, context);
     };
     /**
      * Register additional modules for development
-     *
      * @param tree
      * @param context
      */
@@ -76,16 +71,17 @@ function updateAdditionalModules(options, _rootPath) {
         if ((0, ast_utils_1.isImported)(sourceFile, 'StoreDevtoolsModule', ngrxStoreDevtoolsDep)) {
             return tree;
         }
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName, 'application');
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
             context.logger.warn('No application detected in the project, the development modules will not be added.');
             return tree;
         }
+        const mainFilePath = workspaceProject.architect.build.options.main ?? workspaceProject.architect.build.options.browser;
         // supposing we are in ng 15, the env dev file name is environment.development.ts
-        let envDevFilePath = path.join(path.dirname(workspaceProject.architect.build.options.main), 'environments', 'environment.development.ts');
+        let envDevFilePath = path.join(path.dirname(mainFilePath), 'environments', 'environment.development.ts');
         if (!tree.exists(envDevFilePath)) {
             // we are in ng 14, environment dev file name is: environment.ts
-            envDevFilePath = path.join(path.dirname(workspaceProject.architect.build.options.main), 'environments', 'environment.ts');
+            envDevFilePath = path.join(path.dirname(mainFilePath), 'environments', 'environment.ts');
         }
         if (!tree.exists(envDevFilePath)) { // if we don't use the env setup, we skip the step
             context.logger.warn(` Cannot find environment in ${envDevFilePath}`);
@@ -109,7 +105,6 @@ function updateAdditionalModules(options, _rootPath) {
     };
     /**
      * Register additional modules for production
-     *
      * @param tree
      * @param context
      */
@@ -123,16 +118,17 @@ function updateAdditionalModules(options, _rootPath) {
         if ((0, ast_utils_1.isImported)(sourceFile, 'StoreDevtoolsModule', ngrxStoreDevtoolsDep)) {
             return tree;
         }
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName, 'application');
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
             context.logger.warn('No application detected in the project, the development modules will not be added.');
             return tree;
         }
+        const mainFilePath = workspaceProject.architect.build.options.main ?? workspaceProject.architect.build.options.browser;
         // supposing we are in ng 14, environment prod file name is: environment.prod.ts
-        let envProdFilePath = path.join(path.dirname(workspaceProject.architect.build.options.main), 'environments', 'environment.prod.ts');
+        let envProdFilePath = path.join(path.dirname(mainFilePath), 'environments', 'environment.prod.ts');
         if (!tree.exists(envProdFilePath)) {
             // we are in ng 15, environment prod file name is: environment.ts
-            envProdFilePath = path.join(path.dirname(workspaceProject.architect.build.options.main), 'environments', 'environment.ts');
+            envProdFilePath = path.join(path.dirname(mainFilePath), 'environments', 'environment.ts');
         }
         if (!tree.exists(envProdFilePath)) { // if we don't use the env setup, we skip the step
             context.logger.warn(` Cannot find environment in ${envProdFilePath}`);

package/schematics/rule-factories/additional-modules/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/additional-modules/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiF;AACjF,gDAKyB;AACzB,iCAAiC;AACjC,yDAA4D;AAC5D,qEAAiF;AACjF,+DAAkE;AAElE,kCAAkC;AAElC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;AAClF,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAEpD;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,OAAoF,EAAE,SAAiB;IAC7I;;;;OAIG;IACH,MAAM,iBAAiB,GAAS,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QACxE,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,IAAI,GAAuB,IAAA,0CAA6B,EAAC,gBAAgB,CAAC,CAAC;QACjF,MAAM,qBAAqB,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI;YACF,OAAO,IAAA,wCAA2B,EAAC,qBAAqB,EAAE,eAAe,EAAE,IAAI,EAAE,EAAC,GAAG,OAAO,EAAE,qBAAqB,EAAE,IAAI,EAAC,CAAC,CAAC;SAC7H;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,eAAe,EAAE,CAAC,CAAC;SAC5H;QACD,OAAO,IAAI,CAAC;IAEd,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,eAAe,GAAS,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtE,MAAM,eAAe,GAAW,EAAE,CAAC;QACnC,MAAM,cAAc,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACxD,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,cAAc,EACd,iBAAiB,EACjB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QACF,sIAAsI;QACtI,IAAI,IAAA,sBAAU,EAAC,UAAU,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,IAAI,IAAA,sBAAU,EAAC,UAAU,EAAE,mBAAmB,EAAE,6BAA6B,CAAC,EAAE;YACrJ,OAAO,IAAI,CAAC;SACb;QAED,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,cAAuB,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CACzG,IAAA,uBAAa,EAAC,OAAO,CAAC,WAAY,EAAE,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,EAAE,EAAE,CAAC,IAAI,CAAA,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,cAAc,EAAE,CAAC,CAC1G,CAAC;QAEF,qBAAqB,CACnB,mBAAmB,EACnB,6BAA6B,CAC9B,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC,eAAe,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,4BAA4B,GAAS,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAEnF,MAAM,cAAc,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,cAAc,EACd,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,EACrC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QACF,4HAA4H;QAC5H,IAAI,IAAA,sBAAU,EAAC,UAAU,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACb;QAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnH,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAC;YAC1G,OAAO,IAAI,CAAC;SACb;QACD,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAEzH,iFAAiF;QACjF,IAAI,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,cAAc,EAAE,4BAA4B,CAAC,CAAC;QACzG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAChC,gEAAgE;YAChE,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,kDAAkD;YACpF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,cAAc,EAAE,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC;SACb;QAED,MAAM,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAC1C,cAAc,EACd,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,EACrC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,iIAAiI;QACjI,IAAI,IAAA,sBAAU,EAAC,gBAAgB,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,EAAE;YAC7E,OAAO,IAAI,CAAC;SACb;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAElD,MAAM,YAAY,GAAG,IAAA,wBAAY,EAAC,gBAAgB,EAAE,cAAc,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,CAAC;QACjH,IAAI,YAAY,YAAY,qBAAY,EAAE;YACxC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC,KAAK,IAAI,CAAC,CAAC;SAClE;QAED,QAAQ,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE;;KAE/C,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF;;;;OAIG;IACH,MAAM,6BAA6B,GAAS,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QACpF,MAAM,cAAc,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,cAAc,EACd,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,EACrC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QACF,4HAA4H;QAC5H,IAAI,IAAA,sBAAU,EAAC,UAAU,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,EAAE;YACvE,OAAO,IAAI,CAAC;SACb;QAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnH,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAC;YAC1G,OAAO,IAAI,CAAC;SACb;QACD,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,gBAAgB,CAAC,SAAU,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAEzH,gFAAgF;QAChF,IAAI,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,cAAc,EAAE,qBAAqB,CAAC,CAAC;QAEnG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;YACjC,iEAAiE;YACjE,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;SAC3F;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,EAAE,kDAAkD;YACrF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,eAAe,EAAE,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC;SACb;QAED,MAAM,iBAAiB,GAAG,EAAE,CAAC,gBAAgB,CAC3C,eAAe,EACf,IAAI,CAAC,IAAI,CAAC,eAAe,CAAE,CAAC,QAAQ,EAAE,EACtC,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC;QAE7E,yHAAyH;QACzH,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;YACnC,OAAO,IAAI,CAAC;SACb;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAEnD,QAAQ,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,EAAE,EAAE,0CAA0C,CAAC,CAAC;QAE7F,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,iBAAiB;QACjB,eAAe;QACf,4BAA4B;QAC5B,6BAA6B;KAC9B,CAAC,CAAC;AACL,CAAC;AAxMD,0DAwMC"}

package/schematics/rule-factories/component/common.js

@@ -24,7 +24,7 @@ const askQuestionsToGetRulesOrThrowIfPackageNotAvailable = (path, optionName, de
         try {
             const packageJson = tree.readJson('./package.json');
             if (!packageJson.dependencies?.[packageName] && !packageJson.devDependencies?.[packageName]) {
-                throw new Error(`Package ${packageName} not installed`);
+                throw new schematics_2.O3rCliError(`Package ${packageName} not installed`);
             }
             if (typeof applyRule !== 'boolean' && context.interactive) {
                 applyRule = await (0, prompt_1.askConfirmation)(ruleQuestion, true);
@@ -57,7 +57,7 @@ const askQuestionsToGetRulesOrThrowIfPackageNotAvailable = (path, optionName, de
         }
         catch {
             if (applyRule) {
-                throw new Error(`
+                throw new schematics_2.O3rCliError(`
         You need to install '${packageName}' to be able to generate component with the option ${optionName}.
         Please run 'ng add ${packageName}'.
       `);

package/schematics/rule-factories/component/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/common.ts"],"names":[],"mappings":";;;AAAA,2DAAqH;AACrH,8DAAiF;AACjF,gDAAsF;AAGtF;;;;;;;;;;;;GAYG;AACI,MAAM,kDAAkD,GAAG,CAChE,IAAY,EACZ,UAAkB,EAClB,gBAA4C,EAC5C,YAAoB,EACpB,sBAAgC,EAChC,WAAmB,EACnB,aAAqB,EACrB,mBAAwB,EAAE,EACpB,EAAE;IACR,IAAI,SAAS,GAAG,gBAAgB,CAAC;IACjC,IAAI,eAAe,GAAkB,IAAI,CAAC;IAC1C,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAgB,CAAC;YACnE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC,EAAE;gBAC3F,MAAM,IAAI,KAAK,CAAC,WAAW,WAAW,gBAAgB,CAAC,CAAC;aACzD;YACD,IAAI,OAAO,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;gBACzD,SAAS,GAAG,MAAM,IAAA,wBAAe,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBACtD,IAAI,SAAS,EAAE;oBACb,eAAe,GAAG,MAAM,IAAA,oBAAW,EAAC,mCAAmC,UAAU,cAAc,EAAE;wBAC/F;4BACE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,aAAa;4BACnB,KAAK,EAAE,KAAK;yBACb;wBACD;4BACE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,wBAAwB;4BAC9B,KAAK,EAAE,WAAW;yBACnB;wBACD;4BACE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,mBAAmB,UAAU,aAAa;4BAChD,KAAK,EAAE,IAAI;yBACZ;qBACF,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;iBACd;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;;iBAEb,WAAW,IAAI,aAAa,YAAY,IAAI;SACpD,CAAC,CAAC;iBACF;aACF;SACF;QAAC,MAAM;YACN,IAAI,SAAS,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC;+BACO,WAAW,sDAAsD,UAAU;6BAC7E,WAAW;OACjC,CAAC,CAAC;aACF;YACD,SAAS,GAAG,KAAK,CAAC;SACnB;QAED,MAAM,OAAO,GAAG;YACd,IAAI;YACJ,GAAG,gBAAgB;SACpB,CAAC;QAEF,OAAO,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAK,EAAC;YACvB,WAAW,KAAK,WAAW;gBACzB,CAAC,CAAC,IAAA,8BAAiB,EAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC;gBACxD,CAAC,CAAC,IAAA,sBAAS,EAAC,aAAa,EAAE,OAAO,CAAC;YACrC,GAAG,CAAC,eAAe,KAAK,WAAW,CAAC,CAAC,CAAC;gBACpC,IAAA,yCAA4B,EAC1B,sBAAsB,CAAC,MAAM,CAAC,CAAC,GAA0C,EAAE,qBAAqB,EAAE,EAAE;oBAClG,GAAG,CAAC,qBAAqB,CAAC,GAAG;wBAC3B,CAAC,UAAU,CAAC,EAAE,eAAe,KAAK,KAAK;qBACxC,CAAC;oBACF,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CACP;aACF,CAAC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC,CAAC,CAAC,iBAAI,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC,CAAC;AA5EW,QAAA,kDAAkD,sDA4E7D"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/component/common.ts"],"names":[],"mappings":";;;AAAA,2DAAqH;AACrH,8DAAiF;AACjF,gDAAmG;AAGnG;;;;;;;;;;;;GAYG;AACI,MAAM,kDAAkD,GAAG,CAChE,IAAY,EACZ,UAAkB,EAClB,gBAA4C,EAC5C,YAAoB,EACpB,sBAAgC,EAChC,WAAmB,EACnB,aAAqB,EACrB,mBAAwB,EAAE,EACpB,EAAE;IACR,IAAI,SAAS,GAAG,gBAAgB,CAAC;IACjC,IAAI,eAAe,GAAkB,IAAI,CAAC;IAC1C,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACrD,IAAI;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAgB,CAAC;YACnE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,WAAW,CAAC,EAAE;gBAC3F,MAAM,IAAI,wBAAW,CAAC,WAAW,WAAW,gBAAgB,CAAC,CAAC;aAC/D;YACD,IAAI,OAAO,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,EAAE;gBACzD,SAAS,GAAG,MAAM,IAAA,wBAAe,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBACtD,IAAI,SAAS,EAAE;oBACb,eAAe,GAAG,MAAM,IAAA,oBAAW,EAAC,mCAAmC,UAAU,cAAc,EAAE;wBAC/F;4BACE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,aAAa;4BACnB,KAAK,EAAE,KAAK;yBACb;wBACD;4BACE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,wBAAwB;4BAC9B,KAAK,EAAE,WAAW;yBACnB;wBACD;4BACE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,mBAAmB,UAAU,aAAa;4BAChD,KAAK,EAAE,IAAI;yBACZ;qBACF,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;iBACd;qBAAM;oBACL,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;;iBAEb,WAAW,IAAI,aAAa,YAAY,IAAI;SACpD,CAAC,CAAC;iBACF;aACF;SACF;QAAC,MAAM;YACN,IAAI,SAAS,EAAE;gBACb,MAAM,IAAI,wBAAW,CAAC;+BACC,WAAW,sDAAsD,UAAU;6BAC7E,WAAW;OACjC,CAAC,CAAC;aACF;YACD,SAAS,GAAG,KAAK,CAAC;SACnB;QAED,MAAM,OAAO,GAAG;YACd,IAAI;YACJ,GAAG,gBAAgB;SACpB,CAAC;QAEF,OAAO,SAAS,CAAC,CAAC,CAAC,IAAA,kBAAK,EAAC;YACvB,WAAW,KAAK,WAAW;gBACzB,CAAC,CAAC,IAAA,8BAAiB,EAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC;gBACxD,CAAC,CAAC,IAAA,sBAAS,EAAC,aAAa,EAAE,OAAO,CAAC;YACrC,GAAG,CAAC,eAAe,KAAK,WAAW,CAAC,CAAC,CAAC;gBACpC,IAAA,yCAA4B,EAC1B,sBAAsB,CAAC,MAAM,CAAC,CAAC,GAA0C,EAAE,qBAAqB,EAAE,EAAE;oBAClG,GAAG,CAAC,qBAAqB,CAAC,GAAG;wBAC3B,CAAC,UAAU,CAAC,EAAE,eAAe,KAAK,KAAK;qBACxC,CAAC;oBACF,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CACP;aACF,CAAC,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC,CAAC,CAAC,iBAAI,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC,CAAC;AA5EW,QAAA,kDAAkD,sDA4E7D"}

package/schematics/rule-factories/customization-environment/index.d.ts

@@ -1,7 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
  * Enable customization capabilities
- *
  * @param rootPath @see RuleFactory.rootPath
  * @param o3rCoreVersion
  * @param options

package/schematics/rule-factories/customization-environment/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/customization-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAUpC;;;;;;;;GAQG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAuHnK"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/customization-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAUpC;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAkGnK"}

package/schematics/rule-factories/customization-environment/index.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateCustomizationEnvironment = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
+const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
-const change_1 = require("@schematics/angular/utility/change");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const node_path_1 = require("node:path");
 /**
  * Enable customization capabilities
- *
  * @param rootPath @see RuleFactory.rootPath
  * @param o3rCoreVersion
  * @param options
@@ -19,12 +18,11 @@ const node_path_1 = require("node:path");
 function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLibrary) {
     /**
      * Generate customization folder
-     *
      * @param tree
      * @param context
      */
     const generateC11nFolder = (tree, context) => {
-        const workingDirectory = (0, schematics_2.getProjectRootDir)(tree, options?.projectName) || '.';
+        const workingDirectory = options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '.';
         if (tree.exists(node_path_1.posix.join(workingDirectory, 'src', 'customization', 'presenters-map.empty.ts'))) {
             return tree;
         }
@@ -37,11 +35,11 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
     };
     /**
      * Edit main module with the customization required information
-     *
      * @param tree
      * @param context
      */
     const registerModules = (tree, context) => {
+        const additionalRules = [];
         const fileInfo = (0, schematics_2.getFileInfo)(tree, context, options?.projectName);
         if (!fileInfo.moduleFilePath || !fileInfo.appModuleFile || !fileInfo.sourceFile) {
             return tree;
@@ -52,36 +50,17 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
         }
         const fileContent = tree.readText(fileInfo.moduleFilePath).replace(/[\r\n ]*/g, '');
         const recorder = tree.beginUpdate(fileInfo.moduleFilePath);
-        const moduleIndex = fileInfo.ngModulesMetadata && fileInfo.ngModulesMetadata[0] ?
-            fileInfo.ngModulesMetadata[0].pos - ('NgModule'.length + 1) : fileInfo.appModuleFile.indexOf('@NgModule');
+        const moduleIndex = fileInfo.moduleIndex;
         /**
          * Insert import on top of the main module file
-         *
          * @param rec
          * @param name
          * @param file
          * @param isDefault
          */
         const insertImportToModuleFile = (rec, name, file, isDefault) => (0, schematics_2.insertImportToModuleFile)(name, file, fileInfo.sourceFile, rec, fileInfo.moduleFilePath, isDefault);
-        /**
-         * Add elements in the metadata of the ngModule (customComponents, imports etc.)
-         *
-         * @param rec
-         * @param metadataField
-         * @param name
-         */
-        const addToNgModuleMetadata = (rec, metadataField, name) => {
-            (0, ast_utils_1.addSymbolToNgModuleMetadata)(fileInfo.sourceFile, fileInfo.moduleFilePath, metadataField, name)
-                .forEach((change) => {
-                if (change instanceof change_1.InsertChange) {
-                    rec = rec.insertLeft(change.pos, change.toAdd);
-                }
-            });
-            return rec;
-        };
         /**
          * Add custom code before the module definition
-         *
          * @param rec
          * @param line
          */
@@ -91,17 +70,17 @@ function updateCustomizationEnvironment(rootPath, o3rCoreVersion, options, isLib
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'registerCustomComponents', '../customization/presenters-map.empty');
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'Provider', '@angular/core');
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'initializeCustomProviders', '../customization/custom-providers.empty');
-        updatedRecorder = addToNgModuleMetadata(updatedRecorder, 'imports', '...entry.customComponentsModules');
-        updatedRecorder = addToNgModuleMetadata(updatedRecorder, 'providers', '...customProviders');
-        updatedRecorder = addToNgModuleMetadata(updatedRecorder, 'imports', 'C11nModule.forRoot({registerCompFunc: registerCustomComponents})');
+        additionalRules.push((0, utility_1.addRootImport)(options?.projectName, ({ code }) => code `...entry.customComponentsModules`));
+        additionalRules.push((0, utility_1.addRootProvider)(options?.projectName, ({ code }) => code `...customProviders`));
+        additionalRules.push((0, utility_1.addRootImport)(options?.projectName, ({ code }) => code `C11nModule.forRoot({registerCompFunc: registerCustomComponents})`));
         updatedRecorder = insertImportToModuleFile(updatedRecorder, 'C11nModule', '@o3r/components');
         updatedRecorder = insertBeforeModule(updatedRecorder, 'const entry = initializeEntryComponents();');
         updatedRecorder = insertBeforeModule(updatedRecorder, 'const customProviders: Provider[] = initializeCustomProviders();');
         tree.commitUpdate(updatedRecorder);
-        return tree;
+        return (0, schematics_1.chain)(additionalRules)(tree, context);
     };
     return (tree, _context) => {
-        const workingDirectory = (0, schematics_2.getProjectRootDir)(tree, options?.projectName);
+        const workingDirectory = options?.projectName && (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName]?.root || '.';
         return (0, schematics_1.chain)([
             generateC11nFolder,
             registerModules,

package/schematics/rule-factories/customization-environment/index.js.map

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

package/schematics/rule-factories/index.d.ts

@@ -1,10 +1,7 @@
 export * from './o3r-basic-updates/index';
 export * from './additional-modules/index';
-export * from './azure-pipeline/index';
 export * from './customization-environment/index';
 export * from './otter-environment/index';
 export * from './playwright/index';
-export * from './renovate/index';
 export * from './store/index';
-export * from './monorepo/index';
 //# sourceMappingURL=index.d.ts.map

package/schematics/rule-factories/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mCAAmC,CAAC;AAClD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mCAAmC,CAAC;AAClD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}

package/schematics/rule-factories/index.js

@@ -3,11 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./o3r-basic-updates/index"), exports);
 tslib_1.__exportStar(require("./additional-modules/index"), exports);
-tslib_1.__exportStar(require("./azure-pipeline/index"), exports);
 tslib_1.__exportStar(require("./customization-environment/index"), exports);
 tslib_1.__exportStar(require("./otter-environment/index"), exports);
 tslib_1.__exportStar(require("./playwright/index"), exports);
-tslib_1.__exportStar(require("./renovate/index"), exports);
 tslib_1.__exportStar(require("./store/index"), exports);
-tslib_1.__exportStar(require("./monorepo/index"), exports);
 //# sourceMappingURL=index.js.map

package/schematics/rule-factories/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,qEAA2C;AAC3C,iEAAuC;AACvC,4EAAkD;AAClD,oEAA0C;AAC1C,6DAAmC;AACnC,2DAAiC;AACjC,wDAA8B;AAC9B,2DAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/rule-factories/index.ts"],"names":[],"mappings":";;;AAAA,oEAA0C;AAC1C,qEAA2C;AAC3C,4EAAkD;AAClD,oEAA0C;AAC1C,6DAAmC;AACnC,wDAA8B"}

package/schematics/rule-factories/o3r-basic-updates/index.d.ts

@@ -2,10 +2,9 @@ import { Rule } from '@angular-devkit/schematics';
 import { WorkspaceProject } from '@o3r/schematics';
 /**
  * Package.json updates to include o3r ng update script
- * Install of dev-tools and schematics packages
- *
  * @param pName project name
  * @param o3rCoreVersion
+ * @param _o3rCoreVersion
  * @param projectType
  */
 export declare function o3rBasicUpdates(pName: string | null | undefined, _o3rCoreVersion?: string, projectType?: WorkspaceProject['projectType']): Rule;

package/schematics/rule-factories/o3r-basic-updates/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/o3r-basic-updates/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAInD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAgC/I"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/o3r-basic-updates/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAInD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,eAAe,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,aAAa,CAAC,GAAG,IAAI,CAqC/I"}

package/schematics/rule-factories/o3r-basic-updates/index.js

@@ -4,10 +4,9 @@ exports.o3rBasicUpdates = void 0;
 const schematics_1 = require("@o3r/schematics");
 /**
  * Package.json updates to include o3r ng update script
- * Install of dev-tools and schematics packages
- *
  * @param pName project name
  * @param o3rCoreVersion
+ * @param _o3rCoreVersion
  * @param projectType
  */
 function o3rBasicUpdates(pName, _o3rCoreVersion, projectType) {
@@ -18,8 +17,12 @@ function o3rBasicUpdates(pName, _o3rCoreVersion, projectType) {
         packageJsonObj.scripts['update:otter'] = 'ng update @o3r/core';
         tree.overwrite(packageJsonPath, JSON.stringify(packageJsonObj, null, 2));
     };
-    return (tree, _context) => {
-        const workspace = (0, schematics_1.readAngularJson)(tree);
+    return (tree, context) => {
+        const workspace = (0, schematics_1.getWorkspaceConfig)(tree);
+        if (!workspace) {
+            context.logger.error('No workspace detected');
+            return tree;
+        }
         if (!projectType) { // at the root of the monorepo
             const rootPackageJsonPath = '/package.json';
             if (tree.exists(rootPackageJsonPath)) {

package/schematics/rule-factories/o3r-basic-updates/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/o3r-basic-updates/index.ts"],"names":[],"mappings":";;;AAEA,gDAAmE;AAGnE;;;;;;;GAOG;AACH,SAAgB,eAAe,CAAC,KAAgC,EAAE,eAAwB,EAAE,WAA6C;IAEvI,MAAM,cAAc,GAAG,CAAC,IAAU,EAAE,cAA2B,EAAE,eAAe,GAAG,eAAe,EAAE,EAAE;QACpG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;YAC3B,cAAc,CAAC,OAAO,GAAG,EAAE,CAAC;SAC7B;QAED,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC;QAE/D,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC;IAEF,OAAO,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAChD,MAAM,SAAS,GAAG,IAAA,4BAAe,EAAC,IAAI,CAAC,CAAC;QAExC,IAAI,CAAC,WAAW,EAAE,EAAE,8BAA8B;YAChD,MAAM,mBAAmB,GAAG,eAAe,CAAC;YAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;gBACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAgB,CAAC;gBAChF,cAAc,CAAC,IAAI,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;aAClE;SACF;QAED,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC/B,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC;aAC5C,OAAO,CAAC,CAAC,CAAC,EAAC,gBAAgB,CAAC,EAAE,EAAE;YAC/B,MAAM,WAAW,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAC5D,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,IAAI,eAAe,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AAEJ,CAAC;AAhCD,0CAgCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/rule-factories/o3r-basic-updates/index.ts"],"names":[],"mappings":";;;AAEA,gDAAsE;AAGtE;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,KAAgC,EAAE,eAAwB,EAAE,WAA6C;IAEvI,MAAM,cAAc,GAAG,CAAC,IAAU,EAAE,cAA2B,EAAE,eAAe,GAAG,eAAe,EAAE,EAAE;QACpG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;YAC3B,cAAc,CAAC,OAAO,GAAG,EAAE,CAAC;SAC7B;QAED,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,qBAAqB,CAAC;QAE/D,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC,CAAC;IAEF,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC/C,MAAM,SAAS,GAAG,IAAA,+BAAkB,EAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,WAAW,EAAE,EAAE,8BAA8B;YAChD,MAAM,mBAAmB,GAAG,eAAe,CAAC;YAC5C,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;gBACpC,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAgB,CAAC;gBAChF,cAAc,CAAC,IAAI,EAAE,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;aAClE;SACF;QAED,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC/B,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC;aAC5C,OAAO,CAAC,CAAC,CAAC,EAAC,gBAAgB,CAAC,EAAE,EAAE;YAC/B,MAAM,WAAW,GAAG,IAAA,4BAAe,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAC5D,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,gBAAgB,CAAC,IAAI,eAAe,CAAC,CAAC;QAC7E,CAAC,CAAC,CAAC;QACL,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AAEJ,CAAC;AArCD,0CAqCC"}

package/schematics/rule-factories/otter-environment/index.d.ts

@@ -1,7 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
  * Update Otter environment variable for schematics
- *
  * @param options @see RuleFactory.options
  * @param rootPath @see RuleFactory.rootPath
  * @param options.projectName

package/schematics/rule-factories/otter-environment/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAsJN"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/otter-environment/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAOjF;;;;;;;;;;;GAWG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE;IACP,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,EACD,SAAS,EAAE,MAAM,GAChB,IAAI,CAmJN"}