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

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;