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

package/schematics/add-modules/index.js

@@ -7,22 +7,29 @@ const schematics_2 = require("@o3r/schematics");
 const presets_1 = require("../shared/presets");
 /**
  * Select the available modules to add to the project
- *
  * @param options
  */
 function ngAddModules(options) {
     return async (tree, context) => {
-        if (!context.interactive && options.preset === 'none') {
+        if (!context.interactive && !options.preset && !options.externalPresets) {
             context.logger.error('This command is available only for interactive shell, only the "preset" option can be used without interaction');
             return () => tree;
         }
-        if (options.preset !== 'none') {
-            const { preset, ...forwardOptions } = options;
-            const presetRunner = await presets_1.presets[preset]({ forwardOptions });
-            if (presetRunner.modules) {
-                context.logger.info(`The following modules will be installed: ${presetRunner.modules.join(', ')}`);
+        const { preset, externalPresets, ...forwardOptions } = options;
+        const presetRunner = preset ? await presets_1.presets[preset]({ forwardOptions }) : undefined;
+        const externalPresetRunner = externalPresets ? await (0, presets_1.getExternalPreset)(externalPresets, tree, context)?.({ projectName: forwardOptions.projectName, forwardOptions }) : undefined;
+        const mods = [...new Set([...(presetRunner?.modules || []), ...(externalPresetRunner?.modules || [])])];
+        if (mods.length) {
+            context.logger.info(`The following modules will be installed: ${mods.join(', ')}`);
+            if (context.interactive && !await (0, prompt_1.askConfirmation)('Would you like to process to the setup of these modules?', true)) {
+                return;
             }
-            return presetRunner.rule;
+        }
+        if (presetRunner || externalPresetRunner) {
+            return () => (0, schematics_1.chain)([
+                presetRunner?.rule || (0, schematics_1.noop)(),
+                externalPresetRunner?.rule || (0, schematics_1.noop)()
+            ])(tree, context);
         }
         try {
             const modules = await (0, schematics_2.getAvailableModulesWithLatestPackage)(schematics_2.OTTER_MODULE_KEYWORD, {
@@ -42,7 +49,7 @@ function ngAddModules(options) {
                 short: mod.description
             })), 0, null);
             if (res) {
-                return (0, schematics_1.externalSchematic)(res, 'ng-add', {});
+                return (0, schematics_1.externalSchematic)(res, 'ng-add', forwardOptions);
             }
         }
         catch (e) {

package/schematics/add-modules/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/add-modules/index.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AAErE,8DAAgE;AAChE,gDAAgJ;AAChJ,+CAA4C;AAE5C;;;;GAIG;AACH,SAAgB,YAAY,CAAC,OAAqC;IAChE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YACrD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gHAAgH,CAAC,CAAC;YACvI,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;SACnB;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,MAAM,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;YAC9C,MAAM,YAAY,GAAG,MAAM,iBAAO,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;YAC/D,IAAI,YAAY,CAAC,OAAO,EAAE;gBACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACpG;YACD,OAAO,YAAY,CAAC,IAAI,CAAC;SAC1B;QAED,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,IAAA,iDAAoC,EAAC,iCAAoB,EAAE;gBAC/E,cAAc,EAAE,0CAA6B;gBAC7C,gBAAgB,EAAE,IAAI;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,eAAe,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC;aAC1C,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;gBAC/D,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;aACnB;YAED,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAW,EAAC,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACpF,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,GAAG,CAAC,IAAI;gBACf,KAAK,EAAE,GAAG,CAAC,WAAW;aACvB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAEd,IAAI,GAAG,EAAE;gBACP,OAAO,IAAA,8BAAiB,EAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;aAC7C;SACF;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;SAC3D;QACD,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IAEpB,CAAC,CAAC;AACJ,CAAC;AA7CD,oCA6CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/add-modules/index.ts"],"names":[],"mappings":";;;AAAA,2DAAkF;AAElF,8DAAiF;AACjF,gDAAgJ;AAChJ,+CAA+D;AAE/D;;;GAGG;AACH,SAAgB,YAAY,CAAC,OAAqC;IAChE,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YACvE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gHAAgH,CAAC,CAAC;YACvI,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;SACnB;QAED,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;QAC/D,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,iBAAO,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,MAAM,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,IAAA,2BAAiB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,cAAc,CAAC,WAAW,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAClL,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,oBAAoB,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxG,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnF,IAAI,OAAO,CAAC,WAAW,IAAI,CAAC,MAAM,IAAA,wBAAe,EAAC,0DAA0D,EAAE,IAAI,CAAC,EAAE;gBACnH,OAAO;aACR;SACF;QACD,IAAI,YAAY,IAAI,oBAAoB,EAAE;YACxC,OAAO,GAAG,EAAE,CAAC,IAAA,kBAAK,EAAC;gBACjB,YAAY,EAAE,IAAI,IAAI,IAAA,iBAAI,GAAE;gBAC5B,oBAAoB,EAAE,IAAI,IAAI,IAAA,iBAAI,GAAE;aACrC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnB;QAED,IAAI;YACF,MAAM,OAAO,GAAG,MAAM,IAAA,iDAAoC,EAAC,iCAAoB,EAAE;gBAC/E,cAAc,EAAE,0CAA6B;gBAC7C,gBAAgB,EAAE,IAAI;gBACtB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,eAAe,EAAE,IAAA,+BAAkB,EAAC,IAAI,CAAC;aAC1C,CAAC,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;gBAC/D,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;aACnB;YAED,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAW,EAAC,gCAAgC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACpF,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,KAAK,EAAE,GAAG,CAAC,IAAI;gBACf,KAAK,EAAE,GAAG,CAAC,WAAW;aACvB,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;YAEd,IAAI,GAAG,EAAE;gBACP,OAAO,IAAA,8BAAiB,EAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;aACzD;SACF;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;YAC7D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;SAC3D;QACD,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC;IAEpB,CAAC,CAAC;AACJ,CAAC;AArDD,oCAqDC"}

package/schematics/add-modules/schema.d.ts

@@ -1,7 +1,11 @@
 import type { SchematicOptionObject } from '@o3r/schematics';
 import type { PresetNames } from '../ng-add/schema';
 export interface NgAddModulesSchematicsSchema extends SchematicOptionObject {
+    /** Project name */
+    projectName?: string | undefined;
     /** reset of module list to automatically install */
-    preset: PresetNames | 'none';
+    preset?: PresetNames | undefined;
+    /** Preset of non-official module list to automatically install */
+    externalPresets?: string | undefined;
 }
 //# sourceMappingURL=schema.d.ts.map

package/schematics/add-modules/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/add-modules/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,WAAW,4BAA6B,SAAQ,qBAAqB;IACzE,oDAAoD;IACpD,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC;CAC9B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/add-modules/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,WAAW,4BAA6B,SAAQ,qBAAqB;IACzE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAEjC,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC"}

package/schematics/add-modules/schema.json

@@ -1,18 +1,28 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgAddModules",
   "title": "Add available Otter modules",
   "description": "ng generate Add module",
   "properties": {
+    "projectName": {
+      "type": "string",
+      "description": "Project name",
+      "$default": {
+        "$source": "projectName"
+      }
+    },
     "preset": {
       "type": "string",
       "description": "Preset of module list to automatically install",
-      "default": "none",
       "enum": [
-        "none",
         "basic",
-        "cms"
+        "cms",
+        "all"
       ]
+    },
+    "externalPresets": {
+      "description": "Preset of non-official module list to automatically install",
+      "type": "string"
     }
   },
   "additionalProperties": true

package/schematics/component/container/index.d.ts

@@ -3,7 +3,6 @@ import { NgGenerateComponentContainerSchematicsSchema } from './schema';
 export declare const CONTAINER_FOLDER = "container";
 /**
  * Add Otter container component to an Angular Project
- *
  * @param options
  */
 export declare function ngGenerateComponentContainer(options: NgGenerateComponentContainerSchematicsSchema): Rule;

package/schematics/component/container/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAyBhM,OAAO,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AA8B5C;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CA8NxG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAyBhM,OAAO,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AA6B5C;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CA8NxG"}

package/schematics/component/container/index.js

@@ -16,7 +16,6 @@ const structures_types_1 = require("../structures.types");
 exports.CONTAINER_FOLDER = 'container';
 /**
  * Generates the template properties
- *
  * @param options
  * @param componentStructureDef
  * @param prefix
@@ -41,13 +40,12 @@ const getTemplateProperties = (options, componentStructureDef, prefix) => {
 };
 /**
  * Add Otter container component to an Angular Project
- *
  * @param options
  */
 function ngGenerateComponentContainer(options) {
     const fullStructureRequested = options.componentStructure === 'full';
     const generateFiles = (tree, context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const properties = getTemplateProperties(options, structures_types_1.ComponentStructureDef.Cont, options.prefix ? options.prefix : workspaceProject?.prefix);
         const destination = (0, schematics_2.getDestinationPath)('@o3r/core:component', options.path, tree, options.projectName);
         const componentDestination = path.posix.join(destination, fullStructureRequested ? path.posix.join(properties.folderName, exports.CONTAINER_FOLDER) : properties.folderName);

package/schematics/component/container/index.js.map

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

package/schematics/component/container/schema.json

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

package/schematics/component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/component/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAGxJ,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAiD/D;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,mCAAmC,GAAG,IAAI,CA4EtF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/component/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAsD,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAGxJ,OAAO,EAAE,mCAAmC,EAAE,MAAM,UAAU,CAAC;AAiD/D;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,mCAAmC,GAAG,IAAI,CA+EtF"}

package/schematics/component/index.js

@@ -89,16 +89,19 @@ function ngGenerateComponent(options) {
         return tree;
     };
     switch (options.componentStructure) {
-        case 'container':
+        case 'container': {
             return (0, schematics_1.chain)([
                 generateRootBarrel,
                 generateComponentContainer(options)
             ]);
-        case 'presenter':
+        }
+        case 'simple':
+        case 'presenter': {
             return (0, schematics_1.chain)([
                 generateRootBarrel,
                 generateComponentPresenter(options)
             ]);
+        }
         default: {
             const generateFiles = (tree, context) => {
                 const inputComponentName = (0, schematics_2.getInputComponentName)(options.componentName);

package/schematics/component/index.js.map

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

package/schematics/component/presenter/index.d.ts

@@ -3,7 +3,6 @@ import { NgGenerateComponentSchematicsSchema } from '../schema';
 export declare const PRESENTER_FOLDER = "presenter";
 /**
  * Add Otter component to an Angular Project
- *
  * @param options
  */
 export declare function ngGenerateComponentPresenter(options: NgGenerateComponentSchematicsSchema): Rule;

package/schematics/component/presenter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/presenter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAiBpC,OAAO,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAGhE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAyB5C;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,mCAAmC,GAAG,IAAI,CAyI/F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/presenter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAiBpC,OAAO,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAGhE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAyB5C;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,mCAAmC,GAAG,IAAI,CA6I/F"}

package/schematics/component/presenter/index.js

@@ -14,7 +14,6 @@ const structures_types_1 = require("../structures.types");
 exports.PRESENTER_FOLDER = 'presenter';
 /**
  * Generates the template properties
- *
  * @param options
  * @param componentStructureDef
  * @param prefix
@@ -22,27 +21,27 @@ exports.PRESENTER_FOLDER = 'presenter';
 const getTemplateProperties = (options, componentStructureDef, prefix) => {
     const inputComponentName = (0, schematics_2.getInputComponentName)(options.componentName);
     const folderName = (0, schematics_2.getComponentFolderName)(inputComponentName);
+    const structure = componentStructureDef !== structures_types_1.ComponentStructureDef.Simple ? componentStructureDef : '';
     return {
         ...options,
-        componentName: (0, schematics_2.getComponentName)(inputComponentName, componentStructureDef).replace(/Component$/, ''),
+        componentName: (0, schematics_2.getComponentName)(inputComponentName, structure).replace(/Component$/, ''),
         componentSelector: (0, schematics_2.getComponentSelectorWithoutSuffix)(options.componentName, prefix || null),
         projectName: options.projectName || (0, schematics_2.getLibraryNameFromPath)(options.path),
         folderName,
-        name: (0, schematics_2.getComponentFileName)(options.componentName, componentStructureDef),
-        suffix: componentStructureDef.toLowerCase(),
+        name: (0, schematics_2.getComponentFileName)(options.componentName, structure),
+        suffix: structure.toLowerCase(),
         description: options.description || ''
     };
 };
 /**
  * Add Otter component to an Angular Project
- *
  * @param options
  */
 function ngGenerateComponentPresenter(options) {
     const fullStructureRequested = options.componentStructure === 'full';
     const generateFiles = (tree, _context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree);
-        const properties = getTemplateProperties(options, structures_types_1.ComponentStructureDef.Pres, options.prefix ? options.prefix : workspaceProject?.prefix);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+        const properties = getTemplateProperties(options, options.componentStructure === 'simple' ? structures_types_1.ComponentStructureDef.Simple : structures_types_1.ComponentStructureDef.Pres, options.prefix || workspaceProject?.prefix);
         const destination = (0, schematics_2.getDestinationPath)('@o3r/core:component', options.path, tree, options.projectName);
         const componentDestination = path.posix.join(destination, fullStructureRequested ? path.posix.join(properties.folderName, exports.PRESENTER_FOLDER) : properties.folderName);
         const componentPath = path.posix.join(componentDestination, `${properties.name}.component.ts`);
@@ -52,6 +51,7 @@ function ngGenerateComponentPresenter(options) {
         const o3rStylePath = path.posix.join(componentDestination, `${properties.name}.style.scss`);
         const ngTemplatePath = path.posix.join(componentDestination, `${properties.name}.component.html`);
         const o3rTemplatePath = path.posix.join(componentDestination, `${properties.name}.template.html`);
+        const componentSelector = `${properties.componentSelector}${properties.suffix ? ('-' + properties.suffix) : ''}`;
         const rules = [];
         if (!options.standalone) {
             rules.push((0, schematics_1.externalSchematic)('@schematics/angular', 'module', {
@@ -67,7 +67,7 @@ function ngGenerateComponentPresenter(options) {
             (0, schematics_1.move)(componentDestination)
         ]), schematics_1.MergeStrategy.Overwrite), (0, schematics_1.externalSchematic)('@schematics/angular', 'component', {
             project: properties.projectName,
-            selector: `${properties.componentSelector}-${properties.suffix}`,
+            selector: componentSelector,
             path: componentDestination,
             name: properties.componentName,
             inlineStyle: false,
@@ -93,7 +93,7 @@ function ngGenerateComponentPresenter(options) {
             (0, schematics_1.move)(ngStylePath, o3rStylePath),
             (t) => {
                 // Styling file is empty by default, as we create component with `viewEncapsulation` set to 'None', we should wrap the styling into the selector of the component
-                t.overwrite(o3rStylePath, `${properties.componentSelector}-${properties.suffix} {\n\t// Your component custom SCSS\n}\n`);
+                t.overwrite(o3rStylePath, `${componentSelector} {\n\t// Your component custom SCSS\n}\n`);
                 return t;
             },
             (t) => {

package/schematics/component/presenter/index.js.map

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

package/schematics/component/presenter/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgGenerateComponentSchematicsSchema",
   "title": "Generate Otter Component",
   "description": "ng generate Otter Component",
@@ -33,9 +33,10 @@
       "type": "string",
       "enum": [
         "full",
-        "presenter"
+        "presenter",
+        "simple"
       ],
-      "description": "Structure of the component you want to generate ('full' | 'presenter')",
+      "description": "Structure of the component you want to generate ('full' | 'presenter' | 'simple')",
       "default": "presenter"
     },
     "useComponentFixtures": {

package/schematics/component/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgGenerateComponentSchematicsSchema",
   "title": "Generate Otter Component",
   "description": "ng generate Otter Component",
@@ -32,13 +32,13 @@
     "componentStructure": {
       "type": "string",
       "enum": [
+        "simple",
         "full",
         "container",
         "presenter"
       ],
-      "description": "Structure of the component you want to generate ('full' | 'container' | 'presenter')",
-      "default": "full",
-      "x-prompt": "Specify the structure of the component you want to generate"
+      "description": "Structure of the component you want to generate ('simple' | 'full' | 'container' | 'presenter')",
+      "default": "simple"
     },
     "useComponentFixtures": {
       "type": "boolean",

package/schematics/component/structures.types.d.ts

@@ -1,6 +1,7 @@
-export type ComponentStructure = 'full' | 'container' | 'presenter';
+export type ComponentStructure = 'full' | 'container' | 'presenter' | 'simple';
 export declare enum ComponentStructureDef {
     'Cont' = "Cont",
-    'Pres' = "Pres"
+    'Pres' = "Pres",
+    'Simple' = "Simple"
 }
 //# sourceMappingURL=structures.types.d.ts.map

package/schematics/component/structures.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structures.types.d.ts","sourceRoot":"","sources":["../../../schematics/component/structures.types.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,WAAW,GAAG,WAAW,CAAC;AACpE,oBAAY,qBAAqB;IAC/B,MAAM,SAAS;IACf,MAAM,SAAS;CAChB"}
+{"version":3,"file":"structures.types.d.ts","sourceRoot":"","sources":["../../../schematics/component/structures.types.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAC/E,oBAAY,qBAAqB;IAC/B,MAAM,SAAS;IACf,MAAM,SAAS;IACf,QAAQ,WAAW;CACpB"}

package/schematics/component/structures.types.js

@@ -5,5 +5,6 @@ var ComponentStructureDef;
 (function (ComponentStructureDef) {
     ComponentStructureDef["Cont"] = "Cont";
     ComponentStructureDef["Pres"] = "Pres";
+    ComponentStructureDef["Simple"] = "Simple";
 })(ComponentStructureDef || (exports.ComponentStructureDef = ComponentStructureDef = {}));
 //# sourceMappingURL=structures.types.js.map

package/schematics/component/structures.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"structures.types.js","sourceRoot":"","sources":["../../../schematics/component/structures.types.ts"],"names":[],"mappings":";;;AAEA,IAAY,qBAGX;AAHD,WAAY,qBAAqB;IAC/B,sCAAe,CAAA;IACf,sCAAe,CAAA;AACjB,CAAC,EAHW,qBAAqB,qCAArB,qBAAqB,QAGhC"}
+{"version":3,"file":"structures.types.js","sourceRoot":"","sources":["../../../schematics/component/structures.types.ts"],"names":[],"mappings":";;;AAEA,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,sCAAe,CAAA;IACf,sCAAe,CAAA;IACf,0CAAmB,CAAA;AACrB,CAAC,EAJW,qBAAqB,qCAArB,qBAAqB,QAIhC"}

package/schematics/context-to-component/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/context-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAY5D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI,CAsEvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/context-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAY5D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,2BAA2B,GAAG,IAAI,CAsEvE"}

package/schematics/context-to-component/index.js

@@ -10,7 +10,7 @@ const checkContext = (componentPath, tree) => {
         node_path_1.posix.join((0, node_path_1.dirname)(componentPath), `${(0, node_path_1.basename)(componentPath, '.component.ts')}.context.ts`)
     ];
     if (files.some((file) => tree.exists(file))) {
-        throw new Error(`Unable to add context to this component because it already has at least one of these files: ${files.join(', ')}.`);
+        throw new schematics_2.O3rCliError(`Unable to add context to this component because it already has at least one of these files: ${files.join(', ')}.`);
     }
 };
 /**

package/schematics/context-to-component/index.js.map

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

package/schematics/context-to-component/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgAddContextSchematicsSchema",
   "title": "Add Otter Context to an existing component",
   "description": "Add Otter Context to an existing component",

package/schematics/convert-component/index.js

@@ -19,10 +19,10 @@ function convertToO3rComponent(options) {
         changes.push((0, ast_utils_1.insertImport)(sourceFile, options.path, 'O3rComponent', '@o3r/core'));
         const ngComponentDeclaration = sourceFile.statements.find((s) => ts.isClassDeclaration(s) && (0, schematics_2.isNgClassComponent)(s));
         if (!ngComponentDeclaration) {
-            throw new Error(`No Angular component found in ${options.path}.`);
+            throw new schematics_2.O3rCliError(`No Angular component found in ${options.path}.`);
         }
         if ((0, schematics_2.isO3rClassComponent)(ngComponentDeclaration)) {
-            throw new Error(`${ngComponentDeclaration.name?.escapedText.toString() || 'It'} is already an Otter component.`);
+            throw new schematics_2.O3rCliError(`${ngComponentDeclaration.name?.escapedText.toString() || 'It'} is already an Otter component.`);
         }
         changes.push(new change_1.InsertChange(options.path, ngComponentDeclaration.getStart(), `@O3rComponent({ componentType: '${options.componentType}' })\n`));
         (0, change_1.applyToUpdateRecorder)(recorder, changes);

package/schematics/convert-component/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/convert-component/index.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AACrE,gDAA0F;AAC1F,qEAAqE;AACrE,+DAAyF;AACzF,iCAAiC;AAIjC;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,OAA8C;IAElF,MAAM,mBAAmB,GAAS,CAAC,IAAU,EAAE,EAAE;QAC/C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,IAAI,EACZ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAC3B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;QAElF,MAAM,sBAAsB,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAA4B,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;QAE9I,IAAI,CAAC,sBAAsB,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;SACnE;QAED,IAAI,IAAA,gCAAmB,EAAC,sBAAsB,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CAAC,GAAG,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,IAAI,IAAI,iCAAiC,CAAC,CAAC;SAClH;QAED,OAAO,CAAC,IAAI,CACV,IAAI,qBAAY,CACd,OAAO,CAAC,IAAI,EACZ,sBAAsB,CAAC,QAAQ,EAAE,EACjC,mCAAmC,OAAO,CAAC,aAAa,QAAQ,CACjE,CACF,CAAC;QAEF,IAAA,8BAAqB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,mBAAmB;QACnB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;KAC/C,CAAC,CAAC;AACL,CAAC;AA1CD,sDA0CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/convert-component/index.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AACrE,gDAAuG;AACvG,qEAAqE;AACrE,+DAAyF;AACzF,iCAAiC;AAIjC;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,OAA8C;IAElF,MAAM,mBAAmB,GAAS,CAAC,IAAU,EAAE,EAAE;QAC/C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,IAAI,EACZ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAC3B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;QAElF,MAAM,sBAAsB,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAA4B,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,IAAA,+BAAkB,EAAC,CAAC,CAAC,CAAC,CAAC;QAE9I,IAAI,CAAC,sBAAsB,EAAE;YAC3B,MAAM,IAAI,wBAAW,CAAC,iCAAiC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;SACzE;QAED,IAAI,IAAA,gCAAmB,EAAC,sBAAsB,CAAC,EAAE;YAC/C,MAAM,IAAI,wBAAW,CAAC,GAAG,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE,IAAI,IAAI,iCAAiC,CAAC,CAAC;SACxH;QAED,OAAO,CAAC,IAAI,CACV,IAAI,qBAAY,CACd,OAAO,CAAC,IAAI,EACZ,sBAAsB,CAAC,QAAQ,EAAE,EACjC,mCAAmC,OAAO,CAAC,aAAa,QAAQ,CACjE,CACF,CAAC;QAEF,IAAA,8BAAqB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,mBAAmB;QACnB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;KAC/C,CAAC,CAAC;AACL,CAAC;AA1CD,sDA0CC"}

package/schematics/convert-component/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "convertToO3rComponentSchematicsSchema",
   "title": "Convert an Angular component into an Otter component",
   "description": "Convert an Angular component into an Otter component",

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,EAA4B,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAQpG,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGjD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CA+C1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAM1G,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAKjD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CA+C1D"}

package/schematics/ng-add/index.js

@@ -5,57 +5,56 @@ const schematics_1 = require("@angular-devkit/schematics");
 const fs = require("node:fs");
 const path = require("node:path");
 const rxjs_1 = require("rxjs");
-const module_list_1 = require("../rule-factories/module-list");
 const presets_1 = require("../shared/presets");
+const prompt_1 = require("@angular/cli/src/utilities/prompt");
 const schematics_2 = require("@o3r/schematics");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
+const index_1 = require("./project-setup/index");
 /**
  * Add Otter library to an Angular Project
  * @param options
  */
 function ngAdd(options) {
+    const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
+    const o3rCoreVersion = corePackageJsonContent.version ? `@${corePackageJsonContent.version}` : '';
+    const schematicsDependencies = ['@o3r/schematics'];
     return async (tree, context) => {
-        const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
-        const o3rCoreVersion = corePackageJsonContent.version ? `@${corePackageJsonContent.version}` : '';
-        const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics'];
+        // check if the workspace package is installed, if not installed and we are in workspace context, we install
+        const workspacePackageName = '@o3r/workspace';
+        if (!options.projectName && !(0, schematics_2.isPackageInstalled)(workspacePackageName)) {
+            schematicsDependencies.push(workspacePackageName);
+        }
         context.addTask(new schematics_2.AddDevInstall({
             packageName: [
                 ...schematicsDependencies.map((dependency) => dependency + o3rCoreVersion)
             ].join(' '),
             hideOutput: false,
-            quiet: false
+            quiet: false,
+            force: options.forceInstall
         }));
         await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
         return () => (0, schematics_1.chain)([
-            ...schematicsDependencies.map((dep) => (0, schematics_1.externalSchematic)(dep, 'ng-add', {})),
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            (0, schematics_2.setupSchematicsDefaultParams)({ '*:ng-add': { registerDevtool: options.withDevtool } }),
+            ...schematicsDependencies.map((dep) => (0, schematics_1.externalSchematic)(dep, 'ng-add', options)),
+            options.projectName ? (0, index_1.prepareProject)(options) : (0, schematics_1.noop)(),
+            (0, schematics_2.registerPackageCollectionSchematics)(corePackageJsonContent),
             async (t, c) => {
-                const { prepareProject } = await Promise.resolve().then(() => require('./project-setup/index'));
-                return prepareProject(options)(t, c);
-            },
-            async (t, c) => {
-                const { registerPackageCollectionSchematics } = await Promise.resolve().then(() => require('@o3r/schematics'));
-                return () => registerPackageCollectionSchematics(corePackageJsonContent)(t, c);
-            },
-            async (t, c) => {
-                const { preset, ...forwardOptions } = options;
+                const { preset, externalPresets, ...forwardOptions } = options;
                 const presetRunner = await presets_1.presets[preset]({ projectName: forwardOptions.projectName, forwardOptions });
-                if (presetRunner.modules) {
-                    c.logger.info(`The following modules will be installed: ${presetRunner.modules.join(', ')}`);
+                const externalPresetRunner = externalPresets ? await (0, presets_1.getExternalPreset)(externalPresets, t, c)?.({ projectName: forwardOptions.projectName, forwardOptions }) : undefined;
+                const modules = [...new Set([...(presetRunner.modules || []), ...(externalPresetRunner?.modules || [])])];
+                if (modules.length) {
+                    c.logger.info(`The following modules will be installed: ${modules.join(', ')}`);
+                    if (c.interactive && !await (0, prompt_1.askConfirmation)('Would you like to process to the setup of these modules?', true)) {
+                        return;
+                    }
                 }
-                return () => presetRunner.rule(t, c);
+                return () => (0, schematics_1.chain)([
+                    presetRunner.rule,
+                    externalPresetRunner?.rule || (0, schematics_1.noop)()
+                ])(t, c);
             },
-            async (t, c) => {
-                const { OTTER_MODULE_KEYWORD, OTTER_MODULE_SUPPORTED_SCOPES } = await Promise.resolve().then(() => require('@o3r/schematics'));
-                const displayModuleListRule = (0, module_list_1.displayModuleList)(OTTER_MODULE_KEYWORD, OTTER_MODULE_SUPPORTED_SCOPES);
-                return () => displayModuleListRule(t, c);
-            },
-            (_, c) => {
-                if (!options.projectName && !options.skipGit && options.commit) {
-                    const commit = typeof options.commit == 'object' ? options.commit : {};
-                    commit.message = 'Setup of Otter Framework';
-                    c.addTask(new tasks_1.RepositoryInitializerTask(undefined, commit));
-                }
-            }
+            (0, schematics_2.displayModuleListRule)({ packageName: options.projectName })
         ])(tree, context);
     };
 }