npm - @rxap/schematics-ts-morph - Versions diffs - 16.0.0-dev.9 → 16.0.0 - Mend

@rxap/schematics-ts-morph 16.0.0-dev.9 → 16.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (147) hide show

package/src/lib/add-provider-to-array.js CHANGED Viewed

@@ -1,33 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddProviderToArray = void 0;
-const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const utilities_1 = require("@rxap/utilities");
 const ts_morph_1 = require("ts-morph");
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function AddProviderToArray(providerObject, providerArray, overwrite = false, compare = (ole, po) => {
     var _a;
     const provideProperty = ole.getProperty('provide');
     if (provideProperty instanceof ts_morph_1.PropertyAssignment) {
-        return ((_a = provideProperty.getInitializer()) === null || _a === void 0 ? void 0 : _a.getFullText().trim()) === po.provide;
+        return ((_a = provideProperty.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().trim()) === po.provide;
     }
     return false;
 }) {
+    let expression;
     if (typeof providerObject === 'string') {
-        if (!providerArray.getElements().some(element => element.getFullText().trim() === providerObject)) {
-            providerArray.addElement(providerObject);
+        const index = providerArray.getElements().findIndex(element => {
+            if (element.getText().trim() === providerObject) {
+                return true;
+            }
+            const match = providerObject.match(/^[a-zA-Z0-9]+?\(/);
+            if (match) {
+                return element.getText().trim().startsWith(match[0]);
+            }
+            return false;
+        });
+        if (index === -1) {
+            expression = providerArray.addElement(providerObject);
+        }
+        else if (overwrite) {
+            providerArray.removeElement(index);
+            expression = providerArray.insertElement(index, providerObject);
+        }
+        else {
+            expression = providerArray.getElements()[index];
         }
     }
     else {
-        const index = providerArray.getElements().findIndex(element => {
+        let index = providerArray.getElements().findIndex(element => {
             if (element instanceof ts_morph_1.ObjectLiteralExpression) {
                 return compare(element, providerObject);
             }
             return false;
         });
-        if (overwrite && index !== -1) {
+        if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
             providerArray.removeElement(index);
+            index = -1;
         }
-        if (overwrite || index === -1) {
-            providerArray.addElement(ts_morph_1.Writers.object((0, schematics_utilities_1.DeleteUndefinedProperties)({
+        if (index === -1) {
+            expression = providerArray.addElement(ts_morph_1.Writers.object((0, utilities_1.DeleteUndefinedProperties)({
                 provide: providerObject.provide,
                 useClass: providerObject.useClass,
                 useFactory: providerObject.useFactory,
@@ -41,7 +63,11 @@ function AddProviderToArray(providerObject, providerArray, overwrite = false, co
                     providerObject.multi === false ? w => w.write('false') : undefined,
             })));
         }
+        else {
+            expression = providerArray.getElements()[index];
+        }
     }
+    return expression;
 }
 exports.AddProviderToArray = AddProviderToArray;
 //# sourceMappingURL=add-provider-to-array.js.map

package/src/lib/add-provider-to-array.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-provider-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-provider-to-array.ts"],"names":[],"mappings":";;;AAAA~~,qEAAuE~~;~~AACvE~~,~~uCAKkB~~;AAGlB,SAAgB,kBAAkB,CAChC,cAAuC,EACvC,aAAqC,EACrC,~~SAAS~~,~~GAAG,~~KAAK,~~EACjB~~,UAAyE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;;IACnF,MAAM,eAAe,GAAG,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEnD,IAAI,eAAe,YAAY,6BAAkB,EAAE;QAEjD,OAAO,CAAA,MAAA,eAAe,CAAC,cAAc,EAAE,0CAAE,~~WAAW~~,GAAG,IAAI,EAAE,MAAK,EAAE,CAAC,OAAO,CAAC;~~KAE9E~~;IACD,OAAO,KAAK,CAAC;AACf,CAAC;IAGD,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QAEtC,~~IAAI~~,~~CAAC~~,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,cAAc,CAAC,EAAE;~~YACjG~~,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;~~SAC1C~~;KAEF;SAAM;QAEL,~~MAAM~~,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;~~YAE5D~~,IAAI,OAAO,YAAY,kCAAuB,EAAE;gBAC9C,OAAO,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;aACzC;YAED,OAAO,KAAK,CAAC;QAEf,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;~~YAC7B~~,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;~~SACpC~~;QAED,IAAI,~~SAAS,IAAI,~~KAAK,KAAK,CAAC,CAAC,EAAE;~~YAC7B~~,aAAa,CAAC,UAAU,CAAC,kBAAO,CAAC,MAAM,CAAC,IAAA,~~gDAAyB~~,EAAC;~~gBAChE~~,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;oBACzB,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAE,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBACrG,SAAS;gBACX,KAAK,EAAE,cAAc,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;oBACpC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;oBACtB,cAAc,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;aACrE,CAAC,CAAC,CAAC,CAAC;SACN;KAEF;~~AAEH~~,CAAC;~~AAxDD~~,~~gDAwDC~~"}
1	+ {"version":3,"file":"add-provider-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-provider-to-array.ts"],"names":[],"mappings":"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"}

package/src/lib/add-to-array.d.ts CHANGED Viewed

@@ -9,4 +9,4 @@ import { SourceFile } from 'ts-morph';
  * @param overwrite
  * @constructor
  */
-export declare function AddToArray(sourceFile: SourceFile, arrayName: string, value: string, type?: string, overwrite?: boolean): void;
+export declare function AddToArray(sourceFile: SourceFile, arrayName: string, value: string, type?: string, overwrite?: boolean | string[]): void;

package/src/lib/add-to-array.js CHANGED Viewed

@@ -19,11 +19,12 @@ function AddToArray(sourceFile, arrayName, value, type = 'any[]', overwrite = fa
         type,
     }).getInitializer();
     if (providerArray instanceof ts_morph_1.ArrayLiteralExpression) {
-        const index = providerArray.getElements().findIndex(element => element.getFullText().trim() === value);
-        if (overwrite && index !== -1) {
+        let index = providerArray.getElements().findIndex(element => element.getText().trim() === value);
+        if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
             providerArray.removeElement(index);
+            index = -1;
         }
-        if (overwrite || index === -1) {
+        if (index === -1) {
             providerArray.addElement(value);
         }
     }

package/src/lib/add-to-array.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-to-array.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,+EAA0E;AAE1E;;;;;;;;;GASG;AACH,SAAgB,UAAU,CACxB,UAAsB,EACtB,SAAiB,EACjB,KAAa,EACb,IAAI,GAAG,OAAO,EACd,~~SAAS~~,~~GAAG,~~KAAK;~~IAGjB~~,MAAM,aAAa,GAAG,IAAA,uDAAyB,EAC7C,UAAU,EACV,SAAS,EACT;QACE,WAAW,EAAE,IAAI;QACjB,IAAI;KACL,CACF,CAAC,cAAc,EAAE,CAAC;IAEnB,IAAI,aAAa,YAAY,iCAAsB,EAAE;QAEnD,~~MAAM~~,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,CAAC;~~QAEvG~~,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;~~YAC7B~~,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;~~SACpC~~;QAED,IAAI,~~SAAS,IAAI,~~KAAK,KAAK,CAAC,CAAC,EAAE;~~YAC7B~~,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACjC;KAEF;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACnF;AAEH,CAAC;~~AAjCD~~,~~gCAiCC~~"}
1	+ {"version":3,"file":"add-to-array.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/add-to-array.ts"],"names":[],"mappings":";;;AAAA,uCAGkB;AAClB,+EAA0E;AAE1E;;;;;;;;;GASG;AACH,SAAgB,UAAU,CACxB,UAAsB,EACtB,SAAiB,EACjB,KAAa,EACb,IAAI,GAAG,OAAO,EACd,YAAgC,KAAK;IAGrC,MAAM,aAAa,GAAG,IAAA,uDAAyB,EAC7C,UAAU,EACV,SAAS,EACT;QACE,WAAW,EAAE,IAAI;QACjB,IAAI;KACL,CACF,CAAC,cAAc,EAAE,CAAC;IAEnB,IAAI,aAAa,YAAY,iCAAsB,EAAE;QAEnD,IAAI,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,CAAC,CAAC;QAEjG,IAAI,CACE,SAAS,KAAK,IAAI,IAAI,CACV,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC3D,CACZ,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACrB,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,KAAK,GAAG,CAAC,CAAC,CAAC;SACZ;QAED,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACjC;KAEF;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;KACnF;AAEH,CAAC;AAtCD,gCAsCC"}

package/src/lib/angular/add-component-animations.js CHANGED Viewed

@@ -11,7 +11,7 @@ function AddComponentAnimations(sourceFile, namedImport, moduleSpecifier) {
     });
     const componentOptions = (0, get_component_options_object_1.GetComponentOptionsObject)(sourceFile);
     const importsArray = (0, get_coerce_array_literal_form_object_literal_1.GetCoerceArrayLiteralFromObjectLiteral)(componentOptions, 'animations');
-    if (!importsArray.getElements().some(element => element.getFullText().trim() === namedImport)) {
+    if (!importsArray.getElements().some(element => element.getText().trim() === namedImport)) {
         importsArray.addElement(namedImport);
     }
 }

package/src/lib/angular/add-component-animations.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-component-animations.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-animations.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA2E;AAE3E,SAAgB,sBAAsB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAuB;IAEzG,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB,eAAe;QACf,YAAY,EAAE,CAAE,WAAW,CAAE;KAC9B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAA,wDAAyB,EAAC,UAAU,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAE5F,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;~~QAC7F~~,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAfD,wDAeC"}
1	+ {"version":3,"file":"add-component-animations.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-animations.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA2E;AAE3E,SAAgB,sBAAsB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAuB;IAEzG,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB,eAAe;QACf,YAAY,EAAE,CAAE,WAAW,CAAE;KAC9B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAA,wDAAyB,EAAC,UAAU,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAE5F,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAfD,wDAeC"}

package/src/lib/angular/add-component-import.js CHANGED Viewed

@@ -13,7 +13,7 @@ function AddComponentImport(sourceFile, namedImport, moduleSpecifier) {
     }
     const ngModuleOptions = (0, get_component_options_object_1.GetComponentOptionsObject)(sourceFile);
     const importsArray = (0, get_coerce_array_literal_form_object_literal_1.GetCoerceArrayLiteralFromObjectLiteral)(ngModuleOptions, 'imports');
-    if (!importsArray.getElements().some(element => element.getFullText().trim() === namedImport)) {
+    if (!importsArray.getElements().some(element => element.getText().trim() === namedImport)) {
         importsArray.addElement(namedImport);
     }
 }

package/src/lib/angular/add-component-import.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-component-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-import.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA2E;AAE3E,SAAgB,kBAAkB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAEtG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,wDAAyB,EAAC,UAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;~~QAC7F~~,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,gDAiBC"}
1	+ {"version":3,"file":"add-component-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-component-import.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA2E;AAE3E,SAAgB,kBAAkB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAEtG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,wDAAyB,EAAC,UAAU,CAAC,CAAC;IAE9D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,gDAiBC"}

package/src/lib/angular/add-dependency-injection.d.ts CHANGED Viewed

@@ -1,8 +1,14 @@
 import { ImportDeclarationStructure, OptionalKind, Scope, SourceFile } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare enum Module {
     ANGULAR = "@angular/core",
     NEST = "@nestjs/common"
 }
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export interface InjectionDefinition {
     injectionToken: string;
     parameterName: string;
@@ -11,4 +17,7 @@ export interface InjectionDefinition {
     scope?: Scope;
     module?: Module;
 }
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function AddDependencyInjection(sourceFile: SourceFile, definition: InjectionDefinition, structures?: ReadonlyArray<OptionalKind<ImportDeclarationStructure>>): void;

package/src/lib/angular/add-dependency-injection.js CHANGED Viewed

@@ -4,11 +4,17 @@ exports.AddDependencyInjection = exports.Module = void 0;
 const ts_morph_1 = require("ts-morph");
 const coerce_class_constructor_1 = require("../coerce-class-constructor");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 var Module;
 (function (Module) {
     Module["ANGULAR"] = "@angular/core";
     Module["NEST"] = "@nestjs/common";
 })(Module || (exports.Module = Module = {}));
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function AddDependencyInjection(sourceFile, definition, structures = []) {
     var _a, _b, _c, _d;
     if (!definition.module) {

package/src/lib/angular/add-dependency-injection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-dependency-injection.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-dependency-injection.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAClB,0EAAqE;AACrE,+DAA2D;AAE3D,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,mCAAyB,CAAA;IACzB,iCAAuB,CAAA;AACzB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB;~~AAWD~~,SAAgB,sBAAsB,CACpC,UAAsB,EACtB,UAA+B,EAC/B,aAAsE,EAAE;;IAGxE,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,wDA2DC"}
1	+ {"version":3,"file":"add-dependency-injection.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-dependency-injection.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAClB,0EAAqE;AACrE,+DAA2D;AAE3D;;GAEG;AACH,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,mCAAyB,CAAA;IACzB,iCAAuB,CAAA;AACzB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB;AAcD;;GAEG;AACH,SAAgB,sBAAsB,CACpC,UAAsB,EACtB,UAA+B,EAC/B,aAAsE,EAAE;;IAGxE,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,wDA2DC"}

package/src/lib/angular/add-ng-module-export.js CHANGED Viewed

@@ -13,7 +13,7 @@ function AddNgModuleExport(sourceFile, namedImport, moduleSpecifier) {
     }
     const ngModuleOptions = (0, get_ng_module_options_object_1.GetNgModuleOptionsObject)(sourceFile);
     const importsArray = (0, get_coerce_array_literal_form_object_literal_1.GetCoerceArrayLiteralFromObjectLiteral)(ngModuleOptions, 'exports');
-    if (!importsArray.getElements().some(element => element.getFullText().trim() === namedImport)) {
+    if (!importsArray.getElements().some(element => element.getText().trim() === namedImport)) {
         importsArray.addElement(namedImport);
     }
 }

package/src/lib/angular/add-ng-module-export.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-ng-module-export.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-ng-module-export.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AAEzG,+DAA2D;AAC3D,iFAA0E;AAE1E,SAAgB,iBAAiB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAErG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,uDAAwB,EAAC,UAAU,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;~~QAC7F~~,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,8CAiBC"}
1	+ {"version":3,"file":"add-ng-module-export.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-ng-module-export.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AAEzG,+DAA2D;AAC3D,iFAA0E;AAE1E,SAAgB,iBAAiB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAErG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,uDAAwB,EAAC,UAAU,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,8CAiBC"}

package/src/lib/angular/add-ng-module-import.js CHANGED Viewed

@@ -13,7 +13,7 @@ function AddNgModuleImport(sourceFile, namedImport, moduleSpecifier) {
     }
     const ngModuleOptions = (0, get_ng_module_options_object_1.GetNgModuleOptionsObject)(sourceFile);
     const importsArray = (0, get_coerce_array_literal_form_object_literal_1.GetCoerceArrayLiteralFromObjectLiteral)(ngModuleOptions, 'imports');
-    if (!importsArray.getElements().some(element => element.getFullText().trim() === namedImport)) {
+    if (!importsArray.getElements().some(element => element.getText().trim() === namedImport)) {
         importsArray.addElement(namedImport);
     }
 }

package/src/lib/angular/add-ng-module-import.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-ng-module-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-ng-module-import.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA0E;AAE1E,SAAgB,iBAAiB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAErG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,uDAAwB,EAAC,UAAU,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;~~QAC7F~~,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,8CAiBC"}
1	+ {"version":3,"file":"add-ng-module-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/add-ng-module-import.ts"],"names":[],"mappings":";;;AACA,kHAAyG;AACzG,+DAA2D;AAC3D,iFAA0E;AAE1E,SAAgB,iBAAiB,CAAC,UAAsB,EAAE,WAAmB,EAAE,eAAwB;IAErG,IAAI,eAAe,EAAE;QACnB,IAAA,8BAAa,EAAC,UAAU,EAAE;YACxB,eAAe;YACf,YAAY,EAAE,CAAE,WAAW,CAAE;SAC9B,CAAC,CAAC;KACJ;IAED,MAAM,eAAe,GAAG,IAAA,uDAAwB,EAAC,UAAU,CAAC,CAAC;IAE7D,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAExF,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,8CAiBC"}

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

@@ -9,7 +9,7 @@ export interface CoerceComponentOptions extends TsMorphAngularProjectTransformOp
     name: string;
     flat?: boolean;
     template?: TemplateOptions;
-    overwrite?: boolean;
+    overwrite?: boolean | string[];
     tsMorphTransform?: (project: Project, [componentSourceFile]: [SourceFile], [componentClass]: [ClassDeclaration], options: CoerceComponentOptions) => void;
 }
 export declare function CoerceComponentRule(options: Readonly<CoerceComponentOptions>): Rule;

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

@@ -56,11 +56,11 @@ function CoerceComponentRule(options) {
                 (0, schematics_utilities_1.CoerceFile)(tree, (0, path_1.join)(basePath, componentPath, `${name}.component.scss`), '');
             });
         }
-        if (template && (overwrite || !hasComponent)) {
+        if (template && (overwrite === true || (Array.isArray(overwrite) && (overwrite === null || overwrite === void 0 ? void 0 : overwrite.includes('template'))) || !hasComponent)) {
             (_a = template.url) !== null && _a !== void 0 ? _a : (template.url = './files/component');
             const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, core_1.strings), { prefix, scope: `${prefix}` }), options), ((_b = template === null || template === void 0 ? void 0 : template.options) !== null && _b !== void 0 ? _b : {})), { componentName: name });
             (_c = templateOptions['prefix']) !== null && _c !== void 0 ? _c : (templateOptions['prefix'] = (0, schematics_utilities_1.GetProjectPrefix)(tree, options.project));
-            rules.push(() => console.log(`Template '${template.url}' will be used to modify the component.`), (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(template.url), [
+            rules.push(() => console.log(`Template '${template.url}' will be used to modify the component.`), () => console.log(`Template options: ${JSON.stringify(templateOptions)}`), (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)(template.url), [
                 (0, schematics_1.applyTemplates)(templateOptions),
                 (0, schematics_1.move)(flat ? basePath : (0, path_1.join)(basePath, name)),
             ]), schematics_1.MergeStrategy.Overwrite));

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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~~CAAC~~,EAAE;~~YAC5C~~,MAAA,QAAQ,CAAC,GAAG,oCAAZ,QAAQ,CAAC,GAAG,GAAK,mBAAmB,EAAC;YACrC,MAAM,eAAe,6EAChB,cAAO,KACV,MAAM,EACN,KAAK,EAAE,GAAI,MAAO,EAAE,KACjB,OAAO,GACP,CAAC,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,mCAAI,EAAE,CAAC,KAC5B,aAAa,EAAE,IAAI,GACpB,CAAC;YACF,MAAA,eAAe,CAAC,QAAQ,qCAAxB,eAAe,CAAC,QAAQ,IAAM,IAAA,uCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAC;YACtE,KAAK,CAAC,IAAI,CACR,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,aAAc,QAAS,CAAC,GAAI,yCAAyC,CAAC,EACxF,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACjC,IAAA,2BAAc,EAAC,eAAe,CAAC;gBAC/B,IAAA,iBAAI,EAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC7C,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAC7B,CAAC;SACH;QAED,IAAI,gBAAgB,EAAE;YACpB,KAAK,CAAC,IAAI,CAAC,IAAA,uDAAkC,EAC3C,OAAO,EACP,CAAC,OAAO,EAAE,CAAE,mBAAmB,CAAE,EAAE,EAAE;gBACnC,MAAM,cAAc,GAAG,mBAAmB,CAAC,eAAe,CAAC,GAAI,IAAA,+BAAQ,EAAC,IAAI,CAAE,WAAW,CAAC,CAAC;gBAC3F,gBAAiB,CACf,OAAO,EACP,CAAE,mBAAmB,CAAE,EACvB,CAAE,cAAc,CAAE,EAClB,OAAO,CACR,CAAC;YACJ,CAAC,EACD;gBACE,IAAA,WAAI,EAAC,aAAa,EAAE,GAAI,IAAK,eAAe,CAAC;aAC9C,CACF,CAAC,CAAC;SACJ;QAED,OAAO,IAAA,kBAAK,EAAC,KAAK,CAAC,CAAC;IAEtB,CAAC,CAAC;AACJ,CAAC;~~AAzGD~~,~~kDAyGC~~"}
1	+ {"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":"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"}

package/src/lib/angular/coerce-dialog-component.d.ts CHANGED Viewed

@@ -1,12 +1,9 @@
 import { Rule } from '@angular-devkit/schematics';
 import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
-import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
-import { TemplateOptions } from './coerce-component';
-export interface CoerceDialogComponentOptions extends TsMorphAngularProjectTransformOptions {
+import { CoerceComponentOptions } from './coerce-component';
+export interface CoerceDialogComponentOptions extends Omit<CoerceComponentOptions, 'tsMorphTransform' | 'name'> {
     dialogName: string;
     title?: string;
-    overwrite?: boolean;
-    template?: TemplateOptions;
     tsMorphTransform?: (project: Project, [componentSourceFile]: [SourceFile], [componentClass]: [ClassDeclaration], options: CoerceDialogComponentOptions) => void;
     coerceSubmitMethod?: (classDeclaration: ClassDeclaration, options: CoerceDialogComponentOptions) => void;
 }

package/src/lib/angular/coerce-dialog-component.js CHANGED Viewed

@@ -17,7 +17,7 @@ function DefaultDialogSubmitMethod(classDeclaration, options) {
 }
 exports.DefaultDialogSubmitMethod = DefaultDialogSubmitMethod;
 function CoerceDialogComponentRule(options) {
-    let { template, coerceSubmitMethod, tsMorphTransform, directory, overwrite, title, dialogName, project, feature, } = options;
+    let { template, coerceSubmitMethod, tsMorphTransform, directory, overwrite, title, dialogName, project, feature, flat, } = options;
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => {
     });
@@ -31,6 +31,7 @@ function CoerceDialogComponentRule(options) {
             directory,
             overwrite,
             template,
+            flat,
             tsMorphTransform: (_, [componentSourceFile], [componentClass]) => {
                 (0, add_component_import_1.AddComponentImport)(componentSourceFile, 'FlexLayoutModule', '@angular/flex-layout');
                 (0, add_component_import_1.AddComponentImport)(componentSourceFile, 'MatDialogModule', '@angular/material/dialog');

package/src/lib/angular/coerce-dialog-component.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-dialog-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-dialog-component.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AAMpC,0EAAqE;AACrE,gEAA2D;~~AAE3D~~,6EAAwE;AACxE,+DAA2D;AAC3D,2FAAsF;AACtF,iEAA4D;AAC5D,yDAG4B;~~AAgB5B~~,SAAgB,yBAAyB,CACvC,gBAAkC,EAClC,OAAqC;IAErC,IAAA,uCAAiB,EAAC,gBAAgB,EAAE,QAAQ,EAAE;QAC5C,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,CAAE,gCAAgC,CAAE;KACjD,CAAC,CAAC;AACL,CAAC;AARD,8DAQC;AAED,SAAgB,yBAAyB,CAAC,OAAqC;IAC7E,IAAI,EACF,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,KAAK,EACL,UAAU,EACV,OAAO,EACP,OAAO,~~GACR~~,GAAG,OAAO,CAAC;IACZ,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE;IAC1B,CAAC,EAAC;IACF,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,yBAAyB,EAAC;IACjD,OAAO,IAAA,kBAAK,EAAC;QACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;QAChD,IAAA,sCAAmB,EAAC;YAClB,OAAO;YACP,IAAI,EAAE,UAAU;YAChB,OAAO;YACP,SAAS;YACT,SAAS;YACT,QAAQ;YACR,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAE,mBAAmB,CAAE,EAAE,CAAE,cAAc,CAAE,EAAE,EAAE;gBACnE,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;gBACpF,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,iBAAiB,EAAE,0BAA0B,CAAC,CAAC;gBACvF,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,iBAAiB,EAAE,0BAA0B,CAAC,CAAC;gBACvF,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,sBAAsB,EAAE,gCAAgC,CAAC,CAAC;gBAClG,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;gBAE3E,IAAA,2CAAmB,EAAC,cAAc,EAAE,UAAU,EAAE;oBAC9C,WAAW,EAAE,yBAAyB;oBACtC,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBACH,IAAA,2CAAmB,EAAC,cAAc,EAAE,UAAU,EAAE;oBAC9C,WAAW,EAAE,yBAAyB;oBACtC,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBACH,IAAA,8BAAa,EAAC,mBAAmB,EAAE;oBACjC;wBACE,YAAY,EAAE,CAAE,eAAe,CAAE;wBACjC,eAAe,EAAE,YAAY;qBAC9B;oBACD;wBACE,YAAY,EAAE,CAAE,cAAc,EAAE,iBAAiB,CAAE;wBACnD,eAAe,EAAE,0BAA0B;qBAC5C;oBACD;wBACE,YAAY,EAAE,CAAE,QAAQ,CAAE;wBAC1B,eAAe,EAAE,eAAe;qBACjC;iBACF,CAAC,CAAC;gBACH,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,cAAc,CAAC,CAAC;gBAC1E,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,cAAc,EAAE;oBACjE,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,mBAAmB;iBAC1B,CAAC,CAAC;gBACH,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,MAAM,EAAE;oBACzD,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,KAAK;oBACX,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,QAAQ;4BACd,SAAS,EAAE,CAAE,iBAAiB,CAAE;yBACjC;qBACF;iBACF,CAAC,CAAC;gBACH,gBAAiB,CAAC,CAAC,EAAE,CAAE,mBAAmB,CAAE,EAAE,CAAE,cAAc,CAAE,EAAE,OAAO,CAAC,CAAC;gBAC3E,kBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;SACF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;~~AA1ED~~,~~8DA0EC~~"}
1	+ {"version":3,"file":"coerce-dialog-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-dialog-component.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AAMpC,0EAAqE;AACrE,gEAA2D;AAC3D,6EAAwE;AACxE,+DAA2D;AAC3D,2FAAsF;AACtF,iEAA4D;AAC5D,yDAG4B;AAc5B,SAAgB,yBAAyB,CACvC,gBAAkC,EAClC,OAAqC;IAErC,IAAA,uCAAiB,EAAC,gBAAgB,EAAE,QAAQ,EAAE;QAC5C,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,CAAE,gCAAgC,CAAE;KACjD,CAAC,CAAC;AACL,CAAC;AARD,8DAQC;AAED,SAAgB,yBAAyB,CAAC,OAAqC;IAC7E,IAAI,EACF,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EAChB,SAAS,EACT,SAAS,EACT,KAAK,EACL,UAAU,EACV,OAAO,EACP,OAAO,EACP,IAAI,GACL,GAAG,OAAO,CAAC;IACZ,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE;IAC1B,CAAC,EAAC;IACF,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,yBAAyB,EAAC;IACjD,OAAO,IAAA,kBAAK,EAAC;QACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;QAChD,IAAA,sCAAmB,EAAC;YAClB,OAAO;YACP,IAAI,EAAE,UAAU;YAChB,OAAO;YACP,SAAS;YACT,SAAS;YACT,QAAQ;YACR,IAAI;YACJ,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAE,mBAAmB,CAAE,EAAE,CAAE,cAAc,CAAE,EAAE,EAAE;gBACnE,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;gBACpF,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,iBAAiB,EAAE,0BAA0B,CAAC,CAAC;gBACvF,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,iBAAiB,EAAE,0BAA0B,CAAC,CAAC;gBACvF,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,sBAAsB,EAAE,gCAAgC,CAAC,CAAC;gBAClG,IAAA,yCAAkB,EAAC,mBAAmB,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;gBAE3E,IAAA,2CAAmB,EAAC,cAAc,EAAE,UAAU,EAAE;oBAC9C,WAAW,EAAE,yBAAyB;oBACtC,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBACH,IAAA,2CAAmB,EAAC,cAAc,EAAE,UAAU,EAAE;oBAC9C,WAAW,EAAE,yBAAyB;oBACtC,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBACH,IAAA,8BAAa,EAAC,mBAAmB,EAAE;oBACjC;wBACE,YAAY,EAAE,CAAE,eAAe,CAAE;wBACjC,eAAe,EAAE,YAAY;qBAC9B;oBACD;wBACE,YAAY,EAAE,CAAE,cAAc,EAAE,iBAAiB,CAAE;wBACnD,eAAe,EAAE,0BAA0B;qBAC5C;oBACD;wBACE,YAAY,EAAE,CAAE,QAAQ,CAAE;wBAC1B,eAAe,EAAE,eAAe;qBACjC;iBACF,CAAC,CAAC;gBACH,MAAM,CAAE,sBAAsB,CAAE,GAAG,IAAA,iDAAsB,EAAC,cAAc,CAAC,CAAC;gBAC1E,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,cAAc,EAAE;oBACjE,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,mBAAmB;iBAC1B,CAAC,CAAC;gBACH,IAAA,yDAA0B,EAAC,sBAAsB,EAAE,MAAM,EAAE;oBACzD,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,KAAK;oBACX,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,QAAQ;4BACd,SAAS,EAAE,CAAE,iBAAiB,CAAE;yBACjC;qBACF;iBACF,CAAC,CAAC;gBACH,gBAAiB,CAAC,CAAC,EAAE,CAAE,mBAAmB,CAAE,EAAE,CAAE,cAAc,CAAE,EAAE,OAAO,CAAC,CAAC;gBAC3E,kBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;SACF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AA5ED,8DA4EC"}

package/src/lib/angular/coerce-form-definition-control.js CHANGED Viewed

@@ -60,9 +60,17 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
                         for (let i = 0; i < control.validatorList.length; i++) {
                             const validator = control.validatorList[i];
                             if (isAngularValidator(validator)) {
+                                (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                                    namedImports: ['Validators'],
+                                    moduleSpecifier: '@angular/forms',
+                                });
                                 w.write('Validators.');
                             }
                             else {
+                                (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                                    namedImports: ['RxapValidators'],
+                                    moduleSpecifier: '@rxap/forms',
+                                });
                                 w.write('RxapValidators.');
                             }
                             w.write(validator);
@@ -74,6 +82,10 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
                             if (control.validatorList.length) {
                                 w.write(',');
                             }
+                            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+                                namedImports: ['Validators'],
+                                moduleSpecifier: '@angular/forms',
+                            });
                             w.write('Validators.required');
                         }
                         if (control.validatorList.length > 1 || (control.validatorList.length && control.isRequired)) {
@@ -105,13 +117,9 @@ function CoerceFormControl(sourceFile, classDeclaration, control) {
         ],
     });
     (0, coerce_imports_1.CoerceImports)(sourceFile, {
-        namedImports: ['RxapFormControl', 'UseFormControl', 'RxapValidators'],
+        namedImports: ['RxapFormControl', 'UseFormControl'],
         moduleSpecifier: '@rxap/forms',
     });
-    (0, coerce_imports_1.CoerceImports)(sourceFile, {
-        namedImports: ['Validators'],
-        moduleSpecifier: '@angular/forms',
-    });
     return {
         propertyDeclaration,
         decoratorDeclaration,

package/src/lib/angular/coerce-form-definition-control.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-form-definition-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-control.ts"],"names":[],"mappings":";;;AACA,qEAIoC;AACpC,uCAQkB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD,+DAAqE;AACrE,8DAG+B;AAC/B,mEAA+D;AAC/D,+DAA2D;AAC3D,mEAA+D;AAC/D,uDAAmD;AAoBnD,SAAgB,8BAA8B,CAC5C,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,OAAwC;IAExC,IAAI,UAAU,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE;QACzC,OAAO,CAAC,GAAG,CAAC,cAAe,YAAa,4CAA4C,CAAC,CAAC;QACtF,OAAO;KACR;IACD,MAAM,oBAAoB,GAAG,IAAA,kCAAe,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IACvE,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACzC,IAAA,4CAAyB,EAAC,oBAAoB,EAAE,IAAA,+BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAA,sBAAS,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAC5G,CAAC;AAbD,wEAaC;AAED,SAAgB,kBAAkB,CAAC,SAAiB;IAClD,OAAO;QACL,YAAY;QACZ,YAAY;QACZ,UAAU;QACV,cAAc;QACd,OAAO;QACP,kBAAkB;QAClB,kBAAkB;QAClB,gBAAgB;QAChB,eAAe;KAChB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;AACnG,CAAC;AAZD,gDAYC;AAED,SAAgB,iBAAiB,CAC/B,UAAsB,EACtB,gBAAkC,EAClC,OAAwC;IAExC,MAAM,mBAAmB,GAAG,IAAA,4CAAyB,EAAC,gBAAgB,EAAE,IAAA,+BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAClG,IAAI,EAAE,CAAC,CAAC,EAAE;YACR,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC5B,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;QACD,mBAAmB,EAAE,IAAI;QACzB,KAAK,EAAE,gBAAK,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,IAAA,kCAAe,EAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAAC,GAAG,CAAC;QACtF,SAAS,EAAE;YACT,CAAC,CAAC,EAAE;;gBACF,MAAM,KAAK,GAA4C,EAAE,CAAC;gBAC1D,IAAI,CAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,MAAM,KAAI,OAAO,CAAC,UAAU,EAAE;oBACvD,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE;wBACxB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACb,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE;4BAC5F,CAAC,CAAC,OAAO,EAAE,CAAC;yBACb;wBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;4BACrD,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;4BAC3C,IAAI,kBAAkB,CAAC,SAAS,CAAC,EAAE;gCACjC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;6BACxB;iCAAM;gCACL,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;6BAC5B;4BACD,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;4BACnB,IAAI,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gCACxC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;6BACd;yBACF;wBACD,IAAI,OAAO,CAAC,UAAU,EAAE;4BACtB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;gCAChC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;6BACd;4BACD,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;yBAChC;wBACD,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE;4BAC5F,CAAC,CAAC,OAAO,EAAE,CAAC;yBACb;wBACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACf,CAAC,CAAC;iBACH;gBACD,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;wBACnB,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;4BACrC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;yBACxB;6BAAM,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE;4BAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;yBAClB;6BAAM;4BACL,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;yBACvC;oBACH,CAAC,CAAC;iBACH;qBAAM,IAAI,OAAO,CAAC,OAAO,EAAE;oBAC1B,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;iBACvB;gBACD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;oBAC7B,kBAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC1B;YACH,CAAC;SACF;KACF,CAAC,CAAC;IACH,IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,iBAAiB,EAAE,gBAAgB,~~EAAE,gBAAgB,~~CAAE;~~QACvE~~,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IACH,~~IAAA,8BAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,YAAY,CAAE;QAC9B,eAAe,EAAE,gBAAgB;KAClC,CAAC,CAAC;IACH,~~OAAO;QACL,mBAAmB;QACnB,oBAAoB;KACrB,CAAC;AACJ,CAAC;~~AAhFD~~,~~8CAgFC~~;AAED,SAAgB,2BAA2B,CAAC,OAAqD;IAC/F,IAAI,EACF,iBAAiB,EACjB,gBAAgB,EAChB,qBAAqB,EACrB,QAAQ,GACT,GAAG,OAAO,CAAC;IAEZ,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE;IAC1B,CAAC,EAAC;IACF,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,IAArB,qBAAqB,GAAK,8BAA8B,EAAC;IACzD,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,IAAjB,iBAAiB,GAAK,iBAAiB,EAAC;IAExC,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,+BAAQ,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAE3D,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,GAAG,GAAG,IAAA,mCAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACvF,MAAM,gBAAgB,GAAG,IAAA,0BAAW,EAAC,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAElF,kCAAkC;QAClC,MAAM,aAAa,GAAG,IAAK,SAAU,EAAE,CAAC;QACxC,qBAAsB,CAAC,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC7E,YAAY;QAEZ,iBAAkB,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAE1D,gBAAiB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAElD,CAAC,CAAC,CAAC;AAEL,CAAC;AAhCD,kEAgCC"}
1	+ {"version":3,"file":"coerce-form-definition-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-control.ts"],"names":[],"mappings":"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"}

package/src/lib/angular/coerce-form-definition-type.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
 import { FormDefinitionControl } from '../types/form-definition-control';
 export interface CoerceFormDefinitionTypeOptions extends TsMorphAngularProjectTransformOptions {
-    controlList?: Array<Required<FormDefinitionControl>>;
+    controlList?: ReadonlyArray<Required<FormDefinitionControl>>;
     name: string;
     coerceFormType?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, options: CoerceFormDefinitionTypeOptions) => void;
 }

package/src/lib/angular/coerce-form-definition.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
 import { FormDefinitionControl } from '../types/form-definition-control';
 export interface CoerceFormDefinitionOptions extends TsMorphAngularProjectTransformOptions {
-    controlList?: Array<Required<FormDefinitionControl>>;
+    controlList?: ReadonlyArray<Required<FormDefinitionControl>>;
     name: string;
     tsMorphTransform?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
     coerceFormType?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, options: CoerceFormDefinitionOptions) => void;

package/src/lib/angular/coerce-form-table-action.d.ts CHANGED Viewed

@@ -1,6 +1,14 @@
 import { CoerceTableActionOptions } from './coerce-table-action';
+export interface LoadFromTableActionOptions {
+    operationId: string;
+    scope?: string | null;
+    body: boolean | Record<string, any>;
+    parameters: boolean | Record<string, any>;
+}
 export interface CoerceFormTableActionOptions extends CoerceTableActionOptions {
-    loadOperationId?: string;
+    loadFrom?: LoadFromTableActionOptions | null;
+    formInitial?: Record<string, any> | null;
     scope?: string | null;
+    formComponent: string;
 }
 export declare function CoerceFormTableActionRule(options: CoerceFormTableActionOptions): import("@angular-devkit/schematics").Rule;