@rxap/ts-morph 1.1.0-dev.9 → 1.2.0-dev.0

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/angular/remove-component-import.d.ts

@@ -0,0 +1,3 @@
+import { TypeImport } from '@rxap/ts-morph';
+import { ClassDeclaration, SourceFile } from 'ts-morph';
+export declare function RemoveComponentImport(sourceFileOrClassDeclaration: SourceFile | ClassDeclaration, componentImport: string | TypeImport): void;

package/src/lib/angular/remove-component-import.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoveComponentImport = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
+const ts_morph_2 = require("ts-morph");
+function RemoveComponentImport(sourceFileOrClassDeclaration, componentImport) {
+    var _a, _b, _c;
+    const classDeclaration = sourceFileOrClassDeclaration instanceof ts_morph_2.ClassDeclaration ? sourceFileOrClassDeclaration : (0, ts_morph_1.GetComponentClass)(sourceFileOrClassDeclaration);
+    const sourceFile = sourceFileOrClassDeclaration instanceof ts_morph_2.SourceFile ? sourceFileOrClassDeclaration : sourceFileOrClassDeclaration.getSourceFile();
+    const importName = typeof componentImport === 'string' ? componentImport : (_a = componentImport.namedImport) !== null && _a !== void 0 ? _a : componentImport.name;
+    (_b = sourceFile.getImportDeclaration(importDeclaration => importDeclaration.getNamedImports().some(namedImport => namedImport.getName() === importName))) === null || _b === void 0 ? void 0 : _b.remove();
+    if ((0, ts_morph_1.IsTypeImport)(componentImport) && componentImport.moduleSpecifier) {
+        (_c = sourceFile.getImportDeclaration(componentImport.moduleSpecifier)) === null || _c === void 0 ? void 0 : _c.remove();
+    }
+    const componentDecoratorObject = (0, ts_morph_1.GetComponentDecoratorObject)(classDeclaration);
+    const importsArray = (0, ts_morph_1.GetArrayLiteralFromObjectLiteral)(componentDecoratorObject, 'imports');
+    const element = importsArray === null || importsArray === void 0 ? void 0 : importsArray.getElements().find(e => e.getText().includes(importName));
+    if (element) {
+        importsArray === null || importsArray === void 0 ? void 0 : importsArray.removeElement(element);
+    }
+}
+exports.RemoveComponentImport = RemoveComponentImport;
+//# sourceMappingURL=remove-component-import.js.map

package/src/lib/angular/remove-component-import.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-component-import.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/remove-component-import.ts"],"names":[],"mappings":";;;AAAA,6CAMwB;AACxB,uCAGkB;AAElB,SAAgB,qBAAqB,CACnC,4BAA2D,EAC3D,eAAoC;;IAGpC,MAAM,gBAAgB,GAAG,4BAA4B,YAAY,2BAAgB,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,IAAA,4BAAiB,EAAC,4BAA4B,CAAC,CAAC;IACnK,MAAM,UAAU,GAAG,4BAA4B,YAAY,qBAAU,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,4BAA4B,CAAC,aAAa,EAAE,CAAC;IAEpJ,MAAM,UAAU,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAA,eAAe,CAAC,WAAW,mCAAI,eAAe,CAAC,IAAI,CAAC;IAE/H,MAAA,UAAU,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,CAAC,iBAAiB,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,UAAU,CAAC,CAAC,0CAAE,MAAM,EAAE,CAAC;IAE9J,IAAI,IAAA,uBAAY,EAAC,eAAe,CAAC,IAAI,eAAe,CAAC,eAAe,EAAE;QACpE,MAAA,UAAU,CAAC,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC,0CAAE,MAAM,EAAE,CAAC;KAC5E;IAED,MAAM,wBAAwB,GAAG,IAAA,sCAA2B,EAAC,gBAAgB,CAAC,CAAC;IAE/E,MAAM,YAAY,GAAG,IAAA,2CAAgC,EAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IAE3F,MAAM,OAAO,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACxF,IAAI,OAAO,EAAE;QACX,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,aAAa,CAAC,OAAO,CAAC,CAAC;KACtC;AAEH,CAAC;AAzBD,sDAyBC"}

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

@@ -0,0 +1,13 @@
+import { SourceFile } from 'ts-morph';
+import 'colors';
+export interface RemoveRouteOptions {
+    path?: string[];
+    index?: number;
+    loadRemoteModule?: string | {
+        name: string;
+        entry?: string;
+    };
+    component?: string;
+    name?: string;
+}
+export declare function RemoveRoute(sourceFile: SourceFile, options: RemoveRouteOptions): void;

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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoveRoute = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
+const ts_morph_2 = require("ts-morph");
+require("colors");
+function RemoveRoute(sourceFile, options) {
+    var _a;
+    const { path, component, index, loadRemoteModule, name = 'ROUTES' } = options;
+    if (!path && !component && index === undefined && !loadRemoteModule) {
+        throw new Error('You must provide a path or a component or a index or a loadRemoteModule to remove a route');
+    }
+    if (path) {
+        throw new Error('Not implemented');
+    }
+    const variableDeclaration = (0, ts_morph_1.CoerceVariableDeclaration)(sourceFile, name, { initializer: '[]', type: 'Route[]' });
+    const arrayLiteralExpression = variableDeclaration.getInitializerIfKindOrThrow(ts_morph_2.SyntaxKind.ArrayLiteralExpression);
+    if (index !== undefined) {
+        arrayLiteralExpression.removeElement(index);
+        return;
+    }
+    const items = arrayLiteralExpression.getElements();
+    for (const item of items) {
+        if (item.isKind(ts_morph_2.SyntaxKind.ObjectLiteralExpression)) {
+            const obj = item.asKindOrThrow(ts_morph_2.SyntaxKind.ObjectLiteralExpression);
+            if (component) {
+                const componentProperty = obj.getProperty('component');
+                if (componentProperty) {
+                    const value = componentProperty.asKindOrThrow(ts_morph_2.SyntaxKind.PropertyAssignment).getInitializer();
+                    if (value.getText() === component) {
+                        arrayLiteralExpression.removeElement(item);
+                        return;
+                    }
+                }
+            }
+            if (loadRemoteModule) {
+                const loadChildrenProperty = obj.getProperty('loadChildren');
+                if (loadChildrenProperty) {
+                    const value = loadChildrenProperty.asKindOrThrow(ts_morph_2.SyntaxKind.PropertyAssignment).getInitializer();
+                    let regex;
+                    if (typeof loadRemoteModule === 'string') {
+                        regex = new RegExp(`^\\(\\) =>[\\s\\S]+loadRemoteModule\\('${loadRemoteModule}'`);
+                    }
+                    else {
+                        regex = new RegExp(`^\\(\\) =>[\\s\\S]+loadRemoteModule\\('${loadRemoteModule.name}',\\s*'${(_a = loadRemoteModule.entry) !== null && _a !== void 0 ? _a : './routes'}'\\)`);
+                    }
+                    if (value.getText().match(regex)) {
+                        arrayLiteralExpression.removeElement(item);
+                        return;
+                    }
+                }
+            }
+        }
+    }
+    console.log('No route found to remove'.yellow);
+}
+exports.RemoveRoute = RemoveRoute;
+//# sourceMappingURL=remove-route.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"remove-route.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/angular/remove-route.ts"],"names":[],"mappings":";;;AAAA,6CAA2D;AAC3D,uCAGkB;AAClB,kBAAgB;AAUhB,SAAgB,WAAW,CAAC,UAAsB,EAAE,OAA2B;;IAE7E,MAAM,EACJ,IAAI,EACJ,SAAS,EACT,KAAK,EACL,gBAAgB,EAChB,IAAI,GAAG,QAAQ,EAChB,GAAG,OAAO,CAAC;IAEZ,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,gBAAgB,EAAE;QACnE,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;KAC9G;IAED,IAAI,IAAI,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;KACpC;IAED,MAAM,mBAAmB,GAAG,IAAA,oCAAyB,EAAC,UAAU,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhH,MAAM,sBAAsB,GAAG,mBAAmB,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;IAElH,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,sBAAsB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO;KACR;IAED,MAAM,KAAK,GAAG,sBAAsB,CAAC,WAAW,EAAE,CAAC;IAEnD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,uBAAuB,CAAC,EAAE;YACnD,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;YACnE,IAAI,SAAS,EAAE;gBACb,MAAM,iBAAiB,GAAG,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBACvD,IAAI,iBAAiB,EAAE;oBACrB,MAAM,KAAK,GAAG,iBAAiB,CAAC,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC,cAAc,EAAG,CAAC;oBAC/F,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,SAAS,EAAE;wBACjC,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;wBAC3C,OAAO;qBACR;iBACF;aACF;YACD,IAAI,gBAAgB,EAAE;gBACpB,MAAM,oBAAoB,GAAG,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;gBAC7D,IAAI,oBAAoB,EAAE;oBACxB,MAAM,KAAK,GAAG,oBAAoB,CAAC,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC,cAAc,EAAG,CAAC;oBAClG,IAAI,KAAa,CAAC;oBAClB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;wBACxC,KAAK,GAAG,IAAI,MAAM,CAAC,0CAA0C,gBAAgB,GAAG,CAAC,CAAC;qBACnF;yBAAM;wBACL,KAAK,GAAG,IAAI,MAAM,CAAC,0CAA0C,gBAAgB,CAAC,IAAI,UAAU,MAAA,gBAAgB,CAAC,KAAK,mCAAI,UAAU,MAAM,CAAC,CAAC;qBACzI;oBACD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;wBAChC,sBAAsB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;wBAC3C,OAAO;qBACR;iBACF;aACF;SACF;KACF;IAED,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;AAGjD,CAAC;AAhED,kCAgEC"}

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-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,66 @@
 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 constructorDeclaration = classDeclaration.getConstructors()[0];
+    if (constructorDeclaration) {
+        if (constructorDeclaration.getParameters().some((parameter) => parameter.getName() === definition.parameterName)) {
+            console.warn(`Parameter ${definition.parameterName} already exists in constructor`);
+            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,
         });
-        constructorParameter.type = ts_morph_1.Writers.intersectionType((_d = definition.type) !== null && _d !== void 0 ? _d : definition.injectionToken, 'null');
+    }
+    else {
+        (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Inject', {
+            arguments: [definition.injectionToken],
+        });
+        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,sBAAsB,GAAG,gBAAgB,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;IACrE,IAAI,sBAAsB,EAAE;QAC1B,IAAI,sBAAsB,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,UAAU,CAAC,aAAa,CAAC,EAAE;YAChH,OAAO,CAAC,IAAI,CAAC,aAAa,UAAU,CAAC,aAAa,gCAAgC,CAAC,CAAC;YACpF,OAAO;SACR;KACF;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;AA3DD,8DA2DC"}

package/src/lib/coerce-imports.js

@@ -33,9 +33,19 @@ function CoerceImports(sourceFile, structures) {
         if (defaultImport) {
             coerceDefaultImport(sourceFile, moduleSpecifier, defaultImport);
         }
+        if (!namedImports && !namespaceImport && !defaultImport) {
+            coerceModuleSpecifierImport(sourceFile, moduleSpecifier);
+        }
     }
 }
 exports.CoerceImports = CoerceImports;
+function coerceModuleSpecifierImport(sourceFile, moduleSpecifier) {
+    if (!sourceFile.getImportDeclaration(moduleSpecifier)) {
+        sourceFile.addImportDeclaration({
+            moduleSpecifier,
+        });
+    }
+}
 /**
  * This method is used to coerce the default import of a module in a source file. If the import declaration for the specified module exists, it checks for the existence of a default import. If a default import does not exist, it sets the default import to the provided value. If a default import exists and it does not match the provided value, it removes the existing default import and sets it to the provided value. If the import declaration for the specified module does not exist, it adds a new import declaration with the provided module specifier and default import.
  *

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

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

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);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-statements.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-statements.ts"],"names":[],"mappings":";;;AAMA,SAAgB,gBAAgB,CAC9B,IAAqB,EACrB,UAAuF;IAEvF,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,MAAM;QAC7B,CAAC,EAAE;QACH,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;KAChC;AACH,CAAC;AARD,4CAQC"}
+{"version":3,"file":"coerce-statements.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/coerce-statements.ts"],"names":[],"mappings":";;;AAMA,SAAgB,gBAAgB,CAC9B,IAAqB,EACrB,UAAuF,EACvF,SAAS,GAAG,KAAK;IAEjB,IAAI,SAAS,EAAE;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC;QAC3C,IAAI,MAAM,GAAG,CAAC,EAAE;YACd,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;SACxC;KACF;IACD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;KAChC;AACH,CAAC;AAdD,4CAcC"}

package/src/lib/data-property.d.ts

@@ -1,18 +1,22 @@
-import { TypeImport } from '@rxap/ts-morph';
 import { Normalized } from '@rxap/utilities';
 import { OptionalKind, PropertySignatureStructure, SourceFile } from 'ts-morph';
-import { NormalizedTypeImport } from './type-import';
+import { NormalizedTypeImport, TypeImport, TypeName } from './type-import';
 export interface DataProperty {
     name: string;
-    type?: string | TypeImport;
+    type?: TypeImport | TypeName;
     isArray?: boolean;
     isOptional?: boolean;
     source?: string | null;
+    /**
+     * If set the property is an object with the given members
+     */
+    memberList?: Array<string | DataProperty>;
 }
-export interface NormalizedDataProperty extends Readonly<Normalized<DataProperty>> {
+export interface NormalizedDataProperty extends Readonly<Normalized<Omit<DataProperty, 'memberList'>>> {
     type: NormalizedTypeImport;
     source: string | null;
+    memberList: Array<NormalizedDataProperty>;
 }
-export declare function NormalizeDataProperty(property: string | Readonly<DataProperty>, defaultType?: string): NormalizedDataProperty;
-export declare function NormalizeDataPropertyList(propertyList?: Array<string | DataProperty>, defaultType?: string): Array<NormalizedDataProperty>;
+export declare function NormalizeDataProperty(property: TypeName | Readonly<DataProperty>, defaultType?: TypeImport | TypeName, isArray?: boolean): NormalizedDataProperty;
+export declare function NormalizeDataPropertyList(propertyList?: Array<string | DataProperty>, defaultType?: TypeImport | TypeName): Array<NormalizedDataProperty>;
 export declare function NormalizeDataPropertyToPropertySignatureStructure(property: DataProperty, sourceFile: SourceFile): OptionalKind<PropertySignatureStructure>;

package/src/lib/data-property.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NormalizeDataPropertyToPropertySignatureStructure = exports.NormalizeDataPropertyList = exports.NormalizeDataProperty = void 0;
+const utilities_1 = require("@rxap/utilities");
 const type_import_1 = require("./type-import");
 const write_type_1 = require("./write-type");
 function guessType(name) {
@@ -25,26 +26,31 @@ function guessType(name) {
     }
     return 'unknown';
 }
-function NormalizeDataProperty(property, defaultType = 'unknown') {
-    var _a, _b, _c, _d;
+const notAllowedInVariableNames = [
+    " ", "!", "\"", "#", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/",
+    ":", ";", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"
+];
+function NormalizeDataProperty(property, defaultType = 'unknown', isArray = false) {
+    var _a, _b, _c, _d, _e, _f;
     let name;
     let type = 'unknown';
-    let isArray = false;
     let isOptional = false;
     let source = null;
+    let memberList = [];
     if (typeof property === 'string') {
         // name:type
         // username:string
         const fragments = property.split(':');
         name = fragments[0];
-        type = fragments[1] || guessType(name); // convert an empty string to undefined
+        type = fragments[1] || type; // convert an empty string to undefined
     }
     else {
         name = property.name;
-        type = (_a = property.type) !== null && _a !== void 0 ? _a : guessType(name);
+        type = (_a = property.type) !== null && _a !== void 0 ? _a : type;
         isArray = (_b = property.isArray) !== null && _b !== void 0 ? _b : isArray;
         isOptional = (_c = property.isOptional) !== null && _c !== void 0 ? _c : isOptional;
         source = (_d = property.source) !== null && _d !== void 0 ? _d : source;
+        memberList = NormalizeDataPropertyList(property.memberList, defaultType);
     }
     if (name.endsWith('[]')) {
         isArray = true;
@@ -55,16 +61,34 @@ function NormalizeDataProperty(property, defaultType = 'unknown') {
         name = name.slice(6, -1);
     }
     type !== null && type !== void 0 ? type : (type = defaultType);
-    if (type === 'unknown') {
-        type = guessType(name);
+    if (type === 'unknown' || (typeof type === 'object' && type.name === 'unknown')) {
+        if (defaultType === 'unknown') {
+            type = guessType(name);
+        }
+        else {
+            type = defaultType;
+        }
+    }
+    if (memberList.length) {
+        type = type_import_1.TypeNames.Deferred;
     }
     name = name.replace(/\.\?/g, '.').split('.').join('.?');
+    if (!isNaN(Number(name[0]))) {
+        name = `_${name}`;
+    }
+    if (notAllowedInVariableNames.some(c => name.includes(c))) {
+        const leadingUnderscoreCount = (_f = (_e = name.match(/^_*/)) === null || _e === void 0 ? void 0 : _e[0].length) !== null && _f !== void 0 ? _f : 0;
+        const nameWithoutLeadingUnderscores = name.slice(leadingUnderscoreCount);
+        name = (0, utilities_1.camelize)(nameWithoutLeadingUnderscores);
+        name = '_'.repeat(leadingUnderscoreCount) + name;
+    }
     return Object.freeze({
         name,
         type: (0, type_import_1.NormalizeTypeImport)(type),
         isArray,
         isOptional,
         source,
+        memberList,
     });
 }
 exports.NormalizeDataProperty = NormalizeDataProperty;

package/src/lib/data-property.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-property.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/data-property.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-property.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/data-property.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AAMzB,+CAMuB;AACvB,6CAAyC;AAoBzC,SAAS,SAAS,CAAC,IAAY;IAC7B,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,OAAO,QAAQ,CAAC;QAClB,KAAK,MAAM;YACT,OAAO;gBACL,IAAI,EAAE,YAAY;gBAClB,eAAe,EAAE,iBAAiB;aACnC,CAAC;KACL;IACD,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACvB,OAAO,QAAQ,CAAC;KACjB;IACD,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACvB,OAAO,QAAQ,CAAC;KACjB;IACD,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,EAAE;QAChC,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,yBAAyB,GAAG;IAChC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC1E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CAChF,CAAC;AAGF,SAAgB,qBAAqB,CAAC,QAA2C,EAAE,cAAqC,SAAS,EAAE,OAAO,GAAG,KAAK;;IAChJ,IAAI,IAAY,CAAC;IACjB,IAAI,IAAI,GAAwB,SAAS,CAAC;IAC1C,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,MAAM,GAAkB,IAAI,CAAC;IACjC,IAAI,UAAU,GAAkC,EAAE,CAAC;IACnD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAChC,YAAY;QACZ,kBAAkB;QAClB,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,uCAAuC;KACrE;SAAM;QACL,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QACrB,IAAI,GAAG,MAAA,QAAQ,CAAC,IAAI,mCAAI,IAAI,CAAC;QAC7B,OAAO,GAAG,MAAA,QAAQ,CAAC,OAAO,mCAAI,OAAO,CAAC;QACtC,UAAU,GAAG,MAAA,QAAQ,CAAC,UAAU,mCAAI,UAAU,CAAC;QAC/C,MAAM,GAAG,MAAA,QAAQ,CAAC,MAAM,mCAAI,MAAM,CAAC;QACnC,UAAU,GAAG,yBAAyB,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;KAC1E;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACnD,OAAO,GAAG,IAAI,CAAC;QACf,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;KAC1B;IACD,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,WAAW,EAAC;IACrB,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE;QAC/E,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM;YACL,IAAI,GAAG,WAAW,CAAC;SACpB;KACF;IACD,IAAI,UAAU,CAAC,MAAM,EAAE;QACrB,IAAI,GAAG,uBAAS,CAAC,QAAQ,CAAC;KAC3B;IACD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QAC3B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;KACnB;IACD,IAAI,yBAAyB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QACzD,MAAM,sBAAsB,GAAG,MAAA,MAAA,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,0CAAG,CAAC,EAAE,MAAM,mCAAI,CAAC,CAAC;QAClE,MAAM,6BAA6B,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACzE,IAAI,GAAG,IAAA,oBAAQ,EAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC;KAClD;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,IAAI;QACJ,IAAI,EAAE,IAAA,iCAAmB,EAAC,IAAI,CAAC;QAC/B,OAAO;QACP,UAAU;QACV,MAAM;QACN,UAAU;KACX,CAAC,CAAC;AACL,CAAC;AAzDD,sDAyDC;AAED,SAAgB,yBAAyB,CAAC,YAA2C,EAAE,cAAqC,SAAS;;IACnI,OAAO,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,qBAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,mCAAI,EAAE,CAAC;AAC3F,CAAC;AAFD,8DAEC;AAED,SAAgB,iDAAiD,CAC/D,QAAsB,EACtB,UAAsB;IAEtB,OAAO;QACL,IAAI,EAAE,IAAA,sBAAS,EAAC,QAAQ,EAAE,UAAU,CAAC;QACrC,IAAI,EAAE,QAAQ,CAAC,IAAI;KACpB,CAAC;AACJ,CAAC;AARD,8GAQC"}

package/src/lib/get-coerce-array-literal-form-object-literal.d.ts

@@ -1,2 +1,3 @@
 import { ArrayLiteralExpression, ObjectLiteralExpression } from 'ts-morph';
+export declare function GetArrayLiteralFromObjectLiteral(objectLiteral: ObjectLiteralExpression, propertyKey: string): ArrayLiteralExpression | null;
 export declare function GetCoerceArrayLiteralFromObjectLiteral(objectLiteral: ObjectLiteralExpression, propertyKey: string): ArrayLiteralExpression;

package/src/lib/get-coerce-array-literal-form-object-literal.js

@@ -1,7 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetCoerceArrayLiteralFromObjectLiteral = void 0;
+exports.GetCoerceArrayLiteralFromObjectLiteral = exports.GetArrayLiteralFromObjectLiteral = void 0;
 const ts_morph_1 = require("ts-morph");
+function GetArrayLiteralFromObjectLiteral(objectLiteral, propertyKey) {
+    const arrayLiteralAssignment = objectLiteral.getProperty(propertyKey);
+    if (!arrayLiteralAssignment) {
+        return null;
+    }
+    if (!(arrayLiteralAssignment instanceof ts_morph_1.PropertyAssignment)) {
+        throw new Error('The imports property is not type of Property Assignment!');
+    }
+    const arrayLiteral = arrayLiteralAssignment.getInitializer();
+    if (!arrayLiteral) {
+        throw new Error('The imports property a not a initializer');
+    }
+    if (!(arrayLiteral instanceof ts_morph_1.ArrayLiteralExpression)) {
+        throw new Error('The imports property initializer is not an array');
+    }
+    return arrayLiteral;
+}
+exports.GetArrayLiteralFromObjectLiteral = GetArrayLiteralFromObjectLiteral;
 function GetCoerceArrayLiteralFromObjectLiteral(objectLiteral, propertyKey) {
     let arrayLiteralAssignment = objectLiteral.getProperty(propertyKey);
     if (!arrayLiteralAssignment) {

package/src/lib/get-coerce-array-literal-form-object-literal.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-coerce-array-literal-form-object-literal.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/get-coerce-array-literal-form-object-literal.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAElB,SAAgB,sCAAsC,CACpD,aAAsC,EACtC,WAAmB;IAGnB,IAAI,sBAAsB,GAAG,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAEpE,IAAI,CAAC,sBAAsB,EAAE;QAC3B,sBAAsB,GAAG,aAAa,CAAC,qBAAqB,CAAC;YAC3D,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,CAAC,sBAAsB,YAAY,6BAAkB,CAAC,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IAED,MAAM,YAAY,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAC;IAE7D,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;IAED,IAAI,CAAC,CAAC,YAAY,YAAY,iCAAsB,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,YAAY,CAAC;AAEtB,CAAC;AA9BD,wFA8BC"}
+{"version":3,"file":"get-coerce-array-literal-form-object-literal.js","sourceRoot":"","sources":["../../../../../packages/ts-morph/src/lib/get-coerce-array-literal-form-object-literal.ts"],"names":[],"mappings":";;;AAAA,uCAIkB;AAElB,SAAgB,gCAAgC,CAC9C,aAAsC,EACtC,WAAmB;IAGnB,MAAM,sBAAsB,GAAG,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAEtE,IAAI,CAAC,sBAAsB,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IAED,IAAI,CAAC,CAAC,sBAAsB,YAAY,6BAAkB,CAAC,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IAED,MAAM,YAAY,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAC;IAE7D,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;IAED,IAAI,CAAC,CAAC,YAAY,YAAY,iCAAsB,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,YAAY,CAAC;AAEtB,CAAC;AA3BD,4EA2BC;AAED,SAAgB,sCAAsC,CACpD,aAAsC,EACtC,WAAmB;IAGnB,IAAI,sBAAsB,GAAG,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAEpE,IAAI,CAAC,sBAAsB,EAAE;QAC3B,sBAAsB,GAAG,aAAa,CAAC,qBAAqB,CAAC;YAC3D,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;KACJ;IAED,IAAI,CAAC,CAAC,sBAAsB,YAAY,6BAAkB,CAAC,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;KAC7E;IAED,MAAM,YAAY,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAC;IAE7D,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;KAC7D;IAED,IAAI,CAAC,CAAC,YAAY,YAAY,iCAAsB,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,OAAO,YAAY,CAAC;AAEtB,CAAC;AA9BD,wFA8BC"}