npm - @rxap/schematics-ts-morph - Versions diffs - 16.1.0-dev.19 → 16.1.0-dev.20 - Mend

@rxap/schematics-ts-morph 16.1.0-dev.19 → 16.1.0-dev.20

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 (28) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,18 @@
 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.20](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.19...@rxap/schematics-ts-morph@16.1.0-dev.20) (2024-03-09)
+### Bug Fixes
+- support complex data properties ([3405885](https://gitlab.com/rxap/packages/commit/34058851b85062956effea40aec201e4581d9780))
+- support complex data properties ([2294a05](https://gitlab.com/rxap/packages/commit/2294a05260c5d876ebf5ff209fd450592c7ebe4b))
+- support complex data properties ([39d8967](https://gitlab.com/rxap/packages/commit/39d8967c7e1ac111d15d4ac246f15494730b6b78))
+### Features
+- add ToDtoInstanceList ([97d2963](https://gitlab.com/rxap/packages/commit/97d29635fd49dff369067d32a7150c6c169af340))
 # [16.1.0-dev.19](https://gitlab.com/rxap/packages/compare/@rxap/schematics-ts-morph@16.1.0-dev.18...@rxap/schematics-ts-morph@16.1.0-dev.19) (2024-03-07)
 ### Bug Fixes

package/package.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-  "version": "16.1.0-dev.19",
+  "version": "16.1.0-dev.20",
   "name": "@rxap/schematics-ts-morph",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -71,7 +71,7 @@
     "directory": "packages/schematic/ts-morph"
   },
   "type": "commonjs",
-  "gitHead": "3539c0a753cc776b17ad8d6207deb36b579ec9fd",
+  "gitHead": "74905d7dcb4130997c0cafee7f634c5de80a88fe",
   "main": "./src/index.js",
   "types": "./src/index.d.ts"
 }

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

@@ -3,11 +3,11 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 import { AbstractControl } from '../types/abstract-control';
 import { CoerceFormDefinitionControlOptions } from './coerce-form-definition-control';
 export interface CoerceFormDefinitionFormArrayOptions extends CoerceFormDefinitionControlOptions {
-    controlList?: ReadonlyArray<Required<AbstractControl>>;
+    controlList?: ReadonlyArray<AbstractControl>;
 }
-export declare function CoerceInterfaceFormTypeArray(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>): void;
+export declare function CoerceInterfaceFormTypeArray(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl): void;
 export declare function GetFormArrayNameFromFormDefinitionName(name: string, groupName: string): string;
-export declare function CoerceFormArray(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>): {
+export declare function CoerceFormArray(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl): {
     propertyDeclaration: import("ts-morph").PropertyDeclaration;
     decoratorDeclaration: import("ts-morph").Decorator;
 };

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-form-definition-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-array.ts"],"names":[],"mappings":";;;AACA,qEAAsD;AACtD,6CAKwB;AACxB,uCAMkB;AAClB,mEAA+D;AAE/D,qFAK0C;AAC1C,2EAIqC;AAKrC,SAAgB,4BAA4B,CAC1C,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,~~OAAkC~~;~~IAElC~~,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,MAAM,aAAa,GAAG,sCAAsC,CAAC,gBAAgB,CAAC,OAAO,EAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,IAAA,oCAAyB,EAAC,oBAAoB,EAAE,IAAA,+BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1E,IAAI,EAAE,IAAA,oBAAS,EAAC;YACd,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAA,0DAA8B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;gBAC7D,eAAe,EAAE,IAAA,2DAA+B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;aAC1E;YACD,OAAO,EAAE,IAAI;SACd,EAAE,UAAU,CAAC;QACd,gBAAgB,EAAE,OAAO,CAAC,UAAU;KACrC,CAAC,CAAC;AACL,CAAC;AAvBD,oEAuBC;AAED,SAAgB,sCAAsC,CAAC,IAAY,EAAE,SAAiB;IACpF,OAAO,CAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,SAAS,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5D,CAAC;AAFD,wFAEC;AAED,SAAgB,eAAe,CAC7B,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,~~OAAkC~~;~~IAElC~~,MAAM,aAAa,GAAG,sCAAsC,CAAC,gBAAgB,CAAC,OAAO,EAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,IAAA,wBAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,IAAA,0DAA8B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAE;QAC9H,eAAe,EAAE,IAAA,2DAA+B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;KAC1E,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,IAAA,oCAAyB,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,sBAAsB,CAAC,CAAC;YAChC,CAAC,CAAC,KAAK,CAAC,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;YAC7D,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,0BAAe,EAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC,GAAG,CAAC;QACzF,SAAS,EAAE;YACT,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;YACnD,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,IAAA,oEAAmC,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBAChF;gBACD,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,KAAK,CAAC,OAAO,CAAC,GAAG,IAAA,gEAA+B,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBACvE;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,wBAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,mBAAmB,EAAE,qBAAqB,CAAE;QAC5D,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IACH,OAAO;QACL,mBAAmB;QACnB,oBAAoB;KACrB,CAAC;AACJ,CAAC;AAhDD,0CAgDC;AAED,SAAgB,6BAA6B,CAAC,OAAuD;IACnG,MAAM,EACJ,iBAAiB,GAAG,eAAe,EACnC,qBAAqB,GAAG,4BAA4B,GACrD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,4DAA2B,kCAC7B,OAAO,KACV,iBAAiB;QACjB,qBAAqB,IACrB,CAAC;AAEL,CAAC;AAZD,sEAYC"}
1	+ {"version":3,"file":"coerce-form-definition-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-array.ts"],"names":[],"mappings":"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"}

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

@@ -2,16 +2,16 @@ import { Rule } from '@angular-devkit/schematics';
 import { TsMorphAngularProjectTransformOptions } from '@rxap/workspace-ts-morph';
 import { ClassDeclaration, CodeBlockWriter, Decorator, PropertyDeclaration, SourceFile } from 'ts-morph';
 import { AbstractControl } from '../types/abstract-control';
-export interface CoerceFormDefinitionControlOptions extends Required<AbstractControl>, TsMorphAngularProjectTransformOptions {
+export interface CoerceFormDefinitionControlOptions extends AbstractControl, TsMorphAngularProjectTransformOptions {
     tsMorphTransform?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
     formName: string;
-    coerceFormTypeControl?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>) => void;
-    coerceFormControl?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>) => {
+    coerceFormTypeControl?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl) => void;
+    coerceFormControl?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl) => {
         propertyDeclaration: PropertyDeclaration;
         decoratorDeclaration: Decorator;
     } | void;
 }
 export declare function isAngularValidator(validator: string): boolean;
 export declare function CoerceFormDefinitionControl(options: Readonly<CoerceFormDefinitionControlOptions>): Rule;
-export declare function FormControlValidatorCodeBlockWriter(sourceFile: SourceFile, control: Required<Pick<AbstractControl, 'validatorList' | 'isRequired'>>): (w: CodeBlockWriter) => void;
+export declare function FormControlValidatorCodeBlockWriter(sourceFile: SourceFile, control: Pick<AbstractControl, 'validatorList' | 'isRequired'>): (w: CodeBlockWriter) => void;
 export declare function FormControlStateCodeBlockWriter(sourceFile: SourceFile, control: Required<Pick<AbstractControl, 'state'>>): (w: CodeBlockWriter) => void;

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,qEAA0D;AAC1D,6CAIwB;AACxB,+CAAuC;AASvC,8DAA2E;AAE3E,2EAGqC;AAoBrC,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,2BAA2B,CAAC,OAAqD;IAC/F,MAAM,EACJ,iBAAiB,GAAG,gBAAI,EACxB,gBAAgB,GAAG,gBAAI,EACvB,qBAAqB,GAAG,gBAAI,EAC5B,QAAQ,GACT,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,uDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;QAE7D,MAAM,SAAS,GAAG,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACjE,MAAM,UAAU,GAAG,IAAA,2BAAgB,EAAC,OAAO,EAAE,GAAG,GAAG,IAAA,mCAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QACvF,MAAM,gBAAgB,GAAG,IAAA,sBAAW,EAAC,UAAU,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QAElF,kCAAkC;QAClC,MAAM,aAAa,GAAG,IAAA,0DAA8B,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzE,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAC5E,YAAY;QAEZ,iBAAiB,CAAC,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAExE,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAEjD,CAAC,CAAC,CAAC;AAEL,CAAC;AAzBD,kEAyBC;AAED,SAAgB,mCAAmC,CAAC,UAAsB,EAAE,~~OAAwE~~;~~IAClJ~~,OAAO,CAAC,CAAkB,EAAE,EAAE;QAC5B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACb,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE;YAC5F,CAAC,CAAC,OAAO,EAAE,CAAC;SACb;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACrD,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAC3C,IAAI,kBAAkB,CAAC,SAAS,CAAC,EAAE;gBACjC,IAAA,wBAAa,EAAC,UAAU,EAAE;oBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;oBAC9B,eAAe,EAAE,gBAAgB;iBAClC,CAAC,CAAC;gBACH,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;aACxB;iBAAM;gBACL,IAAA,wBAAa,EAAC,UAAU,EAAE;oBACxB,YAAY,EAAE,CAAE,gBAAgB,CAAE;oBAClC,eAAe,EAAE,aAAa;iBAC/B,CAAC,CAAC;gBACH,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aAC5B;YACD,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACnB,IAAI,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACd;SACF;QACD,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;gBAChC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACd;YACD,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,YAAY,CAAE;gBAC9B,eAAe,EAAE,gBAAgB;aAClC,CAAC,CAAC;YACH,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;SAChC;QACD,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE;YAC5F,CAAC,CAAC,OAAO,EAAE,CAAC;SACb;QACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACf,CAAC,CAAC;AAEJ,CAAC;AA1CD,kFA0CC;AAED,SAAgB,+BAA+B,CAAC,UAAsB,EAAE,OAAiD;IACvH,OAAO,CAAC,CAAkB,EAAE,EAAE;QAC5B,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE;YACrC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACxB;aAAM,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,UAAU,EAAE;YAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACvC;IACH,CAAC,CAAC;AACJ,CAAC;AAVD,0EAUC"}
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-form-control.d.ts CHANGED Viewed

@@ -3,8 +3,8 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 import { AbstractControl } from '../types/abstract-control';
 import { CoerceFormDefinitionControlOptions } from './coerce-form-definition-control';
 export type CoerceFormDefinitionFormControlOptions = CoerceFormDefinitionControlOptions;
-export declare function CoerceInterfaceFormTypeControl(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>): void;
-export declare function CoerceFormControl(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>): {
+export declare function CoerceInterfaceFormTypeControl(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl): void;
+export declare function CoerceFormControl(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl): {
     propertyDeclaration: import("ts-morph").PropertyDeclaration;
     decoratorDeclaration: import("ts-morph").Decorator;
 };

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-form-definition-form-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-form-control.ts"],"names":[],"mappings":";;;AACA,qEAAsD;AACtD,6CAKwB;AACxB,uCAMkB;AAClB,mEAA+D;AAE/D,qFAK0C;AAI1C,SAAgB,8BAA8B,CAC5C,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,~~OAAkC~~;~~IAElC~~,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,oCAAyB,EAAC,oBAAoB,EAAE,IAAA,+BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAA,oBAAS,EAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;AACxH,CAAC;AAbD,wEAaC;AAED,SAAgB,iBAAiB,CAC/B,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,~~OAAkC~~;~~IAElC~~,MAAM,mBAAmB,GAAG,IAAA,oCAAyB,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,oBAAS,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,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,0BAAe,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,IAAA,oEAAmC,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBAChF;gBACD,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,KAAK,CAAC,OAAO,CAAC,GAAG,IAAA,gEAA+B,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBACvE;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,wBAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,iBAAiB,EAAE,gBAAgB,CAAE;QACrD,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IACH,OAAO;QACL,mBAAmB;QACnB,oBAAoB;KACrB,CAAC;AACJ,CAAC;AA1CD,8CA0CC;AAED,SAAgB,+BAA+B,CAAC,OAAqD;IACnG,MAAM,EACJ,iBAAiB,GAAG,iBAAiB,EACrC,qBAAqB,GAAG,8BAA8B,GACvD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,4DAA2B,kCAC7B,OAAO,KACV,iBAAiB;QACjB,qBAAqB,IACrB,CAAC;AAEL,CAAC;AAZD,0EAYC"}
1	+ {"version":3,"file":"coerce-form-definition-form-control.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-form-control.ts"],"names":[],"mappings":"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"}

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

@@ -3,11 +3,11 @@ import { ClassDeclaration, SourceFile } from 'ts-morph';
 import { AbstractControl } from '../types/abstract-control';
 import { CoerceFormDefinitionControlOptions } from './coerce-form-definition-control';
 export interface CoerceFormDefinitionFormGroupOptions extends CoerceFormDefinitionControlOptions {
-    controlList?: ReadonlyArray<Required<AbstractControl>>;
+    controlList?: ReadonlyArray<AbstractControl>;
 }
 export declare function GetFormGroupNameFromFormDefinitionName(name: string, groupName: string): string;
-export declare function CoerceInterfaceFormTypeGroup(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>): void;
-export declare function CoerceFormGroup(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: Required<AbstractControl>): {
+export declare function CoerceInterfaceFormTypeGroup(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl): void;
+export declare function CoerceFormGroup(sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, control: AbstractControl): {
     propertyDeclaration: import("ts-morph").PropertyDeclaration;
     decoratorDeclaration: import("ts-morph").Decorator;
 };

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-form-definition-group.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-group.ts"],"names":[],"mappings":";;;AACA,qEAAsD;AACtD,6CAKwB;AACxB,uCAMkB;AAClB,mEAA+D;AAE/D,qFAK0C;AAC1C,2EAIqC;AAMrC,SAAgB,sCAAsC,CAAC,IAAY,EAAE,SAAiB;IACpF,OAAO,CAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,EAAE,SAAS,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC5D,CAAC;AAFD,wFAEC;AAED,SAAgB,4BAA4B,CAC1C,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,~~OAAkC~~;~~IAElC~~,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,MAAM,aAAa,GAAG,sCAAsC,CAAC,gBAAgB,CAAC,OAAO,EAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,IAAA,oCAAyB,EAAC,oBAAoB,EAAE,IAAA,+BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1E,IAAI,EAAE,IAAA,oBAAS,EAAC;YACd,IAAI,EAAE,IAAA,0DAA8B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;YAC7D,eAAe,EAAE,IAAA,2DAA+B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;SAC1E,EAAE,UAAU,CAAC;QACd,gBAAgB,EAAE,OAAO,CAAC,UAAU;KACrC,CAAC,CAAC;AACL,CAAC;AApBD,oEAoBC;AAED,SAAgB,eAAe,CAC7B,UAAsB,EACtB,gBAAkC,EAClC,YAAoB,EACpB,~~OAAkC~~;~~IAElC~~,MAAM,aAAa,GAAG,sCAAsC,CAAC,gBAAgB,CAAC,OAAO,EAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACxG,IAAA,wBAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,IAAA,0DAA8B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAE;QAC9H,eAAe,EAAE,IAAA,2DAA+B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;KAC1E,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,IAAA,oCAAyB,EAAC,gBAAgB,EAAE,IAAA,+BAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;QAClG,IAAI,EAAE,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;QACzD,mBAAmB,EAAE,IAAI;QACzB,KAAK,EAAE,gBAAK,CAAC,MAAM;QACnB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,IAAA,0BAAe,EAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC,GAAG,CAAC;QACpF,SAAS,EAAE;YACT,IAAA,sDAA0B,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;YACnD,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,IAAA,oEAAmC,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBAChF;gBACD,IAAI,OAAO,CAAC,KAAK,EAAE;oBACjB,KAAK,CAAC,OAAO,CAAC,GAAG,IAAA,gEAA+B,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;iBACvE;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,wBAAa,EAAC,UAAU,EAAE;QACxB,YAAY,EAAE,CAAE,eAAe,EAAE,cAAc,CAAE;QACjD,eAAe,EAAE,aAAa;KAC/B,CAAC,CAAC;IACH,OAAO;QACL,mBAAmB;QACnB,oBAAoB;KACrB,CAAC;AACJ,CAAC;AA5CD,0CA4CC;AAED,SAAgB,6BAA6B,CAAC,OAAuD;IACnG,MAAM,EACJ,iBAAiB,GAAG,eAAe,EACnC,qBAAqB,GAAG,4BAA4B,GACrD,GAAG,OAAO,CAAC;IAEZ,OAAO,IAAA,4DAA2B,kCAC7B,OAAO,KACV,iBAAiB;QACjB,qBAAqB,IACrB,CAAC;AAEL,CAAC;AAZD,sEAYC"}
1	+ {"version":3,"file":"coerce-form-definition-group.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/angular/coerce-form-definition-group.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 { AbstractControl } from '../types/abstract-control';
 export interface CoerceFormDefinitionTypeOptions extends TsMorphAngularProjectTransformOptions {
-    controlList?: ReadonlyArray<Required<AbstractControl>>;
+    controlList?: ReadonlyArray<AbstractControl>;
     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 { AbstractControl } from '../types/abstract-control';
 export interface CoerceFormDefinitionOptions extends TsMorphAngularProjectTransformOptions {
-    controlList?: ReadonlyArray<Required<AbstractControl>>;
+    controlList?: ReadonlyArray<AbstractControl>;
     name: string;
     tsMorphTransform?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
     coerceFormType?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, formTypeName: string, options: CoerceFormDefinitionOptions) => void;

package/src/lib/nest/coerce-autocomplete-options-operation.d.ts CHANGED Viewed

@@ -7,5 +7,6 @@ export interface CoerceAutocompleteOptionsOperationRuleOptions extends CoerceOpe
     toDisplayProperty: NormalizedDataProperty;
     toValueProperty: NormalizedDataProperty;
 }
-export declare function BuildAutocompleteOptionsDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions>): TransformOperation<string | WriterFunction>;
+export declare function BuildAutocompleteOptionsDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceAutocompleteOptionsOperationRuleOptions>): TransformOperation<string | WriterFunction>;
+export declare function BuildAutocompleteOptionsUpstreamGetParametersImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceAutocompleteOptionsOperationRuleOptions>): TransformOperation<string | WriterFunction>;
 export declare function CoerceAutocompleteOptionsOperationRule(options: Readonly<CoerceAutocompleteOptionsOperationRuleOptions>): Rule;

package/src/lib/nest/coerce-autocomplete-options-operation.js CHANGED Viewed

@@ -1,18 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoerceAutocompleteOptionsOperationRule = exports.BuildAutocompleteOptionsDtoDataMapperImplementation = void 0;
+exports.CoerceAutocompleteOptionsOperationRule = exports.BuildAutocompleteOptionsUpstreamGetParametersImplementation = exports.BuildAutocompleteOptionsDtoDataMapperImplementation = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
+const ts_morph_2 = require("ts-morph");
 const coerce_operation_1 = require("./coerce-operation");
 function BuildAutocompleteOptionsDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options) {
     const { isArray, } = options;
     return () => {
+        const { upstream, toValueProperty, toDisplayProperty } = options;
+        if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+            return w => {
+                w.write('(data.entities ?? []).map(item => ({');
+                w.indent(() => {
+                    w.writeLine(`value: item.${toValueProperty.name},`);
+                    w.writeLine(`display: item.${toDisplayProperty.name},`);
+                    w.writeLine(`${toDisplayProperty.name}: item.${toDisplayProperty.name},`);
+                    w.writeLine(`${toValueProperty.name}: item.${toValueProperty.name}`);
+                });
+                w.write('}))');
+            };
+        }
         // TODO : implement the data mapper
         return isArray ? '[]' : '{}';
     };
 }
 exports.BuildAutocompleteOptionsDtoDataMapperImplementation = BuildAutocompleteOptionsDtoDataMapperImplementation;
+function BuildAutocompleteOptionsUpstreamGetParametersImplementation(classDeclaration, moduleSourceFile, dto, options) {
+    return () => {
+        const { upstream, toDisplayProperty } = options;
+        if (upstream && (0, ts_morph_1.IsNormalizedOpenApiUpstreamOptions)(upstream)) {
+            return ts_morph_2.Writers.object({
+                parameters: ts_morph_2.Writers.object({
+                    filter: w => {
+                        w.write('search ? ');
+                        w.write(`\`${toDisplayProperty.name}:\${ search }\``);
+                        w.write(` : ''`);
+                    },
+                    sort: w => w.quote('__updatedAt'),
+                    order: w => w.quote('desc'),
+                    page: '0',
+                    size: '10'
+                }),
+            });
+        }
+        return '';
+    };
+}
+exports.BuildAutocompleteOptionsUpstreamGetParametersImplementation = BuildAutocompleteOptionsUpstreamGetParametersImplementation;
 function CoerceAutocompleteOptionsOperationRule(options) {
-    const { builtDtoDataMapperImplementation = BuildAutocompleteOptionsDtoDataMapperImplementation, isArray = true, propertyList = [], queryList = [], } = options;
+    const { builtDtoDataMapperImplementation = BuildAutocompleteOptionsDtoDataMapperImplementation, buildUpstreamGetParametersImplementation = BuildAutocompleteOptionsUpstreamGetParametersImplementation, isArray = true, propertyList = [], queryList = [], } = options;
     (0, utilities_1.CoerceArrayItems)(queryList, [{ name: 'search', type: 'string', hasQuestionToken: true }], (a, b) => a.name === b.name);
     (0, utilities_1.CoerceArrayItems)(propertyList, [
         Object.assign(Object.assign({}, options.toValueProperty), { name: 'value', source: options.toValueProperty.name }),
@@ -20,6 +57,8 @@ function CoerceAutocompleteOptionsOperationRule(options) {
     ], (a, b) => a.name === b.name);
     return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { propertyList,
         isArray,
+        queryList,
+        buildUpstreamGetParametersImplementation,
         builtDtoDataMapperImplementation }));
 }
 exports.CoerceAutocompleteOptionsOperationRule = CoerceAutocompleteOptionsOperationRule;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-autocomplete-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-autocomplete-options-operation.ts"],"names":[],"mappings":";;;~~AAEA~~,+CAAmD;~~AAOnD~~,yDAI4B;AAO5B,SAAgB,mDAAmD,CACjE,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,~~OAAyC~~;~~IAEzC~~,MAAM,EACJ,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,OAAO,GAAG,EAAE;QACV,mCAAmC;QACnC,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;~~AAbD~~,~~kHAaC~~;AAED,SAAgB,sCAAsC,CAAC,OAAgE;IACrH,MAAM,EACJ,gCAAgC,GAAG,mDAAmD,EACtF,OAAO,GAAG,IAAI,EACd,YAAY,GAAG,EAAE,EACjB,SAAS,GAAG,EAAE,GACf,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACvH,IAAA,4BAAgB,EAAC,YAAY,EAAE;wCAExB,OAAO,CAAC,eAAe,KAC1B,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,IAAI;wCAGjC,OAAO,CAAC,iBAAiB,KAC5B,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,IAAI;KAEzC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,YAAY;QACZ,OAAO;QACP,gCAAgC,IAChC,CAAC;AACL,CAAC;~~AA1BD~~,~~wFA0BC~~"}
1	+ {"version":3,"file":"coerce-autocomplete-options-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-autocomplete-options-operation.ts"],"names":[],"mappings":"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"}

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

@@ -9,7 +9,6 @@ const ts_morph_2 = require("ts-morph");
 const dto_class_property_1 = require("./dto-class-property");
 require("colors");
 function CoerceDtoClass(options) {
-    var _a;
     const { project, propertyList = [], tsMorphTransform = utilities_1.noop, } = options;
     let { name, } = options;
     name = (0, schematics_utilities_1.dasherize)(name);
@@ -19,9 +18,35 @@ function CoerceDtoClass(options) {
     const classDeclaration = (0, ts_morph_1.CoerceClass)(sourceFile, className);
     classDeclaration.setIsExported(true);
     for (const property of propertyList.map(dto_class_property_1.NormalizeDataClassProperty)) {
-        if (property.type.name === '<self>') {
-            property.type.name = className;
-            property.isType = true;
+        // create a clone of the property type to avoid modifying the original type
+        // if the property type is a self reference we need to replace the self reference with the class name
+        // if the property type is a deferred reference we need to replace the deferred reference with the class name
+        const propertyType = Object.assign({}, property.type);
+        let subTypeOutput;
+        switch (propertyType.name) {
+            case ts_morph_1.TypeNames.Self:
+                propertyType.name = className;
+                propertyType.isTypeOnly = false;
+                propertyType.moduleSpecifier = null;
+                propertyType.namedImport = null;
+                propertyType.namespaceImport = null;
+                propertyType.defaultImport = null;
+                property.isType = true;
+                break;
+            case ts_morph_1.TypeNames.Deferred:
+                subTypeOutput = CoerceDtoClass({
+                    project,
+                    name: [name, (0, schematics_utilities_1.dasherize)(property.name)].join('-'),
+                    propertyList: property.memberList,
+                });
+                propertyType.name = subTypeOutput.className;
+                propertyType.moduleSpecifier = './' + (0, schematics_utilities_1.dasherize)(subTypeOutput.className.replace(/Dto$/, '')) + '.dto';
+                propertyType.isTypeOnly = false;
+                propertyType.namedImport = null;
+                propertyType.namespaceImport = null;
+                propertyType.defaultImport = null;
+                property.isType = true;
+                break;
         }
         let propertyName = (0, schematics_utilities_1.camelize)(property.name);
         const prefixMatch = property.name.match(/^(_+)/);
@@ -30,155 +55,174 @@ function CoerceDtoClass(options) {
             propertyName = prefixMatch[0] + propertyName;
         }
         const propertyDeclaration = (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, propertyName).set({
-            type: (0, ts_morph_1.WriteType)(property, sourceFile),
+            type: (0, ts_morph_1.WriteType)({
+                isArray: property.isArray,
+                type: propertyType,
+            }, sourceFile),
             hasQuestionToken: property.isOptional,
             hasExclamationToken: !property.isOptional,
         });
-        (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
-            arguments: [],
-        });
-        (0, ts_morph_1.CoerceImports)(sourceFile, {
-            namedImports: ['Expose'],
-            moduleSpecifier: 'class-transformer',
-        });
+        addExposeDecorator(propertyDeclaration);
         if (property.isArray) {
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
-                arguments: [],
-            });
-            (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['IsArray'],
-                moduleSpecifier: 'class-validator',
-            });
+            addClassValidatorDecoratorForIsArray(propertyDeclaration);
         }
         if (property.isType) {
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Type', {
-                arguments: [
-                    w => {
-                        w.write('() => ');
-                        (0, ts_morph_1.WriteType)({
-                            type: property.type,
-                            isArray: false
-                        }, sourceFile)(w);
-                    },
-                ],
-            });
-            (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['Type'],
-                moduleSpecifier: 'class-transformer',
-            });
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
-                arguments: [
-                    (0, ts_morph_1.WriteType)({
-                        type: property.type,
-                        isArray: false
-                    }, sourceFile),
-                    w => {
-                        if (property.isArray) {
-                            ts_morph_2.Writers.object({ each: 'true' })(w);
-                        }
-                    },
-                ],
+            addClassValidatorDecoratorForNestedDto(propertyDeclaration, propertyType, property.isArray);
+        }
+        if (property.isOptional) {
+            addIsOptionalDecorator(propertyDeclaration);
+        }
+        addClassValidatorDecoratorForType(propertyDeclaration, propertyType);
+        if (propertyType.name !== 'unknown') {
+            cleanupUnknownApiPropertyDecorator(propertyDeclaration);
+        }
+    }
+    tsMorphTransform(project, sourceFile, classDeclaration);
+    return {
+        className,
+        filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
+        sourceFile,
+        classDeclaration,
+    };
+}
+exports.CoerceDtoClass = CoerceDtoClass;
+function addIsOptionalDecorator(propertyDeclaration) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
+        arguments: [],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['IsOptional'],
+        moduleSpecifier: 'class-validator',
+    });
+}
+function addExposeDecorator(propertyDeclaration) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Expose', {
+        arguments: [],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['Expose'],
+        moduleSpecifier: 'class-transformer',
+    });
+}
+function addClassValidatorDecoratorForIsArray(propertyDeclaration) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsArray', {
+        arguments: [],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['IsArray'],
+        moduleSpecifier: 'class-validator',
+    });
+}
+function addClassValidatorDecoratorForNestedDto(propertyDeclaration, propertyType, isArray) {
+    const sourceFile = propertyDeclaration.getSourceFile();
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'Type', {
+        arguments: [
+            w => {
+                w.write('() => ');
+                (0, ts_morph_1.WriteType)({
+                    type: propertyType,
+                    isArray: false,
+                }, sourceFile)(w);
+            },
+        ],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['Type'],
+        moduleSpecifier: 'class-transformer',
+    });
+    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
+        arguments: [
+            (0, ts_morph_1.WriteType)({
+                type: propertyType,
+                isArray: false,
+            }, sourceFile),
+            w => {
+                if (isArray) {
+                    ts_morph_2.Writers.object({ each: 'true' })(w);
+                }
+            },
+        ],
+    });
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: ['IsInstance'],
+        moduleSpecifier: 'class-validator',
+    });
+}
+function addClassValidatorDecoratorForType(propertyDeclaration, propertyType) {
+    var _a;
+    const sourceFile = propertyDeclaration.getSourceFile();
+    switch (propertyType.name) {
+        case 'date':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
+                arguments: [],
             });
             (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['IsInstance'],
+                namedImports: ['IsDate'],
                 moduleSpecifier: 'class-validator',
             });
-        }
-        if (property.isOptional) {
-            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
+            break;
+        case 'number':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
                 arguments: [],
             });
             (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['IsOptional'],
+                namedImports: ['IsNumber'],
                 moduleSpecifier: 'class-validator',
             });
-        }
-        switch (property.type.name) {
-            case 'date':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsDate', {
-                    arguments: [],
-                });
-                (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsDate'],
-                    moduleSpecifier: 'class-validator',
-                });
-                break;
-            case 'number':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
-                    arguments: [],
-                });
+            break;
+        case 'string':
+            if ((_a = propertyDeclaration.getName()) === null || _a === void 0 ? void 0 : _a.match(/^uuid|Uuid$/)) {
                 (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsNumber'],
+                    namedImports: ['IsUUID'],
                     moduleSpecifier: 'class-validator',
                 });
-                break;
-            case 'string':
-                if (property.name === 'uuid') {
-                    (0, ts_morph_1.CoerceImports)(sourceFile, {
-                        namedImports: ['IsUUID'],
-                        moduleSpecifier: 'class-validator',
-                    });
-                    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
-                        arguments: [],
-                    });
-                }
-                else {
-                    (0, ts_morph_1.CoerceImports)(sourceFile, {
-                        namedImports: ['IsString'],
-                        moduleSpecifier: 'class-validator',
-                    });
-                    (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
-                        arguments: [],
-                    });
-                }
-                break;
-            case 'uuid':
                 (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
                     arguments: [],
                 });
+            }
+            else {
                 (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsUUID'],
+                    namedImports: ['IsString'],
                     moduleSpecifier: 'class-validator',
                 });
-                break;
-            case 'boolean':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
+                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
                     arguments: [],
                 });
-                (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['IsBoolean'],
-                    moduleSpecifier: 'class-validator',
-                });
-                break;
-            case 'unknown':
-                (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
-                    arguments: [ts_morph_2.Writers.object({ type: w => w.quote('unknown') })],
-                });
-                (0, ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: ['ApiProperty'],
-                    moduleSpecifier: '@nestjs/swagger',
-                });
-                break;
-        }
-        if (property.type.name !== 'unknown') {
-            const apiProperty = propertyDeclaration.getDecorators().find(d => d.getName() === 'ApiProperty');
-            if (apiProperty) {
-                const args = apiProperty.getArguments()[0];
-                if (args instanceof ts_morph_2.ObjectLiteralExpression) {
-                    if ((_a = args.getProperty('type')) === null || _a === void 0 ? void 0 : _a.getText().includes('unknown')) {
-                        apiProperty.remove();
-                    }
-                }
+            }
+            break;
+        case 'boolean':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
+                arguments: [],
+            });
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
+                namedImports: ['IsBoolean'],
+                moduleSpecifier: 'class-validator',
+            });
+            break;
+        case 'unknown':
+            (0, ts_morph_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
+                arguments: [ts_morph_2.Writers.object({ type: w => w.quote('unknown') })],
+            });
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
+                namedImports: ['ApiProperty'],
+                moduleSpecifier: '@nestjs/swagger',
+            });
+            break;
+    }
+}
+function cleanupUnknownApiPropertyDecorator(propertyDeclaration) {
+    var _a;
+    const apiProperty = propertyDeclaration.getDecorators().find(d => d.getName() === 'ApiProperty');
+    if (apiProperty) {
+        const args = apiProperty.getArguments()[0];
+        if (args instanceof ts_morph_2.ObjectLiteralExpression) {
+            if ((_a = args.getProperty('type')) === null || _a === void 0 ? void 0 : _a.getText().includes('unknown')) {
+                apiProperty.remove();
             }
         }
     }
-    tsMorphTransform(project, sourceFile, classDeclaration);
-    return {
-        className,
-        filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
-        sourceFile,
-        classDeclaration,
-    };
 }
-exports.CoerceDtoClass = CoerceDtoClass;
 //# sourceMappingURL=coerce-dto-class.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":";;;AAAA,qEAKoC;AACpC,~~6CAOwB~~;AACxB,+CAAuC;AACvC,+BAA4B;AAC5B,~~uCAakB~~;AAClB,6DAG8B;AAC9B,kBAAgB;AAgBhB,SAAgB,cAAc,CAAC,OAA8B;;IAC3D,MAAM,EACJ,OAAO,EACP,YAAY,GAAG,EAAE,EACjB,gBAAgB,GAAG,gBAAI,GACxB,GAAG,OAAO,CAAC;IACZ,IAAI,EACF,IAAI,GACL,GAAG,OAAO,CAAC;IAEZ,IAAI,GAAG,IAAA,gCAAS,EAAC,IAAI,CAAC,CAAC;IAEvB,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,+BAAQ,EAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,MAAM,UAAU,GAAG,IAAA,2BAAgB,EAAC,OAAO,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;IAC7E,MAAM,gBAAgB,GAAG,IAAA,sBAAW,EAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC5D,gBAAgB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAErC,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,GAAG,CAAC,+CAA0B,CAAC,EAAE;QAEnE,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;~~YACnC~~,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;~~YAC/B~~,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC;~~SACxB~~;~~QAED~~,IAAI,YAAY,GAAG,IAAA,+BAAQ,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEjD,IAAI,WAAW,EAAE;YACf,YAAY,GAAG,IAAA,+BAAQ,EAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;YAC1D,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;SAC9C;QAED,MAAM,mBAAmB,GAAwB,IAAA,oCAAyB,EACxE,gBAAgB,EAChB,YAAY,CACb,CAAC,GAAG,CAAC;YACJ,IAAI,EAAE,IAAA,oBAAS,EAAC,QAAQ,EAAE,UAAU,CAAC;~~YACrC~~,gBAAgB,EAAE,QAAQ,CAAC,UAAU;YACrC,mBAAmB,EAAE,CAAC,QAAQ,CAAC,UAAU;SAC1C,CAAC,CAAC;QAEH,IAAA,0BAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;~~YACE~~,SAAS,EAAE,EAAE;~~SACd~~,CACF,CAAC;~~QACF~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~YACvB~~,YAAY,EAAE,CAAE,QAAQ,CAAE;~~YAC1B~~,eAAe,EAAE,mBAAmB;~~SACrC~~,CAAC,CAAC;~~QAEH~~,~~IAAI~~,~~QAAQ~~,CAAC,~~OAAO~~,EAAE;~~YACpB~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,SAAS,EACT;~~gBACE~~,SAAS,EAAE,EAAE;~~aACd~~,CACF,CAAC;~~YACF~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~gBACvB~~,YAAY,EAAE,CAAE,SAAS,CAAE;~~gBAC3B~~,eAAe,EAAE,iBAAiB;~~aACnC~~,CAAC,CAAC;~~SACJ~~;~~QACD~~,~~IAAI~~,~~QAAQ~~,~~CAAC~~,MAAM,EAAE;~~YACnB~~,IAAA,0BAAe,EAAC,mBAAmB,EAAE,MAAM,EAAE;~~gBAC3C~~,SAAS,EAAE;~~oBACT~~,CAAC,CAAC,EAAE;~~wBACF~~,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;~~wBAClB~~,IAAA,oBAAS,EAAC;~~4BACR~~,IAAI,EAAE,~~QAAQ,CAAC,IAAI~~;~~4BACnB~~,OAAO,EAAE,KAAK;~~yBACf~~,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;~~oBACpB~~,CAAC;~~iBACF~~;~~aACF~~,CAAC,CAAC;~~YACF~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~gBACxB~~,YAAY,EAAE,CAAE,MAAM,CAAE;~~gBACxB~~,eAAe,EAAE,mBAAmB;~~aACrC~~,CAAC,CAAC;~~YACH~~,IAAA,0BAAe,EAAC,mBAAmB,EAAE,YAAY,EAAE;~~gBACjD~~,SAAS,EAAE;~~oBACT~~,IAAA,oBAAS,EAAC;~~wBACR~~,IAAI,EAAE,~~QAAQ,CAAC,IAAI~~;~~wBACnB~~,OAAO,EAAE,KAAK;~~qBACf~~,EAAE,UAAU,CAAC;~~oBACd~~,CAAC,CAAC,EAAE;~~wBACF~~,IAAI,~~QAAQ,CAAC,~~OAAO,EAAE;~~4BACpB~~,kBAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;~~yBACrC~~;~~oBACH~~,CAAC;~~iBACF~~;~~aACF~~,CAAC,CAAC;~~YACF~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~gBACxB~~,YAAY,EAAE,CAAE,YAAY,CAAE;~~gBAC9B~~,eAAe,EAAE,iBAAiB;~~aACnC~~,CAAC,CAAC;~~SACJ;QACD~~,~~IAAI,QAAQ,~~CAAC~~,UAAU,EAAE~~;~~YACvB~~,~~IAAA,0BAAe,EACb,mBAAmB,EACnB,YAAY,EACZ;gBACE,~~SAAS,~~EAAE~~,~~EAAE;aACd~~,~~CACF~~,~~CAAC;YACD~~,~~IAAA~~,~~wBAAa~~,~~EAAC,~~UAAU,~~EAAC;gBACxB~~,~~YAAY~~,~~EAAE~~,~~CAAE~~,~~YAAY,CAAE;gBAC9B,eAAe,~~EAAE,~~iBAAiB;aACnC,~~CAAC~~,CAAC~~;~~SACJ;QAED~~,QAAQ,~~QAAQ~~,CAAC,IAAI,~~CAAC,IAAI,~~EAAE;~~YAC1B~~,KAAK,MAAM;~~gBACT~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;~~oBACE~~,SAAS,EAAE,EAAE;~~iBACd~~,CACF,CAAC;~~gBACD~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~oBACxB~~,YAAY,EAAE,CAAE,QAAQ,CAAE;~~oBAC1B~~,eAAe,EAAE,iBAAiB;~~iBACnC~~,CAAC,CAAC;~~gBACH~~,MAAM;~~YACR~~,KAAK,QAAQ;~~gBACX~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,UAAU,EACV;~~oBACE~~,SAAS,EAAE,EAAE;~~iBACd~~,CACF,CAAC;~~gBACD~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~oBACxB~~,YAAY,EAAE,CAAE,UAAU,CAAE;~~oBAC5B~~,eAAe,EAAE,iBAAiB;~~iBACnC~~,CAAC,CAAC;~~gBACH~~,MAAM;~~YACR~~,KAAK,QAAQ;~~gBACX~~,IAAI,~~QAAQ~~,CAAC,~~IAAI~~,KAAK,~~MAAM~~,EAAE;~~oBAC3B~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~wBACxB~~,YAAY,EAAE,CAAE,QAAQ,CAAE;~~wBAC1B~~,eAAe,EAAE,iBAAiB;~~qBACnC~~,CAAC,CAAC;~~oBACH~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;~~wBACE~~,SAAS,EAAE,EAAE;~~qBACd~~,CACF,CAAC;~~iBACH~~;~~qBAAM~~;~~oBACJ~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~wBACxB~~,YAAY,EAAE,CAAE,UAAU,CAAE;~~wBAC5B~~,eAAe,EAAE,iBAAiB;~~qBACnC~~,CAAC,CAAC;~~oBACH~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,UAAU,EACV;~~wBACE,SAAS,EAAE,EAAE;qBACd,CACF,CAAC;iBACH;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,IAAA,0BAAe,EACb,mBAAmB,EACnB,QAAQ,EACR;~~oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;~~gBACD,IAAA,wBAAa,EAAC,UAAU,EAAC~~;~~oBACxB~~,~~YAAY,EAAE,CAAE,QAAQ,CAAE;oBAC1B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,~~MAAM;~~YACR~~,KAAK,SAAS;~~gBACZ~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,WAAW,EACX;~~oBACE~~,SAAS,EAAE,EAAE;~~iBACd~~,CACF,CAAC;~~gBACD~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~oBACxB~~,YAAY,EAAE,CAAE,WAAW,CAAE;~~oBAC7B~~,eAAe,EAAE,iBAAiB;~~iBACnC~~,CAAC,CAAC;~~gBACH~~,MAAM;~~YACN~~,KAAK,SAAS;~~gBACZ~~,IAAA,0BAAe,EACb,mBAAmB,EACnB,aAAa,EACb;~~oBACE~~,SAAS,EAAE,~~CAAC~~,kBAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,~~EAAC~~,CAAC,~~CAAC~~;~~iBAC9D~~,CACF,CAAC;~~gBACD~~,IAAA,wBAAa,EAAC,UAAU,~~EAAC~~;~~oBACxB~~,YAAY,EAAE,CAAE,aAAa,CAAE;~~oBAC~~/B,eAAe,EAAE,iBAAiB;~~iBACnC~~,CAAC,CAAC;~~gBACH~~,MAAM;~~SACX~~;~~QAED~~,~~IAAI~~,~~QAAQ~~,~~CAAC~~,~~IAAI,~~CAAC,~~IAAI~~,~~KAAK,SAAS,EAAE;YACpC,~~MAAM,WAAW,GAAG,mBAAmB,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,aAAa,CAAC,CAAC;~~YACjG~~,IAAI,WAAW,EAAE;~~gBACf~~,MAAM,IAAI,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;~~gBAC3C~~,IAAI,IAAI,YAAY,kCAAuB,EAAE;~~oBAC3C~~,IAAI,MAAA,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,0CAAE,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,EAAE;~~wBAC3D~~,WAAW,CAAC,MAAM,EAAE,CAAC;~~qBACtB~~;~~iBACF;aACF;~~SACF;~~KAEF~~;~~IAED~~,~~gBAAgB,~~CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAExD,OAAO;QACL,SAAS;QACT,QAAQ,EAAE,GAAG,GAAG,IAAA,WAAI,EAAC,UAAU,CAAC,gBAAgB,EAAE,EAAE,UAAU,CAAC,2BAA2B,EAAE,CAAC;QAC7F,UAAU;QACV,gBAAgB;KACjB,CAAC;AAEJ,CAAC;AA1OD,wCA0OC"}
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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"}

package/src/lib/nest/coerce-get-root-operation.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceGetRootOperation = exports.BuildGetRootDtoDataMapperImplementation = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
 const coerce_get_by_id_operation_1 = require("./coerce-get-by-id-operation");
 const table_query_list_1 = require("./table-query-list");
@@ -21,7 +22,7 @@ function CoerceGetRootOperation(options) {
         },
         {
             name: 'children',
-            type: '<self>',
+            type: ts_morph_1.TypeNames.Self,
             isArray: true,
             isOptional: true,
             isType: true,

package/src/lib/nest/coerce-get-root-operation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,+CAGyB;AAOzB,6EAGsC;AAKtC,yDAAsD;AAMtD,SAAgB,uCAAuC,CACrD,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAyC;IAEzC,MAAM,EACJ,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,OAAO,GAAG,EAAE;QACV,mCAAmC;QACnC,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAbD,0FAaC;AAED,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,UAAU,EAC1B,gCAAgC,GAAG,uCAAuC,EAC1E,UAAU,GAAG,IAAI,EACjB,kBAAkB,GAAG,OAAO,EAC5B,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,~~QAAQ~~;~~YACd~~,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,UAAU;QACV,kBAAkB;QAClB,OAAO;QACP,gCAAgC,EAChC,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,EAAE;YAEF,uBACE,SAAS,EAAE,mCAAgB,IACxB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAClG;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA7CD,wDA6CC"}
1	+ {"version":3,"file":"coerce-get-root-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-get-root-operation.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,+CAGyB;AAOzB,6EAGsC;AAKtC,yDAAsD;AAMtD,SAAgB,uCAAuC,CACrD,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAyC;IAEzC,MAAM,EACJ,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,OAAO,GAAG,EAAE;QACV,mCAAmC;QACnC,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAbD,0FAaC;AAED,SAAgB,sBAAsB,CAAC,OAAgD;IACrF,MAAM,EACJ,gBAAgB,GAAG,gBAAI,EACvB,YAAY,GAAG,EAAE,EACjB,aAAa,GAAG,UAAU,EAC1B,gCAAgC,GAAG,uCAAuC,EAC1E,UAAU,GAAG,IAAI,EACjB,kBAAkB,GAAG,OAAO,EAC5B,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IACZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;SAChB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,oBAAS,CAAC,IAAI;YACpB,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;SACb;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,IAAA,mDAAsB,kCACxB,OAAO,KACV,aAAa;QACb,UAAU;QACV,kBAAkB;QAClB,OAAO;QACP,gCAAgC,EAChC,gBAAgB,EAAE,CAChB,OAAO,EACP,UAAU,EACV,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,GAAG,EACH,EAAE;YAEF,uBACE,SAAS,EAAE,mCAAgB,IACxB,gBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,CAAC,EAClG;QACJ,CAAC,IACD,CAAC;AACL,CAAC;AA7CD,wDA6CC"}

package/src/lib/nest/coerce-operation.js CHANGED Viewed

@@ -110,14 +110,20 @@ function BuildDtoReturnImplementation(classDeclaration, moduleSourceFile, dto, o
         if (!isReturnVoid && dto) {
             const sourceFile = classDeclaration.getSourceFile();
             (0, ts_morph_1.CoerceImports)(sourceFile, {
-                namedImports: ['ToDtoInstance'],
+                namedImports: [isArray ? 'ToDtoInstanceList' : 'ToDtoInstance'],
                 moduleSpecifier: '@rxap/nest-dto',
             });
             const mapper = builtDtoDataMapperImplementation(classDeclaration, moduleSourceFile, dto, options)(operationOptions);
             operationOptions.returnType = dto.className + (isArray ? '[]' : '');
             (_a = operationOptions.statements) !== null && _a !== void 0 ? _a : (operationOptions.statements = []);
             operationOptions.statements = (0, utilities_1.coerceArray)(operationOptions.statements);
-            operationOptions.statements.push('return ToDtoInstance(', dto.className + ',', w => {
+            if (isArray) {
+                operationOptions.statements.push('return ToDtoInstanceList(');
+            }
+            else {
+                operationOptions.statements.push('return ToDtoInstance(');
+            }
+            operationOptions.statements.push(dto.className + ',', w => {
                 if (typeof mapper === 'string') {
                     w.write(mapper);
                 }

package/src/lib/nest/coerce-operation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-operation.ts"],"names":[],"mappings":";;;AAAA,2DAGoC;AACpC,qEAAsD;AACtD,6CAUwB;AACxB,+CAOyB;AAEzB,+BAA4B;AAC5B,uCAOkB;AAClB,8DAAwE;AACxE,+EAIuC;AACvC,6EAAuE;AACvE,yDAG4B;AAC5B,qEAAgE;AAuEhE,SAAgB,0CAA0C,CACxD,gBAAkC,EAClC,gBAA4B,EAC5B,QAAyB;IAEzB,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;QAChD,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;QACpD,MAAM,gBAAgB,GAAG,IAAA,wCAA6B,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7E,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,gBAAgB,CAAE;YAClC,eAAe,EAAE,IAAA,8CAAmC,EAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC;SAC/G,CAAC,CAAC;QACH,IAAA,iCAAsB,EAAC,gBAAgB,EAAE;YACvC,UAAU,EAAE,YAAY;YACxB,eAAe,EAAE,eAAe;SACjC,CAAC,CAAC;QACH,IAAA,mCAAwB,EAAC,gBAAgB,EAAE;YACzC,cAAc,EAAE,QAAQ;YACxB,eAAe,EAAE,gBAAgB;SAClC,CAAC,CAAC;QACH,IAAA,mCAAwB,EAAC,gBAAgB,EAAE;YACzC,cAAc,EAAE,gBAAgB;YAChC,eAAe,EAAE,IAAA,8CAAmC,EAAC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC;SAC/G,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,IAAA,oBAAQ,EAAC,gBAAgB,CAAC,CAAC;QACrD,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,QAAQ,CAAE;YAC1B,eAAe,EAAE,gBAAgB;SAClC,CAAC,CAAC;QACH,IAAA,oCAAyB,EAAC,gBAAgB,EAAE,iBAAiB,EAAE;YAC7D,IAAI,EAAE,gBAAgB;YACtB,mBAAmB,EAAE,IAAI;YACzB,KAAK,EAAE,gBAAK,CAAC,OAAO;YACpB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,CAAE,gBAAgB,CAAE;iBAChC;aACF;SACF,CAAC,CAAC;QACH,OAAO;YACL,SAAS,EAAE,gBAAgB;YAC3B,UAAU,EAAE,iBAAiB;SAC9B,CAAC;KACH;IACD,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,IAAI,iBAAiB,CAAC,CAAC;AACpE,CAAC;AA/CD,gGA+CC;AAED,SAAgB,0BAA0B,CAAC,cAAsB,EAAE,OAAsF;IACvJ,MAAM,EACJ,kBAAkB,EAClB,YAAY,GACb,GAAG,OAAO,CAAC;IACZ,OAAO,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,CACrB,kBAAkB,CAAC,CAAC,CAAC,IAAA,wBAAY,EAAC,cAAc,EAAE,IAAA,wBAAY,EAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAC1G,CAAC;AACJ,CAAC;AARD,gEAQC;AAED,SAAgB,uBAAuB,CACrC,gBAAkC,EAClC,cAAsB,EACtB,gBAA4B,EAC5B,OAAyC;IAEzC,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,EACJ,kBAAkB,EAClB,YAAY,EACZ,YAAY,GAAG,EAAE,EACjB,YAAY,EACZ,0BAA0B,GAAG,0BAA0B,EACxD,GAAG,OAAO,CAAC;IACZ,IAAI,GAAG,GAAgC,IAAI,CAAC;IAC5C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,YAAY,KAAK,KAAK,IAAI,kBAAkB,IAAI,YAAY,EAAE;QAC3F,GAAG,GAAG,IAAA,iCAAc,EAAC;YACnB,OAAO;YACP,IAAI,EAAE,0BAA0B,CAAC,cAAc,EAAE,OAAO,CAAC;YACzD,YAAY;SACb,CAAC,CAAC;KACJ;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAzBD,0DAyBC;AAID,SAAgB,gCAAgC,CAC9C,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAyC;IAEzC,MAAM,EACJ,YAAY,GAAG,EAAE,EACjB,QAAQ,EACR,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,OAAO,GAAG,EAAE;;QACV,IAAI,QAAQ,EAAE;YACZ,MAAM,MAAM,GAA4C,EAAE,CAAC;YAC3D,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;gBACnC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAS,MAAA,QAAQ,CAAC,MAAM,mCAAI,QAAQ,CAAC,IAAK,EAAE,CAAC;aACtE;YACD,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,CAAC,EAAE;oBACT,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;oBAC9B,kBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC1B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,CAAC;aACH;iBAAM;gBACL,OAAO,kBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aAC/B;SACF;aAAM;YACL,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SAC9B;IACH,CAAC,CAAC;AACJ,CAAC;AA9BD,4EA8BC;AAED,SAAgB,4BAA4B,CAC1C,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAyC;IAEzC,OAAO,CAAC,gBAAkC,EAAE,EAAE;;QAC5C,MAAM,EACJ,OAAO,EACP,YAAY,GAAG,CAAC,GAAG,EACnB,gCAAgC,GAAG,gCAAgC,GACpE,GAAG,OAAO,CAAC;QACZ,IAAI,CAAC,YAAY,IAAI,GAAG,EAAE;YACxB,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;YACpD,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB,YAAY,EAAE,CAAE,eAAe,CAAE;~~gBACjC~~,eAAe,EAAE,gBAAgB;aAClC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,gCAAgC,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,gBAAgB,CAAC,CAAC;YACpH,gBAAgB,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,GAAG,CAC5C,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CACpB,CAAC;YACF,MAAA,gBAAgB,CAAC,UAAU,oCAA3B,gBAAgB,CAAC,UAAU,GAAK,EAAE,EAAC;YACnC,gBAAgB,CAAC,UAAU,GAAG,IAAA,uBAAW,EAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YACvE,gBAAgB,CAAC,UAAU,CAAC,IAAI,~~CAC9B~~,uBAAuB,~~EACvB~~,GAAG,CAAC,SAAS,GAAG,GAAG,EACnB,CAAC,CAAC,EAAE;gBACF,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBACjB;qBAAM;oBACL,MAAM,CAAC,CAAC,CAAC,CAAC;iBACX;gBACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,EACD,IAAI,CACL,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;~~AAvCD~~,~~oEAuCC~~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"}
1	+ {"version":3,"file":"coerce-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-operation.ts"],"names":[],"mappings":"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"}

package/src/lib/nest/coerce-options-operation.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { AbstractControl } from '../types/abstract-control';
 import { CoerceDtoClassOutput } from './coerce-dto-class';
 import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
 export interface CoerceOptionsOperationRuleOptions extends CoerceOperationOptions {
-    control: Required<AbstractControl>;
+    control: AbstractControl;
     responseDtoName?: string;
 }
 export declare function BuildOptionsDtoDataMapperImplementation(classDeclaration: ClassDeclaration, moduleSourceFile: SourceFile, dto: CoerceDtoClassOutput | null, options: Readonly<CoerceOperationOptions>): TransformOperation<string | WriterFunction>;

package/src/lib/nest/coerce-tree-operation.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceTreeOperationRule = void 0;
+const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
 const coerce_operation_1 = require("./coerce-operation");
 function CoerceTreeOperationRule(options) {
@@ -31,7 +32,7 @@ function CoerceTreeOperationRule(options) {
             isOptional: true,
             isArray: true,
             isType: true,
-            type: '<self>',
+            type: ts_morph_1.TypeNames.Self,
         },
     ], (a, b) => a.name === b.name);
     if (!fullTree) {

package/src/lib/nest/coerce-tree-operation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-tree-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-tree-operation.ts"],"names":[],"mappings":";;;AAAA,+CAAmD;AACnD,yDAG4B;AAO5B,SAAgB,uBAAuB,CAAC,OAAmC;IACzE,MAAM,EACJ,aAAa,GAAG,MAAM,EACtB,QAAQ,GAAE,KAAK,EACf,IAAI,GAAE,MAAM,EACZ,YAAY,GAAG,EAAE,EACjB,kBAAkB,GAAG,YAAY,EACjC,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,eAAe,EAAE,gBAAgB;aAClC;YACD,MAAM,EAAE,IAAI;SACb;QACD;YACE,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,~~QAAQ~~;~~SACf~~;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,IAAI;QACJ,aAAa;QACb,kBAAkB;QAClB,YAAY;QACZ,OAAO,IACP,CAAC;AACL,CAAC;AApDD,0DAoDC"}
1	+ {"version":3,"file":"coerce-tree-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-tree-operation.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,+CAAmD;AACnD,yDAG4B;AAO5B,SAAgB,uBAAuB,CAAC,OAAmC;IACzE,MAAM,EACJ,aAAa,GAAG,MAAM,EACtB,QAAQ,GAAE,KAAK,EACf,IAAI,GAAE,MAAM,EACZ,YAAY,GAAG,EAAE,EACjB,kBAAkB,GAAG,YAAY,EACjC,OAAO,GAAG,IAAI,GACf,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;QAC7B;YACE,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE;gBACJ,IAAI,EAAE,SAAS;gBACf,eAAe,EAAE,gBAAgB;aAClC;YACD,MAAM,EAAE,IAAI;SACb;QACD;YACE,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,oBAAS,CAAC,IAAI;SACrB;KACF,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,IAAI;QACJ,aAAa;QACb,kBAAkB;QAClB,YAAY;QACZ,OAAO,IACP,CAAC;AACL,CAAC;AApDD,0DAoDC"}

package/src/lib/nest/dto-class-property.d.ts CHANGED Viewed

@@ -1,18 +1,11 @@
-import { DataProperty, NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
+import { DataProperty, NormalizedDataProperty } from '@rxap/ts-morph';
 import { Normalized } from '@rxap/utilities';
 export interface DtoClassProperty extends DataProperty {
-    /**
-     * The type of the property
-     *
-     * if type = '<self>' the type will be the name of the class
-     */
-    type: string | TypeImport | '<self>';
     /**
      * indicates that the @Type decorator should be used as the type of the property is another dto class
      */
     isType?: boolean;
 }
-export interface NormalizedDtoClassProperty extends Normalized<Omit<DtoClassProperty, 'type'>> {
-    type: NormalizedTypeImport;
+export interface NormalizedDtoClassProperty extends Normalized<Pick<DtoClassProperty, 'isType'>>, NormalizedDataProperty {
 }
 export declare function NormalizeDataClassProperty(property: DtoClassProperty): NormalizedDtoClassProperty;

package/src/lib/nest/dto-class-property.js CHANGED Viewed

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NormalizeDataClassProperty = void 0;
 const ts_morph_1 = require("@rxap/ts-morph");
 function NormalizeDataClassProperty(property) {
-    var _a, _b, _c;
-    const { name, type, isArray } = (0, ts_morph_1.NormalizeDataProperty)(property);
-    let isType = (_b = (_a = property.isType) !== null && _a !== void 0 ? _a : type.name === '<self>') !== null && _b !== void 0 ? _b : false;
-    const isOptional = (_c = property.isOptional) !== null && _c !== void 0 ? _c : false;
+    var _a, _b;
+    const { name, type, isArray, memberList, source, isOptional, } = (0, ts_morph_1.NormalizeDataProperty)(property);
+    let isType = (_b = (_a = property.isType) !== null && _a !== void 0 ? _a : [ts_morph_1.TypeNames.Self, ts_morph_1.TypeNames.Deferred].includes(type.name)) !== null && _b !== void 0 ? _b : false;
     switch (type.name) {
         case 'IconConfig':
             type.name = 'IconDto';
@@ -15,6 +14,8 @@ function NormalizeDataClassProperty(property) {
             break;
     }
     return {
+        source,
+        memberList,
         name,
         type,
         isArray,

package/src/lib/nest/dto-class-property.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dto-class-property.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/dto-class-property.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;~~AAoBxB~~,SAAgB,0BAA0B,CAAC,QAA0B;;IACnE,MAAM,~~EAAE~~,IAAI,~~EAAG~~,IAAI,~~EAAE~~,OAAO,~~EAAE~~,GAAG,IAAA,gCAAqB,EAAC,QAAQ,CAAC,CAAC;~~IACjE~~,IAAI,MAAM,GAAG,MAAA,MAAA,QAAQ,CAAC,MAAM,~~mCAAI~~,~~IAAI~~,CAAC,IAAI,~~KAAK~~,QAAQ,~~mCAAI~~,~~KAAK,~~CAAC~~;IAChE~~,~~MAAM~~,~~UAAU~~,~~GAAG~~,~~MAAA~~,~~QAAQ~~,CAAC,~~UAAU,~~mCAAI,KAAK,CAAC;~~IAChD~~,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,YAAY;YACf,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC;YACd,MAAM;KACT;IACD,OAAO;QACL,IAAI;QACJ,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;KACX,CAAC;AACJ,CAAC;~~AAlBD~~,~~gEAkBC~~"}
1	+ {"version":3,"file":"dto-class-property.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/dto-class-property.ts"],"names":[],"mappings":";;;AAAA,6CAKwB;AAcxB,SAAgB,0BAA0B,CAAC,QAA0B;;IACnE,MAAM,EACJ,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,UAAU,EACV,MAAM,EACN,UAAU,GACX,GAAG,IAAA,gCAAqB,EAAC,QAAQ,CAAC,CAAC;IACpC,IAAI,MAAM,GAAG,MAAA,MAAA,QAAQ,CAAC,MAAM,mCAAK,CAAE,oBAAS,CAAC,IAAI,EAAE,oBAAS,CAAC,QAAQ,CAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,KAAK,CAAC;IAClH,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,YAAY;YACf,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,IAAI,CAAC,eAAe,GAAG,gBAAgB,CAAC;YACxC,MAAM,GAAG,IAAI,CAAC;YACd,MAAM;KACT;IACD,OAAO;QACL,MAAM;QACN,UAAU;QACV,IAAI;QACJ,IAAI;QACJ,OAAO;QACP,MAAM;QACN,UAAU;KACX,CAAC;AACJ,CAAC;AA1BD,gEA0BC"}

package/src/lib/types/abstract-control.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 import { DataProperty } from '@rxap/ts-morph';
 import { WriterFunction } from 'ts-morph';
 export interface AbstractControl extends DataProperty {
-    state?: string | WriterFunction | null;
-    isRequired?: boolean;
-    validatorList?: string[];
-    role?: 'control' | 'group' | 'array';
+    state: string | WriterFunction | null;
+    isRequired: boolean;
+    validatorList: string[];
+    role: 'control' | 'group' | 'array';
 }