@o3r/core 11.1.0-prerelease.49 → 11.1.0-prerelease.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "11.1.0-prerelease.49",
+  "version": "11.1.0-prerelease.50",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,7 @@
     "@ngrx/entity": "~18.0.0",
     "@ngrx/store": "~18.0.0",
     "@nx/angular": "~19.5.0",
-    "@o3r/telemetry": "^11.1.0-prerelease.49",
+    "@o3r/telemetry": "^11.1.0-prerelease.50",
     "@schematics/angular": "~18.1.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
@@ -59,7 +59,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^11.1.0-prerelease.49",
+    "@o3r/schematics": "^11.1.0-prerelease.50",
     "tslib": "^2.6.2",
     "uuid": "^10.0.0"
   },
@@ -69,7 +69,7 @@
     "@ngrx/router-store": "~18.0.0",
     "@ngrx/effects": "~18.0.0",
     "@ngrx/store-devtools": "~18.0.0",
-    "@o3r/store-sync": "^11.1.0-prerelease.49",
+    "@o3r/store-sync": "^11.1.0-prerelease.50",
     "@types/jest": "~29.5.2",
     "nx": "~19.5.0",
     "@typescript-eslint/parser": "^7.14.1",

package/schematics/page/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/page/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAchM,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAgN1D;;;GAGG;AACH,eAAO,MAAM,cAAc,mDAA0D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/page/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA8F,IAAI,EAAoD,MAAM,4BAA4B,CAAC;AAehM,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AA6O1D;;;GAGG;AACH,eAAO,MAAM,cAAc,mDAA0D,CAAC"}

package/schematics/page/index.js

@@ -134,7 +134,29 @@ function ngGeneratePageFn(options) {
             import: `./${indexFilePath.replace(/[\\/]/g, '/')}`,
             module: `${pageName}${options.standalone ? 'Component' : 'Module'}`
         };
-        return (0, schematics_2.insertRoute)(tree, context, options.appRoutingModulePath, route, options.standalone);
+        if (options.appRoutingModulePath) {
+            return (0, schematics_2.insertRoute)(tree, context, options.appRoutingModulePath, route, options.standalone);
+        }
+        const appModuleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, options.projectName);
+        if (appModuleFilePath) {
+            const text = tree.readText(appModuleFilePath);
+            const match = text.match(/(provideRouter|RouterModule\.forRoot)\((\s*)?(?<routeVarName>[^,\s)]*)/);
+            const routeVariableName = match?.groups?.routeVarName;
+            if (routeVariableName) {
+                const sourceFile = ts.createSourceFile(appModuleFilePath, text, ts.ScriptTarget.ES2015, true);
+                const importStatement = sourceFile.statements.find((statement) => ts.isImportDeclaration(statement)
+                    && !!statement?.moduleSpecifier
+                    && ts.isStringLiteral(statement.moduleSpecifier)
+                    && !!statement.importClause?.namedBindings
+                    && ts.isNamedImports(statement.importClause.namedBindings)
+                    && statement.importClause.namedBindings.elements.some((element) => element.name.escapedText === routeVariableName));
+                const importRouteVariablePath = importStatement?.moduleSpecifier?.text;
+                // If importRouteVariablePath is undefined it is because the variable is defined in this file
+                const appRoutingModulePath = importRouteVariablePath ? path.join(path.dirname(appModuleFilePath), `${importRouteVariablePath}.ts`) : appModuleFilePath;
+                return (0, schematics_2.insertRoute)(tree, context, appRoutingModulePath, route, options.standalone);
+            }
+        }
+        throw new schematics_2.O3rCliError('No routes definition found. Please use the option `appRoutingModulePath` to specify the path of the routes definition.');
     };
     return (0, schematics_1.chain)([
         isApplication,

package/schematics/page/schema.d.ts

@@ -7,7 +7,7 @@ export interface NgGeneratePageSchematicsSchema extends SchematicOptionObject {
     /** Page scope */
     scope: string;
     /** Application routing module path */
-    appRoutingModulePath: string;
+    appRoutingModulePath?: string | undefined;
     /** Selector prefix */
     prefix?: string | undefined;
     /** Directory containing the pages */

package/schematics/page/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/page/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,8BAA+B,SAAQ,qBAAqB;IAC3E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IAEd,sCAAsC;IACtC,oBAAoB,EAAE,MAAM,CAAC;IAE7B,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,kEAAkE;IAClE,eAAe,EAAE,OAAO,CAAC;IAEzB,2DAA2D;IAC3D,cAAc,EAAE,OAAO,CAAC;IAExB,oDAAoD;IACpD,eAAe,EAAE,OAAO,CAAC;IAEzB,oDAAoD;IACpD,UAAU,EAAE,OAAO,CAAC;IAEpB,uCAAuC;IACvC,eAAe,EAAE,OAAO,CAAC;IAEzB,4BAA4B;IAC5B,aAAa,EAAE,OAAO,CAAC;CACxB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/page/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,8BAA+B,SAAQ,qBAAqB;IAC3E,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IAEd,sCAAsC;IACtC,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1C,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,qCAAqC;IACrC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,kEAAkE;IAClE,eAAe,EAAE,OAAO,CAAC;IAEzB,2DAA2D;IAC3D,cAAc,EAAE,OAAO,CAAC;IAExB,oDAAoD;IACpD,eAAe,EAAE,OAAO,CAAC;IAEzB,oDAAoD;IACpD,UAAU,EAAE,OAAO,CAAC;IAEpB,uCAAuC;IACvC,eAAe,EAAE,OAAO,CAAC;IAEzB,4BAA4B;IAC5B,aAAa,EAAE,OAAO,CAAC;CACxB"}

package/schematics/page/schema.json

@@ -28,9 +28,7 @@
     },
     "appRoutingModulePath": {
       "type": "string",
-      "description": "Application routing module path",
-      "default": "./src/app/app-routing.module.ts",
-      "x-prompt": "Application routing module path?"
+      "description": "Application routing module path"
     },
     "prefix": {
       "type": "string",
@@ -74,7 +72,6 @@
   },
   "additionalProperties": true,
   "required": [
-    "name",
-    "appRoutingModulePath"
+    "name"
   ]
 }