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

package/mocks/mock-component-generator.js

@@ -7,7 +7,6 @@ var forms_1 = require("@angular/forms");
 var ts = require("typescript");
 /**
  * Determine if the node in an input field
- *
  * @param node Typescript AST Node
  * @param source Typescript source file
  */
@@ -16,7 +15,6 @@ function isInputNode(node, source) {
 }
 /**
  * Determine if the node in an output field
- *
  * @param node Typescript AST Node
  * @param source Typescript source file
  */
@@ -25,7 +23,6 @@ function isOutputNode(node, source) {
 }
 /**
  * Get the name of the input / output
- *
  * @param currentNode Typescript AST Node
  * @param decorator Current Input/Output decorator node
  * @param source Typescript source file
@@ -47,7 +44,6 @@ function getIOName(currentNode, decorator, source) {
 }
 /**
  * Get the list of Input and Output of a component
- *
  * @param parentNode Typescript AST Node
  * @param source Typescript source file
  */
@@ -80,7 +76,6 @@ function parseIO(parentNode, source) {
 }
 /**
  * Get the selector of an angular class
- *
  * @param parentNode Typescript AST Node
  * @param source Typescript source file
  * @param isInDecorator true if the recursive execution is in a decorator
@@ -113,7 +108,6 @@ function getSelector(parentNode, source, isInDecorator, isInComponentConfig) {
 }
 /**
  * Generate a mock class base on a component file
- *
  * @param componentPath Path to the component file to mock
  * @param config Object containing the following configurations:
  * template: should be provided if the template contain `<ng-content></ng-content>`
@@ -121,15 +115,17 @@ function getSelector(parentNode, source, isInDecorator, isInComponentConfig) {
  * @param config.template
  * @param config.isControlValueAccessor
  * @example
+ * ```typescript
  * // hero.component.ts
- * @Component({selector: 'hero'})
+ * \@Component({selector: 'hero'})
  * class HeroComponent {
- * @Input() name: string;
- * @Output() doSomething: EventEmitter<void>
+ *   \@Input() name: string;
+ *   \@Output() doSomething: EventEmitter<void>
  * }
  *
  * // mock generation
  * class MockComponent extends generateMockComponent('hero.component.ts') {}
+ * ```
  */
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint
 function generateMockComponent(componentPath, config) {

package/mocks/mock-component-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"mock-component-generator.js","sourceRoot":"","sources":["../../src/mocks/mock-component-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, EventEmitter, forwardRef, Type } from '@angular/core';\nimport { NG_VALUE_ACCESSOR } from '@angular/forms';\n\nimport * as ts from 'typescript';\n\n/**\n * Determine if the node in an input field\n *\n * @param node Typescript AST Node\n * @param source Typescript source file\n */\nfunction isInputNode(node: ts.Node, source: ts.SourceFile): node is ts.Decorator {\n  return ts.isDecorator(node) && /^@Input/.test(node.getText(source));\n}\n\n/**\n * Determine if the node in an output field\n *\n * @param node Typescript AST Node\n * @param source Typescript source file\n */\nfunction isOutputNode(node: ts.Node, source: ts.SourceFile): node is ts.Decorator {\n  return ts.isDecorator(node) && /^@Output/.test(node.getText(source));\n}\n\n/**\n * Get the name of the input / output\n *\n * @param currentNode Typescript AST Node\n * @param decorator Current Input/Output decorator node\n * @param source Typescript source file\n */\nfunction getIOName(currentNode: ts.Node, decorator: ts.Decorator, source: ts.SourceFile): string | undefined {\n  const nameInDecorator = decorator.getText(source).match(/@(Input|Ouput) *\\( *(['\"](.*)['\"])? *\\) */i);\n  if (nameInDecorator && nameInDecorator[3]) {\n    return nameInDecorator[3];\n  } else {\n    let name: string | undefined;\n    currentNode.forEachChild((node) => {\n      if (ts.isIdentifier(node)) {\n        name = node.getText(source);\n      }\n    });\n    return name;\n  }\n}\n\n/**\n * Get the list of Input and Output of a component\n *\n * @param parentNode Typescript AST Node\n * @param source Typescript source file\n */\nfunction parseIO(parentNode: ts.Node, source: ts.SourceFile): { outputs: string[]; inputs: string[] } {\n  const outputs: string[] = [];\n  const inputs: string[] = [];\n\n  parentNode.forEachChild((node) => {\n    if (isInputNode(node, source)) {\n      const name = getIOName(parentNode, node, source);\n      if (name) {\n        inputs.push(name);\n      }\n    } else if (isOutputNode(node, source)) {\n      const name = getIOName(parentNode, node, source);\n      if (name) {\n        outputs.push(name);\n      }\n    } else {\n      const childrenResult = parseIO(node, source);\n      inputs.push(...childrenResult.inputs);\n      outputs.push(...childrenResult.outputs);\n    }\n  });\n\n  return {\n    outputs,\n    inputs\n  };\n}\n\n/**\n * Get the selector of an angular class\n *\n * @param parentNode Typescript AST Node\n * @param source Typescript source file\n * @param isInDecorator true if the recursive execution is in a decorator\n * @param isInComponentConfig true if the recursive execution is in a component decorator configuration\n */\nfunction getSelector(parentNode: ts.Node, source: ts.SourceFile, isInDecorator = false, isInComponentConfig = false) {\n  let foundDecorator = false;\n  let foundSelector = false;\n  let ret: string | undefined;\n  parentNode.forEachChild((node) => {\n    if (isInDecorator && isInComponentConfig && ts.isIdentifier(node) && node.getText(source) === 'selector') {\n      foundSelector = true;\n    } else if (foundSelector && ts.isStringLiteral(node)) {\n      ret = node.getText(source).replace(/['\"]/ig, '');\n    } else if (isInDecorator && ts.isIdentifier(node) && node.getText(source) === 'Component') {\n      foundDecorator = true;\n    } else if (isInDecorator && foundDecorator && ts.isObjectLiteralExpression(node)) {\n      ret = ret || getSelector(node, source, isInDecorator, true);\n    } else {\n      ret = ret || getSelector(node, source, isInDecorator || ts.isDecorator(node), isInComponentConfig);\n    }\n  });\n  return ret;\n}\n\n/**\n * Generate a mock class base on a component file\n *\n * @param componentPath Path to the component file to mock\n * @param config Object containing the following configurations:\n * template: should be provided if the template contain `<ng-content></ng-content>`\n * isControlValueAccessor: should be provided if the component extends ControlValueAccessor\n * @param config.template\n * @param config.isControlValueAccessor\n * @example\n * // hero.component.ts\n * @Component({selector: 'hero'})\n * class HeroComponent {\n * @Input() name: string;\n * @Output() doSomething: EventEmitter<void>\n * }\n *\n * // mock generation\n * class MockComponent extends generateMockComponent('hero.component.ts') {}\n */\n// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint\nexport function generateMockComponent<T extends unknown = Record<string, unknown>>(componentPath: string, config?: { template?: string; isControlValueAccessor?: boolean }): Type<T> {\n  const program = ts.createProgram([componentPath], {});\n  const source = program.getSourceFile(componentPath);\n  if (!source) {\n    throw new Error('No Source found');\n  }\n\n  const { outputs, inputs } = parseIO(source, source);\n  const mock = class {\n    public writeValue: any;\n    public registerOnChange: any;\n    public registerOnTouched: any;\n\n    constructor() {\n      Object.keys(outputs)\n        .forEach((outputName) => (this as any)[outputName] = new EventEmitter<any>());\n      if (config && config.isControlValueAccessor) {\n        this.writeValue = () => { };\n        this.registerOnChange = () => { };\n        this.registerOnTouched = () => { };\n      }\n    }\n  };\n\n  return Component({\n    template: config && config.template || '',\n    selector: getSelector(source, source) || '',\n    inputs,\n    outputs,\n    ...(config && config.isControlValueAccessor) ? {\n      providers: [\n        {\n          provide: NG_VALUE_ACCESSOR,\n          useExisting: forwardRef(() => mock),\n          multi: true\n        }\n      ]\n    } : {}\n  })(mock) as Type<T>;\n}\n"]}
+{"version":3,"file":"mock-component-generator.js","sourceRoot":"","sources":["../../src/mocks/mock-component-generator.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, EventEmitter, forwardRef, Type } from '@angular/core';\nimport { NG_VALUE_ACCESSOR } from '@angular/forms';\n\nimport * as ts from 'typescript';\n\n/**\n * Determine if the node in an input field\n * @param node Typescript AST Node\n * @param source Typescript source file\n */\nfunction isInputNode(node: ts.Node, source: ts.SourceFile): node is ts.Decorator {\n  return ts.isDecorator(node) && /^@Input/.test(node.getText(source));\n}\n\n/**\n * Determine if the node in an output field\n * @param node Typescript AST Node\n * @param source Typescript source file\n */\nfunction isOutputNode(node: ts.Node, source: ts.SourceFile): node is ts.Decorator {\n  return ts.isDecorator(node) && /^@Output/.test(node.getText(source));\n}\n\n/**\n * Get the name of the input / output\n * @param currentNode Typescript AST Node\n * @param decorator Current Input/Output decorator node\n * @param source Typescript source file\n */\nfunction getIOName(currentNode: ts.Node, decorator: ts.Decorator, source: ts.SourceFile): string | undefined {\n  const nameInDecorator = decorator.getText(source).match(/@(Input|Ouput) *\\( *(['\"](.*)['\"])? *\\) */i);\n  if (nameInDecorator && nameInDecorator[3]) {\n    return nameInDecorator[3];\n  } else {\n    let name: string | undefined;\n    currentNode.forEachChild((node) => {\n      if (ts.isIdentifier(node)) {\n        name = node.getText(source);\n      }\n    });\n    return name;\n  }\n}\n\n/**\n * Get the list of Input and Output of a component\n * @param parentNode Typescript AST Node\n * @param source Typescript source file\n */\nfunction parseIO(parentNode: ts.Node, source: ts.SourceFile): { outputs: string[]; inputs: string[] } {\n  const outputs: string[] = [];\n  const inputs: string[] = [];\n\n  parentNode.forEachChild((node) => {\n    if (isInputNode(node, source)) {\n      const name = getIOName(parentNode, node, source);\n      if (name) {\n        inputs.push(name);\n      }\n    } else if (isOutputNode(node, source)) {\n      const name = getIOName(parentNode, node, source);\n      if (name) {\n        outputs.push(name);\n      }\n    } else {\n      const childrenResult = parseIO(node, source);\n      inputs.push(...childrenResult.inputs);\n      outputs.push(...childrenResult.outputs);\n    }\n  });\n\n  return {\n    outputs,\n    inputs\n  };\n}\n\n/**\n * Get the selector of an angular class\n * @param parentNode Typescript AST Node\n * @param source Typescript source file\n * @param isInDecorator true if the recursive execution is in a decorator\n * @param isInComponentConfig true if the recursive execution is in a component decorator configuration\n */\nfunction getSelector(parentNode: ts.Node, source: ts.SourceFile, isInDecorator = false, isInComponentConfig = false) {\n  let foundDecorator = false;\n  let foundSelector = false;\n  let ret: string | undefined;\n  parentNode.forEachChild((node) => {\n    if (isInDecorator && isInComponentConfig && ts.isIdentifier(node) && node.getText(source) === 'selector') {\n      foundSelector = true;\n    } else if (foundSelector && ts.isStringLiteral(node)) {\n      ret = node.getText(source).replace(/['\"]/ig, '');\n    } else if (isInDecorator && ts.isIdentifier(node) && node.getText(source) === 'Component') {\n      foundDecorator = true;\n    } else if (isInDecorator && foundDecorator && ts.isObjectLiteralExpression(node)) {\n      ret = ret || getSelector(node, source, isInDecorator, true);\n    } else {\n      ret = ret || getSelector(node, source, isInDecorator || ts.isDecorator(node), isInComponentConfig);\n    }\n  });\n  return ret;\n}\n\n/**\n * Generate a mock class base on a component file\n * @param componentPath Path to the component file to mock\n * @param config Object containing the following configurations:\n * template: should be provided if the template contain `<ng-content></ng-content>`\n * isControlValueAccessor: should be provided if the component extends ControlValueAccessor\n * @param config.template\n * @param config.isControlValueAccessor\n * @example\n * ```typescript\n * // hero.component.ts\n * \\@Component({selector: 'hero'})\n * class HeroComponent {\n *   \\@Input() name: string;\n *   \\@Output() doSomething: EventEmitter<void>\n * }\n *\n * // mock generation\n * class MockComponent extends generateMockComponent('hero.component.ts') {}\n * ```\n */\n// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint\nexport function generateMockComponent<T extends unknown = Record<string, unknown>>(componentPath: string, config?: { template?: string; isControlValueAccessor?: boolean }): Type<T> {\n  const program = ts.createProgram([componentPath], {});\n  const source = program.getSourceFile(componentPath);\n  if (!source) {\n    throw new Error('No Source found');\n  }\n\n  const { outputs, inputs } = parseIO(source, source);\n  const mock = class {\n    public writeValue: any;\n    public registerOnChange: any;\n    public registerOnTouched: any;\n\n    constructor() {\n      Object.keys(outputs)\n        .forEach((outputName) => (this as any)[outputName] = new EventEmitter<any>());\n      if (config && config.isControlValueAccessor) {\n        this.writeValue = () => { };\n        this.registerOnChange = () => { };\n        this.registerOnTouched = () => { };\n      }\n    }\n  };\n\n  return Component({\n    template: config && config.template || '',\n    selector: getSelector(source, source) || '',\n    inputs,\n    outputs,\n    ...(config && config.isControlValueAccessor) ? {\n      providers: [\n        {\n          provide: NG_VALUE_ACCESSOR,\n          useExisting: forwardRef(() => mock),\n          multi: true\n        }\n      ]\n    } : {}\n  })(mock) as Type<T>;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/testing",
-  "version": "10.0.0-next.9",
+  "version": "11.0.0-next.0",
   "description": "The module provides testing (e2e, unit test) utilities to help you build your own E2E pipeline integrating visual testing.",
   "keywords": [
     "testing",
@@ -95,24 +95,24 @@
   },
   "peerDependencies": {
     "@amadeus-it-group/kassette": "^1.6.0",
-    "@angular-devkit/schematics": "~16.2.0",
-    "@angular/common": "~16.2.0",
-    "@angular/core": "~16.2.0",
-    "@angular/forms": "~16.2.0",
-    "@angular/platform-browser": "~16.2.0",
-    "@ngrx/store": "~16.2.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",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^10.0.0-next.9",
-    "@o3r/localization": "^10.0.0-next.9",
-    "@o3r/schematics": "^10.0.0-next.9",
-    "@playwright/test": "~1.38.0",
-    "@schematics/angular": "~16.2.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",
     "pixelmatch": "^5.2.1",
     "pngjs": "^7.0.0",
     "protractor": "^7.0.0",
     "rxjs": "^7.8.1",
-    "temporal-polyfill": "^0.1.1",
-    "typescript": "~5.1.6"
+    "temporal-polyfill": "^0.2.0",
+    "typescript": "~5.2.2"
   },
   "peerDependenciesMeta": {
     "@amadeus-it-group/kassette": {
@@ -121,6 +121,9 @@
     "@angular-devkit/schematics": {
       "optional": true
     },
+    "@ngx-translate/core": {
+      "optional": true
+    },
     "@o3r/core": {
       "optional": true
     },
@@ -136,6 +139,12 @@
     "@schematics/angular": {
       "optional": true
     },
+    "pixelmatch": {
+      "optional": true
+    },
+    "pngjs": {
+      "optional": true
+    },
     "protractor": {
       "optional": true
     },
@@ -150,68 +159,69 @@
   },
   "devDependencies": {
     "@amadeus-it-group/kassette": "^1.6.0",
-    "@angular-devkit/build-angular": "~16.2.0",
-    "@angular-devkit/core": "~16.2.0",
-    "@angular-devkit/schematics": "~16.2.0",
-    "@angular-eslint/eslint-plugin": "~16.1.0",
-    "@angular/cli": "~16.2.0",
-    "@angular/common": "~16.2.0",
-    "@angular/compiler": "~16.2.0",
-    "@angular/compiler-cli": "~16.2.0",
-    "@angular/core": "~16.2.0",
-    "@angular/forms": "~16.2.0",
-    "@angular/platform-browser": "~16.2.0",
-    "@angular/platform-browser-dynamic": "~16.2.0",
-    "@babel/core": "~7.22.0",
-    "@babel/preset-typescript": "~7.22.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",
     "@compodoc/compodoc": "^1.1.19",
-    "@ngrx/store": "~16.2.0",
+    "@ngrx/store": "~17.0.0",
     "@ngx-translate/core": "~15.0.0",
-    "@nx/jest": "~16.8.0",
-    "@o3r/build-helpers": "^10.0.0-next.9",
-    "@o3r/core": "^10.0.0-next.9",
-    "@o3r/dev-tools": "^10.0.0-next.9",
-    "@o3r/eslint-plugin": "^10.0.0-next.9",
-    "@o3r/localization": "^10.0.0-next.9",
-    "@o3r/schematics": "^10.0.0-next.9",
-    "@o3r/test-helpers": "^10.0.0-next.9",
-    "@playwright/test": "~1.38.0",
-    "@schematics/angular": "~16.2.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",
     "@types/jest": "~29.5.2",
-    "@types/node": "^18.0.0",
+    "@types/node": "^20.0.0",
     "@types/pixelmatch": "^5.2.3",
     "@types/pngjs": "^6.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9",
+    "@typescript-eslint/eslint-plugin": "6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
     "concurrently": "^8.0.0",
-    "cpy-cli": "^4.2.0",
+    "cpy-cli": "^5.0.0",
     "eslint": "^8.42.0",
     "eslint-import-resolver-node": "^0.3.4",
-    "eslint-plugin-jest": "~27.2.3",
-    "eslint-plugin-jsdoc": "~46.8.0",
+    "eslint-plugin-jest": "~27.6.0",
+    "eslint-plugin-jsdoc": "~48.0.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^47.0.0",
+    "eslint-plugin-unicorn": "^50.0.0",
     "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.1",
-    "nx": "~16.8.0",
+    "jest-preset-angular": "~13.1.4",
+    "jsonc-eslint-parser": "~2.4.0",
+    "nx": "~17.1.1",
     "pid-from-port": "^1.1.3",
     "pixelmatch": "^5.2.1",
     "pngjs": "^7.0.0",
     "protractor": "^7.0.0",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
-    "temporal-polyfill": "^0.1.1",
+    "temporal-polyfill": "^0.2.0",
     "ts-jest": "~29.1.1",
-    "type-fest": "^3.12.0",
-    "typescript": "~5.1.6",
-    "zone.js": "~0.13.1"
+    "type-fest": "^4.3.1",
+    "typescript": "~5.2.2",
+    "zone.js": "~0.14.2"
   },
   "schematics": "./collection.json",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "type": "commonjs",
   "contributors": [
@@ -277,5 +287,6 @@
   ],
   "bugs": "https://github.com/AmadeusITGroup/otter/issues",
   "repository": "https://github.com/AmadeusITGroup/otter",
-  "license": "BSD-3-Clause"
+  "license": "BSD-3-Clause",
+  "homepage": "https://amadeusitgroup.github.io/otter/"
 }

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

@@ -16,7 +16,7 @@ function ngAddFunctionsToFixture(options) {
         (tree) => {
             const { path, methods, selector } = options;
             if (!tree.exists(path)) {
-                throw new Error(`File does not exist: ${path}`);
+                throw new schematics_2.O3rCliError(`File does not exist: ${path}`);
             }
             methods.forEach((methodType, index) => {
                 const signature = (0, helpers_1.getSignature)(methodType, selector);

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/add-functions-to-fixture/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "NgAddFunctionsToFixtureSchematicsSchema",
   "title": "Generate Otter Fixture",
   "description": "ng generate Otter fixture based on a selector and default methods",

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;AAWpC,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;AAYpC,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAW7D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,4BAA4B,GAAG,IAAI,CAkGxE"}

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

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

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/fixture-to-component/schema.json

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

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

@@ -1,12 +1,13 @@
 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;
 //# 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,CAAA;CAAE,EAAE,4BAA4B,EAAE,OAAO,GAAG,IAAI,CA2DrI"}
+{"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"}

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

@@ -7,21 +7,20 @@ 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) {
     const oldPaths = ['@otter/testing/core', '@otter/testing/core/*'];
     /**
      * Update test tsconfig
-     *
      * @param tree
      * @param _context
      */
-    const updateTestTsconfig = (tree, _context) => {
-        const workspaceProject = (0, schematics_2.getProjectFromTree)(tree, options.projectName || null);
+    const updateTestTsconfig = (tree, context) => {
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (!workspaceProject) {
             return tree;
         }
@@ -31,9 +30,6 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
             const tsconfigFile = ts.parseConfigFileTextToJson(tsconfig, tree.readText(tsconfig)).config;
             tsconfigFile.compilerOptions = tsconfigFile.compilerOptions || {};
             const tsconfigCompilerOptions = tsconfigFile.compilerOptions;
-            if (!tsconfigCompilerOptions.baseUrl) {
-                tsconfigCompilerOptions.baseUrl = '.';
-            }
             tsconfigCompilerOptions.lib = [...(tsconfigCompilerOptions.lib || []),
                 'dom',
                 'es2020',
@@ -44,21 +40,52 @@ function updateFixtureConfig(options, registerUnitTestFixturePaths) {
                 }
                 return libs;
             }, []);
-            tsconfigCompilerOptions.paths = Object.entries(tsconfigCompilerOptions.paths || {}).reduce((acc, [key, value]) => {
-                if (oldPaths.indexOf(key) === -1) {
-                    acc[key] = value;
+            const testFramework = options.testingFramework || (0, schematics_2.getTestFramework)((0, schematics_2.getWorkspaceConfig)(tree), context);
+            if (testFramework === 'jest') {
+                tsconfigCompilerOptions.types ||= [];
+                if (tsconfigCompilerOptions.types.indexOf('jest') === -1) {
+                    tsconfigCompilerOptions.types.push('jest');
                 }
-                return acc;
-            }, {});
-            if (registerUnitTestFixturePaths) {
-                tsconfigCompilerOptions.paths['@o3r/testing/core'] = ['node_modules/@o3r/testing/core/angular'];
-                tsconfigCompilerOptions.paths['@o3r/testing/core/*'] = ['node_modules/@o3r/testing/core/angular/*'];
             }
+            tsconfigCompilerOptions.esModuleInterop = true;
+            tsconfigCompilerOptions.outDir = 'test';
             tree.overwrite(tsconfig, JSON.stringify(tsconfigFile, null, 2));
         }
         return tree;
     };
-    return (0, schematics_1.chain)([updateTestTsconfig]);
+    /**
+     * Update base tsconfig paths with o3r fixtures
+     * @param tree
+     * @param context
+     */
+    const updateBaseTsConfigWithO3rFixtures = (tree, context) => {
+        const tsconfigs = ['tsconfig.base.json', 'tsconfig.build.json', 'tsconfig.json'];
+        const configs = tsconfigs
+            .filter((tsconfig) => tree.exists(tsconfig))
+            .map((tsconfig) => ({
+            tsconfig,
+            content: ts.parseConfigFileTextToJson(tsconfig, tree.readText(tsconfig)).config
+        }))
+            .filter(({ content }) => !!content);
+        if (!configs.length) {
+            context.logger.warn('No base tsconfig found, the path mapping for otter fixtures will not be updated');
+            return tree;
+        }
+        const configWithPath = configs.find((config) => !!config.content?.compilerOptions?.paths) || configs[0];
+        configWithPath.content.compilerOptions.paths = Object.entries(configWithPath.content.compilerOptions.paths || {}).reduce((acc, [key, value]) => {
+            if (oldPaths.indexOf(key) === -1) {
+                acc[key] = value;
+            }
+            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;
+    };
+    return (0, schematics_1.chain)([updateTestTsconfig, updateBaseTsConfigWithO3rFixtures]);
 }
 exports.updateFixtureConfig = updateFixtureConfig;
 //# sourceMappingURL=index.js.map

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":";;;AAAA,yDAAyD;AACzD,2DAAiF;AACjF,gDAAqD;AAErD,iCAAiC;AAEjC;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAAC,OAAoD,EAAE,4BAAqC;IAE7H,MAAM,QAAQ,GAAG,CAAC,qBAAqB,EAAE,uBAAuB,CAAC,CAAC;IAClE;;;;;OAKG;IACH,MAAM,kBAAkB,GAAS,CAAC,IAAU,EAAE,QAA0B,EAAE,EAAE;QAC1E,MAAM,gBAAgB,GAAG,IAAA,+BAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,CAAC;QAE/E,IAAI,CAAC,gBAAgB,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC;QACjF,MAAM,QAAQ,GAAuB,UAAU,IAAI,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC;QAErG,IAAI,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YACrC,MAAM,YAAY,GAAG,EAAE,CAAC,yBAAyB,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5F,YAAY,CAAC,eAAe,GAAG,YAAY,CAAC,eAAe,IAAI,EAAE,CAAC;YAElE,MAAM,uBAAuB,GAAG,YAAY,CAAC,eAAe,CAAC;YAE7D,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE;gBACpC,uBAAuB,CAAC,OAAO,GAAG,GAAG,CAAC;aACvC;YAED,uBAAuB,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,IAAI,EAAE,CAAC;gBACnE,KAAK;gBACL,QAAQ;gBACR,YAAY;aACb,CAAC,MAAM,CAAW,CAAC,IAAI,EAAE,GAAW,EAAE,EAAE;gBACvC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;oBAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBAChB;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,uBAAuB,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAA0B,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBACxI,IAAI,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;oBAChC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAClB;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;YAEP,IAAI,4BAA4B,EAAE;gBAChC,uBAAuB,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;gBAChG,uBAAuB,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;aACrG;YAED,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACjE;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;AACrC,CAAC;AA3DD,kDA2DC"}
+{"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

@@ -2,7 +2,6 @@ import { Rule } from '@angular-devkit/schematics';
 import { NgAddSchematicsSchema } from '../../schematics/ng-add/schema';
 /**
  * Add Otter testing to an Angular Project
- *
  * @param options
  */
 export declare function ngAdd(options: NgAddSchematicsSchema): Rule;

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;AAGlK,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAiBvE;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CA6H1D"}
+{"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"}

package/schematics/ng-add/index.js

@@ -4,10 +4,10 @@ exports.ngAdd = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
 const prompt_1 = require("@angular/cli/src/utilities/prompt");
-const fixture_1 = require("./fixture");
-const path = require("node:path");
-const fs = require("node:fs");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const fs = require("node:fs");
+const path = require("node:path");
+const fixture_1 = require("./fixture");
 const playwright_1 = require("./playwright");
 function canResolvePlaywright() {
     try {
@@ -20,19 +20,17 @@ function canResolvePlaywright() {
 }
 /**
  * Add Otter testing to an Angular Project
- *
  * @param options
  */
 function ngAdd(options) {
     return async (tree, context) => {
         try {
-            const { addVsCodeRecommendations, getProjectDepType, getProjectFromTree, getO3rPeerDeps, ngAddPackages, ngAddPeerDependencyPackages, removePackages, registerPackageCollectionSchematics } = await Promise.resolve().then(() => require('@o3r/schematics'));
             const testPackageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
             const packageJson = JSON.parse(fs.readFileSync(testPackageJsonPath, { encoding: 'utf-8' }));
-            const depsInfo = getO3rPeerDeps(testPackageJsonPath);
-            const dependencyType = getProjectDepType(tree);
-            const workspaceProject = (tree.exists('angular.json') && options.projectName) ? getProjectFromTree(tree, options.projectName) : undefined;
-            const workingDirectory = workspaceProject?.root;
+            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';
             let installJest;
             const testFramework = options.testingFramework || (0, schematics_2.getTestFramework)((0, schematics_2.getWorkspaceConfig)(tree), context);
@@ -64,9 +62,9 @@ function ngAdd(options) {
             }
             const rules = [
                 (0, fixture_1.updateFixtureConfig)(options, installJest),
-                removePackages(['@otter/testing']),
-                addVsCodeRecommendations(['Orta.vscode-jest']),
-                ngAddPackages(depsInfo.o3rPeerDeps, {
+                (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,
@@ -75,8 +73,8 @@ function ngAdd(options) {
                     workingDirectory
                 }),
                 installPlaywright ? (0, playwright_1.updatePlaywright)(options) : schematics_1.noop,
-                ngAddPeerDependencyPackages(['pixelmatch', 'pngjs'], testPackageJsonPath, dependencyType, { ...options, workingDirectory, skipNgAddSchematicRun: true }),
-                registerPackageCollectionSchematics(packageJson),
+                (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
                     '@o3r/core:component': {
@@ -101,7 +99,8 @@ function ngAdd(options) {
                     const jestConfigFilesForProject = () => (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates/project'), [
                         (0, schematics_1.template)({
                             ...options,
-                            rootRelativePath: path.relative(workingDirectory, tree.root.path.replace(/^\//, './'))
+                            rootRelativePath: path.posix.relative(workingDirectory, tree.root.path.replace(/^\//, './')),
+                            isAngularSetup: tree.exists('/angular.json')
                         }),
                         (0, schematics_1.move)(workingDirectory),
                         (0, schematics_1.renameTemplateFiles)()
@@ -113,10 +112,10 @@ function ngAdd(options) {
                         (0, schematics_1.move)(tree.root.path),
                         (0, schematics_1.renameTemplateFiles)()
                     ]), schematics_1.MergeStrategy.Default);
-                    rules.push(ngAddPeerDependencyPackages(['jest', 'jest-preset-angular'], testPackageJsonPath, dependencies_1.NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }), jestConfigFilesForProject, jestConfigFilesForWorkspace);
+                    rules.push((0, schematics_2.ngAddPeerDependencyPackages)(['jest', 'jest-preset-angular'], testPackageJsonPath, dependencies_1.NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }), jestConfigFilesForProject, jestConfigFilesForWorkspace);
                 }
                 else {
-                    throw new Error(`Could not find working directory for project ${workspaceProject?.name || ''}`);
+                    throw new schematics_2.O3rCliError(`Could not find working directory for project ${options.projectName || ''}`);
                 }
             }
             return () => (0, schematics_1.chain)(rules)(tree, context);
@@ -125,7 +124,7 @@ function ngAdd(options) {
             context.logger.error(`[ERROR]: Adding @o3r/testing has failed.
       If the error is related to missing @o3r dependencies you need to install '@o3r/core' or '@o3r/schematics' to be able to use the testing package.
       Please run 'ng add @o3r/core' or 'ng add @o3r/schematics'. Otherwise, use the error message as guidance.`);
-            throw (e);
+            throw new schematics_2.O3rCliError(e);
         }
     };
 }