@o3r/testing 11.0.0-next.0 → 11.0.0-next.2

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@o3r/testing",
-  "version": "11.0.0-next.0",
+  "version": "11.0.0-next.2",
+  "publishConfig": {
+    "access": "public"
+  },
   "description": "The module provides testing (e2e, unit test) utilities to help you build your own E2E pipeline integrating visual testing.",
   "keywords": [
     "testing",
@@ -10,9 +13,6 @@
   "main": "./src/public_api.js",
   "typings": "public_api.d.ts",
   "types": "public_api.d.ts",
-  "ng-update": {
-    "migrations": "./migration.json"
-  },
   "sideEffects": false,
   "scripts": {
     "nx": "nx",
@@ -94,25 +94,26 @@
     }
   },
   "peerDependencies": {
-    "@amadeus-it-group/kassette": "^1.6.0",
-    "@angular-devkit/schematics": "~17.0.0",
-    "@angular/common": "~17.0.2",
-    "@angular/core": "~17.0.2",
-    "@angular/forms": "~17.0.2",
-    "@angular/platform-browser": "~17.0.2",
-    "@ngrx/store": "~17.0.0",
+    "@amadeus-it-group/kassette": "^1.7.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular/animations": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@angular/forms": "~17.3.0",
+    "@angular/platform-browser": "~17.3.0",
+    "@ngrx/store": "~17.2.0",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^11.0.0-next.0",
-    "@o3r/localization": "^11.0.0-next.0",
-    "@o3r/schematics": "^11.0.0-next.0",
-    "@playwright/test": "~1.40.0",
-    "@schematics/angular": "~17.0.0",
+    "@o3r/core": "^11.0.0-next.2",
+    "@o3r/localization": "^11.0.0-next.2",
+    "@o3r/schematics": "^11.0.0-next.2",
+    "@playwright/test": "~1.43.0",
+    "@schematics/angular": "~17.3.0",
     "pixelmatch": "^5.2.1",
     "pngjs": "^7.0.0",
     "protractor": "^7.0.0",
     "rxjs": "^7.8.1",
     "temporal-polyfill": "^0.2.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
     "@amadeus-it-group/kassette": {
@@ -153,60 +154,61 @@
     }
   },
   "dependencies": {
-    "esbuild": "~0.19.0",
+    "esbuild": "~0.20.0",
     "module-from-string": "^3.2.0",
-    "tslib": "^2.5.3"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@amadeus-it-group/kassette": "^1.6.0",
-    "@angular-devkit/build-angular": "~17.0.3",
-    "@angular-devkit/core": "~17.0.3",
-    "@angular-devkit/schematics": "~17.0.3",
-    "@angular-eslint/eslint-plugin": "~17.1.0",
-    "@angular/cli": "~17.0.3",
-    "@angular/common": "~17.0.4",
-    "@angular/compiler": "~17.0.4",
-    "@angular/compiler-cli": "~17.0.4",
-    "@angular/core": "~17.0.4",
-    "@angular/forms": "~17.0.4",
-    "@angular/platform-browser": "~17.0.4",
-    "@angular/platform-browser-dynamic": "~17.0.4",
-    "@babel/core": "~7.23.0",
-    "@babel/preset-typescript": "~7.23.0",
+    "@amadeus-it-group/kassette": "^1.7.0",
+    "@angular-devkit/build-angular": "~17.3.0",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular-eslint/eslint-plugin": "~17.3.0",
+    "@angular/cli": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/compiler": "~17.3.0",
+    "@angular/compiler-cli": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@angular/forms": "~17.3.0",
+    "@angular/platform-browser": "~17.3.0",
+    "@angular/platform-browser-dynamic": "~17.3.0",
+    "@babel/core": "~7.24.0",
+    "@babel/preset-typescript": "~7.24.0",
     "@compodoc/compodoc": "^1.1.19",
-    "@ngrx/store": "~17.0.0",
+    "@ngrx/store": "~17.2.0",
     "@ngx-translate/core": "~15.0.0",
-    "@nx/eslint-plugin": "~17.1.1",
-    "@nx/jest": "~17.1.1",
-    "@o3r/build-helpers": "^11.0.0-next.0",
-    "@o3r/core": "^11.0.0-next.0",
-    "@o3r/eslint-plugin": "^11.0.0-next.0",
-    "@o3r/localization": "^11.0.0-next.0",
-    "@o3r/schematics": "^11.0.0-next.0",
-    "@o3r/test-helpers": "^11.0.0-next.0",
-    "@playwright/test": "~1.40.0",
-    "@schematics/angular": "~17.0.3",
+    "@nx/eslint-plugin": "~18.3.0",
+    "@nx/jest": "~18.3.0",
+    "@o3r/build-helpers": "^11.0.0-next.2",
+    "@o3r/core": "^11.0.0-next.2",
+    "@o3r/eslint-plugin": "^11.0.0-next.2",
+    "@o3r/localization": "^11.0.0-next.2",
+    "@o3r/schematics": "^11.0.0-next.2",
+    "@o3r/test-helpers": "^11.0.0-next.2",
+    "@playwright/test": "~1.43.0",
+    "@schematics/angular": "~17.3.0",
+    "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
     "@types/pixelmatch": "^5.2.3",
     "@types/pngjs": "^6.0.0",
-    "@typescript-eslint/eslint-plugin": "6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "concurrently": "^8.0.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "^8.42.0",
-    "eslint-import-resolver-node": "^0.3.4",
-    "eslint-plugin-jest": "~27.6.0",
-    "eslint-plugin-jsdoc": "~48.0.0",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-node": "^0.3.9",
+    "eslint-plugin-jest": "~27.9.0",
+    "eslint-plugin-jsdoc": "~48.2.1",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^50.0.0",
+    "eslint-plugin-unicorn": "^51.0.1",
     "isomorphic-fetch": "~3.0.0",
     "jest": "~29.7.0",
     "jest-environment-jsdom": "~29.7.0",
     "jest-junit": "~16.0.0",
-    "jest-preset-angular": "~13.1.4",
+    "jest-preset-angular": "~14.0.3",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~17.1.1",
+    "nx": "~18.3.0",
     "pid-from-port": "^1.1.3",
     "pixelmatch": "^5.2.1",
     "pngjs": "^7.0.0",
@@ -214,12 +216,16 @@
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
     "temporal-polyfill": "^0.2.0",
-    "ts-jest": "~29.1.1",
-    "type-fest": "^4.3.1",
-    "typescript": "~5.2.2",
+    "ts-jest": "~29.1.2",
+    "ts-node": "~10.9.2",
+    "type-fest": "^4.10.2",
+    "typescript": "~5.4.2",
     "zone.js": "~0.14.2"
   },
   "schematics": "./collection.json",
+  "ng-update": {
+    "migrations": "./migration.json"
+  },
   "engines": {
     "node": ">=18.0.0"
   },

package/schematics/add-functions-to-fixture/helpers.js.map

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

package/schematics/add-functions-to-fixture/index.d.ts

@@ -2,8 +2,7 @@ import { Rule } from '@angular-devkit/schematics';
 import { NgAddFunctionsToFixtureSchematicsSchema } from './schema';
 /**
  * Generate fixture
- *
  * @param options options to generate a fixture
  */
-export declare function ngAddFunctionsToFixture(options: NgAddFunctionsToFixtureSchematicsSchema): Rule;
+export declare const ngAddFunctionsToFixture: (options: NgAddFunctionsToFixtureSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/add-functions-to-fixture/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/add-functions-to-fixture/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AAKrE,OAAO,EAAE,uCAAuC,EAAE,MAAM,UAAU,CAAC;AAEnE;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,uCAAuC,GAAG,IAAI,CAuD9F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/add-functions-to-fixture/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AAKrE,OAAO,EAAE,uCAAuC,EAAE,MAAM,UAAU,CAAC;AA+DnE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,4DAAmE,CAAC"}

package/schematics/add-functions-to-fixture/index.js

@@ -8,10 +8,9 @@ const helpers_1 = require("./helpers");
 const models_1 = require("./models");
 /**
  * Generate fixture
- *
  * @param options options to generate a fixture
  */
-function ngAddFunctionsToFixture(options) {
+function ngAddFunctionsToFixtureFn(options) {
     return (0, schematics_1.chain)([
         (tree) => {
             const { path, methods, selector } = options;
@@ -54,5 +53,9 @@ function ngAddFunctionsToFixture(options) {
         options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)()
     ]);
 }
-exports.ngAddFunctionsToFixture = ngAddFunctionsToFixture;
+/**
+ * Generate fixture
+ * @param options options to generate a fixture
+ */
+exports.ngAddFunctionsToFixture = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFunctionsToFixtureFn);
 //# sourceMappingURL=index.js.map

package/schematics/add-functions-to-fixture/index.js.map

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

package/schematics/fixture-to-component/index.d.ts

@@ -2,8 +2,12 @@ import { Rule } from '@angular-devkit/schematics';
 import type { NgAddFixtureSchematicsSchema } from './schema';
 /**
  * Add fixture to an existing component
- *
  * @param options
  */
-export declare function ngAddFixture(options: NgAddFixtureSchematicsSchema): Rule;
+export declare function ngAddFixtureFn(options: NgAddFixtureSchematicsSchema): Rule;
+/**
+ * Add fixture to an existing component
+ * @param options
+ */
+export declare const ngAddFixture: (options: NgAddFixtureSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/fixture-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAW7D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAkGxE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/fixture-to-component/index.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAapC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAW7D;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAkG1E;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,iDAAwD,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ngAddFixture = void 0;
+exports.ngAddFixture = exports.ngAddFixtureFn = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const change_1 = require("@schematics/angular/utility/change");
@@ -16,10 +16,9 @@ const checkFixture = (componentPath, tree, baseFileName) => {
 };
 /**
  * Add fixture to an existing component
- *
  * @param options
  */
-function ngAddFixture(options) {
+function ngAddFixtureFn(options) {
     return async (tree, context) => {
         try {
             const baseFileName = (0, node_path_1.basename)(options.path, '.component.ts');
@@ -81,7 +80,7 @@ function ngAddFixture(options) {
                         (0, schematics_1.externalSchematic)('@o3r/core', 'convert-component', {
                             path: options.path
                         }),
-                        ngAddFixture(options)
+                        ngAddFixtureFn(options)
                     ]);
                 }
             }
@@ -89,5 +88,10 @@ function ngAddFixture(options) {
         }
     };
 }
-exports.ngAddFixture = ngAddFixture;
+exports.ngAddFixtureFn = ngAddFixtureFn;
+/**
+ * Add fixture to an existing component
+ * @param options
+ */
+exports.ngAddFixture = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFixtureFn);
 //# sourceMappingURL=index.js.map

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

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

package/schematics/ng-add/fixture/index.d.ts

@@ -3,11 +3,10 @@ import { Rule } from '@angular-devkit/schematics';
  * Add fixture configuration
  * @param options @see RuleFactory.options
  * @param options.projectName
- * @param registerUnitTestFixturePaths should add path mapping for unit test fixtures
  * @param options.testingFramework
  */
 export declare function updateFixtureConfig(options: {
     projectName?: string | null | undefined;
     testingFramework?: string | null | undefined;
-}, registerUnitTestFixturePaths: boolean): Rule;
+}): Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/fixture/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/fixture/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKjF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,4BAA4B,EAAE,OAAO,GAAG,IAAI,CA2FnL"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/fixture/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKjF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,IAAI,CAyF5I"}

package/schematics/ng-add/fixture/index.js

@@ -3,32 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateFixtureConfig = void 0;
 /* eslint-disable @typescript-eslint/naming-convention */
 const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 const ts = require("typescript");
 /**
  * Add fixture configuration
  * @param options @see RuleFactory.options
  * @param options.projectName
- * @param registerUnitTestFixturePaths should add path mapping for unit test fixtures
  * @param options.testingFramework
  */
-function updateFixtureConfig(options, registerUnitTestFixturePaths) {
+function updateFixtureConfig(options) {
     const oldPaths = ['@otter/testing/core', '@otter/testing/core/*'];
     /**
      * Update test tsconfig
      * @param tree
-     * @param _context
+     * @param context
      */
-    const updateTestTsconfig = (tree, context) => {
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+    const updateTestTsconfig = async (tree, context) => {
+        const { getTestFramework, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
-            return tree;
+            return;
         }
         const testTarget = workspaceProject.architect && workspaceProject.architect.test;
-        const tsconfig = testTarget && testTarget.options && testTarget.options.tsConfig;
-        if (tsconfig && tree.exists(tsconfig)) {
-            const tsconfigFile = ts.parseConfigFileTextToJson(tsconfig, tree.readText(tsconfig)).config;
-            tsconfigFile.compilerOptions = tsconfigFile.compilerOptions || {};
+        const tsconfigPath = testTarget && testTarget.options && testTarget.options.tsConfig;
+        if (tsconfigPath && tree.exists(tsconfigPath)) {
+            const tsconfigFile = tree.readJson(tsconfigPath);
+            tsconfigFile.compilerOptions ||= {};
             const tsconfigCompilerOptions = tsconfigFile.compilerOptions;
             tsconfigCompilerOptions.lib = [...(tsconfigCompilerOptions.lib || []),
                 'dom',
@@ -40,18 +39,21 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
                 }
                 return libs;
             }, []);
-            const testFramework = options.testingFramework || (0, schematics_2.getTestFramework)((0, schematics_2.getWorkspaceConfig)(tree), context);
+            const testFramework = options.testingFramework || getTestFramework(getWorkspaceConfig(tree), context);
             if (testFramework === 'jest') {
                 tsconfigCompilerOptions.types ||= [];
                 if (tsconfigCompilerOptions.types.indexOf('jest') === -1) {
                     tsconfigCompilerOptions.types.push('jest');
                 }
+                tsconfigCompilerOptions.types = tsconfigCompilerOptions.types.filter((tsType) => tsType !== 'jasmine');
             }
             tsconfigCompilerOptions.esModuleInterop = true;
             tsconfigCompilerOptions.outDir = 'test';
-            tree.overwrite(tsconfig, JSON.stringify(tsconfigFile, null, 2));
+            tsconfigFile.include ||= [];
+            tsconfigFile.include.concat(['**/fixture/', '**/*.fixture.ts', '**/fixtures.ts']);
+            tree.overwrite(tsconfigPath, JSON.stringify(tsconfigFile, null, 2));
         }
-        return tree;
+        return;
     };
     /**
      * Update base tsconfig paths with o3r fixtures
@@ -78,10 +80,6 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
             }
             return acc;
         }, {});
-        if (registerUnitTestFixturePaths) {
-            configWithPath.content.compilerOptions.paths['@o3r/testing/core'] = ['node_modules/@o3r/testing/core/angular'];
-            configWithPath.content.compilerOptions.paths['@o3r/testing/core/*'] = ['node_modules/@o3r/testing/core/angular/*'];
-        }
         tree.overwrite(configWithPath.tsconfig, JSON.stringify(configWithPath.content, null, 2));
         return tree;
     };

package/schematics/ng-add/fixture/index.js.map

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

package/schematics/ng-add/index.d.ts

@@ -1,8 +1,8 @@
 import { Rule } from '@angular-devkit/schematics';
-import { NgAddSchematicsSchema } from '../../schematics/ng-add/schema';
+import type { NgAddSchematicsSchema } from '../../schematics/ng-add/schema';
 /**
  * Add Otter testing to an Angular Project
  * @param options
  */
-export declare function ngAdd(options: NgAddSchematicsSchema): Rule;
+export declare const ngAdd: (options: NgAddSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

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,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAiBlK,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAavE;;;GAGG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAoH1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2E,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAoBlK,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAkJ5E;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -9,20 +9,20 @@ const fs = require("node:fs");
 const path = require("node:path");
 const fixture_1 = require("./fixture");
 const playwright_1 = require("./playwright");
-function canResolvePlaywright() {
-    try {
-        require.resolve('playwright/package.json');
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+const devDependenciesToInstall = [
+    'pixelmatch',
+    'pngjs',
+    'jest',
+    'jest-environment-jsdom',
+    'jest-preset-angular',
+    'ts-jest',
+    '@types/jest'
+];
 /**
  * Add Otter testing to an Angular Project
  * @param options
  */
-function ngAdd(options) {
+function ngAddFn(options) {
     return async (tree, context) => {
         try {
             const testPackageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
@@ -30,8 +30,26 @@ function ngAdd(options) {
             const depsInfo = (0, schematics_2.getO3rPeerDeps)(testPackageJsonPath);
             const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
             const workingDirectory = workspaceProject?.root || '.';
-            const dependencyType = (0, schematics_2.getProjectNewDependenciesType)(workspaceProject);
             const projectType = workspaceProject?.projectType || 'application';
+            const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
+                acc[dep] = {
+                    inManifest: [{
+                            range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
+                            types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
+                        }],
+                    ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
+                };
+                return acc;
+            }, (0, schematics_2.getPackageInstallConfig)(testPackageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
+            Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, testPackageJsonPath))
+                .forEach(([dep, range]) => {
+                dependencies[dep] = {
+                    inManifest: [{
+                            range,
+                            types: [dependencies_1.NodeDependencyType.Dev]
+                        }]
+                };
+            });
             let installJest;
             const testFramework = options.testingFramework || (0, schematics_2.getTestFramework)((0, schematics_2.getWorkspaceConfig)(tree), context);
             switch (testFramework) {
@@ -53,27 +71,19 @@ function ngAdd(options) {
                     break;
                 }
             }
-            let installPlaywright;
-            if (options.enablePlaywright && projectType === 'application') {
-                installPlaywright = true;
-            }
-            else {
-                installPlaywright = !canResolvePlaywright() ? await (0, prompt_1.askConfirmation)('Do you want to setup Playwright test framework for E2E?', true) : false;
-            }
+            const installPlaywright = options.enablePlaywright !== undefined && projectType === 'application' ?
+                options.enablePlaywright :
+                await (0, prompt_1.askConfirmation)('Do you want to setup Playwright test framework for E2E?', true);
             const rules = [
-                (0, fixture_1.updateFixtureConfig)(options, installJest),
+                (0, fixture_1.updateFixtureConfig)(options),
                 (0, schematics_2.removePackages)(['@otter/testing']),
                 (0, schematics_2.addVsCodeRecommendations)(['Orta.vscode-jest']),
-                (0, schematics_2.ngAddPackages)(depsInfo.o3rPeerDeps, {
-                    skipConfirmation: true,
-                    version: depsInfo.packageVersion,
-                    parentPackageInfo: depsInfo.packageName,
+                installPlaywright ? (0, playwright_1.updatePlaywright)(options, dependencies) : schematics_1.noop,
+                (0, schematics_2.setupDependencies)({
                     projectName: options.projectName,
-                    dependencyType: dependencyType,
-                    workingDirectory
+                    dependencies,
+                    ngAddToRun: depsInfo.o3rPeerDeps
                 }),
-                installPlaywright ? (0, playwright_1.updatePlaywright)(options) : schematics_1.noop,
-                (0, schematics_2.ngAddPeerDependencyPackages)(['pixelmatch', 'pngjs'], testPackageJsonPath, dependencyType, { ...options, workingDirectory, skipNgAddSchematicRun: true }),
                 (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
                 (0, schematics_2.setupSchematicsDefaultParams)({
                     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -96,10 +106,11 @@ function ngAdd(options) {
                     packageJsonFile.scripts ||= {};
                     packageJsonFile.scripts.test = 'jest';
                     tree.overwrite(`${workingDirectory}/package.json`, JSON.stringify(packageJsonFile, null, 2));
+                    const rootRelativePath = path.posix.relative(workingDirectory, tree.root.path.replace(/^\//, './'));
                     const jestConfigFilesForProject = () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates/project'), [
                         (0, schematics_1.template)({
                             ...options,
-                            rootRelativePath: path.posix.relative(workingDirectory, tree.root.path.replace(/^\//, './')),
+                            rootRelativePath,
                             isAngularSetup: tree.exists('/angular.json')
                         }),
                         (0, schematics_1.move)(workingDirectory),
@@ -112,7 +123,7 @@ function ngAdd(options) {
                         (0, schematics_1.move)(tree.root.path),
                         (0, schematics_1.renameTemplateFiles)()
                     ]), schematics_1.MergeStrategy.Default);
-                    rules.push((0, schematics_2.ngAddPeerDependencyPackages)(['jest', 'jest-preset-angular'], testPackageJsonPath, dependencies_1.NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }), jestConfigFilesForProject, jestConfigFilesForWorkspace);
+                    rules.push(jestConfigFilesForProject, jestConfigFilesForWorkspace);
                 }
                 else {
                     throw new schematics_2.O3rCliError(`Could not find working directory for project ${options.projectName || ''}`);
@@ -128,5 +139,9 @@ function ngAdd(options) {
         }
     };
 }
-exports.ngAdd = ngAdd;
+/**
+ * Add Otter testing to an Angular Project
+ * @param options
+ */
+exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
 //# sourceMappingURL=index.js.map