fix: the tsconfig spec generated for library contains several issues

packages/@o3r/test-helpers/src/utilities/package-manager.ts

@@ -297,7 +297,7 @@ export function setPackagerManagerConfig(options: PackageManagerConfig, execAppO
         execFileSync('yarn', ['config', 'set', 'enableGlobalCache', 'true'], execOptions);
         execFileSync('yarn', ['config', 'set', 'globalFolder', options.globalFolderPath], execOptions);
       }
-      execFileSync('yarn', ['config', 'set', 'nodeLinker', 'pnp'], execOptions);
+      execFileSync('yarn', ['config', 'set', 'nodeLinker', 'node-modules'], execOptions);
       execFileSync('yarn', ['config', 'set', 'npmScopes.ama-sdk.npmRegistryServer', options.registry], execOptions);
       execFileSync('yarn', ['config', 'set', 'npmScopes.ama-terasu.npmRegistryServer', options.registry], execOptions);
       execFileSync('yarn', ['config', 'set', 'npmScopes.o3r.npmRegistryServer', options.registry], execOptions);

packages/@o3r/workspace/schematics/index.it.spec.ts

@@ -115,6 +115,7 @@ describe('new otter workspace', () => {
     expect(existsSync(path.join(workspacePath, 'project'))).toBe(false);
     generatedLibFiles.forEach((file) => expect(existsSync(path.join(inLibraryPath, file))).toBe(true));
     expect(() => packageManagerRunOnProject(libName, true, { script: 'build' }, execAppOptions)).not.toThrow();
+    expect(() => packageManagerExec({ script: 'ng', args: ['test', '--watch=false', '--browsers=ChromeHeadless'] }, execAppOptions)).not.toThrow();
   });
 
   test('should generate a monorepo setup', async () => {

packages/@o3r/workspace/schematics/library/index.spec.ts

@@ -17,6 +17,15 @@ jest.mock('@angular-devkit/schematics', () => {
 });
 
 const collectionPath = path.join(__dirname, '..', '..', 'collection.json');
+const angularJsonFile = `{
+  "version": 1,
+  "projects": {
+    "my-new-module": {
+      "projectType": "library",
+      "root": "packages-test/my-new-module"
+    }
+  }
+}`;
 
 describe('New module generator', () => {
   let initialTree: Tree;
@@ -36,7 +45,7 @@ describe('New module generator', () => {
   });
 
   it('should generate the minimum mandatory files', async () => {
-    initialTree.create('angular.json', '{"version": 1, "projects": {} }');
+    initialTree.create('angular.json', angularJsonFile);
     initialTree.create('package.json', '{ "version": "0.0.0-test" }');
     initialTree.create('/packages-test/my-new-module/package.json', '{ "version": "0.0.0-test" }');
     initialTree.create('/packages-test/my-new-module/ng-package.json', '{  }');
@@ -58,11 +67,36 @@ describe('New module generator', () => {
     expect(tree.exists('/packages-test/my-new-module/project.json')).toBe(false);
     expect(JSON.parse(tree.readContent('/tsconfig.base.json')).compilerOptions.paths['@my/new-module']).toContain('packages-test/my-new-module/src/public-api');
     expect(JSON.parse(tree.readContent('/tsconfig.build.json')).compilerOptions.paths['@my/new-module'][0]).toBe('packages-test/my-new-module/dist');
+    expect(tree.exists('/packages-test/my-new-module/testing/setup-jest.ts')).toBe(false);
+    expect(tree.exists('/packages-test/my-new-module/jest.config.js')).toBe(false);
     expect(tree.files.length).toBeGreaterThanOrEqual(9);
   });
 
-  // eslint-disable-next-line jest/no-disabled-tests -- TODO: Should be re-enable when the following issue #2066 is fixed
-  describe.skip('in NX monorepo', () => {
+  it('should generate an project with jest files', async () => {
+    initialTree.create('angular.json', angularJsonFile);
+    initialTree.create('package.json', '{ "version": "0.0.0-test" }');
+    initialTree.create('/packages-test/my-new-module/package.json', '{ "version": "0.0.0-test" }');
+    initialTree.create('/packages-test/my-new-module/ng-package.json', '{  }');
+    const runner = new SchematicTestRunner('schematics', collectionPath);
+    const angularPackageJson = require.resolve('@schematics/angular/package.json');
+    const o3rCorePackageJson = require.resolve('@o3r/core/package.json');
+    runner.registerCollection('@o3r/core', path.resolve(path.dirname(o3rCorePackageJson), require(o3rCorePackageJson).schematics));
+    runner.registerCollection('@schematics/angular', path.resolve(path.dirname(angularPackageJson), require(angularPackageJson).schematics));
+    jest.spyOn(require('@angular-devkit/schematics'), 'externalSchematic');
+    const tree = await runner.runSchematic('library', {
+      path: 'packages-test',
+      name: '@my/new-module',
+      skipLinter: true,
+      skipInstall: true,
+      testingFramework: 'jest'
+
+    }, initialTree);
+    expect(tree.exists('/packages-test/my-new-module/testing/setup-jest.ts')).toBe(true);
+    expect(tree.exists('/packages-test/my-new-module/jest.config.js')).toBe(true);
+    expect(JSON.parse(tree.readContent('/packages-test/my-new-module/package.json')).scripts.test).toContain('jest');
+  });
+
+  describe('in NX monorepo', () => {
     it('should generate Nx project.json with given name', async () => {
       initialTree.create('nx.json', '{"workspaceLayout": { "libsDir": "packages-test" } }');
       initialTree.create('angular.json', '{"version": 1, "projects": {} }');
@@ -77,7 +111,6 @@ describe('New module generator', () => {
       runner.registerCollection('@schematics/angular', path.resolve(path.dirname(angularPackageJson), require(angularPackageJson).schematics));
       runner.registerCollection('@nx/workspace', path.resolve(path.dirname(nxWorkspacePackageJson), require(nxWorkspacePackageJson).generators));
       const tree = await runner.runExternalSchematic('schematics', 'library', {
-        path: 'packages-test',
         name: '@my/new-module',
         projectName: 'test-module-name',
         skipLinter: true

packages/@o3r/workspace/schematics/library/rules/rules.ng.ts

@@ -28,6 +28,7 @@ import type {
   NgGenerateModuleSchema,
 } from '../schema';
 import {
+  setUpJest,
   updateNgPackagrFactory,
   updatePackageDependenciesFactory,
 } from './shared';
@@ -61,9 +62,25 @@ export function ngGenerateModule(options: NgGenerateModuleSchema & { targetPath:
       renameTemplateFiles(),
       move(options.targetPath)
     ]);
+    const templateJest = apply(url('./templates/jest'), [
+      template({
+        ...options,
+        tsconfigBasePath: findConfigFileRelativePath(tree, ['tsconfig.base.json', 'tsconfig.json'], options.targetPath)
+      }),
+      renameTemplateFiles(),
+      move(options.targetPath)
+    ]);
+    const packageJsonContent = tree.readText('/package.json');
+    const hasJestInstalled = options.testingFramework === 'jest' || packageJsonContent.match('jest');
 
     return chain([
       mergeWith(templateNg, MergeStrategy.Overwrite),
+      ...hasJestInstalled
+        ? [
+          mergeWith(templateJest, MergeStrategy.Overwrite),
+          setUpJest(options)
+        ]
+        : [],
       updatePackageDependenciesFactory(options.targetPath, otterVersion!, o3rCorePackageJson, options),
       updateNgPackagrFactory(options.targetPath),
       (t) => {

packages/@o3r/workspace/schematics/library/rules/rules.nx.ts

@@ -27,6 +27,7 @@ import type {
   NgGenerateModuleSchema,
 } from '../schema';
 import {
+  setUpJest,
   updateNgPackagrFactory,
   updatePackageDependenciesFactory,
 } from './shared';
@@ -118,12 +119,28 @@ export function nxGenerateModule(options: NgGenerateModuleSchema & { packageJson
       renameTemplateFiles(),
       move(targetPath)
     ]);
+    const templateJest = apply(url('./templates/jest'), [
+      template({
+        ...options,
+        tsconfigBasePath: findConfigFileRelativePath(tree, ['tsconfig.base.json', 'tsconfig.json'], targetPath)
+      }),
+      renameTemplateFiles(),
+      move(targetPath)
+    ]);
     rules.push(mergeWith(templateNx, MergeStrategy.Overwrite));
+    const packageJsonContent = tree.readText('/package.json');
+    const hasJestInstalled = options.testingFramework === 'jest' || packageJsonContent.match('jest');
 
     return chain([
       ...rules,
       updatePackageDependenciesFactory(targetPath, otterVersion!, o3rCorePackageJson, options),
       updateNgPackagrFactory(targetPath),
+      ...hasJestInstalled
+        ? [
+          mergeWith(templateJest, MergeStrategy.Overwrite),
+          setUpJest(options)
+        ]
+        : [],
       (t) => {
         const packageJson = t.readJson(path.posix.join(targetPath, 'package.json')) as PackageJson;
         packageJson.name = options.packageJsonName;

packages/@o3r/workspace/schematics/library/rules/shared.ts

@@ -1,6 +1,8 @@
 import * as path from 'node:path';
 import type {
   Rule,
+  SchematicContext,
+  Tree,
 } from '@angular-devkit/schematics';
 import {
   getPackageManagerRunner,
@@ -13,6 +15,27 @@ import {
   NgGenerateModuleSchema,
 } from '../schema';
 
+/**
+ * Set jest files and script in the generated library.
+ * @param options
+ */
+export function setUpJest(options: NgGenerateModuleSchema) {
+  return (tree: Tree, context: SchematicContext) => {
+    const workspaceConfig = getWorkspaceConfig(tree);
+    const workspaceProject = (options.name && workspaceConfig?.projects?.[options.name]) || undefined;
+    if (!workspaceProject?.root) {
+      context.logger.error(`Failed to find a package json for ${options.name}`);
+      return;
+    }
+    const packageJsonPath = path.join(workspaceProject.root, 'package.json');
+    const packageJsonContent = tree.readJson(packageJsonPath) as PackageJson;
+    packageJsonContent.scripts ||= {};
+    packageJsonContent.scripts.test ||= 'jest';
+    tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
+    return tree;
+  };
+}
+
 /**
  * Generate rule to update generated package.json file
  * @param targetPath Path of the generated files

packages/@o3r/workspace/schematics/ng-add/helpers/npm-workspace.ts

@@ -115,9 +115,10 @@ export function addMonorepoManager(o3rWorkspacePackageJson: PackageJson & { gene
         lint: 'lerna run lint'
       };
 
-      const lernaJson: { $schema: string; version: string; npmClient?: string } = {
+      const lernaJson: { $schema: string; version: string; npmClient?: string; useNx?: boolean } = {
         $schema: 'https://github.com/lerna/lerna/blob/main/packages/lerna/schemas/lerna-schema.json',
-        version: rootPackageJsonObject.version || '0.0.0-placeholder'
+        version: rootPackageJsonObject.version || '0.0.0-placeholder',
+        useNx: false
       };
       if (getPackageManager() === 'yarn') {
         lernaJson.npmClient = 'yarn';