@rxap/ts-morph 1.1.0-dev.2 → 1.1.0-dev.21

package/src/lib/angular/coerce-component-input.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceComponentInput = void 0;
-const ts_morph_1 = require("@rxap/ts-morph");
+const ts_morph_1 = require("ts-morph");
 const coerce_accessor_declaration_1 = require("../coerce-accessor-declaration");
+const coerce_decorator_1 = require("../coerce-decorator");
 const coerce_imports_1 = require("../coerce-imports");
-const ts_morph_2 = require("ts-morph");
 const coerce_property_declaration_1 = require("../coerce-property-declaration");
 const has_constructor_parameter_1 = require("../has-constructor-parameter");
-const get_component_class_1 = require("./get-component-class");
 const write_type_1 = require("../write-type");
+const get_component_class_1 = require("./get-component-class");
 function CoerceComponentInput(sourceFileOrClassDeclaration, name, type, { initializer, alias, isRequired, asSetAccessor } = {}) {
-    const classDeclaration = sourceFileOrClassDeclaration instanceof ts_morph_2.ClassDeclaration ? sourceFileOrClassDeclaration : (0, get_component_class_1.GetComponentClass)(sourceFileOrClassDeclaration);
-    const sourceFile = sourceFileOrClassDeclaration instanceof ts_morph_2.SourceFile ? sourceFileOrClassDeclaration : sourceFileOrClassDeclaration.getSourceFile();
+    const classDeclaration = sourceFileOrClassDeclaration instanceof ts_morph_1.ClassDeclaration ? sourceFileOrClassDeclaration : (0, get_component_class_1.GetComponentClass)(sourceFileOrClassDeclaration);
+    const sourceFile = sourceFileOrClassDeclaration instanceof ts_morph_1.SourceFile ? sourceFileOrClassDeclaration : sourceFileOrClassDeclaration.getSourceFile();
     if ((0, has_constructor_parameter_1.HasConstructorParameter)(classDeclaration, name, true)) {
         throw new Error(`The component '${classDeclaration.getName()}' already has a constructor parameter that is a class member with the name '${name}'. Cannot add an input with the same name!`);
     }
@@ -31,12 +31,12 @@ function CoerceComponentInput(sourceFileOrClassDeclaration, name, type, { initia
         if (isRequired) {
             inputArgument['required'] = 'true';
         }
-        inputDecoratorStructure.arguments = [ts_morph_2.Writers.object(inputArgument)];
+        inputDecoratorStructure.arguments = [ts_morph_1.Writers.object(inputArgument)];
     }
     let propertyNode;
     if (asSetAccessor) {
         propertyNode = (0, coerce_accessor_declaration_1.CoerceSetAccessorDeclaration)(classDeclaration, name, { statements: `this._${name} = ${name};` }).set({
-            scope: ts_morph_2.Scope.Public,
+            scope: ts_morph_1.Scope.Public,
             parameters: [
                 {
                     name: name,
@@ -44,7 +44,7 @@ function CoerceComponentInput(sourceFileOrClassDeclaration, name, type, { initia
                 },
             ],
         });
-        (0, coerce_property_declaration_1.CoercePropertyDeclaration)(classDeclaration, '_' + name, { scope: ts_morph_2.Scope.Private }).set({
+        (0, coerce_property_declaration_1.CoercePropertyDeclaration)(classDeclaration, '_' + name, { scope: ts_morph_1.Scope.Private }).set({
             type: (0, write_type_1.WriteType)(type, sourceFile),
             initializer: initializer,
             hasQuestionToken: !initializer && !isRequired,
@@ -53,14 +53,14 @@ function CoerceComponentInput(sourceFileOrClassDeclaration, name, type, { initia
     }
     else {
         propertyNode = (0, coerce_property_declaration_1.CoercePropertyDeclaration)(classDeclaration, name).set({
-            scope: ts_morph_2.Scope.Public,
+            scope: ts_morph_1.Scope.Public,
             type: (0, write_type_1.WriteType)(type, sourceFile),
             initializer,
             hasQuestionToken: !initializer && !isRequired,
             hasExclamationToken: !initializer && isRequired,
         });
     }
-    (0, ts_morph_1.CoerceDecorator)(propertyNode, 'Input', inputDecoratorStructure);
+    (0, coerce_decorator_1.CoerceDecorator)(propertyNode, 'Input', inputDecoratorStructure);
     return propertyNode;
 }
 exports.CoerceComponentInput = CoerceComponentInput;

package/src/lib/angular/coerce-component-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-component-input.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-component-input.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coerce-component-input.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-component-input.ts"],"names":[],"mappings":"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"}

package/src/lib/angular/coerce-component.d.ts

@@ -1,6 +1,6 @@
 import { ClassDeclarationStructure, ObjectLiteralExpression, OptionalKind, SourceFile } from 'ts-morph';
 export interface CoerceComponentOptions {
-    selector?: string;
+    selector?: string | false;
     prefix?: string;
     template?: string;
     styles?: string;

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

@@ -11,7 +11,18 @@ function CoerceComponent(sourceFile, name, options = {}, classStructure = {}) {
     const className = (0, utilities_1.classify)((0, utilities_1.CoerceSuffix)((0, utilities_1.dasherize)(name), '-component'));
     const { prefix, changeDetection, } = options;
     let { selector, template, templateUrl, styles, styleUrls, } = options;
-    selector !== null && selector !== void 0 ? selector : (selector = prefix ? `${prefix}-${(0, utilities_1.dasherize)(name)}` : (0, utilities_1.dasherize)(name));
+    if (selector !== false) {
+        selector !== null && selector !== void 0 ? selector : (selector = prefix ? `${prefix}-${(0, utilities_1.dasherize)(name)}` : (0, utilities_1.dasherize)(name));
+        if (selector.includes('{{prefix}}')) {
+            if (!prefix) {
+                throw new Error(`The selector '${selector}' contains a template expression '{{prefix}}' but no prefix is provided`);
+            }
+            selector = selector.replace('{{prefix}}', prefix);
+        }
+        if (selector.match(/\{\{.*}}/)) {
+            throw new Error(`The selector '${selector}' contains an invalid templates expression`);
+        }
+    }
     if (templateUrl === true || !template) {
         template = undefined;
         templateUrl = `./${(0, utilities_1.dasherize)(name)}.component.html`;
@@ -36,8 +47,10 @@ function CoerceComponent(sourceFile, name, options = {}, classStructure = {}) {
     const classDeclaration = (0, coerce_class_1.CoerceClass)(sourceFile, className, classStructure);
     const componentOptions = {
         standalone: 'true',
-        selector: w => w.quote(selector),
     };
+    if (selector) {
+        componentOptions['selector'] = w => w.quote(selector);
+    }
     if (changeDetection) {
         componentOptions['changeDetection'] = `ChangeDetectionStrategy.${changeDetection}`;
         (0, coerce_imports_1.CoerceImports)(sourceFile, {

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":";;;AAAA,+CAIyB;AACzB,uCAOkB;AAClB,kDAA8C;AAC9C,0DAAsD;AACtD,sDAAkD;AAkBlD,SAAgB,eAAe,CAC7B,UAAsB,EACtB,IAAY,EACZ,UAAkC,EAAE,EACpC,iBAAwE,EAAE;;IAE1E,MAAM,SAAS,GAAG,IAAA,oBAAQ,EAAC,IAAA,wBAAY,EAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IACxE,MAAM,EACJ,MAAM,EACN,eAAe,GAChB,GAAG,OAAO,CAAC;IACZ,IAAI,EACF,QAAQ,EACR,QAAQ,EACR,WAAW,EACX,MAAM,EACN,SAAS,GACV,GAAG,OAAO,CAAC;IAEZ,IAAI,QAAQ,KAAK,KAAK,EAAE;QACtB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,MAAM,CAAC,CAAC,CAAC,GAAI,MAAO,IAAK,IAAA,qBAAS,EAAC,IAAI,CAAE,EAAE,CAAC,CAAC,CAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAC;QAC3E,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACnC,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CACb,iBAAkB,QAAS,yEAAyE,CAAC,CAAC;aACzG;YACD,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;SACnD;QACD,IAAI,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,iBAAkB,QAAS,4CAA4C,CAAC,CAAC;SAC1F;KACF;IACD,IAAI,WAAW,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;QACrC,QAAQ,GAAG,SAAS,CAAC;QACrB,WAAW,GAAG,KAAM,IAAA,qBAAS,EAAC,IAAI,CAAE,iBAAiB,CAAC;KACvD;IACD,IAAI,SAAS,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;QACjC,MAAM,GAAG,SAAS,CAAC;QACnB,SAAS,GAAG,CAAE,KAAM,IAAA,qBAAS,EAAC,IAAI,CAAE,iBAAiB,CAAE,CAAC;KACzD;IACD,IAAI,CAAC,WAAW,EAAE;QAChB,QAAQ,aAAR,QAAQ,cAAR,QAAQ,IAAR,QAAQ,GAAK,EAAE,EAAC;KACjB;IACD,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,aAAN,MAAM,cAAN,MAAM,IAAN,MAAM,GAAK,IAAI,EAAC;KACjB;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,SAAS,GAAG,KAAM,SAAS,CAAC,IAAI,CAAC,SAAS,CAAE,IAAI,CAAC;KAClD;IACD,IAAI,SAAS,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,CAAC,GAAG,CAAC,CAAA,EAAE;QAC5C,SAAS,GAAG,IAAK,SAAU,GAAG,CAAC;KAChC;IAED,MAAA,cAAc,CAAC,UAAU,oCAAzB,cAAc,CAAC,UAAU,GAAK,IAAI,EAAC;IAEnC,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAE5E,MAAM,gBAAgB,GAA4C;QAChE,UAAU,EAAE,MAAM;KACnB,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAkB,CAAC,CAAC;KACjE;IAED,IAAI,eAAe,EAAE;QACnB,gBAAgB,CAAC,iBAAiB,CAAC,GAAG,2BAA4B,eAAgB,EAAE,CAAC;QACrF,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,WAAW,EAAE,yBAAyB,CAAE;YACxD,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;KACJ;IAED,IAAI,QAAQ,EAAE;QACZ,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,QAAS,CAAC,CAAC;KACxD;IAED,IAAI,WAAW,EAAE;QACf,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAqB,CAAC,CAAC;KACvE;IAED,IAAI,MAAM,EAAE;QACV,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAO,CAAC,CAAC;KACpD;IAED,IAAI,SAAS,EAAE;QACb,gBAAgB,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;KAC3C;IAED,MAAM,6BAA6B,GAAG,IAAA,kCAAe,EAAC,gBAAgB,EAAE,WAAW,EAAE;QACnF,SAAS,EAAE;YACT,kBAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC;SACjC;KACF,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,6BAA6B,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IACjF,IAAI,CAAC,wBAAwB,EAAE;QAC7B,MAAM,IAAI,KAAK,CAAC,4DAA6D,SAAU,GAAG,CAAC,CAAC;KAC7F;IACD,IAAI,CAAC,CAAC,wBAAwB,YAAY,kCAAuB,CAAC,EAAE;QAClE,MAAM,IAAI,KAAK,CAAC,6CAA8C,SAAU,uCAAuC,CAAC,CAAC;KAClH;IAED,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;AACxD,CAAC;AAxGD,0CAwGC"}

package/src/lib/angular/coerce-layout-routes.d.ts

@@ -0,0 +1,4 @@
+import { SourceFile } from 'ts-morph';
+import { CoerceRoutesOptions } from './coerce-routes';
+export type CoerceLayoutRoutesOptions = CoerceRoutesOptions;
+export declare function CoerceLayoutRoutes(sourceFile: SourceFile, options?: CoerceLayoutRoutesOptions): import("ts-morph").VariableDeclaration;

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

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceLayoutRoutes = void 0;
+const ts_morph_1 = require("ts-morph");
+const coerce_imports_1 = require("../coerce-imports");
+const coerce_routes_1 = require("./coerce-routes");
+function CoerceLayoutRoutes(sourceFile, options = {}) {
+    var _a;
+    const variableDeclaration = (0, coerce_routes_1.CoerceRoutes)(sourceFile, Object.assign(Object.assign({}, options), { initializer: (_a = options.initializer) !== null && _a !== void 0 ? _a : (w => {
+            w.writeLine('[');
+            w.indent(() => {
+                ts_morph_1.Writers.object({
+                    path: w => w.quote(''),
+                    component: 'LayoutComponent',
+                    canActivateChild: '[StatusCheckGuard]',
+                    children: w => {
+                        w.writeLine('[');
+                        w.indent(() => {
+                            ts_morph_1.Writers.object({
+                                path: w => w.quote('**'),
+                                redirectTo: w => w.quote('')
+                            })(w);
+                        });
+                        w.write(']');
+                    },
+                    providers: w => {
+                        w.write('[');
+                        w.indent(() => {
+                            w.write('APP_NAVIGATION_PROVIDER');
+                            w.write(',');
+                            w.newLine();
+                            w.write('NavigationService');
+                        });
+                        w.write(']');
+                    }
+                })(w);
+                w.write(',');
+            });
+            ts_morph_1.Writers.object({
+                path: w => w.quote('**'),
+                redirectTo: w => w.quote('')
+            })(w);
+            w.newLine();
+            w.write(']');
+        }) }));
+    (0, coerce_imports_1.CoerceImports)(sourceFile, [
+        {
+            namedImports: ['LayoutComponent', 'NavigationService'],
+            moduleSpecifier: '@rxap/layout'
+        },
+        {
+            namedImports: ['StatusCheckGuard'],
+            moduleSpecifier: '@rxap/ngx-status-check'
+        },
+        {
+            namedImports: ['APP_NAVIGATION_PROVIDER'],
+            moduleSpecifier: './app.navigation'
+        }
+    ]);
+    return variableDeclaration;
+}
+exports.CoerceLayoutRoutes = CoerceLayoutRoutes;
+//# sourceMappingURL=coerce-layout-routes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-layout-routes.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/coerce-layout-routes.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,sDAAkD;AAClD,mDAGyB;AAIzB,SAAgB,kBAAkB,CAAC,UAAsB,EAAE,UAAqC,EAAE;;IAEhG,MAAM,mBAAmB,GAAG,IAAA,4BAAY,EAAC,UAAU,kCAC9C,OAAO,KACV,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,CAAC,CAAC,CAAC,EAAE;YACvC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACjB,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;gBACZ,kBAAO,CAAC,MAAM,CAAC;oBACb,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtB,SAAS,EAAE,iBAAiB;oBAC5B,gBAAgB,EAAE,oBAAoB;oBACtC,QAAQ,EAAE,CAAC,CAAC,EAAE;wBACZ,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;wBACjB,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;4BACZ,kBAAO,CAAC,MAAM,CAAC;gCACb,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gCACxB,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;6BAC7B,CAAC,CAAC,CAAC,CAAC,CAAC;wBACR,CAAC,CAAC,CAAC;wBACH,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACf,CAAC;oBACD,SAAS,EAAE,CAAC,CAAC,EAAE;wBACb,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACb,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;4BACZ,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;4BACnC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;4BACb,CAAC,CAAC,OAAO,EAAE,CAAC;4BACZ,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;wBAC/B,CAAC,CAAC,CAAC;wBACH,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACf,CAAC;iBACF,CAAC,CAAC,CAAC,CAAC,CAAC;gBACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,kBAAO,CAAC,MAAM,CAAC;gBACb,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACxB,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;aAC7B,CAAC,CAAC,CAAC,CAAC,CAAC;YACN,CAAC,CAAC,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC,CAAC,IACF,CAAC;IAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB;YACE,YAAY,EAAE,CAAE,iBAAiB,EAAE,mBAAmB,CAAE;YACxD,eAAe,EAAE,cAAc;SAChC;QACD;YACE,YAAY,EAAE,CAAE,kBAAkB,CAAE;YACpC,eAAe,EAAE,wBAAwB;SAC1C;QACD;YACE,YAAY,EAAE,CAAE,yBAAyB,CAAE;YAC3C,eAAe,EAAE,kBAAkB;SACpC;KACF,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC;AAE7B,CAAC;AA7DD,gDA6DC"}

package/src/lib/angular/coerce-routes.d.ts

@@ -0,0 +1,11 @@
+import { SourceFile, WriterFunction } from 'ts-morph';
+import { AngularRoute } from './build-route-object';
+export interface CoerceRoutesOptions {
+    name?: string;
+    initializer?: string | WriterFunction;
+    itemList?: Array<{
+        route: AngularRoute;
+        path?: string[];
+    }>;
+}
+export declare function CoerceRoutes(sourceFile: SourceFile, options?: CoerceRoutesOptions): import("ts-morph").VariableDeclaration;

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceRoutes = void 0;
+const ts_morph_1 = require("ts-morph");
+const coerce_default_export_1 = require("../coerce-default-export");
+const coerce_imports_1 = require("../coerce-imports");
+const coerce_variable_declaration_1 = require("../coerce-variable-declaration");
+const add_route_1 = require("./add-route");
+function CoerceRoutes(sourceFile, options = {}) {
+    var _a;
+    const { name = 'ROUTES', initializer = `[{ path: '**', redirectTo: '' }]` } = options;
+    // region remove a route declaration if the initializer is an empty array to ensure the initializer is set
+    let variableDeclaration = (0, coerce_variable_declaration_1.CoerceVariableDeclaration)(sourceFile, name, { initializer: '[]', type: 'Route[]' });
+    if (variableDeclaration.getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression).getElements().length === 0) {
+        variableDeclaration.getVariableStatementOrThrow().remove();
+    }
+    // endregion
+    variableDeclaration = (0, coerce_variable_declaration_1.CoerceVariableDeclaration)(sourceFile, name, {
+        initializer,
+        type: 'Route[]'
+    });
+    (0, coerce_default_export_1.CoerceDefaultExport)(variableDeclaration);
+    (0, coerce_imports_1.CoerceImports)(sourceFile, [
+        {
+            namedImports: ['Route'],
+            moduleSpecifier: '@angular/router'
+        },
+    ]);
+    for (const { route, path } of (_a = options.itemList) !== null && _a !== void 0 ? _a : []) {
+        (0, add_route_1.AddRoute)(sourceFile, route, path, name);
+    }
+    return variableDeclaration;
+}
+exports.CoerceRoutes = CoerceRoutes;
+//# sourceMappingURL=coerce-routes.js.map

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

@@ -0,0 +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,EAAE,IAAI,CAAC,CAAC;KACzC;IAED,OAAO,mBAAmB,CAAC;AAE7B,CAAC;AA/BD,oCA+BC"}

package/src/lib/angular/find-parent-route.d.ts

@@ -0,0 +1,2 @@
+import { ArrayLiteralExpression } from 'ts-morph';
+export declare function FindParentRoute(ale: ArrayLiteralExpression, path: string[]): ArrayLiteralExpression | null;

package/src/lib/angular/find-parent-route.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FindParentRoute = void 0;
+const ts_morph_1 = require("ts-morph");
+function FindParentRoute(ale, path) {
+    var _a;
+    for (const e of ale.getElements()) {
+        if (e instanceof ts_morph_1.ObjectLiteralExpression) {
+            const pathProperty = e.getProperty('path');
+            if (pathProperty && pathProperty instanceof ts_morph_1.PropertyAssignment) {
+                const initializer = pathProperty.getInitializerIfKind(ts_morph_1.SyntaxKind.StringLiteral);
+                if (initializer) {
+                    const fragment = path.pop();
+                    if (initializer.getLiteralText() === fragment) {
+                        const childrenProperty = (_a = e.getProperty('children')) !== null && _a !== void 0 ? _a : e.addProperty({
+                            name: 'children',
+                            initializer: '[]',
+                            kind: ts_morph_1.StructureKind.PropertyAssignment,
+                        });
+                        if (childrenProperty instanceof ts_morph_1.PropertyAssignment) {
+                            const children = childrenProperty.getInitializerIfKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
+                            if (path.length) {
+                                // console.log('Continue search for parent route');
+                                return FindParentRoute(children, path);
+                            }
+                            else {
+                                // console.log('Found parent route');
+                                return children;
+                            }
+                        }
+                        else {
+                            // console.log('Children property is not a PropertyAssignment');
+                        }
+                    }
+                    else {
+                        // console.log('Path property does not match', initializer.getLiteralText(), fragment);
+                    }
+                }
+                else {
+                    // console.log('Path property has no StringLiteral initializer');
+                }
+            }
+            else {
+                // console.log('Element has no path property');
+            }
+        }
+        else {
+            // console.log('Element is not an ObjectLiteralExpression');
+        }
+    }
+    return null;
+}
+exports.FindParentRoute = FindParentRoute;
+//# sourceMappingURL=find-parent-route.js.map

package/src/lib/angular/find-parent-route.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-parent-route.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/find-parent-route.ts"],"names":[],"mappings":";;;AAAA,uCAMkB;AAElB,SAAgB,eAAe,CAAC,GAA2B,EAAE,IAAc;;IACzE,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,WAAW,EAAE,EAAE;QACjC,IAAI,CAAC,YAAY,kCAAuB,EAAE;YACxC,MAAM,YAAY,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAI,YAAY,IAAI,YAAY,YAAY,6BAAkB,EAAE;gBAC9D,MAAM,WAAW,GAAG,YAAY,CAAC,oBAAoB,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC;gBAChF,IAAI,WAAW,EAAE;oBACf,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC5B,IAAI,WAAW,CAAC,cAAc,EAAE,KAAK,QAAQ,EAAE;wBAC7C,MAAM,gBAAgB,GAAG,MAAA,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,mCAAI,CAAC,CAAC,WAAW,CAAC;4BAClE,IAAI,EAAE,UAAU;4BAChB,WAAW,EAAE,IAAI;4BACjB,IAAI,EAAE,wBAAa,CAAC,kBAAkB;yBACvC,CAAC,CAAC;wBACH,IAAI,gBAAgB,YAAY,6BAAkB,EAAE;4BAClD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;4BACjG,IAAI,IAAI,CAAC,MAAM,EAAE;gCACf,mDAAmD;gCACnD,OAAO,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;6BACxC;iCAAM;gCACL,qCAAqC;gCACrC,OAAO,QAAQ,CAAC;6BACjB;yBACF;6BAAM;4BACL,gEAAgE;yBACjE;qBACF;yBAAM;wBACL,uFAAuF;qBACxF;iBACF;qBAAM;oBACL,iEAAiE;iBAClE;aACF;iBAAM;gBACL,+CAA+C;aAChD;SACF;aAAM;YACL,4DAA4D;SAC7D;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAxCD,0CAwCC"}

package/src/lib/angular/get-component-decorator-object.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetComponentDecoratorObject = void 0;
-const ts_morph_1 = require("@rxap/ts-morph");
-const ts_morph_2 = require("ts-morph");
+const ts_morph_1 = require("ts-morph");
+const get_component_class_1 = require("./get-component-class");
 function GetComponentDecoratorObject(sourceFileOrClassDeclaration) {
-    const classDeclaration = sourceFileOrClassDeclaration instanceof ts_morph_2.ClassDeclaration ? sourceFileOrClassDeclaration : (0, ts_morph_1.GetComponentClass)(sourceFileOrClassDeclaration);
+    const classDeclaration = sourceFileOrClassDeclaration instanceof ts_morph_1.ClassDeclaration ? sourceFileOrClassDeclaration : (0, get_component_class_1.GetComponentClass)(sourceFileOrClassDeclaration);
     const componentDecorator = classDeclaration.getDecorator('Component');
     let componentOptions = componentDecorator.getArguments()[0];
     if (!componentOptions) {
-        componentOptions = componentDecorator.addArgument(ts_morph_2.Writers.object({}));
+        componentOptions = componentDecorator.addArgument(ts_morph_1.Writers.object({}));
     }
-    if (!(componentOptions instanceof ts_morph_2.ObjectLiteralExpression)) {
+    if (!(componentOptions instanceof ts_morph_1.ObjectLiteralExpression)) {
         throw new Error('The Component options is not an object literal expression');
     }
     return componentOptions;

package/src/lib/angular/get-component-decorator-object.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-component-decorator-object.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/get-component-decorator-object.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AACnD,uCAKkB;AAElB,SAAgB,2BAA2B,CACzC,4BAA2D;IAG3D,MAAM,gBAAgB,GAAG,4BAA4B,YAAY,2BAAgB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAA,4BAAiB,EAAC,4BAA4B,CAAC,CAAC;IAGnK,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAE,CAAC;IACvE,IAAI,gBAAgB,GAAG,kBAAkB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE;QACrB,gBAAgB,GAAG,kBAAkB,CAAC,WAAW,CAAC,kBAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;KACvE;IAED,IAAI,CAAC,CAAC,gBAAgB,YAAY,kCAAuB,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;KAC9E;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAnBD,kEAmBC"}
+{"version":3,"file":"get-component-decorator-object.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/get-component-decorator-object.ts"],"names":[],"mappings":";;;AAAA,uCAKkB;AAClB,+DAA0D;AAE1D,SAAgB,2BAA2B,CACzC,4BAA2D;IAG3D,MAAM,gBAAgB,GAAG,4BAA4B,YAAY,2BAAgB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAA,uCAAiB,EAAC,4BAA4B,CAAC,CAAC;IAGnK,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAE,CAAC;IACvE,IAAI,gBAAgB,GAAG,kBAAkB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,gBAAgB,EAAE;QACrB,gBAAgB,GAAG,kBAAkB,CAAC,WAAW,CAAC,kBAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;KACvE;IAED,IAAI,CAAC,CAAC,gBAAgB,YAAY,kCAAuB,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;KAC9E;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAnBD,kEAmBC"}

package/src/lib/coerce-array-element.js

@@ -36,7 +36,12 @@ function CoerceArrayElement(array, element, findExisting, insertAt) {
         }
     }
     if (insertAt) {
-        return array.insertElement(insertAt(array), element);
+        const index = insertAt(array);
+        if (index < 0) {
+            console.warn('The insertAt function returned a negative index - normalizing to 0');
+            return array.insertElement(0, element);
+        }
+        return array.insertElement(index, element);
     }
     return array.addElement(element);
 }

package/src/lib/coerce-array-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-array-element.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-array-element.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB,SAAgB,gCAAgC,CAAC,QAAgB,EAAE,KAAa;IAC9E,OAAO,CAAC,CAAa,EAAE,EAAE;QACvB,IAAI,CAAC,YAAY,kCAAuB,EAAE;YACxC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,6BAAkB,EAAE;gBACxC,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC;gBAC3D,IAAI,CAAC,EAAE;oBACL,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,KAAK,CAAC;iBACrC;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAbD,4EAaC;AAED,SAAgB,0BAA0B,CAAC,OAAe;IACxD,OAAO,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;AAC3D,CAAC;AAFD,gEAEC;AAED,SAAgB,kBAAkB,CAChC,KAA6B,EAC7B,OAAgC,EAChC,YAAyC,EACzC,QAAoD;IAGpD,IAAI,CAAC,YAAY,EAAE;QACjB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,YAAY,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;SACpD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC3F;KACF;IAED,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;QACnC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;YACnB,OAAO,CAAC,CAAC;SACV;KACF;IAED,IAAI,QAAQ,EAAE;QACZ,OAAO,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;KACtD;IAED,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAEnC,CAAC;AA3BD,gDA2BC"}
+{"version":3,"file":"coerce-array-element.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-array-element.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB,SAAgB,gCAAgC,CAAC,QAAgB,EAAE,KAAa;IAC9E,OAAO,CAAC,CAAa,EAAE,EAAE;QACvB,IAAI,CAAC,YAAY,kCAAuB,EAAE;YACxC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,YAAY,6BAAkB,EAAE;gBACxC,MAAM,CAAC,GAAG,CAAC,CAAC,oBAAoB,CAAC,qBAAU,CAAC,aAAa,CAAC,CAAC;gBAC3D,IAAI,CAAC,EAAE;oBACL,OAAO,CAAC,CAAC,cAAc,EAAE,KAAK,KAAK,CAAC;iBACrC;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAbD,4EAaC;AAED,SAAgB,0BAA0B,CAAC,OAAe;IACxD,OAAO,CAAC,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,OAAO,CAAC;AAC3D,CAAC;AAFD,gEAEC;AAED,SAAgB,kBAAkB,CAChC,KAA6B,EAC7B,OAAgC,EAChC,YAAyC,EACzC,QAAoD;IAGpD,IAAI,CAAC,YAAY,EAAE;QACjB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC/B,YAAY,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;SACpD;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;SAC3F;KACF;IAED,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;QACnC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE;YACnB,OAAO,CAAC,CAAC;SACV;KACF;IAED,IAAI,QAAQ,EAAE;QACZ,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;YACnF,OAAO,KAAK,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;SACxC;QACD,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;KAC5C;IAED,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAEnC,CAAC;AAhCD,gDAgCC"}

package/src/lib/coerce-decorator.js

@@ -3,6 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceDecorator = void 0;
 const find_function_1 = require("./find-function");
 function CoerceDecorator(decoratableNode, name, structure = {}, compareTo = find_function_1.FindByNameFunction) {
+    const match = name.match(/(.+)<(.+)>/);
+    if (match) {
+        name = match[1];
+        structure.typeArguments = match[2].split(',');
+    }
     let decorator = decoratableNode.getDecorator(compareTo(Object.assign(Object.assign({}, structure), { name })));
     if (!decorator) {
         decorator = decoratableNode.addDecorator({ name });

package/src/lib/coerce-decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-decorator.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-decorator.ts"],"names":[],"mappings":";;;AAMA,mDAGyB;AAEzB,SAAgB,eAAe,CAC7B,eAAgC,EAChC,IAAY,EACZ,YAAqE,EAAE,EACvE,YAA4F,kCAAkB;IAE9G,IAAI,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,SAAS,iCACjD,SAAS,KACZ,IAAI,IACJ,CAAC,CAAC;IACJ,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC1B;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAfD,0CAeC"}
+{"version":3,"file":"coerce-decorator.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-decorator.ts"],"names":[],"mappings":";;;AAMA,mDAGyB;AAEzB,SAAgB,eAAe,CAC7B,eAAgC,EAChC,IAAY,EACZ,YAAqE,EAAE,EACvE,YAA4F,kCAAkB;IAE9G,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,IAAI,KAAK,EAAE;QACT,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAChB,SAAS,CAAC,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAC/C;IACD,IAAI,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,SAAS,iCACjD,SAAS,KACZ,IAAI,IACJ,CAAC,CAAC;IACJ,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAC1B;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AApBD,0CAoBC"}

package/src/lib/coerce-default-class-export.d.ts

@@ -1,2 +1,2 @@
 import { ClassDeclaration, SourceFile } from 'ts-morph';
-export declare function CoerceDefaultClassExport(sourceFileOrClassDeclaration: SourceFile | ClassDeclaration, standalone?: boolean): void;
+export declare function CoerceDefaultClassExport(sourceFileOrClassDeclaration: SourceFile | ClassDeclaration): void;

package/src/lib/coerce-default-class-export.js

@@ -2,26 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceDefaultClassExport = void 0;
 const ts_morph_1 = require("ts-morph");
-function CoerceDefaultClassExport(sourceFileOrClassDeclaration, standalone = false) {
+const coerce_default_export_1 = require("./coerce-default-export");
+function CoerceDefaultClassExport(sourceFileOrClassDeclaration) {
     const classDeclaration = sourceFileOrClassDeclaration instanceof ts_morph_1.SourceFile ? sourceFileOrClassDeclaration.getClasses().filter(cd => !cd.isDefaultExport())[0] : sourceFileOrClassDeclaration;
-    const sourceFile = sourceFileOrClassDeclaration instanceof ts_morph_1.SourceFile ? sourceFileOrClassDeclaration : sourceFileOrClassDeclaration.getSourceFile();
     if (!ts_morph_1.ClassDeclaration) {
         throw new Error('No class declaration');
     }
-    if (standalone) {
-        console.log('standalone', sourceFile.getExportAssignments().map(ed => ed.getExpression().getText()));
-        if (!sourceFile.getExportAssignments().some(ed => ed.getExpression().getText() === classDeclaration.getName())) {
-            sourceFile.addExportAssignment({
-                isExportEquals: false,
-                expression: classDeclaration.getName(),
-            });
-        }
-    }
-    else {
-        if (!sourceFile.getClasses().some(cd => cd.isDefaultExport() && cd.getName() === classDeclaration.getName())) {
-            classDeclaration.setIsDefaultExport(true);
-        }
-    }
+    (0, coerce_default_export_1.CoerceDefaultExport)(classDeclaration);
 }
 exports.CoerceDefaultClassExport = CoerceDefaultClassExport;
 //# sourceMappingURL=coerce-default-class-export.js.map

package/src/lib/coerce-default-class-export.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-default-class-export.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-default-class-export.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAElB,SAAgB,wBAAwB,CAAC,4BAA2D,EAAE,UAAU,GAAG,KAAK;IAEtH,MAAM,gBAAgB,GAAG,4BAA4B,YAAY,qBAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,4BAA4B,CAAC;IAC9L,MAAM,UAAU,GAAG,4BAA4B,YAAY,qBAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,4BAA4B,CAAC,aAAa,EAAE,CAAC;IAEpJ,IAAI,CAAC,2BAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,IAAI,UAAU,EAAE;QACd,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACrG,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE;YAC9G,UAAU,CAAC,mBAAmB,CAAC;gBAC7B,cAAc,EAAE,KAAK;gBACrB,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAG;aACxC,CAAC,CAAC;SACJ;KACF;SAAM;QACL,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,KAAK,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE;YAC5G,gBAAgB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;SAC3C;KACF;AAEH,CAAC;AAvBD,4DAuBC"}
+{"version":3,"file":"coerce-default-class-export.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-default-class-export.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,mEAA8D;AAE9D,SAAgB,wBAAwB,CAAC,4BAA2D;IAElG,MAAM,gBAAgB,GAAG,4BAA4B,YAAY,qBAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,4BAA4B,CAAC;IAE9L,IAAI,CAAC,2BAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,IAAA,2CAAmB,EAAC,gBAAgB,CAAC,CAAC;AAExC,CAAC;AAVD,4DAUC"}

package/src/lib/coerce-default-export.d.ts

@@ -0,0 +1,2 @@
+import { NameableNodeSpecific, NamedNodeSpecificBase, Node } from 'ts-morph';
+export declare function CoerceDefaultExport(node: (NamedNodeSpecificBase<any> | NameableNodeSpecific) & Node): void;

package/src/lib/coerce-default-export.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceDefaultExport = void 0;
+function CoerceDefaultExport(node) {
+    const sourceFile = node.getSourceFile();
+    if (!sourceFile.getExportAssignments().some(ed => ed.getExpression().getText() === node.getName())) {
+        sourceFile.addExportAssignment({
+            isExportEquals: false,
+            expression: node.getName(),
+        });
+    }
+}
+exports.CoerceDefaultExport = CoerceDefaultExport;
+//# sourceMappingURL=coerce-default-export.js.map

package/src/lib/coerce-default-export.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-default-export.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-default-export.ts"],"names":[],"mappings":";;;AAMA,SAAgB,mBAAmB,CAAC,IAAgE;IAElG,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;IAExC,IAAI,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE;QAClG,UAAU,CAAC,mBAAmB,CAAC;YAC7B,cAAc,EAAE,KAAK;YACrB,UAAU,EAAE,IAAI,CAAC,OAAO,EAAG;SAC5B,CAAC,CAAC;KACJ;AAEH,CAAC;AAXD,kDAWC"}

package/src/lib/coerce-dependency-injection.d.ts

@@ -9,6 +9,6 @@ export interface InjectionDefinition {
     optional?: boolean;
     type?: string;
     scope?: Scope;
-    module?: Module;
+    module: Module;
 }
 export declare function CoerceDependencyInjection(sourceFile: SourceFile, definition: InjectionDefinition, structures?: Array<OptionalKind<ImportDeclarationStructure>>): void;

package/src/lib/coerce-dependency-injection.js

@@ -2,55 +2,59 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceDependencyInjection = exports.Module = void 0;
 const ts_morph_1 = require("ts-morph");
-const coerce_class_constructor_1 = require("./coerce-class-constructor");
+const coerce_decorator_1 = require("./coerce-decorator");
 const coerce_imports_1 = require("./coerce-imports");
+const coerce_property_declaration_1 = require("./coerce-property-declaration");
 var Module;
 (function (Module) {
     Module["ANGULAR"] = "@angular/core";
     Module["NEST"] = "@nestjs/common";
 })(Module || (exports.Module = Module = {}));
 function CoerceDependencyInjection(sourceFile, definition, structures = []) {
-    var _a, _b, _c, _d;
-    if (!definition.module) {
-        definition.module = Module.ANGULAR;
-    }
+    var _a, _b;
     const classDeclaration = sourceFile.getClasses()[0];
     if (!classDeclaration) {
         throw new Error('Could not find class declaration');
     }
-    const constructorDeclarations = (0, coerce_class_constructor_1.CoerceClassConstructor)(classDeclaration);
-    const constructorDeclaration = constructorDeclarations[0];
-    if (constructorDeclaration.getParameter(definition.parameterName)) {
-        return;
-    }
-    const constructorParameter = {
-        name: definition.parameterName,
-        type: (_a = definition.type) !== null && _a !== void 0 ? _a : definition.injectionToken,
-        scope: (_b = definition.scope) !== null && _b !== void 0 ? _b : ts_morph_1.Scope.Public,
+    const propertyDeclaration = (0, coerce_property_declaration_1.CoercePropertyDeclaration)(classDeclaration, definition.parameterName, {
+        scope: (_a = definition.scope) !== null && _a !== void 0 ? _a : ts_morph_1.Scope.Public,
         isReadonly: true,
-        decorators: [
-            {
-                name: 'Inject',
-                arguments: [definition.injectionToken],
-            },
-        ],
-    };
-    if (definition.optional) {
-        (_c = constructorParameter.decorators) === null || _c === void 0 ? void 0 : _c.unshift({
-            name: 'Optional',
-            arguments: [],
+    });
+    if (definition.module === Module.ANGULAR) {
+        if (definition.optional) {
+            propertyDeclaration.setInitializer(`inject(${definition.injectionToken}, { optional: true })`);
+        }
+        else {
+            propertyDeclaration.setInitializer(`inject(${definition.injectionToken})`);
+        }
+        (0, coerce_imports_1.CoerceImports)(sourceFile, {
+            namedImports: ['inject'],
+            moduleSpecifier: definition.module,
+        });
+    }
+    else {
+        (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Inject', {
+            arguments: [definition.injectionToken],
         });
-        constructorParameter.type = ts_morph_1.Writers.intersectionType((_d = definition.type) !== null && _d !== void 0 ? _d : definition.injectionToken, 'null');
+        if (definition.optional) {
+            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Optional', {
+                arguments: [],
+            });
+            propertyDeclaration.setType(`${definition.type} | null`);
+            propertyDeclaration.setInitializer('null');
+            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                namedImports: ['Optional'],
+                moduleSpecifier: definition.module,
+            });
+        }
+        else {
+            propertyDeclaration.setType((_b = definition.type) !== null && _b !== void 0 ? _b : definition.injectionToken);
+        }
         (0, coerce_imports_1.CoerceImports)(sourceFile, {
-            namedImports: ['Optional'],
+            namedImports: ['Inject'],
             moduleSpecifier: definition.module,
         });
     }
-    constructorDeclaration.addParameter(constructorParameter);
-    (0, coerce_imports_1.CoerceImports)(sourceFile, {
-        namedImports: ['Inject'],
-        moduleSpecifier: definition.module,
-    });
     (0, coerce_imports_1.CoerceImports)(sourceFile, structures);
 }
 exports.CoerceDependencyInjection = CoerceDependencyInjection;

package/src/lib/coerce-dependency-injection.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-dependency-injection.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-dependency-injection.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAClB,yEAAoE;AACpE,qDAAiD;AAEjD,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,mCAAyB,CAAA;IACzB,iCAAuB,CAAA;AACzB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB;AAWD,SAAgB,yBAAyB,CACvC,UAAsB,EACtB,UAA+B,EAC/B,aAA8D,EAAE;;IAGhE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;KACpC;IAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpD,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,MAAM,uBAAuB,GAAG,IAAA,iDAAsB,EAAC,gBAAgB,CAAC,CAAC;IACzE,MAAM,sBAAsB,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAE1D,IAAI,sBAAsB,CAAC,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE;QACjE,OAAO;KACR;IAED,MAAM,oBAAoB,GAAgD;QACxE,IAAI,EAAE,UAAU,CAAC,aAAa;QAC9B,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,UAAU,CAAC,cAAc;QAClD,KAAK,EAAE,MAAA,UAAU,CAAC,KAAK,mCAAI,gBAAK,CAAC,MAAM;QACvC,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE;YACV;gBACE,IAAI,EAAE,QAAQ;gBACd,SAAS,EAAE,CAAE,UAAU,CAAC,cAAc,CAAE;aACzC;SACF;KACF,CAAC;IAEF,IAAI,UAAU,CAAC,QAAQ,EAAE;QACvB,MAAA,oBAAoB,CAAC,UAAU,0CAAE,OAAO,CAAC;YACvC,IAAI,EAAE,UAAU;YAChB,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,GAAG,kBAAO,CAAC,gBAAgB,CAClD,MAAA,UAAU,CAAC,IAAI,mCAAI,UAAU,CAAC,cAAc,EAC5C,MAAM,CACP,CAAC;QACF,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,UAAU,CAAE;YAC5B,eAAe,EAAE,UAAU,CAAC,MAAM;SACnC,CAAC,CAAC;KACJ;IAED,sBAAsB,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAE1D,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,QAAQ,CAAE;QAC1B,eAAe,EAAE,UAAU,CAAC,MAAM;KACnC,CAAC,CAAC;IAEH,IAAA,8BAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACxC,CAAC;AA3DD,8DA2DC"}
+{"version":3,"file":"coerce-dependency-injection.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-dependency-injection.ts"],"names":[],"mappings":";;;AAAA,uCAKkB;AAClB,yDAAqD;AACrD,qDAAiD;AACjD,+EAA0E;AAE1E,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,mCAAyB,CAAA;IACzB,iCAAuB,CAAA;AACzB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB;AAWD,SAAgB,yBAAyB,CACvC,UAAsB,EACtB,UAA+B,EAC/B,aAA8D,EAAE;;IAGhE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;IAEpD,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IAED,MAAM,mBAAmB,GAAG,IAAA,uDAAyB,EAAC,gBAAgB,EAAE,UAAU,CAAC,aAAa,EAAE;QAChG,KAAK,EAAE,MAAA,UAAU,CAAC,KAAK,mCAAI,gBAAK,CAAC,MAAM;QACvC,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,EAAE;QACxC,IAAI,UAAU,CAAC,QAAQ,EAAE;YACvB,mBAAmB,CAAC,cAAc,CAAC,UAAU,UAAU,CAAC,cAAc,uBAAuB,CAAC,CAAC;SAChG;aAAM;YACL,mBAAmB,CAAC,cAAc,CAAC,UAAU,UAAU,CAAC,cAAc,GAAG,CAAC,CAAC;SAC5E;QACD,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,QAAQ,CAAE;YAC1B,eAAe,EAAE,UAAU,CAAC,MAAM;SACnC,CAAC,CAAC;KACJ;SAAM;QACL,IAAA,kCAAe,EAAC,mBAAmB,EAAE,QAAQ,EAAC;YAC5C,SAAS,EAAE,CAAE,UAAU,CAAC,cAAc,CAAE;SACzC,CAAC,CAAC;QACH,IAAI,UAAU,CAAC,QAAQ,EAAE;YACvB,IAAA,kCAAe,EAAC,mBAAmB,EAAE,UAAU,EAAC;gBAC9C,SAAS,EAAE,EAAE;aACd,CAAC,CAAC;YACH,mBAAmB,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,IAAI,SAAS,CAAC,CAAC;YACzD,mBAAmB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,UAAU,CAAE;gBAC5B,eAAe,EAAE,UAAU,CAAC,MAAM;aACnC,CAAC,CAAC;SACJ;aAAM;YACL,mBAAmB,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,IAAI,mCAAI,UAAU,CAAC,cAAc,CAAC,CAAC;SAC3E;QACD,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,QAAQ,CAAE;YAC1B,eAAe,EAAE,UAAU,CAAC,MAAM;SACnC,CAAC,CAAC;KACJ;IAED,IAAA,8BAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACxC,CAAC;AAnDD,8DAmDC"}

package/src/lib/coerce-statements.d.ts

@@ -1,2 +1,2 @@
 import { StatementedNode, StatementStructures, WriterFunction } from 'ts-morph';
-export declare function CoerceStatements(node: StatementedNode, statements: (string | WriterFunction | StatementStructures)[] | string | WriterFunction): void;
+export declare function CoerceStatements(node: StatementedNode, statements: (string | WriterFunction | StatementStructures)[] | string | WriterFunction, overwrite?: boolean): void;

package/src/lib/coerce-statements.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceStatements = void 0;
-function CoerceStatements(node, statements) {
-    if (node.getStatements().length ===
-        0) {
+function CoerceStatements(node, statements, overwrite = false) {
+    if (overwrite) {
+        const length = node.getStatements().length;
+        if (length > 0) {
+            node.removeStatements([0, length - 1]);
+        }
+    }
+    if (node.getStatements().length === 0) {
         node.addStatements(statements);
     }
 }