@o3r/core 13.4.0-prerelease.9 → 13.4.0-rc.2

package/messages/common-message-interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common-message-interface.js","sourceRoot":"","sources":["../../src/messages/common-message-interface.ts"],"names":[],"mappings":""}

package/messages/index.d.ts

@@ -0,0 +1,4 @@
+export * from './common-message-interface';
+export * from './message-helpers';
+export * from './message-interfaces';
+//# sourceMappingURL=index.d.ts.map

package/messages/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/messages/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}

package/messages/index.js

@@ -0,0 +1,4 @@
+export * from './common-message-interface';
+export * from './message-helpers';
+export * from './message-interfaces';
+//# sourceMappingURL=index.js.map

package/messages/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/messages/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}

package/messages/message-helpers.d.ts

@@ -0,0 +1,24 @@
+import { Observable } from 'rxjs';
+import { ContentMessageData, FilterMessageToApplication, OtterMessage, OtterMessageContent } from './message-interfaces';
+/**
+ * Determine if a message should be handle by the application
+ * @param message Message to analyze
+ */
+export declare const isToAppOtterMessage: <T extends OtterMessage>(message?: T) => message is FilterMessageToApplication<T & {
+    to: "app";
+}>;
+/**
+ * Determine if a message is emitted by an Otter tool
+ * @param message Message to analyze
+ */
+export declare const isOtterMessage: <T extends OtterMessageContent>(message: any) => message is OtterMessage<T>;
+/**
+ * Send an Otter Message
+ * @param dataType Type of the message
+ * @param content content of the message
+ * @param preStringify determine if the message should JSON.stringify before being send (will use the default mechanism otherwise)
+ */
+export declare const sendOtterMessage: <T extends OtterMessageContent>(dataType: T["dataType"], content: ContentMessageData<T>, preStringify?: boolean) => void;
+export declare function filterMessageContent<T extends Event | MessageEvent>(): (source$: Observable<T>) => Observable<OtterMessageContent<string>>;
+export declare function filterMessageContent<T extends Event | MessageEvent, S extends OtterMessageContent>(predicate: (message: any) => message is S): (source$: Observable<T>) => Observable<S>;
+//# sourceMappingURL=message-helpers.d.ts.map

package/messages/message-helpers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-helpers.d.ts","sourceRoot":"","sources":["../../src/messages/message-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACX,MAAM,MAAM,CAAC;AACd,OAAO,EAEL,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,mBAAmB,EAEpB,MAAM,sBAAsB,CAAC;AAE9B;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,YAAY,EAAE,UAAU,CAAC,KAAG,OAAO,IAAI,0BAA0B,CAAC,CAAC,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAEhI,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,mBAAmB,EAAE,SAAS,GAAG,KAAG,OAAO,IAAI,YAAY,CAAC,CAAC,CAErG,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,mBAAmB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,EAAE,SAAS,kBAAkB,CAAC,CAAC,CAAC,EAAE,sBAAmB,SAS3I,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,KAAK,GAAG,YAAY,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5I,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,KAAK,GAAG,YAAY,EAAE,CAAC,SAAS,mBAAmB,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC"}

package/messages/message-helpers.js

@@ -0,0 +1,54 @@
+import { filter, map, } from 'rxjs';
+import { applicationMessageTarget, otterMessageType, } from './message-interfaces';
+/**
+ * Determine if a message should be handle by the application
+ * @param message Message to analyze
+ */
+export const isToAppOtterMessage = (message) => {
+    return message?.to === applicationMessageTarget;
+};
+/**
+ * Determine if a message is emitted by an Otter tool
+ * @param message Message to analyze
+ */
+export const isOtterMessage = (message) => {
+    return message?.type === otterMessageType;
+};
+/**
+ * Send an Otter Message
+ * @param dataType Type of the message
+ * @param content content of the message
+ * @param preStringify determine if the message should JSON.stringify before being send (will use the default mechanism otherwise)
+ */
+export const sendOtterMessage = (dataType, content, preStringify = true) => {
+    const message = {
+        type: otterMessageType,
+        content: {
+            ...content,
+            dataType
+        }
+    };
+    return window.postMessage(preStringify ? JSON.stringify(message) : message, '*');
+};
+/**
+ * Filter the Otter message that should be handle by the application and returns it content
+ * @param predicate condition to filter the message
+ * @returns content of the message
+ */
+/**
+ * Operator to get only Otter messages that match the predicate
+ * @param predicate
+ */
+export function filterMessageContent(predicate) {
+    return (source$) => {
+        const obs = source$.pipe(map((event) => {
+            const data = event.data;
+            return typeof data === 'string' ? JSON.parse(data) : data;
+        }), filter(isOtterMessage), filter(isToAppOtterMessage), map((message) => message.content));
+        if (predicate) {
+            return obs.pipe(filter(predicate));
+        }
+        return obs;
+    };
+}
+//# sourceMappingURL=message-helpers.js.map

package/messages/message-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-helpers.js","sourceRoot":"","sources":["../../src/messages/message-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,GAAG,GAEJ,MAAM,MAAM,CAAC;AACd,OAAO,EACL,wBAAwB,EAKxB,gBAAgB,GACjB,MAAM,sBAAsB,CAAC;AAE9B;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAyB,OAAW,EAA4D,EAAE;IACnI,OAAO,OAAO,EAAE,EAAE,KAAK,wBAAwB,CAAC;AAClD,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAgC,OAAY,EAA8B,EAAE;IACxG,OAAO,OAAO,EAAE,IAAI,KAAK,gBAAgB,CAAC;AAC5C,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAgC,QAAuB,EAAE,OAA8B,EAAE,YAAY,GAAG,IAAI,EAAE,EAAE;IAC9I,MAAM,OAAO,GAAG;QACd,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE;YACP,GAAG,OAAO;YACV,QAAQ;SACT;KACF,CAAC;IACF,OAAO,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;AACnF,CAAC,CAAC;AAIF;;;;GAIG;AAEH;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAgE,SAA0C;IAE5I,OAAO,CAAC,OAAsB,EAAE,EAAE;QAChC,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CACtB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,IAAI,GAAI,KAAsB,CAAC,IAAI,CAAC;YAC1C,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5D,CAAC,CAAC,EACF,MAAM,CAAC,cAAc,CAAC,EACtB,MAAM,CAAC,mBAAmB,CAAC,EAC3B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAClC,CAAC;QACF,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC"}

package/messages/message-interfaces.d.ts

@@ -0,0 +1,26 @@
+/** Type of a message exchanged within the Otter Framework */
+export declare const otterMessageType = "otter";
+/** Target of a message that should be handled by the application */
+export declare const applicationMessageTarget = "app";
+export interface OtterMessageContent<DataType extends string = string> {
+    /** Type of data */
+    dataType: DataType;
+}
+export interface OtterMessage<Content extends OtterMessageContent = OtterMessageContent, Target extends string | undefined = undefined | string> {
+    /** Type of the message */
+    type: typeof otterMessageType;
+    /** Version of the message (default to the @o3r/core version ) */
+    version?: string;
+    /** Target of the message */
+    to: Target;
+    /** Message content */
+    content: Content;
+}
+/** Type helper to retrieve the data types of a union of MessageContent */
+export type MessageDataTypes<T extends OtterMessageContent> = T['dataType'];
+/** Type helper to filter the message that can be received by the application */
+export type FilterMessageToApplication<T extends OtterMessage> = T extends {
+    to: infer U;
+} ? U extends (typeof applicationMessageTarget | undefined) ? T : never : never;
+export type ContentMessageData<T extends OtterMessageContent> = T extends any ? Omit<T, 'dataType'> : never;
+//# sourceMappingURL=message-interfaces.d.ts.map

package/messages/message-interfaces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-interfaces.d.ts","sourceRoot":"","sources":["../../src/messages/message-interfaces.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,eAAO,MAAM,gBAAgB,UAAU,CAAC;AAExC,oEAAoE;AACpE,eAAO,MAAM,wBAAwB,QAAQ,CAAC;AAE9C,MAAM,WAAW,mBAAmB,CAAC,QAAQ,SAAS,MAAM,GAAG,MAAM;IACnE,mBAAmB;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,MAAM,WAAW,YAAY,CAAC,OAAO,SAAS,mBAAmB,GAAG,mBAAmB,EAAE,MAAM,SAAS,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM;IAC7I,0BAA0B;IAC1B,IAAI,EAAE,OAAO,gBAAgB,CAAC;IAE9B,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,4BAA4B;IAC5B,EAAE,EAAE,MAAM,CAAC;IAEX,sBAAsB;IACtB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,0EAA0E;AAC1E,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,mBAAmB,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC;AAE5E,gFAAgF;AAChF,MAAM,MAAM,0BAA0B,CAAC,CAAC,SAAS,YAAY,IAAI,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC,SAAS,CAAC,OAAO,wBAAwB,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;AAEzK,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,mBAAmB,IAAI,CAAC,SAAS,GAAG,GACzE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,GACnB,KAAK,CAAC"}

package/messages/message-interfaces.js

@@ -0,0 +1,5 @@
+/** Type of a message exchanged within the Otter Framework */
+export const otterMessageType = 'otter';
+/** Target of a message that should be handled by the application */
+export const applicationMessageTarget = 'app';
+//# sourceMappingURL=message-interfaces.js.map

package/messages/message-interfaces.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-interfaces.js","sourceRoot":"","sources":["../../src/messages/message-interfaces.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC;AAExC,oEAAoE;AACpE,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC"}

package/migration.json

@@ -20,6 +20,11 @@
       "version": "12.1.0-prerelease.0",
       "description": "Updates of @o3r/core to v12.1.*",
       "factory": "./schematics/ng-update/index#updateV12_1"
+    },
+    "migration-all": {
+      "version": "*",
+      "description": "Run on all versions",
+      "factory": "./schematics/ng-update/index#updateAll"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "13.4.0-prerelease.9",
+  "version": "13.4.0-rc.2",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "@ngrx/entity": "^20.0.0",
     "@ngrx/store": "^20.0.0",
     "@nx/angular": "~21.6.0",
-    "@o3r/telemetry": "13.4.0-prerelease.9",
+    "@o3r/telemetry": "~13.4.0-rc.2",
     "@schematics/angular": "^20.0.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
@@ -77,7 +77,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "13.4.0-prerelease.9",
+    "@o3r/schematics": "~13.4.0-rc.2",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
@@ -89,19 +89,19 @@
     "@ngrx/store": "~20.1.0",
     "@ngrx/store-devtools": "~20.1.0",
     "@nx/eslint-plugin": "~21.6.0",
-    "@o3r/store-sync": "13.4.0-prerelease.9",
-    "@stylistic/eslint-plugin": "~5.5.0",
+    "@o3r/store-sync": "~13.4.0-rc.2",
+    "@stylistic/eslint-plugin": "~5.6.0",
     "@types/jest": "~29.5.2",
-    "@typescript-eslint/eslint-plugin": "~8.46.0",
-    "@typescript-eslint/parser": "~8.46.0",
-    "angular-eslint": "~20.5.0",
+    "@typescript-eslint/eslint-plugin": "~8.47.0",
+    "@typescript-eslint/parser": "~8.47.0",
+    "angular-eslint": "~20.6.0",
     "cpy-cli": "^6.0.0",
-    "eslint": "~9.38.0",
+    "eslint": "~9.39.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~4.4.0",
     "eslint-plugin-import": "~2.32.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~29.0.0",
+    "eslint-plugin-jest": "~29.1.0",
     "eslint-plugin-jsdoc": "~54.7.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~60.0.0",
@@ -114,7 +114,7 @@
     "jsonc-eslint-parser": "~2.4.0",
     "nx": "~21.6.0",
     "ts-jest": "~29.4.0",
-    "typescript-eslint": "~8.46.0",
+    "typescript-eslint": "~8.47.0",
     "zone.js": "~0.15.0"
   },
   "engines": {
@@ -125,6 +125,8 @@
   "ng-update": {
     "migrations": "./migration.json",
     "packageGroup": [
+      "@ama-mfe/messages",
+      "@ama-mfe/ng-utils",
       "@ama-sdk/core",
       "@ama-sdk/schematics",
       "@ama-sdk/swagger-builder",
@@ -157,6 +159,7 @@
       "@o3r/rules-engine",
       "@o3r/schematics",
       "@o3r/store-sync",
+      "@o3r/style-dictionary",
       "@o3r/stylelint-plugin",
       "@o3r/styling",
       "@o3r/telemetry",

package/public_api.d.ts

@@ -0,0 +1,6 @@
+export * from './core/index';
+export * from './log/index';
+export * from './messages/index';
+export * from './store/index';
+export * from './utils/index';
+//# sourceMappingURL=public_api.d.ts.map

package/public_api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"public_api.d.ts","sourceRoot":"","sources":["../src/public_api.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

package/public_api.js

@@ -0,0 +1,6 @@
+export * from './core/index';
+export * from './log/index';
+export * from './messages/index';
+export * from './store/index';
+export * from './utils/index';
+//# sourceMappingURL=public_api.js.map

package/public_api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public_api.js","sourceRoot":"","sources":["../src/public_api.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/add-modules/schema.ts"],"names":[],"mappings":""}

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":"AACA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AA+CpC,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAkQ5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,wBAAuD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"AACA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAgDpC,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAkP5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,wBAAuD,CAAC"}

package/schematics/component/container/index.js

@@ -28,12 +28,12 @@ const getTemplateProperties = (options, componentStructureDef, prefix) => {
         ...options,
         componentType: options.componentStructure === 'full' ? 'Block' : 'Component',
         presenterModuleName: (0, schematics_2.getComponentModuleName)(inputComponentName, structures_types_1.ComponentStructureDef.Pres),
-        componentName: (0, schematics_2.getComponentName)(inputComponentName, componentStructureDef).replace(/Component$/, ''),
-        presenterComponentName: (0, schematics_2.getComponentName)(inputComponentName, structures_types_1.ComponentStructureDef.Pres),
+        componentName: (0, schematics_2.getComponentBaseName)(inputComponentName, componentStructureDef),
+        presenterComponentName: (0, schematics_2.getComponentName)(inputComponentName, structures_types_1.ComponentStructureDef.Pres, options.type),
         presenterComponentSelector: `${componentSelector}-${structures_types_1.ComponentStructureDef.Pres.toLowerCase()}`,
         componentSelector: (0, schematics_2.getComponentSelectorWithoutSuffix)(options.componentName, prefix || null),
         folderName,
-        name: (0, schematics_2.getComponentFileName)(options.componentName, componentStructureDef), // air-offer | air-offer-cont,
+        name: (0, schematics_2.getComponentFileName)(options.componentName, componentStructureDef, options.type), // air-offer | air-offer-cont,
         suffix: componentStructureDef.toLowerCase(), // cont | ''
         description: options.description || ''
     };
@@ -48,20 +48,17 @@ function ngGenerateComponentContainerFn(options) {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const properties = getTemplateProperties(options, structures_types_1.ComponentStructureDef.Cont, 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);
-        const componentPath = path.posix.join(componentDestination, `${properties.name}.component.ts`);
-        const ngSpecPath = path.posix.join(componentDestination, `${properties.name}.component.spec.ts`);
-        const o3rSpecPath = path.posix.join(componentDestination, `${properties.name}.spec.ts`);
-        const ngTemplatePath = path.posix.join(componentDestination, `${properties.name}.component.html`);
-        const o3rTemplatePath = path.posix.join(componentDestination, `${properties.name}.template.html`);
+        const componentDestination = path.posix.join(destination, fullStructureRequested ? path.posix.join(properties.folderName, exports.CONTAINER_FOLDER) : `${properties.folderName}${properties.suffix ? ('-' + properties.suffix) : ''}`);
+        const componentPath = path.posix.join(componentDestination, `${properties.name}.ts`);
+        const specPath = path.posix.join(componentDestination, `${properties.name}.spec.ts`);
+        const templatePath = path.posix.join(componentDestination, `${properties.name}.html`);
         const rules = [];
         if (!options.standalone) {
             rules.push((0, schematics_1.externalSchematic)('@schematics/angular', 'module', {
                 project: properties.projectName,
                 path: componentDestination,
                 flat: true,
-                name: properties.componentName,
-                typeSeparator: '.'
+                name: properties.componentName
             }));
         }
         rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
@@ -78,7 +75,7 @@ function ngGenerateComponentContainerFn(options) {
             viewEncapsulation: 'None',
             changeDetection: 'OnPush',
             style: 'none',
-            type: 'component',
+            type: properties.type,
             skipSelector: false,
             skipTests: false,
             standalone: options.standalone,
@@ -87,21 +84,11 @@ function ngGenerateComponentContainerFn(options) {
                     skipImport: true
                 }
                 : {
-                    module: `${properties.name}.module.ts`,
+                    module: `${properties.name}-module.ts`,
                     export: true
                 }),
             flat: true
-        }), 
-        // Angular schematics generate spec file with this pattern: component-name.component.spec.ts
-        (0, schematics_1.move)(ngSpecPath, o3rSpecPath), 
-        // Angular schematics generate template file with this pattern: component-name.component.html
-        (0, schematics_1.chain)([
-            (0, schematics_1.move)(ngTemplatePath, o3rTemplatePath),
-            (t) => {
-                t.overwrite(componentPath, t.readText(componentPath).replace(path.basename(ngTemplatePath), path.basename(o3rTemplatePath)));
-                return t;
-            }
-        ]), (0, schematics_1.schematic)('convert-component', {
+        }), (0, schematics_1.schematic)('convert-component', {
             path: componentPath,
             skipLinter: options.skipLinter,
             componentType: properties.componentType
@@ -130,7 +117,7 @@ function ngGenerateComponentContainerFn(options) {
                     }
                 ])
                 : () => {
-                    const modulePath = path.posix.join(componentDestination, `${properties.name}.module.ts`);
+                    const modulePath = path.posix.join(componentDestination, `${properties.name}-module.ts`);
                     const moduleSourceFile = ts.createSourceFile(modulePath, tree.readText(modulePath), ts.ScriptTarget.ES2020, true);
                     const changes = (0, ast_utils_1.addImportToModule)(moduleSourceFile, modulePath, properties.presenterModuleName, componentPresenterDestination);
                     const recorder = tree.beginUpdate(modulePath);
@@ -139,16 +126,16 @@ function ngGenerateComponentContainerFn(options) {
                     return tree;
                 };
             const addMockPresenterComponentInSpecFile = () => {
-                if (!tree.exists(o3rSpecPath)) {
-                    context.logger.warn(`No update applied on spec file because ${o3rSpecPath} does not exist.`);
+                if (!tree.exists(specPath)) {
+                    context.logger.warn(`No update applied on spec file because ${specPath} does not exist.`);
                     return;
                 }
-                let specSourceFile = ts.createSourceFile(o3rSpecPath, tree.readText(o3rSpecPath), ts.ScriptTarget.ES2020, true);
-                const recorder = tree.beginUpdate(o3rSpecPath);
+                let specSourceFile = ts.createSourceFile(specPath, tree.readText(specPath), ts.ScriptTarget.ES2020, true);
+                const recorder = tree.beginUpdate(specPath);
                 const lastImport = [...specSourceFile.statements].reverse().find((statement) => ts.isImportDeclaration(statement));
                 const changes = [
-                    (0, ast_utils_1.insertImport)(specSourceFile, o3rSpecPath, 'Component', '@angular/core'),
-                    new change_1.InsertChange(o3rSpecPath, lastImport?.getEnd() || 0, `
+                    (0, ast_utils_1.insertImport)(specSourceFile, specPath, 'Component', '@angular/core'),
+                    new change_1.InsertChange(specPath, lastImport?.getEnd() || 0, `
 @Component({
   template: '',
   selector: '${properties.presenterComponentSelector}'
@@ -158,7 +145,7 @@ class Mock${properties.presenterComponentName} {}
                 ];
                 (0, change_1.applyToUpdateRecorder)(recorder, changes);
                 tree.commitUpdate(recorder);
-                specSourceFile = ts.createSourceFile(o3rSpecPath, tree.readText(o3rSpecPath), ts.ScriptTarget.ES2020, true);
+                specSourceFile = ts.createSourceFile(specPath, tree.readText(specPath), ts.ScriptTarget.ES2020, true);
                 const result = ts.transform(specSourceFile, [
                     (0, schematics_2.addImportsAndCodeBlockStatementAtSpecInitializationTransformerFactory)([
                         `Mock${properties.presenterComponentName}`
@@ -169,15 +156,15 @@ class Mock${properties.presenterComponentName} {}
                     newLine: ts.NewLineKind.LineFeed
                 });
                 const newContent = printer.printFile(result.transformed[0]);
-                tree.overwrite(o3rSpecPath, newContent);
+                tree.overwrite(specPath, newContent);
                 return tree;
             };
             rules.push((t) => {
-                t.overwrite(o3rTemplatePath, `<${properties.presenterComponentSelector}></${properties.presenterComponentSelector}>`);
+                t.overwrite(templatePath, `<${properties.presenterComponentSelector}></${properties.presenterComponentSelector}>`);
                 return t;
             }, addPresenterComponentOrModuleToImport, addMockPresenterComponentInSpecFile);
         }
-        rules.push((0, configuration_1.getAddConfigurationRules)(componentPath, options), (0, fixture_1.getAddFixtureRules)(componentPath, options), (0, context_1.getAddContextRules)(componentPath, options), (0, rules_engine_1.getAddRulesEngineRules)(path.posix.join(componentDestination, `${properties.name}.component.ts`), options));
+        rules.push((0, configuration_1.getAddConfigurationRules)(componentPath, options), (0, fixture_1.getAddFixtureRules)(componentPath, options), (0, context_1.getAddContextRules)(componentPath, options), (0, rules_engine_1.getAddRulesEngineRules)(path.posix.join(componentDestination, `${properties.name}.ts`), options));
         return (0, schematics_1.chain)(rules);
     };
     return (0, schematics_1.chain)([

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

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

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

@@ -24,5 +24,7 @@ export interface NgGenerateComponentContainerSchematicsSchema extends SchematicO
     skipLinter: boolean;
     /** Whether the generated component is standalone */
     standalone: boolean;
+    /** Custom type to append to the component's file name */
+    type?: string;
 }
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,4CAA6C,SAAQ,qBAAqB;IACzF,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,wCAAwC;IACxC,aAAa,EAAE,MAAM,CAAC;IAEtB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,0BAA0B;IAC1B,kBAAkB,EAAE,MAAM,GAAG,WAAW,CAAC;IAEzC,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,uBAAuB;IACvB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,0DAA0D;IAC1D,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE3C,gEAAgE;IAChE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAErC,6DAA6D;IAC7D,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEjC,yDAAyD;IACzD,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAErC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,oDAAoD;IACpD,UAAU,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,4CAA6C,SAAQ,qBAAqB;IACzF,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,wCAAwC;IACxC,aAAa,EAAE,MAAM,CAAC;IAEtB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,0BAA0B;IAC1B,kBAAkB,EAAE,MAAM,GAAG,WAAW,CAAC;IAEzC,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,uBAAuB;IACvB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,0DAA0D;IAC1D,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAE3C,gEAAgE;IAChE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAErC,6DAA6D;IAC7D,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAEjC,yDAAyD;IACzD,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAErC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,oDAAoD;IACpD,UAAU,EAAE,OAAO,CAAC;IAEpB,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../schematics/component/container/schema.ts"],"names":[],"mappings":""}

package/schematics/component/container/schema.json

@@ -72,6 +72,10 @@
       "type": "boolean",
       "description": "Whether the generated component is standalone.",
       "default": true
+    },
+    "type": {
+      "type": "string",
+      "description": "Custom type to append to the component's file name"
     }
   },
   "additionalProperties": true,

package/schematics/component/container/templates/index.ts.template

@@ -1,3 +1,3 @@
-export * from './<%= name %>.component';
-<% if (!standalone) { %>export * from './<%= name %>.module';
+export * from './<%= name %>';
+<% if (!standalone) { %>export * from './<%= name %>-module';
 <% } %>

package/schematics/component/index.js.map

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

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":"AACA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAyCpC,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAiL5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,wBAAuD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/presenter/index.ts"],"names":[],"mappings":"AACA,OAAO,EASL,IAAI,EAML,MAAM,4BAA4B,CAAC;AAyCpC,eAAO,MAAM,gBAAgB,cAAc,CAAC;AA2I5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,wBAAuD,CAAC"}

package/schematics/component/presenter/index.js

@@ -25,11 +25,11 @@ const getTemplateProperties = (options, componentStructureDef, prefix) => {
     const structure = componentStructureDef === structures_types_1.ComponentStructureDef.Simple ? '' : componentStructureDef;
     return {
         ...options,
-        componentName: (0, schematics_2.getComponentName)(inputComponentName, structure).replace(/Component$/, ''),
+        componentName: (0, schematics_2.getComponentBaseName)(inputComponentName, structure),
         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, structure),
+        name: (0, schematics_2.getComponentFileName)(options.componentName, structure, options.type),
         suffix: structure.toLowerCase(),
         description: options.description || ''
     };
@@ -44,15 +44,10 @@ function ngGenerateComponentPresenterFn(options) {
         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`);
-        const ngSpecPath = path.posix.join(componentDestination, `${properties.name}.component.spec.ts`);
-        const o3rSpecPath = path.posix.join(componentDestination, `${properties.name}.spec.ts`);
-        const ngStylePath = path.posix.join(componentDestination, `${properties.name}.component.scss`);
-        const o3rStylePath = path.posix.join(componentDestination, `${properties.name}.style.scss`);
+        const componentDestination = path.posix.join(destination, fullStructureRequested ? path.posix.join(properties.folderName, exports.PRESENTER_FOLDER) : `${properties.folderName}${properties.suffix ? ('-' + properties.suffix) : ''}`);
+        const componentPath = path.posix.join(componentDestination, `${properties.name}.ts`);
+        const stylePath = path.posix.join(componentDestination, `${properties.name}.scss`);
         const o3rDesignTokenPath = path.posix.join(componentDestination, `${properties.name}.theme.json`);
-        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) {
@@ -60,8 +55,7 @@ function ngGenerateComponentPresenterFn(options) {
                 project: properties.projectName,
                 path: componentDestination,
                 flat: true,
-                name: properties.componentName,
-                typeSeparator: '.'
+                name: properties.componentName
             }));
         }
         rules.push((0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
@@ -78,7 +72,7 @@ function ngGenerateComponentPresenterFn(options) {
             viewEncapsulation: 'None',
             changeDetection: 'OnPush',
             style: 'scss',
-            type: 'component',
+            type: options.type,
             skipSelector: false,
             standalone: options.standalone,
             ...(options.standalone
@@ -86,37 +80,14 @@ function ngGenerateComponentPresenterFn(options) {
                     skipImport: true
                 }
                 : {
-                    module: `${properties.name}.module.ts`,
+                    module: `${properties.name}-module.ts`,
                     export: true
                 }),
             flat: true
-        }), 
-        // Angular schematics generate spec file with this pattern: component-name.component.spec.ts
-        (0, schematics_1.move)(ngSpecPath, o3rSpecPath), 
-        // Angular schematics generate style file with this pattern: component-name.component.scss
-        (0, schematics_1.chain)([
-            (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, `${componentSelector} {\n\t// Your component custom SCSS\n}\n`);
-                return t;
-            },
-            (t) => {
-                t.overwrite(componentPath, t.readText(componentPath).replace(path.basename(ngStylePath), path.basename(o3rStylePath)));
-                return t;
-            }
-        ]), 
-        // Angular schematics generate template file with this pattern: component-name.component.html
-        (0, schematics_1.chain)([
-            (0, schematics_1.move)(ngTemplatePath, o3rTemplatePath),
-            (t) => {
-                t.overwrite(componentPath, t.readText(componentPath).replace(path.basename(ngTemplatePath), path.basename(o3rTemplatePath)));
-                return t;
-            }
-        ]), (0, schematics_1.schematic)('convert-component', {
+        }), (0, schematics_1.schematic)('convert-component', {
             path: componentPath,
             skipLinter: options.skipLinter
-        }), (0, configuration_1.getAddConfigurationRules)(componentPath, options), (0, theming_1.getAddThemingRules)(o3rStylePath, options), (0, design_token_1.getAddDesignTokenRules)(o3rStylePath, o3rDesignTokenPath, options), (0, localization_1.getAddLocalizationRules)(componentPath, options), (0, fixture_1.getAddFixtureRules)(componentPath, options), (0, analytics_1.getAddAnalyticsRules)(componentPath, options), (0, context_1.getAddContextRules)(componentPath, options));
+        }), (0, configuration_1.getAddConfigurationRules)(componentPath, options), (0, theming_1.getAddThemingRules)(stylePath, options), (0, design_token_1.getAddDesignTokenRules)(stylePath, o3rDesignTokenPath, options), (0, localization_1.getAddLocalizationRules)(componentPath, options), (0, fixture_1.getAddFixtureRules)(componentPath, options), (0, analytics_1.getAddAnalyticsRules)(componentPath, options), (0, context_1.getAddContextRules)(componentPath, options));
         return (0, schematics_1.chain)(rules);
     };
     return (0, schematics_1.chain)([

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

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

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

@@ -31,5 +31,7 @@ export interface NgGenerateComponentPresenterSchematicsSchema extends SchematicO
     skipLinter: boolean;
     /** Whether the generated component is standalone */
     standalone: boolean;
+    /** Custom type to append to the component's file name */
+    type?: string;
 }
 //# sourceMappingURL=schema.d.ts.map