@rxap/ts-morph 1.1.0-dev.19 → 1.1.0-dev.20

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0-dev.20](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.19...@rxap/ts-morph@1.1.0-dev.20) (2024-03-15)
+
+### Bug Fixes
+
+- pass missing name property ([3329809](https://gitlab.com/rxap/packages/commit/332980968b8440738e3441074fd2e4f187c01666))
+
+### Features
+
+- auto detect the inset at index ([948d812](https://gitlab.com/rxap/packages/commit/948d8127d132622f442d69a593ef995b16febe40))
+- support complex load children and component ([4c10be5](https://gitlab.com/rxap/packages/commit/4c10be5ce97e57c7f554870eb4f93a2555f621f3))
+
 # [1.1.0-dev.19](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.1.0-dev.18...@rxap/ts-morph@1.1.0-dev.19) (2024-03-14)
 
 ### Bug Fixes

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-dev.19",
+  "version": "1.1.0-dev.20",
   "name": "@rxap/ts-morph",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -44,7 +44,7 @@
     "directory": "packages/ts-morph"
   },
   "type": "commonjs",
-  "gitHead": "ed07f30b85b21d1521b602abd6932bba6029001c",
+  "gitHead": "f314d2e61a80e93a7420d2c9ce36adec2ab88c9b",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/lib/angular/add-route.d.ts

@@ -1,3 +1,4 @@
-import { SourceFile } from 'ts-morph';
+import { ArrayLiteralExpression, SourceFile } from 'ts-morph';
 import { AngularRoute } from './build-route-object';
-export declare function AddRoute(sourceFile: SourceFile, route: AngularRoute, path?: string[], name?: string, insertAt?: number): void;
+export declare function DefaultInsertAtFactory(route: AngularRoute): (array: ArrayLiteralExpression) => number;
+export declare function AddRoute(sourceFile: SourceFile, route: AngularRoute, path?: string[], name?: string, insertAt?: (array: ArrayLiteralExpression) => number): void;

package/src/lib/angular/add-route.js

@@ -1,11 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddRoute = void 0;
+exports.AddRoute = exports.DefaultInsertAtFactory = void 0;
 const ts_morph_1 = require("ts-morph");
 const coerce_array_element_1 = require("../coerce-array-element");
 const build_route_object_1 = require("./build-route-object");
 const find_parent_route_1 = require("./find-parent-route");
-function AddRoute(sourceFile, route, path, name = 'ROUTES', insertAt = 0) {
+function DefaultInsertAtFactory(route) {
+    return (array) => {
+        var _a;
+        const elementCount = array.getElements().length;
+        if (route.path === '') {
+            if (elementCount > 0) {
+                const lastElement = array.getElements()[elementCount - 1];
+                if (lastElement.isKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)) {
+                    if ((_a = lastElement.asKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression).getProperty('path')) === null || _a === void 0 ? void 0 : _a.getText().match(/\*\*/)) {
+                        return elementCount - 2;
+                    }
+                }
+            }
+            return array.getElements().length - 1;
+        }
+        let insertAt = 0;
+        if (elementCount > 0) {
+            // find the first object literal
+            // this ensures that use of variables for route imports like STATUS_CHECK_ROUTE is always the first element
+            for (const element of array.getElements()) {
+                if (!element.isKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)) {
+                    insertAt++;
+                }
+                else {
+                    break;
+                }
+            }
+        }
+        return insertAt;
+    };
+}
+exports.DefaultInsertAtFactory = DefaultInsertAtFactory;
+function AddRoute(sourceFile, route, path, name = 'ROUTES', insertAt = DefaultInsertAtFactory(route)) {
     const routes = sourceFile.getVariableDeclaration(name);
     if (routes) {
         let initializer = routes.getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
@@ -13,7 +45,7 @@ function AddRoute(sourceFile, route, path, name = 'ROUTES', insertAt = 0) {
             initializer = (0, find_parent_route_1.FindParentRoute)(initializer, path);
         }
         if (initializer) {
-            (0, coerce_array_element_1.CoerceArrayElement)(initializer, (0, build_route_object_1.BuildRouteObject)(route), (0, coerce_array_element_1.FindArrayElementByObjectProperty)('path', route.path), () => insertAt);
+            (0, coerce_array_element_1.CoerceArrayElement)(initializer, (0, build_route_object_1.BuildRouteObject)(route), (0, coerce_array_element_1.FindArrayElementByObjectProperty)('path', route.path), insertAt);
         }
         else {
             console.warn('Initializer not found');

package/src/lib/angular/add-route.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-route.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/add-route.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,kEAGiC;AACjC,6DAG8B;AAC9B,2DAAsD;AAEtD,SAAgB,QAAQ,CAAC,UAAsB,EAAE,KAAmB,EAAE,IAAe,EAAE,IAAI,GAAG,QAAQ,EAAE,QAAQ,GAAG,CAAC;IAClH,MAAM,MAAM,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,MAAM,EAAE;QACV,IAAI,WAAW,GAAkC,MAAM,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;QACvH,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE;YAChB,WAAW,GAAG,IAAA,mCAAe,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAClD;QACD,IAAI,WAAW,EAAE;YACf,IAAA,yCAAkB,EAChB,WAAW,EAAE,IAAA,qCAAgB,EAAC,KAAK,CAAC,EAAE,IAAA,uDAAgC,EAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC;SAC/G;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;SACvC;KACF;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,qBAAqB,CAAC,CAAC;KAC5C;AACH,CAAC;AAhBD,4BAgBC"}
+{"version":3,"file":"add-route.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/add-route.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,kEAGiC;AACjC,6DAG8B;AAC9B,2DAAsD;AAEtD,SAAgB,sBAAsB,CAAC,KAAmB;IACxD,OAAO,CAAC,KAA6B,EAAE,EAAE;;QACvC,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;QAChD,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,EAAE;YACrB,IAAI,YAAY,GAAG,CAAC,EAAE;gBACpB,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;gBAC1D,IAAI,WAAW,CAAC,MAAM,CAAC,qBAAU,CAAC,uBAAuB,CAAC,EAAE;oBAC1D,IAAI,MAAA,WAAW,CAAC,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,0CAAE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE;wBAC9G,OAAO,YAAY,GAAG,CAAC,CAAC;qBACzB;iBACF;aACF;YACD,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACvC;QACD,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,gCAAgC;YAChC,2GAA2G;YAC3G,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;gBACzC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAU,CAAC,uBAAuB,CAAC,EAAE;oBACvD,QAAQ,EAAE,CAAC;iBACZ;qBAAM;oBACL,MAAM;iBACP;aACF;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC;AA5BD,wDA4BC;AAED,SAAgB,QAAQ,CAAC,UAAsB,EAAE,KAAmB,EAAE,IAAe,EAAE,IAAI,GAAG,QAAQ,EAAE,WAAsD,sBAAsB,CAAC,KAAK,CAAC;IACzL,MAAM,MAAM,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,MAAM,EAAE;QACV,IAAI,WAAW,GAAkC,MAAM,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;QACvH,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAE;YAChB,WAAW,GAAG,IAAA,mCAAe,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAClD;QACD,IAAI,WAAW,EAAE;YACf,IAAA,yCAAkB,EAChB,WAAW,EAAE,IAAA,qCAAgB,EAAC,KAAK,CAAC,EAAE,IAAA,uDAAgC,EAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;SACzG;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;SACvC;KACF;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,qBAAqB,CAAC,CAAC;KAC5C;AACH,CAAC;AAhBD,4BAgBC"}

package/src/lib/angular/build-route-object.d.ts

@@ -1,7 +1,13 @@
 import { WriterFunction } from 'ts-morph';
 export interface AngularRoute {
     path: string;
-    loadChildren?: string;
-    loadComponent?: string;
+    loadChildren?: string | {
+        import: string;
+        then: string;
+    };
+    loadComponent?: string | {
+        import: string;
+        then: string;
+    };
 }
 export declare function BuildRouteObject(route: AngularRoute): WriterFunction;

package/src/lib/angular/build-route-object.js

@@ -7,10 +7,20 @@ function BuildRouteObject(route) {
         path: w => w.quote(route.path),
     };
     if (route.loadChildren) {
-        obj['loadChildren'] = `() => import('${route.loadChildren}')`;
+        if (typeof route.loadChildren === 'string') {
+            obj['loadChildren'] = `() => import('${route.loadChildren}')`;
+        }
+        else {
+            obj['loadChildren'] = `() => import('${route.loadChildren.import}').then((m) => m.${route.loadChildren.then})`;
+        }
     }
     if (route.loadComponent) {
-        obj['loadComponent'] = `() => import('${route.loadComponent}')`;
+        if (typeof route.loadComponent === 'string') {
+            obj['loadComponent'] = `() => import('${route.loadComponent}')`;
+        }
+        else {
+            obj['loadComponent'] = `() => import('${route.loadComponent.import}').then((m) => m.${route.loadComponent.then})`;
+        }
     }
     return ts_morph_1.Writers.object(obj);
 }

package/src/lib/angular/build-route-object.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-route-object.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/build-route-object.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAQlB,SAAgB,gBAAgB,CAAC,KAAmB;IAClD,MAAM,GAAG,GAA4C;QACnD,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;KAC/B,CAAC;IACF,IAAI,KAAK,CAAC,YAAY,EAAE;QACtB,GAAG,CAAC,cAAc,CAAC,GAAG,iBAAkB,KAAK,CAAC,YAAa,IAAI,CAAC;KACjE;IACD,IAAI,KAAK,CAAC,aAAa,EAAE;QACvB,GAAG,CAAC,eAAe,CAAC,GAAG,iBAAkB,KAAK,CAAC,aAAc,IAAI,CAAC;KACnE;IACD,OAAO,kBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAXD,4CAWC"}
+{"version":3,"file":"build-route-object.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/build-route-object.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAQlB,SAAgB,gBAAgB,CAAC,KAAmB;IAClD,MAAM,GAAG,GAA4C;QACnD,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;KAC/B,CAAC;IACF,IAAI,KAAK,CAAC,YAAY,EAAE;QACtB,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,EAAE;YAC1C,GAAG,CAAC,cAAc,CAAC,GAAG,iBAAkB,KAAK,CAAC,YAAa,IAAI,CAAC;SACjE;aAAM;YACL,GAAG,CAAC,cAAc,CAAC,GAAG,iBAAkB,KAAK,CAAC,YAAY,CAAC,MAAO,oBAAqB,KAAK,CAAC,YAAY,CAAC,IAAK,GAAG,CAAC;SACpH;KACF;IACD,IAAI,KAAK,CAAC,aAAa,EAAE;QACvB,IAAI,OAAO,KAAK,CAAC,aAAa,KAAK,QAAQ,EAAE;YAC3C,GAAG,CAAC,eAAe,CAAC,GAAG,iBAAkB,KAAK,CAAC,aAAc,IAAI,CAAC;SACnE;aAAM;YACL,GAAG,CAAC,eAAe,CAAC,GAAG,iBAAkB,KAAK,CAAC,aAAa,CAAC,MAAO,oBAAqB,KAAK,CAAC,aAAa,CAAC,IAAK,GAAG,CAAC;SACvH;KACF;IACD,OAAO,kBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAnBD,4CAmBC"}

package/src/lib/angular/coerce-routes.js

@@ -27,7 +27,7 @@ function CoerceRoutes(sourceFile, options = {}) {
         },
     ]);
     for (const { route, path } of (_a = options.itemList) !== null && _a !== void 0 ? _a : []) {
-        (0, add_route_1.AddRoute)(sourceFile, route, path);
+        (0, add_route_1.AddRoute)(sourceFile, route, path, name);
     }
     return variableDeclaration;
 }

package/src/lib/angular/coerce-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-routes.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-routes.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,oEAA+D;AAC/D,sDAAkD;AAClD,gFAA2E;AAC3E,2CAAuC;AASvC,SAAgB,YAAY,CAAC,UAAsB,EAAE,UAA+B,EAAE;;IAEpF,MAAM,EACJ,IAAI,GAAG,QAAQ,EACf,WAAW,GAAG,kCAAkC,EACjD,GAAG,OAAO,CAAC;IAEZ,0GAA0G;IAC1G,IAAI,mBAAmB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9G,IAAI,mBAAmB,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;QACjH,mBAAmB,CAAC,2BAA2B,EAAE,CAAC,MAAM,EAAE,CAAC;KAC5D;IACD,YAAY;IACZ,mBAAmB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,IAAI,EAAE;QAChE,WAAW;QACX,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IACH,IAAA,2CAAmB,EAAC,mBAAmB,CAAC,CAAC;IACzC,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE,CAAE,OAAO,CAAE;YACzB,eAAe,EAAE,iBAAiB;SACnC;KACF,CAAC,CAAC;IAEH,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,EAAE;QACpD,IAAA,oBAAQ,EAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;KACnC;IAED,OAAO,mBAAmB,CAAC;AAE7B,CAAC;AA/BD,oCA+BC"}
+{"version":3,"file":"coerce-routes.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-routes.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAClB,oEAA+D;AAC/D,sDAAkD;AAClD,gFAA2E;AAC3E,2CAAuC;AASvC,SAAgB,YAAY,CAAC,UAAsB,EAAE,UAA+B,EAAE;;IAEpF,MAAM,EACJ,IAAI,GAAG,QAAQ,EACf,WAAW,GAAG,kCAAkC,EACjD,GAAG,OAAO,CAAC;IAEZ,0GAA0G;IAC1G,IAAI,mBAAmB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9G,IAAI,mBAAmB,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;QACjH,mBAAmB,CAAC,2BAA2B,EAAE,CAAC,MAAM,EAAE,CAAC;KAC5D;IACD,YAAY;IACZ,mBAAmB,GAAG,IAAA,uDAAyB,EAAC,UAAU,EAAE,IAAI,EAAE;QAChE,WAAW;QACX,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IACH,IAAA,2CAAmB,EAAC,mBAAmB,CAAC,CAAC;IACzC,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE,CAAE,OAAO,CAAE;YACzB,eAAe,EAAE,iBAAiB;SACnC;KACF,CAAC,CAAC;IAEH,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,EAAE;QACpD,IAAA,oBAAQ,EAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KACzC;IAED,OAAO,mBAAmB,CAAC;AAE7B,CAAC;AA/BD,oCA+BC"}