@rxap/schematics-ts-morph 16.0.1-dev.0 → 16.1.0-dev.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.1.0-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.1-dev.1...@rxap/schematics-ts-morph@16.1.0-dev.0) (2024-02-22)
+
+### Bug Fixes
+
+- add is modifier functions ([456c085](https://gitlab.com/rxap/packages/commit/456c085e4f455301e66fae0f61c657f4c43ed450))
+- initial component class creation ([070552a](https://gitlab.com/rxap/packages/commit/070552a35cd3a8a01e0c27f2d5316c9083ad72b3))
+- mark CoercePropertyDeclaration as deprected ([8e2c4da](https://gitlab.com/rxap/packages/commit/8e2c4da8b5a2b60fcc9a9ef576673231bb7fc8e0))
+- merge the property and table property interface ([1ad96cb](https://gitlab.com/rxap/packages/commit/1ad96cba8d085a5458a3c061910755b4c782ca4e))
+- small issues ([93f69c5](https://gitlab.com/rxap/packages/commit/93f69c5e2f445994db265360c6dd4a1e8228bfdb))
+- support complex types ([d8b6f11](https://gitlab.com/rxap/packages/commit/d8b6f1190ecd343debead50587e0ed058eedc1b8))
+- support TypeImport ([fa95a22](https://gitlab.com/rxap/packages/commit/fa95a22fff13303b0c2c8ce96c5188980cb74cfb))
+- unify coerce component functions ([3bc1701](https://gitlab.com/rxap/packages/commit/3bc170116d7e794b94ef323251c59579a7887355))
+- unify type import concept ([9cb2f7b](https://gitlab.com/rxap/packages/commit/9cb2f7b07e28eb36849b1f3afdba15989ba17c72))
+- use correct function return type ([95d6c72](https://gitlab.com/rxap/packages/commit/95d6c728daacb76245e32c7c7530ce75e383267c))
+
+### Features
+
+- move WriteType to ts-morph package ([af6357a](https://gitlab.com/rxap/packages/commit/af6357a2f642199dc7807e21e5e369395872d595))
+- support custom id property ([540d429](https://gitlab.com/rxap/packages/commit/540d429fa861e757e892c3f071c32a7d79e3ad90))
+- support simple type ([6c012be](https://gitlab.com/rxap/packages/commit/6c012be37ca9f7ed1ffe5947327dcf42703c2bf9))
+
+## [16.0.1-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.1-dev.0...@rxap/schematics-ts-morph@16.0.1-dev.1) (2024-02-09)
+
+### Bug Fixes
+
+- remove FlexLayout dependency ([1fea895](https://gitlab.com/rxap/packages/commit/1fea895ea326d64e3ca230386175d1cd71d25ace))
+
 ## [16.0.1-dev.0](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.0.0...@rxap/schematics-ts-morph@16.0.1-dev.0) (2024-02-09)
 
 ### Bug Fixes

package/README.md

@@ -17,5 +17,5 @@ yarn add @rxap/schematics-ts-morph
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.0 @rxap/ts-morph@^1.0.1 @rxap/utilities@^16.0.0 @rxap/workspace-ts-morph@^16.0.1 ts-morph@^18.0.0 tslib@2.6.2 
+yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-utilities@^16.0.1-dev.0 @rxap/ts-morph@^1.1.0-dev.0 @rxap/utilities@^16.0.0 @rxap/workspace-ts-morph@^16.0.1 ts-morph@^18.0.0 tslib@2.6.2 
 ```

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.0.1-dev.0",
+  "version": "16.1.0-dev.0",
   "name": "@rxap/schematics-ts-morph",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -12,14 +12,15 @@
   "peerDependencies": {
     "@angular-devkit/core": "^16.1.4",
     "@angular-devkit/schematics": "^16.1.4",
-    "@rxap/schematics-utilities": "^16.0.0",
-    "@rxap/ts-morph": "^1.0.1",
+    "@rxap/schematics-utilities": "^16.0.1-dev.0",
+    "@rxap/ts-morph": "^1.1.0-dev.0",
     "@rxap/utilities": "^16.0.0",
     "@rxap/workspace-ts-morph": "^16.0.1",
     "ts-morph": "^18.0.0",
     "tslib": "2.6.2",
     "@rxap/node-utilities": "1.1.0",
-    "@rxap/workspace-utilities": "16.0.1"
+    "@rxap/workspace-utilities": "16.0.1",
+    "util": "0.12.5"
   },
   "author": {
     "name": "Merzough Münker",
@@ -41,11 +42,11 @@
     "packageGroup": [
       {
         "package": "@rxap/schematics-utilities",
-        "version": "16.0.0"
+        "version": "16.0.1-dev.0"
       },
       {
         "package": "@rxap/ts-morph",
-        "version": "1.0.1"
+        "version": "1.1.0-dev.0"
       },
       {
         "package": "@rxap/utilities",
@@ -67,7 +68,7 @@
     "directory": "packages/schematic/ts-morph"
   },
   "type": "commonjs",
-  "gitHead": "c72606219a2dc28185f6e21617ec127d7c82715c",
+  "gitHead": "f7c69031c4849d91b4a852bf9e5c31cabf3f98c9",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

package/src/lib/angular/add-component-import.d.ts

@@ -1,2 +1,11 @@
 import { SourceFile } from 'ts-morph';
+/**
+ * Adds a provided class to the imports array of the component.
+ *
+ * @param sourceFile - The source file where the component class is located.
+ * @param namedImport - The name of the class that should be added to the imports array of the component.
+ * @param [moduleSpecifier] - The module specifier to import the class into the source file.
+ *
+ * @returns {void}
+ */
 export declare function AddComponentImport(sourceFile: SourceFile, namedImport: string, moduleSpecifier?: string): void;

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

@@ -4,6 +4,15 @@ exports.AddComponentImport = void 0;
 const get_coerce_array_literal_form_object_literal_1 = require("../get-coerce-array-literal-form-object-literal");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const get_component_options_object_1 = require("./get-component-options-object");
+/**
+ * Adds a provided class to the imports array of the component.
+ *
+ * @param sourceFile - The source file where the component class is located.
+ * @param namedImport - The name of the class that should be added to the imports array of the component.
+ * @param [moduleSpecifier] - The module specifier to import the class into the source file.
+ *
+ * @returns {void}
+ */
 function AddComponentImport(sourceFile, namedImport, moduleSpecifier) {
     if (moduleSpecifier) {
         (0, coerce_imports_1.CoerceImports)(sourceFile, {

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

@@ -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,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,WAAW,CAAC,EAAE;QACzF,YAAY,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;KACtC;AAEH,CAAC;AAjBD,gDAiBC"}
+{"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;;;;;;;;GAQG;AACH,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-component-input.d.ts

@@ -1,7 +1,8 @@
+import { TypeImport } from '@rxap/ts-morph';
 import { ImportDeclarationStructure, JSDocStructure, OptionalKind, SourceFile, WriterFunction } from 'ts-morph';
 export interface ComponentInputDefinition {
     name: string;
-    type: string | WriterFunction;
+    type: string | TypeImport | WriterFunction;
     selector?: string;
     required?: boolean;
     initializer?: string | WriterFunction;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddComponentInput = void 0;
 const ts_morph_1 = require("ts-morph");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const ts_morph_2 = require("@rxap/ts-morph");
 const get_component_class_1 = require("./get-component-class");
 function AddComponentInput(sourceFile, componentInputDefinition, structures = []) {
     const componentClass = (0, get_component_class_1.GetComponentClass)(sourceFile);
@@ -18,7 +19,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
                     parameters: [
                         {
                             name: componentInputDefinition.name,
-                            type: componentInputDefinition.type,
+                            type: (0, ts_morph_2.WriteType)(componentInputDefinition.type, sourceFile),
                         },
                     ],
                     docs: componentInputDefinition.docs,
@@ -36,7 +37,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
                     componentClass.addProperty({
                         name: '_' + componentInputDefinition.name,
                         scope: ts_morph_1.Scope.Private,
-                        type: componentInputDefinition.type,
+                        type: (0, ts_morph_2.WriteType)(componentInputDefinition.type, sourceFile),
                         initializer: componentInputDefinition.initializer,
                         hasQuestionToken: !componentInputDefinition.initializer && !componentInputDefinition.required,
                         hasExclamationToken: !componentInputDefinition.initializer && componentInputDefinition.required,
@@ -53,7 +54,7 @@ function AddComponentInput(sourceFile, componentInputDefinition, structures = []
                 componentClass.addProperty({
                     name: componentInputDefinition.name,
                     scope: ts_morph_1.Scope.Public,
-                    type: componentInputDefinition.type,
+                    type: (0, ts_morph_2.WriteType)(componentInputDefinition.type, sourceFile),
                     initializer: componentInputDefinition.initializer,
                     hasQuestionToken: !componentInputDefinition.initializer && !componentInputDefinition.required,
                     hasExclamationToken: !componentInputDefinition.initializer && componentInputDefinition.required,

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

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

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

@@ -1,8 +1,8 @@
-import { ArrayLiteralExpression, ClassDeclaration, ObjectLiteralExpression, Project, SourceFile } from 'ts-morph';
+import { ClassDeclaration, ObjectLiteralExpression, Project, SourceFile } from 'ts-morph';
 import { TsMorphAngularProjectTransformOptions } from '../ts-morph-transform';
 export interface CoerceComponentClassRuleOptions extends TsMorphAngularProjectTransformOptions {
     componentName: string;
     selector?: string;
-    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, componentDecoratorObject: ObjectLiteralExpression, providersArray: ArrayLiteralExpression, importsArray: ArrayLiteralExpression) => void;
+    tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, componentDecoratorObject: ObjectLiteralExpression) => void;
 }
 export declare function CoerceComponentClassRule(options: Readonly<CoerceComponentClassRuleOptions>): import("@angular-devkit/schematics").Rule;

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

@@ -8,8 +8,8 @@ function CoerceComponentClassRule(options) {
     const { componentName, selector, tsMorphTransform, } = options;
     return (0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project) => {
         const sourceFile = (0, coerce_source_file_1.CoerceSourceFile)(project, `/${componentName}.component.ts`);
-        const { classDeclaration, componentDecoratorObject, providersArray, importsArray } = (0, ts_morph_1.CoerceComponent)(sourceFile, componentName, { selector, styleUrls: true, templateUrl: true });
-        tsMorphTransform === null || tsMorphTransform === void 0 ? void 0 : tsMorphTransform(project, sourceFile, classDeclaration, componentDecoratorObject, providersArray, importsArray);
+        const { classDeclaration, componentDecoratorObject } = (0, ts_morph_1.CoerceComponent)(sourceFile, componentName, { selector, styleUrls: true, templateUrl: true });
+        tsMorphTransform === null || tsMorphTransform === void 0 ? void 0 : tsMorphTransform(project, sourceFile, classDeclaration, componentDecoratorObject);
     });
 }
 exports.CoerceComponentClassRule = CoerceComponentClassRule;

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-component-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component-class.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AAQjD,8DAAyD;AACzD,8DAG+B;AAe/B,SAAgB,wBAAwB,CAAC,OAAkD;IACzF,MAAM,EACJ,aAAa,EACb,QAAQ,EACR,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,IAAK,aAAc,eAAe,CAAC,CAAC;QAEjF,MAAM,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAA,0BAAe,EAAC,UAAU,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAElL,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC;IAEpH,CAAC,CAAC,CAAC;AAEL,CAAC;AAjBD,4DAiBC"}
+{"version":3,"file":"coerce-component-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component-class.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AAQjD,8DAAyD;AACzD,8DAG+B;AAa/B,SAAgB,wBAAwB,CAAC,OAAkD;IACzF,MAAM,EACJ,aAAa,EACb,QAAQ,EACR,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,UAAU,GAAG,IAAA,qCAAgB,EAAC,OAAO,EAAE,IAAK,aAAc,eAAe,CAAC,CAAC;QAEjF,MAAM,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,GAAG,IAAA,0BAAe,EAAC,UAAU,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpJ,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAEtF,CAAC,CAAC,CAAC;AAEL,CAAC;AAjBD,4DAiBC"}

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

@@ -4,8 +4,8 @@ exports.CoerceComponentRule = void 0;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const ts_morph_1 = require("@rxap/ts-morph");
 const path_1 = require("path");
-const ts_morph_1 = require("ts-morph");
 const ts_morph_transform_1 = require("../ts-morph-transform");
 const build_angular_base_path_1 = require("./build-angular-base-path");
 const has_component_1 = require("./has-component");
@@ -24,30 +24,10 @@ function CoerceComponentRule(options) {
         if (!hasComponent) {
             rules.push(() => console.log(`Project '${project}' does not have a component '${name}' in the feature '${feature}' in the directory '${directory}', New component will be created.`));
             rules.push((0, ts_morph_transform_1.TsMorphAngularProjectTransformRule)(options, (project, [componentSourceFile]) => {
-                componentSourceFile.addClass({
-                    isExported: true,
-                    name: `${(0, schematics_utilities_1.classify)(name)}Component`,
-                    decorators: [
-                        {
-                            name: 'Component',
-                            arguments: [
-                                ts_morph_1.Writers.object({
-                                    selector: w => w.quote(`${prefix}-${(0, schematics_utilities_1.dasherize)(name)}`),
-                                    templateUrl: w => w.quote(`./${name}.component.html`),
-                                    styleUrls: w => w.write('[').quote(`./${name}.component.scss`).write(']'),
-                                    changeDetection: 'ChangeDetectionStrategy.OnPush',
-                                    standalone: 'true',
-                                }),
-                            ],
-                        },
-                    ],
+                (0, ts_morph_1.CoerceComponent)(componentSourceFile, name, {
+                    prefix,
+                    changeDetection: 'OnPush',
                 });
-                componentSourceFile.addImportDeclarations([
-                    {
-                        moduleSpecifier: '@angular/core',
-                        namedImports: ['Component', 'ChangeDetectionStrategy'],
-                    },
-                ]);
             }, [
                 (0, path_1.join)(componentPath, `${name}.component.ts?`),
             ]));

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-component.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-component.ts"],"names":[],"mappings":";;;AAAA,+CAA+C;AAC/C,2DASoC;AACpC,qEAKoC;AACpC,+BAA4B;AAC5B,uCAKkB;AAClB,8DAG+B;AAC/B,uEAAiE;AACjE,mDAA+C;AAoB/C,SAAgB,mBAAmB,CAAC,OAAyC;IAC3E,IAAI,EACF,gBAAgB,EAChB,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,KAAK,EAAC;IACpB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC;IAClC,OAAO,IAAI,CAAC,EAAE;;QAGZ,MAAM,KAAK,GAAW,EAAE,CAAC;QAEzB,MAAM,QAAQ,GAAG,IAAA,8CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,YAAY,GAAG,IAAA,4BAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACvC,MAAM,MAAM,GAAG,IAAA,uCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,EAAE;YACjB,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,YAAa,OAAQ,gCAAiC,IAAK,qBAAsB,OAAQ,uBAAwB,SAAU,mCAAmC,CAAC,CAAC,CAAC;YAC9L,KAAK,CAAC,IAAI,CAAC,IAAA,uDAAkC,EAC3C,OAAO,EACP,CAAC,OAAO,EAAE,CAAE,mBAAmB,CAAE,EAAE,EAAE;gBACnC,mBAAmB,CAAC,QAAQ,CAAC;oBAC3B,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,GAAI,IAAA,+BAAQ,EAAC,IAAI,CAAE,WAAW;oBACpC,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,WAAW;4BACjB,SAAS,EAAE;gCACT,kBAAO,CAAC,MAAM,CAAC;oCACb,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAI,MAAO,IAAK,IAAA,gCAAS,EAAC,IAAI,CAAE,EAAE,CAAC;oCAC1D,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAM,IAAK,iBAAiB,CAAC;oCACvD,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,KAAM,IAAK,iBAAiB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;oCAC3E,eAAe,EAAE,gCAAgC;oCACjD,UAAU,EAAE,MAAM;iCACnB,CAAC;6BACH;yBACF;qBACF;iBACF,CAAC,CAAC;gBACH,mBAAmB,CAAC,qBAAqB,CAAC;oBACxC;wBACE,eAAe,EAAE,eAAe;wBAChC,YAAY,EAAE,CAAE,WAAW,EAAE,yBAAyB,CAAE;qBACzD;iBACF,CAAC,CAAC;YACL,CAAC,EACD;gBACE,IAAA,WAAI,EAAC,aAAa,EAAE,GAAI,IAAK,gBAAgB,CAAC;aAC/C,CACF,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChB,IAAA,iCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,QAAQ,EAAE,aAAa,EAAE,GAAI,IAAK,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChF,IAAA,iCAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,QAAQ,EAAE,aAAa,EAAE,GAAI,IAAK,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;YAClF,CAAC,CAAC,CAAC;SACJ;QAED,IAAI,QAAQ,IAAI,CACd,SAAS,KAAK,IAAI,IAAI,CACV,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,UAAU,CAAC,CAAA,CAC5D,IAAI,CAAC,YAAY,CAC7B,EAAE;YACD,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,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAsB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAE,EAAE,CAAC,EAC3E,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;AA9GD,kDA8GC"}
+{"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.js

@@ -33,7 +33,6 @@ function CoerceDialogComponentRule(options) {
             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');
                 (0, add_component_import_1.AddComponentImport)(componentSourceFile, 'MatButtonModule', '@angular/material/button');
                 (0, add_component_import_1.AddComponentImport)(componentSourceFile, 'MatProgressBarModule', '@angular/material/progress-bar');

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

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

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

@@ -10,7 +10,7 @@ const ts_morph_transform_1 = require("../ts-morph-transform");
 const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const coerce_interface_1 = require("../ts-morph/coerce-interface");
-const write_type_1 = require("../ts-morph/write-type");
+const ts_morph_2 = require("@rxap/ts-morph");
 function CoerceInterfaceFormTypeControl(sourceFile, classDeclaration, formTypeName, control) {
     if (sourceFile.getTypeAlias(formTypeName)) {
         console.log(`Type alias ${formTypeName} already exists! Skip interface generation`);
@@ -18,7 +18,7 @@ function CoerceInterfaceFormTypeControl(sourceFile, classDeclaration, formTypeNa
     }
     const interfaceDeclaration = (0, coerce_interface_1.CoerceInterface)(sourceFile, formTypeName);
     interfaceDeclaration.setIsExported(true);
-    (0, coerce_dto_class_1.CoercePropertyDeclaration)(interfaceDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({ type: (0, write_type_1.WriteType)(control) });
+    (0, coerce_dto_class_1.CoercePropertyDeclaration)(interfaceDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({ type: (0, ts_morph_2.WriteType)(control, sourceFile) });
 }
 exports.CoerceInterfaceFormTypeControl = CoerceInterfaceFormTypeControl;
 function isAngularValidator(validator) {
@@ -36,10 +36,14 @@ function isAngularValidator(validator) {
 }
 exports.isAngularValidator = isAngularValidator;
 function CoerceFormControl(sourceFile, classDeclaration, control) {
+    (0, coerce_imports_1.CoerceImports)(sourceFile, {
+        namedImports: ['RxapFormControl', 'UseFormControl'],
+        moduleSpecifier: '@rxap/forms',
+    });
     const propertyDeclaration = (0, coerce_dto_class_1.CoercePropertyDeclaration)(classDeclaration, (0, schematics_utilities_1.camelize)(control.name)).set({
         type: w => {
             w.write('RxapFormControl<');
-            (0, write_type_1.WriteType)(control)(w);
+            (0, ts_morph_2.WriteType)(control, sourceFile)(w);
             w.write('>');
         },
         hasExclamationToken: true,

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

@@ -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":"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"}
+{"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.js

@@ -14,14 +14,6 @@ function CoerceFormControls(sourceFile, classDeclaration, { controlList }) {
     for (const control of controlList !== null && controlList !== void 0 ? controlList : []) {
         (0, coerce_form_definition_control_1.CoerceFormControl)(sourceFile, classDeclaration, control);
     }
-    (0, coerce_imports_1.CoerceImports)(sourceFile, {
-        namedImports: ['RxapFormControl', 'UseFormControl', 'RxapValidators'],
-        moduleSpecifier: '@rxap/forms',
-    });
-    (0, coerce_imports_1.CoerceImports)(sourceFile, {
-        namedImports: ['Validators'],
-        moduleSpecifier: '@angular/forms',
-    });
 }
 exports.CoerceFormControls = CoerceFormControls;
 function CoerceFormDefinition(options) {

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

@@ -1 +1 @@
-{"version":3,"file":"coerce-form-definition.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,uCAIkB;AAClB,+DAAqE;AACrE,8DAG+B;AAC/B,mEAA+D;AAC/D,+DAA2D;AAE3D,qFAAqE;AACrE,+EAA6E;AAC7E,2EAIqC;AAmBrC,SAAgB,kBAAkB,CAChC,UAAsB,EACtB,gBAAkC,EAClC,EAAE,WAAW,EAA+B;IAE5C,KAAK,MAAM,OAAO,IAAI,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,EAAE;QACvC,IAAA,kDAAiB,EAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;KAC1D;IACD,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;AACL,CAAC;AAhBD,gDAgBC;AAED,SAAgB,oBAAoB,CAAC,OAA8C;IACjF,IAAI,EACF,kBAAkB,EAClB,gBAAgB,EAChB,IAAI,GACL,GAAG,OAAO,CAAC;IAEZ,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE;IAC1B,CAAC,EAAC;IACF,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,IAAlB,kBAAkB,GAAK,kBAAkB,EAAC;IAE1C,MAAM,aAAa,GAAG,IAAA,0DAA8B,EAAC,OAAO,CAAC,CAAC;IAE9D,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;YAEtE,MAAM,gBAAgB,GAAG,IAAA,qDAAyB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAExE,mCAAmC;YACnC,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE;gBACnG,gBAAgB,CAAC,aAAa,CAAC,YAAa,aAAc,GAAG,CAAC,CAAC;aAChE;YACD,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,UAAU,CAAE;gBAC5B,eAAe,EAAE,aAAa;aAC/B,CAAC,CAAC;YACH,YAAY;YAEZ,IAAA,4CAAyB,EAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC,GAAG,CAAC;gBAC/D,IAAI,EAAE,iBAAkB,aAAc,GAAG;gBACzC,mBAAmB,EAAE,IAAI;gBACzB,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE,gBAAK,CAAC,MAAM;aACpB,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,eAAe,CAAE;gBACjC,eAAe,EAAE,aAAa;aAC/B,CAAC,CAAC;YAEH,kBAAmB,CAAC,UAAU,EAAE,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAE3D,8BAA8B;YAC9B,IAAA,kCAAe,EAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAE,EAAE,CAAC,CAAC;YACzF,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,UAAU,CAAE;gBAC5B,eAAe,EAAE,aAAa;aAC/B,CAAC,CAAC;YAEH,IAAA,kCAAe,EAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;YACvE,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,eAAe;aACjC,CAAC,CAAC;YACH,YAAY;YAEZ,gBAAiB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAElD,CAAC,EAAE,CAAE,IAAA,qDAAyB,EAAC,OAAO,CAAC,CAAE,CAAC;QAC1C,IAAA,0DAA4B,EAAC,OAAO,CAAC;KACtC,CAAC,CAAC;AAEL,CAAC;AA9DD,oDA8DC"}
+{"version":3,"file":"coerce-form-definition.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition.ts"],"names":[],"mappings":"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"}

package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js

@@ -7,7 +7,7 @@ const coerce_proxy_remote_method_class_1 = require("./coerce-proxy-remote-method
 function CoerceTreeTableRootProxyRemoteMethodClass(options) {
     let { tsMorphTransform, getRootOperationId, scope, } = options;
     tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => ({}));
-    return (0, coerce_proxy_remote_method_class_1.CoerceProxyRemoteMethodClass)(Object.assign(Object.assign({}, options), { name: 'tree-table-root', sourceType: 'Node<unknown>', targetType: `OpenApiRemoteMethodParameter<${(0, operation_id_utilities_1.OperationIdToParameterClassName)(getRootOperationId)}>`, proxyMethod: (0, operation_id_utilities_1.OperationIdToClassName)(getRootOperationId), tsMorphTransform: (project, sourceFile, classDeclaration) => {
+    return (0, coerce_proxy_remote_method_class_1.CoerceProxyRemoteMethodClass)(Object.assign(Object.assign({}, options), { name: 'tree-table-root', sourceType: 'Node<unknown>', targetType: `OpenApiRemoteMethodParameter<void>`, proxyMethod: (0, operation_id_utilities_1.OperationIdToClassName)(getRootOperationId), tsMorphTransform: (project, sourceFile, classDeclaration) => {
             (0, coerce_imports_1.CoerceImports)(sourceFile, {
                 namedImports: [(0, operation_id_utilities_1.OperationIdToClassName)(getRootOperationId)],
                 moduleSpecifier: (0, operation_id_utilities_1.OperationIdToClassImportPath)(getRootOperationId, scope),
@@ -20,10 +20,6 @@ function CoerceTreeTableRootProxyRemoteMethodClass(options) {
                 namedImports: ['OpenApiRemoteMethodParameter'],
                 moduleSpecifier: '@rxap/open-api/remote-method',
             });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
-                namedImports: [(0, operation_id_utilities_1.OperationIdToParameterClassName)(getRootOperationId)],
-                moduleSpecifier: (0, operation_id_utilities_1.OperationIdToParameterClassImportPath)(getRootOperationId, scope),
-            });
             return tsMorphTransform(project, sourceFile, classDeclaration);
         } }));
 }

package/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-tree-table-root-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAKA,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,yCAAyC,CAAC,OAAyD;IACjH,IAAI,EACF,gBAAgB,EAChB,kBAAkB,EAClB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,gCAAiC,IAAA,wDAA+B,EAAC,kBAAkB,CAAE,GAAG,EACpG,WAAW,EAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,EACvD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,CAAE;gBAC5D,eAAe,EAAE,IAAA,qDAA4B,EAAC,kBAAkB,EAAE,KAAK,CAAC;aACzE,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,2BAA2B;aAC7C,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,8BAA8B,CAAE;gBAChD,eAAe,EAAE,8BAA8B;aAChD,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,wDAA+B,EAAC,kBAAkB,CAAC,CAAE;gBACrE,eAAe,EAAE,IAAA,8DAAqC,EAAC,kBAAkB,EAAE,KAAK,CAAC;aAClF,CAAC,CAAC;YACH,OAAO,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAClE,CAAC,IACD,CAAC;AACL,CAAC;AAjCD,8FAiCC"}
+{"version":3,"file":"coerce-tree-table-root-proxy-remote-method-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-tree-table-root-proxy-remote-method-class.ts"],"names":[],"mappings":";;;AAKA,2EAKwC;AACxC,+DAA2D;AAC3D,yFAG4C;AAQ5C,SAAgB,yCAAyC,CAAC,OAAyD;IACjH,IAAI,EACF,gBAAgB,EAChB,kBAAkB,EAClB,KAAK,GACN,GAAG,OAAO,CAAC;IACZ,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,EAAC;IAChC,OAAO,IAAA,+DAA4B,kCAC9B,OAAO,KACV,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,oCAAoC,EAChD,WAAW,EAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,EACvD,gBAAgB,EAAE,CAAC,OAAgB,EAAE,UAAsB,EAAE,gBAAkC,EAAE,EAAE;YACjG,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,IAAA,+CAAsB,EAAC,kBAAkB,CAAC,CAAE;gBAC5D,eAAe,EAAE,IAAA,qDAA4B,EAAC,kBAAkB,EAAE,KAAK,CAAC;aACzE,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,MAAM,CAAE;gBACxB,eAAe,EAAE,2BAA2B;aAC7C,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,8BAA8B,CAAE;gBAChD,eAAe,EAAE,8BAA8B;aAChD,CAAC,CAAC;YACH,OAAO,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAClE,CAAC,IACD,CAAC;AACL,CAAC;AA7BD,8FA6BC"}

package/src/lib/nest/add-operation-to-controller.d.ts

@@ -1,7 +1,8 @@
+import { TypeImport } from '@rxap/ts-morph';
 import { ClassDeclaration, DecoratorStructure, MethodDeclaration, OptionalKind, SourceFile, StatementStructures, WriterFunction } from 'ts-morph';
 export interface OperationParameter {
     name: string;
-    type?: string | WriterFunction;
+    type?: string | WriterFunction | TypeImport;
     pipeList?: Array<string | WriterFunction>;
     defaultValue?: string | WriterFunction;
     hasQuestionToken?: boolean;

package/src/lib/nest/add-operation-to-controller.js

@@ -7,7 +7,8 @@ const coerce_class_method_1 = require("../coerce-class-method");
 const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
 const coerce_statements_1 = require("../ts-morph/coerce-statements");
-function buildMethodQueryParameters(queryList, importStructures) {
+const ts_morph_2 = require("@rxap/ts-morph");
+function buildMethodQueryParameters(queryList, sourceFile) {
     if (queryList.length) {
         return queryList.map(query => {
             var _a, _b;
@@ -15,7 +16,7 @@ function buildMethodQueryParameters(queryList, importStructures) {
                 undefined) {
                 return query;
             }
-            importStructures.push({
+            (0, coerce_imports_1.CoerceImports)(sourceFile, {
                 namedImports: ['DefaultValuePipe'],
                 moduleSpecifier: '@nestjs/common',
             });
@@ -38,7 +39,7 @@ function buildMethodQueryParameters(queryList, importStructures) {
             var _a, _b, _c;
             return ({
                 name: (_a = query.alias) !== null && _a !== void 0 ? _a : query.name,
-                type: query.type,
+                type: query.type ? (0, ts_morph_2.WriteType)({ type: query.type, isArray: false }, sourceFile) : undefined,
                 hasQuestionToken: (_b = query.hasQuestionToken) !== null && _b !== void 0 ? _b : (!query.required && query.defaultValue === undefined),
                 decorators: [
                     {
@@ -54,21 +55,21 @@ function buildMethodQueryParameters(queryList, importStructures) {
     }
     return [];
 }
-function buildMethodParamParameters(paramList) {
+function buildMethodParamParameters(paramList, sourceFile) {
     if (paramList.length) {
-        return paramList.map(param => {
-            var _a;
-            return ({
-                name: (_a = param.alias) !== null && _a !== void 0 ? _a : param.name,
-                type: param.type,
-                decorators: [
-                    {
-                        name: 'Param',
-                        arguments: [w => w.quote(param.name)],
-                    },
-                ],
-            });
-        });
+        return paramList.map(({ alias, name, type }) => ({
+            name: alias !== null && alias !== void 0 ? alias : name,
+            type: type ? (0, ts_morph_2.WriteType)({
+                type: type,
+                isArray: false
+            }, sourceFile) : undefined,
+            decorators: [
+                {
+                    name: 'Param',
+                    arguments: [w => w.quote(name)],
+                },
+            ],
+        }));
     }
     return [];
 }
@@ -164,8 +165,8 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
         scope: ts_morph_1.Scope.Public,
         isAsync,
         parameters: [
-            ...buildMethodQueryParameters(queryList, importStructures),
-            ...buildMethodParamParameters(paramList),
+            ...buildMethodQueryParameters(queryList, sourceFile),
+            ...buildMethodParamParameters(paramList, sourceFile),
             ...buildMethodBodyParameters(body),
         ].sort((a, b) => {
             if (a.hasQuestionToken && b.hasQuestionToken) {

package/src/lib/nest/add-operation-to-controller.js.map

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

package/src/lib/nest/coerce-dto-class.d.ts

@@ -6,6 +6,9 @@ export interface CoerceDtoClassOutput {
     sourceFile: SourceFile;
     classDeclaration: ClassDeclaration;
 }
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
 export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;
 export interface CoerceDtoClassOptions {

package/src/lib/nest/coerce-dto-class.js

@@ -8,7 +8,7 @@ const coerce_class_1 = require("../coerce-class");
 const coerce_source_file_1 = require("../coerce-source-file");
 const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const write_type_1 = require("../ts-morph/write-type");
+const ts_morph_2 = require("@rxap/ts-morph");
 function CoercePropertyDeclaration(node, name, structure = {}) {
     let property = node.getProperty(name);
     if (!property) {
@@ -41,8 +41,8 @@ function CoerceDtoClass(options) {
             propertyName = prefixMatch[0] + propertyName;
         }
         const propertyDeclaration = CoercePropertyDeclaration(classDeclaration, propertyName).set({
-            type: (0, write_type_1.WriteType)(property),
-            hasQuestionToken: property.isOptional,
+            type: (0, ts_morph_2.WriteType)(property, sourceFile),
+            hasQuestionToken: !!property.isOptional,
             hasExclamationToken: !property.isOptional,
         });
         (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
@@ -66,12 +66,10 @@ function CoerceDtoClass(options) {
                 arguments: [
                     w => {
                         w.write('() => ');
-                        if (typeof property.type === 'string') {
-                            w.write(property.type);
-                        }
-                        else {
-                            property.type(w);
-                        }
+                        (0, ts_morph_2.WriteType)({
+                            type: property.type,
+                            isArray: false
+                        }, sourceFile)(w);
                     },
                 ],
             });
@@ -81,14 +79,10 @@ function CoerceDtoClass(options) {
             });
             (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
                 arguments: [
-                    w => {
-                        if (typeof property.type === 'string') {
-                            w.write(property.type);
-                        }
-                        else {
-                            property.type(w);
-                        }
-                    },
+                    (0, ts_morph_2.WriteType)({
+                        type: property.type,
+                        isArray: false
+                    }, sourceFile),
                     w => {
                         if (property.isArray) {
                             ts_morph_1.Writers.object({ each: 'true' })(w);
@@ -110,7 +104,14 @@ function CoerceDtoClass(options) {
                 moduleSpecifier: 'class-validator',
             });
         }
-        switch (property.type) {
+        let autoType = 'none';
+        if (typeof property.type === 'string') {
+            autoType = property.type;
+        }
+        else if (typeof property.type === 'object') {
+            autoType = property.type.name;
+        }
+        switch (autoType) {
             case 'date':
                 (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
                     arguments: [],
@@ -167,6 +168,15 @@ function CoerceDtoClass(options) {
                     moduleSpecifier: 'class-validator',
                 });
                 break;
+            case 'unknown':
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
+                    arguments: [ts_morph_1.Writers.object({ type: w => w.quote('unknown') })],
+                });
+                importStructureList.push({
+                    namedImports: ['ApiProperty'],
+                    moduleSpecifier: '@nestjs/swagger',
+                });
+                break;
         }
     }
     (0, coerce_imports_1.CoerceImports)(sourceFile, importStructureList);

package/src/lib/nest/coerce-dto-class.js.map

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

package/src/lib/nest/coerce-get-by-id-operation.d.ts

@@ -3,5 +3,7 @@ import { DtoClassProperty } from './create-dto-class';
 export interface CoerceGetByIdControllerOptions extends Omit<CoerceOperationOptions, 'operationName'> {
     propertyList?: DtoClassProperty[];
     isArray?: boolean;
+    idProperty?: DtoClassProperty;
+    operationName?: string;
 }
 export declare function CoerceGetByIdOperation(options: CoerceGetByIdControllerOptions): import("@angular-devkit/schematics").Rule;

package/src/lib/nest/coerce-get-by-id-operation.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetByIdOperation = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const ts_morph_1 = require("@rxap/ts-morph");
 const coerce_dto_class_1 = require("./coerce-dto-class");
 const coerce_operation_1 = require("./coerce-operation");
 function CoerceGetByIdOperation(options) {
-    let { controllerName, isArray, nestModule, paramList, propertyList, } = options;
-    propertyList !== null && propertyList !== void 0 ? propertyList : (propertyList = []);
-    paramList !== null && paramList !== void 0 ? paramList : (paramList = []);
+    const { controllerName, isArray, paramList = [], propertyList = [], idProperty = { name: 'uuid', type: 'string' }, operationName = 'getById', } = options;
+    let { nestModule } = options;
     /**
      * If the module is not specified. This controller has an own module. Else the
      * module is originated by another controller.
@@ -29,30 +28,30 @@ function CoerceGetByIdOperation(options) {
      * module = "report-details"
      */
     const isFirstBornSibling = !nestModule || nestModule === controllerName;
-    if (isFirstBornSibling && !propertyList.some(param => param.name === 'uuid')) {
-        propertyList.unshift({
-            name: 'uuid',
-            type: 'string',
-        });
+    if (isFirstBornSibling && !propertyList.some(param => param.name === idProperty.name)) {
+        propertyList.unshift(idProperty);
     }
     if (isFirstBornSibling) {
         nestModule = controllerName;
     }
-    if (!paramList.some(param => param.name === 'uuid')) {
+    if (!paramList.some(param => param.name === idProperty.name)) {
         paramList.push({
-            name: 'uuid',
-            type: 'string',
-            alias: isFirstBornSibling ? undefined : (0, schematics_utilities_1.CoerceSuffix)(nestModule, '-uuid'),
+            name: idProperty.name,
+            type: idProperty.type,
+            alias: isFirstBornSibling ? undefined : (0, schematics_utilities_1.CoerceSuffix)(nestModule, '-' + idProperty.name),
             fromParent: !isFirstBornSibling,
         });
     }
-    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { nestModule, controllerName: controllerName, paramList, operationName: 'getById', tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { nestModule,
+        controllerName,
+        paramList,
+        operationName, tsMorphTransform: (project, sourceFile, classDeclaration, controllerName) => {
             const { className: dtoClassName, filePath: dtoFilePath, } = (0, coerce_dto_class_1.CoerceDtoClass)({
                 project,
                 name: controllerName,
                 propertyList,
             });
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
                 namedImports: [dtoClassName],
                 moduleSpecifier: dtoFilePath,
             });

package/src/lib/nest/coerce-get-by-id-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,+DAA2D;AAC3D,yDAAoD;AACpD,yDAG4B;AAQ5B,SAAgB,sBAAsB,CAAC,OAAuC;IAC5E,IAAI,EACF,cAAc,EACd,OAAO,EACP,UAAU,EACV,SAAS,EACT,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,YAAY,aAAZ,YAAY,cAAZ,YAAY,IAAZ,YAAY,GAAK,EAAE,EAAC;IACpB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IAEjB;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,kBAAkB,GAAG,CAAC,UAAU,IAAI,UAAU,KAAK,cAAc,CAAC;IAExE,IAAI,kBAAkB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE;QAC5E,YAAY,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;KACJ;IAED,IAAI,kBAAkB,EAAE;QACtB,UAAU,GAAG,cAAc,CAAC;KAC7B;IAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE;QACnD,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mCAAY,EAAC,UAAW,EAAE,OAAO,CAAC;YAC1E,UAAU,EAAE,CAAC,kBAAkB;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,UAAU,EACV,cAAc,EAAE,cAAe,EAC/B,SAAS,EACT,aAAa,EAAE,SAAS,EACxB,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aACjD,CAAC;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AAvFD,wDAuFC"}
+{"version":3,"file":"coerce-get-by-id-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-by-id-operation.ts"],"names":[],"mappings":";;;AAAA,qEAA0D;AAC1D,6CAA+C;AAC/C,yDAAoD;AACpD,yDAG4B;AAU5B,SAAgB,sBAAsB,CAAC,OAAuC;IAC5E,MAAM,EACJ,cAAc,EACd,OAAO,EACP,SAAS,GAAE,EAAE,EACb,YAAY,GAAG,EAAE,EACjB,UAAU,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAC7C,aAAa,GAAG,SAAS,GAC1B,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE7B;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,kBAAkB,GAAG,CAAC,UAAU,IAAI,UAAU,KAAK,cAAc,CAAC;IAExE,IAAI,kBAAkB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE;QACrF,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;KAClC;IAED,IAAI,kBAAkB,EAAE;QACtB,UAAU,GAAG,cAAc,CAAC;KAC7B;IAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE;QAC5D,SAAS,CAAC,IAAI,CAAC;YACb,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mCAAY,EAAC,UAAW,EAAE,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC;YACxF,UAAU,EAAE,CAAC,kBAAkB;SAChC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,UAAU;QACV,cAAc;QACd,SAAS;QACT,aAAa,EACb,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,EAAE;YAEF,MAAM,EACJ,SAAS,EAAE,YAAY,EACvB,QAAQ,EAAE,WAAW,GACtB,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,cAAc;gBACpB,YAAY;aACb,CAAC,CAAC;YAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,WAAW;aAC7B,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,YAAY,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;aACjD,CAAC;QAEJ,CAAC,IACD,CAAC;AAEL,CAAC;AAnFD,wDAmFC"}

package/src/lib/nest/coerce-options-operation.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceOptionsOperationRule = void 0;
 const utilities_1 = require("@rxap/utilities");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const write_type_1 = require("../ts-morph/write-type");
+const ts_morph_1 = require("@rxap/ts-morph");
 const coerce_dto_class_1 = require("./coerce-dto-class");
 const coerce_operation_1 = require("./coerce-operation");
 function CoerceOptionsOperationRule(options) {
@@ -20,7 +20,7 @@ function CoerceOptionsOperationRule(options) {
                     },
                     {
                         name: 'value',
-                        type: (0, write_type_1.WriteType)(control),
+                        type: (0, ts_morph_1.WriteType)(control, sourceFile),
                     },
                 ],
             });

package/src/lib/nest/coerce-options-operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,+DAA2D;AAC3D,uDAAmD;AAEnD,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,eAAe,EACf,OAAO,EACP,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,eAAe,aAAf,eAAe,cAAf,eAAe,IAAf,eAAe,GAAK,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAE,CAAC,EAAC;IACvE,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE;YAE1E,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,eAAgB;gBACtB,YAAY,EAAE;oBACZ;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,IAAA,sBAAS,EAAC,OAAO,CAAC;qBACzB;iBACF;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,QAAQ;aAC1B,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,iBAAiB,CAAE;gBACnC,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,uBAAuB,CAAE;gBACzC,eAAe,EAAE,sBAAsB;aACxC,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,SAAU,SAAU,GAAG;gBACnC,UAAU,EAAE;oBACV,yBAAyB;oBACzB,SAAS,GAAG,GAAG;oBACf,KAAK;oBACL,uBAAuB;oBACvB,IAAI;iBACL;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAtDD,gEAsDC"}
+{"version":3,"file":"coerce-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-options-operation.ts"],"names":[],"mappings":";;;AACA,+CAA+C;AAC/C,+DAA2D;AAC3D,6CAA2C;AAE3C,yDAAoD;AACpD,yDAG4B;AAO5B,SAAgB,0BAA0B,CAAC,OAAoD;IAC7F,IAAI,EACF,eAAe,EACf,OAAO,EACP,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,eAAe,aAAf,eAAe,cAAf,eAAe,IAAf,eAAe,GAAK,IAAA,wBAAY,EAAC,CAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAE,CAAC,EAAC;IACvE,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAAE;YAE1E,MAAM,EACJ,SAAS,EACT,QAAQ,GACT,GAAG,IAAA,iCAAc,EAAC;gBACjB,OAAO;gBACP,IAAI,EAAE,eAAgB;gBACtB,YAAY,EAAE;oBACZ;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,IAAA,oBAAS,EAAC,OAAO,EAAE,UAAU,CAAC;qBACrC;iBACF;aACF,CAAC,CAAC;YAEH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,SAAS,CAAE;gBAC3B,eAAe,EAAE,QAAQ;aAC1B,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,iBAAiB,CAAE;gBACnC,eAAe,EAAE,mBAAmB;aACrC,CAAC,CAAC;YACH,IAAA,8BAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,uBAAuB,CAAE;gBACzC,eAAe,EAAE,sBAAsB;aACxC,CAAC,CAAC;YAEH,OAAO;gBACL,UAAU,EAAE,SAAU,SAAU,GAAG;gBACnC,UAAU,EAAE;oBACV,yBAAyB;oBACzB,SAAS,GAAG,GAAG;oBACf,KAAK;oBACL,uBAAuB;oBACvB,IAAI;iBACL;aACF,CAAC;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AAtDD,gEAsDC"}

package/src/lib/nest/create-dto-class.d.ts

@@ -1,3 +1,4 @@
+import { TypeImport } from '@rxap/ts-morph';
 import { ClassDeclaration, ClassDeclarationStructure, ImportDeclarationStructure, OptionalKind, SourceFile, WriterFunction } from 'ts-morph';
 export interface DtoClassProperty {
     name: string;
@@ -6,14 +7,18 @@ export interface DtoClassProperty {
      *
      * if type = '<self>' the type will be the name of the class
      */
-    type: string | WriterFunction;
-    isArray?: boolean;
-    isType?: boolean;
-    isOptional?: boolean;
+    type: string | WriterFunction | TypeImport | '<self>';
+    isArray?: boolean | null;
+    /**
+     * indicates that the @Type decorator should be used as the type of the property is another dto class
+     */
+    isType?: boolean | null;
+    isOptional?: boolean | null;
     /**
      * Use to import the type
+     * @deprecated use the type property with a TypeImport object
      */
-    moduleSpecifier?: string;
+    moduleSpecifier?: string | null;
 }
 export declare function CreateDtoClass(sourceFile: SourceFile, className: string, propertyList: DtoClassProperty[], classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, structures?: Array<OptionalKind<ImportDeclarationStructure>>): ClassDeclaration;
 export declare function CreatePageDtoClass(sourceFile: SourceFile, className: string, rowType: string | WriterFunction, classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>, structures?: Array<OptionalKind<ImportDeclarationStructure>>): ClassDeclaration;

package/src/lib/nest/create-dto-class.js

@@ -5,6 +5,7 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const ts_morph_1 = require("ts-morph");
 const coerce_class_1 = require("../coerce-class");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const ts_morph_2 = require("@rxap/ts-morph");
 function CreateDtoClass(sourceFile, className, propertyList, classStructure, structures) {
     var _a;
     className = (0, schematics_utilities_1.CoerceSuffix)(className, 'Dto');
@@ -42,17 +43,10 @@ function CreateDtoClass(sourceFile, className, propertyList, classStructure, str
                 arguments: [
                     w => {
                         w.write('() => ');
-                        if (typeof property.type === 'string') {
-                            if (property.type === 'date') {
-                                w.write('Date');
-                            }
-                            else {
-                                w.write(property.type);
-                            }
-                        }
-                        else {
-                            property.type(w);
-                        }
+                        (0, ts_morph_2.WriteType)({
+                            type: property.type,
+                            isArray: false
+                        }, sourceFile)(w);
                     },
                 ],
             });
@@ -63,19 +57,10 @@ function CreateDtoClass(sourceFile, className, propertyList, classStructure, str
             decorators.push({
                 name: 'IsInstance',
                 arguments: [
-                    w => {
-                        if (typeof property.type === 'string') {
-                            if (property.type === 'date') {
-                                w.write('Date');
-                            }
-                            else {
-                                w.write(property.type);
-                            }
-                        }
-                        else {
-                            property.type(w);
-                        }
-                    },
+                    (0, ts_morph_2.WriteType)({
+                        type: property.type,
+                        isArray: false
+                    }, sourceFile),
                     w => {
                         if (property.isArray) {
                             ts_morph_1.Writers.object({ each: 'true' })(w);
@@ -142,22 +127,8 @@ function CreateDtoClass(sourceFile, className, propertyList, classStructure, str
         }
         classStructure.properties.push({
             name: property.name,
-            type: !property.isArray ? property.type : w => {
-                w.write('Array<');
-                if (typeof property.type === 'string') {
-                    if (property.type === 'date') {
-                        w.write('Date');
-                    }
-                    else {
-                        w.write(property.type);
-                    }
-                }
-                else {
-                    property.type(w);
-                }
-                w.write('>');
-            },
-            hasQuestionToken: property.isOptional,
+            type: (0, ts_morph_2.WriteType)(property, sourceFile),
+            hasQuestionToken: !!property.isOptional,
             hasExclamationToken: !property.isOptional,
             decorators,
         });

package/src/lib/nest/create-dto-class.js.map

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

package/src/lib/ts-morph/coerce-interface.d.ts

@@ -1,9 +1,11 @@
+import { NormalizedDataProperty } from '@rxap/ts-morph';
 import { InterfaceDeclaration, InterfaceDeclarationStructure, OptionalKind, Project, SourceFile } from 'ts-morph';
 import { TsMorphAngularProjectTransformOptions, TsMorphNestProjectTransformOptions, TsMorphTransformFunctionRule } from '../ts-morph-transform';
 export declare function CoerceInterface(sourceFile: SourceFile, interfaceName: string, structure?: Omit<OptionalKind<InterfaceDeclarationStructure>, 'name'>): InterfaceDeclaration;
 export interface CoerceInterfaceRuleOptions extends TsMorphNestProjectTransformOptions, TsMorphAngularProjectTransformOptions {
     name: string;
     structure?: Omit<OptionalKind<InterfaceDeclarationStructure>, 'name'>;
+    propertyList?: NormalizedDataProperty[];
     tsMorphTransform?: (project: Project, sourceFile: SourceFile, interfaceDeclaration: InterfaceDeclaration) => void;
 }
 export declare function CoerceInterfaceRule(options: CoerceInterfaceRuleOptions, tsMorphTransForm: TsMorphTransformFunctionRule<TsMorphNestProjectTransformOptions | TsMorphAngularProjectTransformOptions>): import("@angular-devkit/schematics").Rule;

package/src/lib/ts-morph/coerce-interface.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceInterfaceRule = exports.CoerceInterface = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
 function CoerceInterface(sourceFile, interfaceName, structure = {}) {
     let interfaceDeclaration = sourceFile.getInterface(interfaceName);
@@ -11,17 +12,18 @@ function CoerceInterface(sourceFile, interfaceName, structure = {}) {
 }
 exports.CoerceInterface = CoerceInterface;
 function CoerceInterfaceRule(options, tsMorphTransForm) {
-    let { tsMorphTransform, project, feature, shared, directory, name, structure, } = options;
+    const { tsMorphTransform = utilities_1.noop, project, feature, shared, directory, structure = { isExported: true }, propertyList, } = options;
+    let { name } = options;
     name = (0, utilities_1.classify)(name);
-    structure !== null && structure !== void 0 ? structure : (structure = {});
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    tsMorphTransform !== null && tsMorphTransform !== void 0 ? tsMorphTransform : (tsMorphTransform = () => { });
     return tsMorphTransForm({
         project,
         feature,
         shared,
         directory,
     }, (project, [sourceFile]) => {
+        if (propertyList) {
+            structure.properties = propertyList.map(p => (0, ts_morph_1.NormalizeDataPropertyToPropertySignatureStructure)(p, sourceFile));
+        }
         const interfaceDeclaration = CoerceInterface(sourceFile, name, structure);
         tsMorphTransform(project, sourceFile, interfaceDeclaration);
     }, [(0, utilities_1.dasherize)(name) + '.ts?']);

package/src/lib/ts-morph/coerce-interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"coerce-interface.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/coerce-interface.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AAczB,SAAgB,eAAe,CAC7B,UAAsB,EACtB,aAAqB,EACrB,YAAuE,EAAE;IAEzE,IAAI,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAClE,IAAI,CAAC,oBAAoB,EAAE;QACzB,oBAAoB,GAAG,UAAU,CAAC,YAAY,iCACzC,SAAS,KACZ,IAAI,EAAE,aAAa,IACnB,CAAC;KACJ;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAbD,0CAaC;AASD,SAAgB,mBAAmB,CACjC,OAAmC,EACnC,gBAA0H;IAE1H,IAAI,EACF,gBAAgB,EAChB,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,EACT,IAAI,EACJ,SAAS,GACV,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC;IACtB,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IACjB,gEAAgE;IAChE,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,IAAhB,gBAAgB,GAAK,GAAG,EAAE,GAAE,CAAC,EAAC;IAE9B,OAAO,gBAAgB,CAAC;QACtB,OAAO;QACP,OAAO;QACP,MAAM;QACN,SAAS;KACV,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAC7B,MAAM,oBAAoB,GAAG,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1E,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC;IAC/D,CAAC,EAAE,CAAE,IAAA,qBAAS,EAAC,IAAI,CAAC,GAAG,MAAM,CAAE,CAAC,CAAC;AACnC,CAAC;AA3BD,kDA2BC"}
+{"version":3,"file":"coerce-interface.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/coerce-interface.ts"],"names":[],"mappings":";;;AAAA,6CAGwB;AACxB,+CAIyB;AAczB,SAAgB,eAAe,CAC7B,UAAsB,EACtB,aAAqB,EACrB,YAAuE,EAAE;IAEzE,IAAI,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAClE,IAAI,CAAC,oBAAoB,EAAE;QACzB,oBAAoB,GAAG,UAAU,CAAC,YAAY,iCACzC,SAAS,KACZ,IAAI,EAAE,aAAa,IACnB,CAAC;KACJ;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAbD,0CAaC;AAUD,SAAgB,mBAAmB,CACjC,OAAmC,EACnC,gBAA0H;IAE1H,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,EACT,SAAS,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,EAChC,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACvB,IAAI,GAAG,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC;IAEtB,OAAO,gBAAgB,CAAC;QACtB,OAAO;QACP,OAAO;QACP,MAAM;QACN,SAAS;KACV,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAC7B,IAAI,YAAY,EAAE;YAChB,SAAS,CAAC,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,4DAAiD,EAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;SAChH;QACD,MAAM,oBAAoB,GAAG,eAAe,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1E,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,oBAAoB,CAAC,CAAC;IAC9D,CAAC,EAAE,CAAE,IAAA,qBAAS,EAAC,IAAI,CAAC,GAAG,MAAM,CAAE,CAAC,CAAC;AACnC,CAAC;AA5BD,kDA4BC"}

package/src/lib/ts-morph/write-type.d.ts

@@ -1,6 +1,18 @@
-import { CodeBlockWriter, WriterFunction } from 'ts-morph';
+import { TypeImport } from '@rxap/ts-morph';
+import { CodeBlockWriter, SourceFile, WriterFunction } from 'ts-morph';
+export type WriteType = string | TypeImport | WriterFunction;
 export interface WriteTypeOptions {
-    isArray?: boolean;
-    type: string | WriterFunction;
+    isArray?: boolean | null;
+    type: WriteType;
 }
-export declare function WriteType(property: WriteTypeOptions): (w: CodeBlockWriter) => void;
+export declare function IsWriteTypeOptions(value: any): value is WriteTypeOptions;
+/**
+ * Uses the CodeBlockWriter to write the type to the AST thereby the value of the property type is evaluated
+ * to determine the value that should be written to the AST
+ * @param type
+ * @param w
+ * @constructor
+ */
+export declare function WriteStringType(type: string, w: CodeBlockWriter): void;
+export declare function WriteType(type: WriteType, sourceFile: SourceFile): WriterFunction;
+export declare function WriteType(property: WriteTypeOptions, sourceFile: SourceFile): WriterFunction;

package/src/lib/ts-morph/write-type.js

@@ -1,31 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WriteType = void 0;
-function WriteType(property) {
+exports.WriteType = exports.WriteStringType = exports.IsWriteTypeOptions = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
+function IsWriteTypeOptions(value) {
+    return value && typeof value === 'object' && value.type;
+}
+exports.IsWriteTypeOptions = IsWriteTypeOptions;
+/**
+ * Uses the CodeBlockWriter to write the type to the AST thereby the value of the property type is evaluated
+ * to determine the value that should be written to the AST
+ * @param type
+ * @param w
+ * @constructor
+ */
+function WriteStringType(type, w) {
+    switch (type) {
+        case 'date':
+            w.write('Date');
+            break;
+        case 'uuid':
+            w.write('string');
+            break;
+        default:
+            w.write(type);
+            break;
+    }
+}
+exports.WriteStringType = WriteStringType;
+function WriteType(propertyOrType, sourceFile) {
+    var _a;
+    let isArray = false;
+    let type;
+    if (IsWriteTypeOptions(propertyOrType)) {
+        isArray = (_a = propertyOrType.isArray) !== null && _a !== void 0 ? _a : isArray;
+        type = propertyOrType.type;
+    }
+    else {
+        type = propertyOrType;
+    }
+    if ((0, ts_morph_1.IsTypeImport)(type)) {
+        if (sourceFile) {
+            (0, ts_morph_1.CoerceImports)(sourceFile, (0, ts_morph_1.TypeImportToImportStructure)(type));
+        }
+        else {
+            console.warn('WriteType :: No source file provided to coerce imports');
+        }
+    }
     return (w) => {
-        if (property.isArray) {
+        if (isArray) {
             w.write('Array<');
         }
-        if (typeof property.type === 'string') {
-            switch (property.type) {
-                case 'date':
-                    w.write('Date');
-                    break;
-                case 'uuid':
-                    w.write('string');
-                    break;
-                default:
-                    w.write(property.type);
-                    break;
-            }
-        }
-        else if (typeof property.type === 'function') {
-            property.type(w);
+        if (typeof type === 'string') {
+            WriteStringType(type, w);
+        }
+        else if (typeof type === 'function') {
+            type(w);
+        }
+        else if ((0, ts_morph_1.IsTypeImport)(type)) {
+            WriteStringType(type.name, w);
         }
         else {
             throw new Error('Invalid type');
         }
-        if (property.isArray) {
+        if (isArray) {
             w.write('>');
         }
     };

package/src/lib/ts-morph/write-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"write-type.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/write-type.ts"],"names":[],"mappings":";;;AAUA,SAAgB,SAAS,CAAC,QAA0B;IAClD,OAAO,CAAC,CAAkB,EAAE,EAAE;QAC5B,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACnB;QACD,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;YACrC,QAAQ,QAAQ,CAAC,IAAI,EAAE;gBACrB,KAAK,MAAM;oBACT,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAChB,MAAM;gBACR,KAAK,MAAM;oBACT,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBAClB,MAAM;gBACR;oBACE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACvB,MAAM;aACT;SACF;aAAM,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;YAC9C,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAClB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QACD,IAAI,QAAQ,CAAC,OAAO,EAAE;YACpB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACd;IACH,CAAC,CAAC;AACJ,CAAC;AA1BD,8BA0BC"}
+{"version":3,"file":"write-type.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/ts-morph/write-type.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAcxB,SAAgB,kBAAkB,CAAC,KAAU;IAC3C,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC;AAC1D,CAAC;AAFD,gDAEC;AAED;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,IAAY,EAAE,CAAkB;IAC9D,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM;YACT,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,MAAM;QACR,KAAK,MAAM;YACT,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAClB,MAAM;QACR;YACE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACd,MAAM;KACT;AACH,CAAC;AAZD,0CAYC;AAID,SAAgB,SAAS,CAAC,cAA4C,EAAE,UAAsB;;IAC5F,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,IAAe,CAAC;IACpB,IAAI,kBAAkB,CAAC,cAAc,CAAC,EAAE;QACtC,OAAO,GAAG,MAAA,cAAc,CAAC,OAAO,mCAAI,OAAO,CAAC;QAC5C,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;KAC5B;SAAM;QACL,IAAI,GAAG,cAAc,CAAC;KACvB;IACD,IAAI,IAAA,uBAAY,EAAC,IAAI,CAAC,EAAE;QACtB,IAAI,UAAU,EAAE;YACd,IAAA,wBAAa,EAAC,UAAU,EAAE,IAAA,sCAA2B,EAAC,IAAI,CAAC,CAAC,CAAC;SAC9D;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;SACxE;KACF;IACD,OAAO,CAAC,CAAkB,EAAE,EAAE;QAC5B,IAAI,OAAO,EAAE;YACX,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACnB;QACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC5B,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC1B;aAAM,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE;YACrC,IAAI,CAAC,CAAC,CAAC,CAAC;SACT;aAAM,IAAI,IAAA,uBAAY,EAAC,IAAI,CAAC,EAAE;YAC7B,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC/B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;SACjC;QACD,IAAI,OAAO,EAAE;YACX,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACd;IACH,CAAC,CAAC;AACJ,CAAC;AAjCD,8BAiCC"}

package/src/lib/types/form-definition-control.d.ts

@@ -1,7 +1,8 @@
+import { TypeImport } from '@rxap/ts-morph';
 import { WriterFunction } from 'ts-morph';
 export interface FormDefinitionControl {
     name: string;
-    type?: string | WriterFunction;
+    type?: string | TypeImport | WriterFunction;
     isArray?: boolean;
     state?: string | WriterFunction | null;
     isRequired?: boolean;

package/src/test-setup.d.ts

@@ -0,0 +1 @@
+export {};

package/src/test-setup.js

@@ -0,0 +1,7 @@
+"use strict";
+var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("util");
+(_a = global.TextEncoder) !== null && _a !== void 0 ? _a : (global.TextEncoder = util_1.TextEncoder);
+(_b = global.TextDecoder) !== null && _b !== void 0 ? _b : (global.TextDecoder = util_1.TextDecoder);
+//# sourceMappingURL=test-setup.js.map

package/src/test-setup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-setup.js","sourceRoot":"","sources":["../../../../../packages/schematic/ts-morph/src/test-setup.ts"],"names":[],"mappings":";;;AAAA,+BAAgD;AAEhD,MAAA,MAAM,CAAC,WAAW,oCAAlB,MAAM,CAAC,WAAW,GAAK,kBAAkB,EAAC;AAC1C,MAAA,MAAM,CAAC,WAAW,oCAAlB,MAAM,CAAC,WAAW,GAAK,kBAAkB,EAAC"}