@o3r/core 10.3.0-prerelease.9 → 10.4.0-prerelease.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "10.3.0-prerelease.9",
+  "version": "10.4.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -22,11 +22,11 @@
     "@angular/forms": "~17.3.0",
     "@angular/platform-browser-dynamic": "~17.3.0",
     "@angular/router": "~17.3.0",
-    "@ngrx/entity": "~17.1.0",
-    "@ngrx/store": "~17.1.0",
-    "@nrwl/devkit": "~18.2.0",
-    "@nx/angular": "~18.2.0",
-    "@o3r/telemetry": "^10.3.0-prerelease.9",
+    "@ngrx/entity": "~17.2.0",
+    "@ngrx/store": "~17.2.0",
+    "@nrwl/devkit": "~18.3.0",
+    "@nx/angular": "~18.3.0",
+    "@o3r/telemetry": "^10.4.0-prerelease.0",
     "@schematics/angular": "~17.3.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
@@ -64,24 +64,24 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^10.3.0-prerelease.9",
+    "@o3r/schematics": "^10.4.0-prerelease.0",
     "tslib": "^2.6.2",
     "uuid": "^9.0.0"
   },
   "generatorDependencies": {
     "@angular-eslint/eslint-plugin": "~17.3.0",
     "@angular/material": "~17.3.0",
-    "@ngrx/router-store": "~17.1.0",
-    "@ngrx/effects": "~17.1.0",
-    "@ngrx/store-devtools": "~17.1.0",
-    "@o3r/store-sync": "^10.3.0-prerelease.9",
+    "@ngrx/router-store": "~17.2.0",
+    "@ngrx/effects": "~17.2.0",
+    "@ngrx/store-devtools": "~17.2.0",
+    "@o3r/store-sync": "^10.4.0-prerelease.0",
     "@types/jest": "~29.5.2",
-    "nx": "~18.2.0",
+    "nx": "~18.3.0",
     "@typescript-eslint/parser": "^7.2.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "cpy-cli": "^5.0.0",
     "eslint": "^8.57.0",
-    "@nx/eslint-plugin": "~18.2.0",
+    "@nx/eslint-plugin": "~18.3.0",
     "jsonc-eslint-parser": "~2.4.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-jest": "~27.9.0",

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;AA0BhM,OAAO,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAiQ5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,iEAAwE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/component/container/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AA0BhM,OAAO,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAExE,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAmQ5C;;;GAGG;AACH,eAAO,MAAM,4BAA4B,iEAAwE,CAAC"}

package/schematics/component/container/index.js

@@ -143,14 +143,17 @@ function ngGenerateComponentContainerFn(options) {
                 let specSourceFile = ts.createSourceFile(o3rSpecPath, tree.readText(o3rSpecPath), ts.ScriptTarget.ES2020, true);
                 const recorder = tree.beginUpdate(o3rSpecPath);
                 const lastImport = [...specSourceFile.statements].reverse().find((statement) => ts.isImportDeclaration(statement));
-                const changes = [new change_1.InsertChange(o3rSpecPath, lastImport?.getEnd() || 0, `
+                const changes = [
+                    (0, ast_utils_1.insertImport)(specSourceFile, o3rSpecPath, 'Component', '@angular/core'),
+                    new change_1.InsertChange(o3rSpecPath, lastImport?.getEnd() || 0, `
 @Component({
   template: '',
   selector: '${properties.presenterComponentSelector}',
   standalone: true
 })
 class Mock${properties.presenterComponentName} {}
-        `)];
+        `)
+                ];
                 (0, change_1.applyToUpdateRecorder)(recorder, changes);
                 tree.commitUpdate(recorder);
                 specSourceFile = ts.createSourceFile(o3rSpecPath, tree.readText(o3rSpecPath), ts.ScriptTarget.ES2020, true);

package/schematics/ng-add/utils/linter/index.js

@@ -14,13 +14,13 @@ const shouldOtterLinterBeInstalled = async (context) => {
     try {
         require.resolve(`${linterPackageName}/package.json`);
         if (context.interactive) {
-            useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have eslint installed. Would you like to add otter config rules for eslint ?
+            useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add otter config rules for ESLint?
 Otherwise, you can add them later via this command: ng add @o3r/eslint-config-otter`, true);
         }
     }
     catch {
-        context.logger.info(`eslint package not installed. Skipping otter linter phase !
-You can add otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
+        context.logger.info(`ESLint package not installed. Skipping Otter linter phase!
+You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config-otter`);
     }
     return useOtterLinter;
 };

package/schematics/page/schema.json

@@ -24,7 +24,6 @@
     "scope": {
       "type": "string",
       "description": "Page scope (e.g. booking, servicing, ssci, etc.)",
-      "x-prompt": "Page scope (e.g. booking, servicing, ssci, etc.)?",
       "default": ""
     },
     "appRoutingModulePath": {

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

@@ -59,7 +59,7 @@ function updateAdditionalModules(options, dependenciesSetupConfig) {
         if ((0, ast_utils_1.isImported)(sourceFile, 'StoreDevtoolsModule', ngrxStoreDevtoolsDep) || (0, ast_utils_1.isImported)(sourceFile, 'additionalModules', '../environments/environment')) {
             return tree;
         }
-        const addImportToModuleFile = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `${external(name, file)}${moduleFunction}`));
+        const addImportToModuleFile = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `\n${external(name, file)}${moduleFunction}`));
         addImportToModuleFile('additionalModules', '../environments/environment');
         return (0, schematics_1.chain)(additionalRules)(tree, context);
     };

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

@@ -2,6 +2,5 @@ export * from './o3r-basic-updates/index';
 export * from './additional-modules/index';
 export * from './customization-environment/index';
 export * from './otter-environment/index';
-export * from './playwright/index';
 export * from './store/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,mCAAmC,CAAC;AAClD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,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,eAAe,CAAC"}

package/schematics/rule-factories/index.js

@@ -5,6 +5,5 @@ tslib_1.__exportStar(require("./o3r-basic-updates/index"), exports);
 tslib_1.__exportStar(require("./additional-modules/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("./store/index"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -79,7 +79,7 @@ function updateStore(options, projectType) {
         }
         let recorder = tree.beginUpdate(moduleFilePath);
         const { moduleIndex } = (0, schematics_2.getModuleIndex)(sourceFile, sourceFileContent);
-        const addImportToModuleFile = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `${external(name, file)}${moduleFunction}`));
+        const addImportToModuleFile = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `\n${external(name, file)}${moduleFunction}`));
         const insertImportToModuleFile = (name, file, isDefault) => recorder = (0, schematics_2.insertImportToModuleFile)(name, file, sourceFile, recorder, moduleFilePath, isDefault);
         const insertBeforeModule = (line) => recorder = (0, schematics_2.insertBeforeModule)(line, sourceFileContent, recorder, moduleIndex);
         addImportToModuleFile('EffectsModule', '@ngrx/effects', '.forRoot([])');

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

@@ -1,10 +0,0 @@
-import { Rule } from '@angular-devkit/schematics';
-import { NgAddPackageOptions } from '@o3r/schematics';
-/**
- * Add Playwright to Otter application
- * @param options @see RuleFactory.options
- * @param options.projectName
- * @param rootPath @see RuleFactory.rootPath
- */
-export declare function updatePlaywright(rootPath: string, options?: NgAddPackageOptions): Rule;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/rule-factories/playwright/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA+D,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AACtJ,OAAO,EAGL,mBAAmB,EAEpB,MAAM,iBAAiB,CAAC;AAMzB;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB,GAAG,IAAI,CAoE1F"}

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

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updatePlaywright = void 0;
-const core_1 = require("@angular-devkit/core");
-const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
-const dependencies_1 = require("@schematics/angular/utility/dependencies");
-const path = require("node:path");
-const fs = require("node:fs");
-/**
- * Add Playwright to Otter application
- * @param options @see RuleFactory.options
- * @param options.projectName
- * @param rootPath @see RuleFactory.rootPath
- */
-function updatePlaywright(rootPath, options = {}) {
-    const ownPackageJsonPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
-    const ownPackageJson = JSON.parse(fs.readFileSync(ownPackageJsonPath, { encoding: 'utf-8' }));
-    return (tree, context) => {
-        // update gitignore
-        if (tree.exists('/.gitignore')) {
-            let gitignore = tree.read('/.gitignore').toString();
-            if (!gitignore.includes('dist*') && !gitignore.includes('/dist-e2e-playwright') && !gitignore.includes('/playwright-reports')) {
-                gitignore +=
-                    `
-# Playwright
-/dist-e2e-playwright
-/playwright-reports
-`;
-                tree.overwrite('/.gitignore', gitignore);
-            }
-        }
-        // register scripts
-        if (tree.exists('/package.json')) {
-            const packageJson = JSON.parse(tree.read('/package.json').toString());
-            packageJson.scripts ||= {};
-            packageJson.scripts['test:playwright'] ||= 'playwright test --config=e2e-playwright/playwright-config.ts';
-            packageJson.scripts['test:playwright:sanity'] ||= 'playwright test --config=e2e-playwright/playwright-config.sanity.ts';
-            tree.overwrite('/package.json', JSON.stringify(packageJson, null, 2));
-        }
-        const dependencies = ['@playwright/test', 'rimraf'].reduce((acc, dep) => {
-            acc[dep] = {
-                inManifest: [{
-                        range: ownPackageJson.generatorDependencies[dep],
-                        types: [dependencies_1.NodeDependencyType.Dev]
-                    }]
-            };
-            return acc;
-        }, {});
-        const ngAddRules = (0, schematics_2.setupDependencies)({
-            projectName: options.projectName || undefined,
-            dependencies
-        });
-        // generate files
-        if (!tree.exists('/e2e-playwright/playwright-config.ts')) {
-            const name = 'my-scenario';
-            const scenarioName = core_1.strings.capitalize(core_1.strings.camelize(name));
-            const sanity = 'my-sanity';
-            const sanityName = core_1.strings.capitalize(core_1.strings.camelize(sanity));
-            const templateSource = (0, schematics_1.apply)((0, schematics_1.url)((0, schematics_2.getTemplateFolder)(rootPath, __dirname)), [
-                (0, schematics_1.template)({
-                    ...core_1.strings,
-                    name,
-                    scenarioName,
-                    sanity,
-                    sanityName
-                }),
-                (0, schematics_1.renameTemplateFiles)()
-            ]);
-            return (0, schematics_1.chain)([
-                ngAddRules,
-                (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite)
-            ])(tree, context);
-        }
-        return ngAddRules(tree, context);
-    };
-}
-exports.updatePlaywright = updatePlaywright;
-//# sourceMappingURL=index.js.map

package/schematics/rule-factories/playwright/templates/e2e-playwright/playwright-config.sanity.ts.template

@@ -1,12 +0,0 @@
-import {PlaywrightTestConfig} from '@playwright/test';
-import * as path from 'node:path';
-
-import {default as defaultConfig} from './playwright-config';
-
-const config: PlaywrightTestConfig = {
-  ...defaultConfig,
-  testDir: path.join(__dirname, 'sanity'),
-  testMatch: /.*\.e2e\.ts$/
-};
-
-export default config;

package/schematics/rule-factories/playwright/templates/e2e-playwright/playwright-config.ts.template

@@ -1,34 +0,0 @@
-import { adjustPath } from '@o3r/testing/tools/path-replacement';
-import type { PlaywrightTestConfig } from '@playwright/test';
-import * as path from 'node:path';
-
-adjustPath('playwright');
-
-const FIVE_MINUTES = 1_000 * 60 * 5;
-
-const reportsFolder = path.join(__dirname, '..', 'playwright-reports');
-
-const config: PlaywrightTestConfig = {
-  testDir: path.join(__dirname, '..', 'e2e-playwright'),
-  testMatch: /.*\.e2e-playwright-spec.ts$/,
-  reporter: [
-    ['list'],
-    ['junit', {outputFile: path.join(reportsFolder, 'junit', 'reporter.xml')}],
-    ['html', {open: 'never', outputFolder: path.join(reportsFolder, 'html')}]
-  ],
-  retries: process.env.CI ? 3 : 0,
-  forbidOnly: !!process.env.CI,
-  timeout: FIVE_MINUTES,
-  use: {
-    ignoreHTTPSErrors: true,
-    screenshot: 'only-on-failure',
-    trace: 'retain-on-failure'
-  },
-  projects: [
-    {name: 'Chromium', use: {browserName: 'chromium'}},
-    {name: 'Webkit', use: {browserName: 'webkit'}},
-    {name: 'Firefox', use: {browserName: 'firefox'}}
-  ]
-};
-
-export default config;

package/schematics/rule-factories/playwright/templates/e2e-playwright/sanity/__sanity@dasherize__.e2e.ts

@@ -1,7 +0,0 @@
-import { expect, test } from '@playwright/test';
-
-test.describe.serial('Empty <%= classify(sanityName) %> test', () => {
-  test('Empty test', ({ page }) => {
-    expect(page).toBeDefined();
-  });
-});

package/schematics/rule-factories/playwright/templates/e2e-playwright/scenarios/__name@dasherize__.e2e-playwright-spec.ts

@@ -1,19 +0,0 @@
-import { expect, test } from '@playwright/test';
-import { BaseScenario } from '../utils';
-
-export class <%= classify(scenarioName) %> extends BaseScenario {
-  protected <%= camelize(scenarioName) %>() {
-    test.describe.serial('Empty <%= classify(scenarioName) %> tests', () => {
-      test('Empty test', async ({ page }) => {
-        await page.goto(this.targetUrl);
-        await expect(page).toHaveTitle('TestApp');
-      });
-    });
-  }
-
-  public performFlow() {
-    this.<%= camelize(scenarioName) %>();
-  }
-}
-
-new <%= classify(scenarioName) %>().run();

package/schematics/rule-factories/playwright/templates/e2e-playwright/utils/base-scenario.ts

@@ -1,29 +0,0 @@
-import { test } from '@playwright/test';
-
-/**
- * Interface to define the interface of a flow test
- */
-export interface Flow {
-  /**
-   * Run the flow
-   */
-  performFlow(): void;
-}
-
-/**
- * Base scenario for e2e scenarios.
- * Init the fetch manager and call `performFlow` method.
- * E2E Booking flows should inherit from this class.
- */
-export abstract class BaseScenario implements Flow {
-
-  public targetUrl = process.env.PLAYWRIGHT_TARGET_URL || 'http://localhost:4200/';
-
-  public abstract performFlow();
-
-  public run() {
-    test.describe.serial(this.constructor.name, () => {
-      this.performFlow();
-    });
-  }
-}

package/schematics/rule-factories/playwright/templates/e2e-playwright/utils/index.ts

@@ -1 +0,0 @@
-export * from './base-scenario';