fix: add missing devDep to schematics

nx.json

@@ -32,6 +32,7 @@
     ],
     "source": [
       "base",
+      "{projectRoot}/ng-package.json",
       "{projectRoot}/tsconfig.build.json",
       "{projectRoot}/tsconfig.build.*.json",
       "{projectRoot}/src/**/*",

packages/@ama-sdk/client-angular/package.json

@@ -84,6 +84,7 @@
     "@nx/jest": "~19.5.0",
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",

packages/@ama-sdk/client-beacon/package.json

@@ -83,6 +83,7 @@
     "@nx/jest": "~19.5.0",
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",

packages/@ama-sdk/client-fetch/package.json

@@ -87,6 +87,7 @@
     "@nx/jest": "~19.5.0",
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",

packages/@ama-sdk/core/package.json

@@ -132,6 +132,7 @@
     "@nx/jest": "~19.5.0",
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",

packages/@o3r/analytics/package.json

@@ -88,6 +88,7 @@
     "@o3r/build-helpers": "workspace:^",
     "@o3r/core": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",

packages/@o3r/application/schematics/ng-add/index.ts

@@ -40,8 +40,8 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       getProjectNewDependenciesTypes,
       getPackageInstallConfig
     } = await import('@o3r/schematics');
-    const { isImported } = await import('@schematics/angular/utility/ast-utils');
-    const ts = await import('typescript');
+    const { isImported } = await import('@schematics/angular/utility/ast-utils').catch(() => ({ isImported: undefined }));
+    const ts = await import('typescript').catch(() => undefined);
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
     const depsInfo = getO3rPeerDeps(packageJsonPath);
 
@@ -56,15 +56,25 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       }
 
       const sourceFileContent = tree.readText(moduleFilePath);
-      const sourceFile = ts.createSourceFile(
+      const sourceFile = ts?.createSourceFile(
         moduleFilePath,
         sourceFileContent,
         ts.ScriptTarget.ES2015,
         true
       );
 
+      if (!sourceFile) {
+        context.logger.warn('No Typescript executor detected, the ng-add process will be skipped.');
+        return tree;
+      }
+
+      if (!isImported) {
+        context.logger.warn('No @schematics/angular dependency detected, the ng-add process will be skipped.');
+        return tree;
+      }
+
       if (isImported(sourceFile, 'prefersReducedMotion', '@o3r/application')) {
-        context.logger.info('[LOG]: prefersReducedMotion from @o3r/application is already imported.');
+        context.logger.info('prefersReducedMotion from @o3r/application is already imported.');
         return tree;
       }
 

packages/@o3r/components/schematics/ng-add/index.ts

@@ -9,6 +9,9 @@ import {
 import type {
   DependencyToAdd,
 } from '@o3r/schematics';
+import type {
+  NodeDependencyType as NodeDependencyTypeEnum,
+} from '@schematics/angular/utility/dependencies';
 import {
   updateCmsAdapter,
 } from '../cms-adapter';
@@ -43,7 +46,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       registerPackageCollectionSchematics,
       getPackageInstallConfig
     } = await import('@o3r/schematics');
-    const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies');
+    const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies').catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' as NodeDependencyTypeEnum.Dev } }));
     options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/components', 'ng-add', options), ...options };
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
     const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));

packages/@o3r/extractors/schematics/ng-add/index.ts

@@ -5,6 +5,9 @@ import {
 import type {
   Rule,
 } from '@angular-devkit/schematics';
+import type {
+  NodeDependencyType as NodeDependencyTypeEnum,
+} from '@schematics/angular/utility/dependencies';
 import {
   updateCmsAdapter,
 } from '../cms-adapter';
@@ -37,7 +40,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       getO3rPeerDeps,
       getWorkspaceConfig
     } = await import('@o3r/schematics');
-    const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies');
+    const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies').catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' as NodeDependencyTypeEnum.Dev } }));
     const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
     const depsInfo = getO3rPeerDeps(packageJsonPath);
     const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;

packages/@o3r/localization/schematics/ng-add/index.ts

@@ -50,6 +50,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
     const depsInfo = getO3rPeerDeps(packageJsonPath);
     context.logger.info(`The package ${depsInfo.packageName as string} comes with a debug mechanism`);
     context.logger.info('Get information on https://github.com/AmadeusITGroup/otter/tree/main/docs/localization/LOCALIZATION.md#Debugging');
+
     const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies');
     const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
     const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {

packages/@o3r/new-version/package.json

@@ -45,7 +45,9 @@
     "@nx/jest": "~19.5.0",
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
+    "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
@@ -68,6 +70,7 @@
     "jest-junit": "~16.0.0",
     "nx": "~19.5.0",
     "pid-from-port": "^1.1.3",
+    "rxjs": "^7.8.1",
     "semver": "^7.5.2",
     "ts-jest": "~29.2.0",
     "ts-node": "~10.9.2",

packages/@o3r/schematics/package.json

@@ -53,6 +53,9 @@
     "eslint": {
       "optional": true
     },
+    "rxjs": {
+      "optional": true
+    },
     "type-fest": {
       "optional": true
     }

packages/@o3r/schematics/src/rule-factories/dev-tools/devtools-registration.ts

@@ -1,6 +1,6 @@
 import {
   chain,
-  Rule,
+  type Rule,
 } from '@angular-devkit/schematics';
 import {
   isImported,

packages/@o3r/schematics/src/rule-factories/ng-add/ng-add.helpers.ts

@@ -8,19 +8,16 @@
   chain,
   externalSchematic,
   noop,
-  Rule,
-  Schematic,
-  SchematicContext,
+  type Rule,
+  type Schematic,
+  type SchematicContext,
 } from '@angular-devkit/schematics';
 import {
   NodePackageInstallTask,
 } from '@angular-devkit/schematics/tasks';
 import {
   NodeDependencyType,
 } from '@schematics/angular/utility/dependencies';
-import {
-  lastValueFrom,
-} from 'rxjs';
 import type {
   PackageJson,
 } from 'type-fest';
@@ -145,7 +142,10 @@
         hideOutput: false,
         quiet: false
       } as any));
-      await lastValueFrom(context.engine.executePostTasks());
+
+      await new Promise<void>((resolve, reject) =>
+        context.engine.executePostTasks().subscribe({ next: () => { /* don't store data */ }, complete: () => resolve(), error: (errors: Error) => reject(errors) })
+      );
 
       const ngAddsToApply = packagesToInstall
         .map((packageName) => ({ packageName, ngAddCollection: getNgAddSchema(packageName, context) }))

packages/@o3r/stylelint-plugin/package.json

@@ -58,6 +58,7 @@
     "@o3r/build-helpers": "workspace:^",
     "@o3r/eslint-config": "workspace:^",
     "@o3r/eslint-plugin": "workspace:^",
+    "@o3r/schematics": "workspace:^",
     "@o3r/test-helpers": "workspace:^",
     "@schematics/angular": "~18.2.0",
     "@stylistic/eslint-plugin": "~2.7.0",
@@ -85,6 +86,7 @@
     "postcss": "~8.4.31",
     "postcss-scss": "~4.0.9",
     "rimraf": "^5.0.1",
+    "rxjs": "^7.8.1",
     "semver": "^7.5.2",
     "stylelint": "^16.0.2",
     "ts-jest": "~29.2.0",

packages/@o3r/stylelint-plugin/schematics/ng-add/index.ts

@@ -35,6 +35,7 @@ function ngAddFn(options: NgAddSchematicsSchema): Rule {
       getWorkspaceConfig,
       setupDependencies
     } = await import('@o3r/schematics');
+
     const { NodeDependencyType } = await import('@schematics/angular/utility/dependencies');
     const depsInfo = getO3rPeerDeps(packageJsonPath);
     const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;