@o3r/application 12.3.0-prerelease.48 → 12.3.0-prerelease.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/application",
-  "version": "12.3.0-prerelease.48",
+  "version": "12.3.0-prerelease.49",
   "publishConfig": {
     "access": "public"
   },
@@ -26,11 +26,11 @@
     "@angular-devkit/schematics": "^19.0.0",
     "@angular/common": "^19.0.0",
     "@angular/core": "^19.0.0",
-    "@o3r/core": "^12.3.0-prerelease.48",
-    "@o3r/logger": "^12.3.0-prerelease.48",
-    "@o3r/routing": "^12.3.0-prerelease.48",
-    "@o3r/schematics": "^12.3.0-prerelease.48",
-    "@o3r/testing": "^12.3.0-prerelease.48",
+    "@o3r/core": "^12.3.0-prerelease.49",
+    "@o3r/logger": "^12.3.0-prerelease.49",
+    "@o3r/routing": "^12.3.0-prerelease.49",
+    "@o3r/schematics": "^12.3.0-prerelease.49",
+    "@o3r/testing": "^12.3.0-prerelease.49",
     "@schematics/angular": "^19.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "~10.9.2",
@@ -48,6 +48,7 @@
     }
   },
   "dependencies": {
+    "@o3r/schematics": "^12.3.0-prerelease.49",
     "tslib": "^2.6.2"
   },
   "engines": {

package/schematics/ng-add/helpers/devtools-registration.d.ts

@@ -1,8 +1,7 @@
-import { Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from '../schema';
 /**
  * Register Devtools to the application
  * @param options
  */
-export declare const registerDevtools: (options: NgAddSchematicsSchema) => Promise<Rule>;
+export declare const registerDevtools: (options: NgAddSchematicsSchema) => import("@angular-devkit/schematics").Rule;
 //# sourceMappingURL=devtools-registration.d.ts.map

package/schematics/ng-add/helpers/devtools-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtools-registration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAOnB;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAU,SAAS,qBAAqB,KAAG,OAAO,CAAC,IAAI,CAgBnF,CAAC"}
+{"version":3,"file":"devtools-registration.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/helpers/devtools-registration.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAOnB;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,qBAAqB,8CAe9D,CAAC"}

package/schematics/ng-add/helpers/devtools-registration.js

@@ -4,6 +4,7 @@ exports.registerDevtools = void 0;
 const node_fs_1 = require("node:fs");
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const DEVTOOL_MODULE_NAME = 'ApplicationDevtoolsModule';
 const CONSOLE_DEVTOOL_SERVICE_NAME = 'ApplicationDevtoolsConsoleService';
 const MESSAGE_DEVTOOL_SERVICE_NAME = 'ApplicationDevtoolsMessageService';
@@ -12,16 +13,15 @@ const PACKAGE_NAME = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirna
  * Register Devtools to the application
  * @param options
  */
-const registerDevtools = async (options) => {
-    const { registerDevtoolsToApplication } = await Promise.resolve().then(() => require('@o3r/schematics'));
+const registerDevtools = (options) => {
     return (0, schematics_1.chain)([
-        registerDevtoolsToApplication({
+        (0, schematics_2.registerDevtoolsToApplication)({
             moduleName: DEVTOOL_MODULE_NAME,
             packageName: PACKAGE_NAME,
             serviceName: CONSOLE_DEVTOOL_SERVICE_NAME,
             projectName: options.projectName
         }),
-        registerDevtoolsToApplication({
+        (0, schematics_2.registerDevtoolsToApplication)({
             moduleName: DEVTOOL_MODULE_NAME,
             packageName: PACKAGE_NAME,
             serviceName: MESSAGE_DEVTOOL_SERVICE_NAME,

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":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6GlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAoBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6FlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -3,14 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const utility_1 = require("@schematics/angular/utility");
 const devtools_registration_1 = require("./helpers/devtools-registration");
-const reportMissingSchematicsDep = (logger) => (reason) => {
-    logger.error(`[ERROR]: Adding @o3r/application has failed.
-If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the o3r application package. Please run 'ng add @o3r/core' .
-Otherwise, use the error message as guidance.`);
-    throw reason;
-};
 /**
  * Add Otter application to an Angular Project
  * @param options The options to pass to ng-add execution
@@ -18,15 +13,14 @@ Otherwise, use the error message as guidance.`);
 function ngAddFn(options) {
     /* ng add rules */
     return async (tree, context) => {
-        const { getAppModuleFilePath, getWorkspaceConfig, insertImportToModuleFile, setupDependencies, getO3rPeerDeps, getProjectNewDependenciesTypes, getPackageInstallConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
         const { isImported } = await Promise.resolve().then(() => require('@schematics/angular/utility/ast-utils')).catch(() => ({ isImported: undefined }));
         const ts = await Promise.resolve().then(() => require('typescript')).catch(() => undefined);
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const depsInfo = getO3rPeerDeps(packageJsonPath);
-        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const addAngularAnimationPreferences = () => {
             const additionalRules = [];
-            const moduleFilePath = getAppModuleFilePath(tree, context, options.projectName);
+            const moduleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, options.projectName);
             if (!moduleFilePath || !options.projectName) {
                 return tree;
             }
@@ -46,7 +40,7 @@ function ngAddFn(options) {
             }
             const importInRootModule = (name, file, moduleFunction) => additionalRules.push((0, utility_1.addRootImport)(options.projectName, ({ code, external }) => code `\n${external(name, file)}${moduleFunction}`));
             const recorder = tree.beginUpdate(moduleFilePath);
-            insertImportToModuleFile('prefersReducedMotion', '@o3r/application', sourceFile, recorder, moduleFilePath);
+            (0, schematics_2.insertImportToModuleFile)('prefersReducedMotion', '@o3r/application', sourceFile, recorder, moduleFilePath);
             importInRootModule('BrowserAnimationsModule', '@angular/platform-browser/animations', '.withConfig({disableAnimations: prefersReducedMotion()})');
             tree.commitUpdate(recorder);
             return (0, schematics_1.chain)(additionalRules)(tree, context);
@@ -55,15 +49,15 @@ function ngAddFn(options) {
             acc[dep] = {
                 inManifest: [{
                         range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }],
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             };
             return acc;
-        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        const registerDevtoolRule = await (0, devtools_registration_1.registerDevtools)(options);
+        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        const registerDevtoolRule = (0, devtools_registration_1.registerDevtools)(options);
         return () => (0, schematics_1.chain)([
-            setupDependencies({
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
@@ -77,9 +71,6 @@ function ngAddFn(options) {
  * Add Otter application to an Angular Project
  * @param options The options to pass to ng-add execution
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
-    return createOtterSchematic(ngAddFn)(options);
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map