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

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

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

Files changed (153) hide show

package/src/lib/coerce-class-method.d.ts CHANGED Viewed

@@ -1,2 +1,5 @@
 import { ClassDeclaration, MethodDeclarationStructure, OptionalKind } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function CoerceClassMethod(classDeclaration: ClassDeclaration, name: string, structure?: Omit<OptionalKind<MethodDeclarationStructure>, 'name'>): import("ts-morph").MethodDeclaration;

package/src/lib/coerce-class-method.js CHANGED Viewed

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceClassMethod = void 0;
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function CoerceClassMethod(classDeclaration, name, structure = {}) {
     let methodDeclaration = classDeclaration.getMethod(name);
     if (!methodDeclaration) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-class-method.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-class-method.ts"],"names":[],"mappings":";;;AAMA,SAAgB,iBAAiB,CAC/B,gBAAkC,EAClC,IAAY,EACZ,YAAoE,EAAE;IAGtE,IAAI,iBAAiB,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEzD,IAAI,CAAC,iBAAiB,EAAE;QAEtB,iBAAiB,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAElC;IAED,OAAO,iBAAiB,CAAC;AAE3B,CAAC;AAlBD,8CAkBC"}
1	+ {"version":3,"file":"coerce-class-method.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-class-method.ts"],"names":[],"mappings":";;;AAMA;;GAEG;AACH,SAAgB,iBAAiB,CAC/B,gBAAkC,EAClC,IAAY,EACZ,YAAoE,EAAE;IAGtE,IAAI,iBAAiB,GAAG,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEzD,IAAI,CAAC,iBAAiB,EAAE;QAEtB,iBAAiB,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzD,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;KAElC;IAED,OAAO,iBAAiB,CAAC;AAE3B,CAAC;AAlBD,8CAkBC"}

package/src/lib/coerce-class.d.ts CHANGED Viewed

@@ -1,2 +1,5 @@
 import { ClassDeclaration, ClassDeclarationStructure, OptionalKind, SourceFile } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function CoerceClass(sourceFile: SourceFile, className: string, classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>): ClassDeclaration;

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

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceClass = void 0;
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function CoerceClass(sourceFile, className, classStructure = {}) {
     let classDeclaration = sourceFile.getClass(className);
     if (!classDeclaration) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-class.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-class.ts"],"names":[],"mappings":";;;AAOA,SAAgB,WAAW,CACzB,UAAsB,EACtB,SAAiB,EACjB,iBAAwE,EAAE;IAG1E,IAAI,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEtD,IAAI,CAAC,gBAAgB,EAAE;QACrB,gBAAgB,GAAG,UAAU,CAAC,QAAQ,iCACjC,cAAc,KACjB,IAAI,EAAE,SAAS,IACf,CAAC;KACJ;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAhBD,kCAgBC"}
1	+ {"version":3,"file":"coerce-class.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-class.ts"],"names":[],"mappings":";;;AAOA;;GAEG;AACH,SAAgB,WAAW,CACzB,UAAsB,EACtB,SAAiB,EACjB,iBAAwE,EAAE;IAG1E,IAAI,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAEtD,IAAI,CAAC,gBAAgB,EAAE;QACrB,gBAAgB,GAAG,UAAU,CAAC,QAAQ,iCACjC,cAAc,KACjB,IAAI,EAAE,SAAS,IACf,CAAC;KACJ;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAhBD,kCAgBC"}

package/src/lib/coerce-source-file.d.ts CHANGED Viewed

@@ -1,2 +1,5 @@
 import { Project, SourceFile } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function CoerceSourceFile(project: Project, fileNameOrPath: string, content?: string): SourceFile;

package/src/lib/coerce-source-file.js CHANGED Viewed

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceSourceFile = void 0;
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function CoerceSourceFile(project, fileNameOrPath, content) {
     let sourceFile = project.getSourceFile(fileNameOrPath);
     if (!sourceFile) {

package/src/lib/coerce-source-file.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-source-file.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-source-file.ts"],"names":[],"mappings":";;;AAKA,SAAgB,gBAAgB,CAC9B,OAAgB,EAChB,cAAsB,EACtB,OAAgB;IAGhB,IAAI,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;KAChE;IAED,OAAO,UAAU,CAAC;AAEpB,CAAC;AAdD,4CAcC"}
1	+ {"version":3,"file":"coerce-source-file.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-source-file.ts"],"names":[],"mappings":";;;AAKA;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,OAAgB,EAChB,cAAsB,EACtB,OAAgB;IAGhB,IAAI,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;KAChE;IAED,OAAO,UAAU,CAAC;AAEpB,CAAC;AAdD,4CAcC"}

package/src/lib/coerce-variable-declaration.d.ts CHANGED Viewed

@@ -1,2 +1,5 @@
 import { OptionalKind, SourceFile, VariableDeclaration, VariableDeclarationStructure, VariableStatementStructure } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function CoerceVariableDeclaration(sourceFile: SourceFile, name: string, defaultDeclaration?: Omit<OptionalKind<VariableDeclarationStructure>, 'name'>, variableStatementStructure?: Partial<Omit<OptionalKind<VariableStatementStructure>, 'declarations'>>): VariableDeclaration;

package/src/lib/coerce-variable-declaration.js CHANGED Viewed

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoerceVariableDeclaration = void 0;
 const ts_morph_1 = require("ts-morph");
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function CoerceVariableDeclaration(sourceFile, name, defaultDeclaration = {}, variableStatementStructure) {
     var _a, _b;
     const declaration = Object.assign(Object.assign({}, defaultDeclaration), { name });

package/src/lib/coerce-variable-declaration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"coerce-variable-declaration.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-variable-declaration.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB,SAAgB,yBAAyB,CACvC,UAAsB,EACtB,IAAY,EACZ,qBAA+E,EAAE,EACjF,0BAAoG;;IAGpG,MAAM,WAAW,mCACZ,kBAAkB,KACrB,IAAI,GACL,CAAC;IAEF,IAAI,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC9D,IAAI,CAAC,iBAAiB,EAAE;QACtB,0BAA0B,aAA1B,0BAA0B,cAA1B,0BAA0B,IAA1B,0BAA0B,GAAK;YAC7B,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,kCAAuB,CAAC,KAAK;SAC/C,EAAC;QACF,MAAA,0BAA0B,CAAC,UAAU,oCAArC,0BAA0B,CAAC,UAAU,GAAK,IAAI,EAAC;QAC/C,MAAA,0BAA0B,CAAC,eAAe,oCAA1C,0BAA0B,CAAC,eAAe,GAAK,kCAAuB,CAAC,KAAK,EAAC;QAC7E,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,iCAC9C,0BAA0B,KAC7B,YAAY,EAAE,CAAE,WAAW,CAAE,IAC7B,CAAC;KACJ;IAED,IAAI,mBAAmB,GAAG,iBAAiB,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;IAEjE,IAAI,CAAC,mBAAmB,EAAE;QACxB,mBAAmB,GAAG,iBAAiB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KACrE;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAjCD,8DAiCC"}
1	+ {"version":3,"file":"coerce-variable-declaration.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/coerce-variable-declaration.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB;;GAEG;AACH,SAAgB,yBAAyB,CACvC,UAAsB,EACtB,IAAY,EACZ,qBAA+E,EAAE,EACjF,0BAAoG;;IAGpG,MAAM,WAAW,mCACZ,kBAAkB,KACrB,IAAI,GACL,CAAC;IAEF,IAAI,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC9D,IAAI,CAAC,iBAAiB,EAAE;QACtB,0BAA0B,aAA1B,0BAA0B,cAA1B,0BAA0B,IAA1B,0BAA0B,GAAK;YAC7B,UAAU,EAAE,IAAI;YAChB,eAAe,EAAE,kCAAuB,CAAC,KAAK;SAC/C,EAAC;QACF,MAAA,0BAA0B,CAAC,UAAU,oCAArC,0BAA0B,CAAC,UAAU,GAAK,IAAI,EAAC;QAC/C,MAAA,0BAA0B,CAAC,eAAe,oCAA1C,0BAA0B,CAAC,eAAe,GAAK,kCAAuB,CAAC,KAAK,EAAC;QAC7E,iBAAiB,GAAG,UAAU,CAAC,oBAAoB,iCAC9C,0BAA0B,KAC7B,YAAY,EAAE,CAAE,WAAW,CAAE,IAC7B,CAAC;KACJ;IAED,IAAI,mBAAmB,GAAG,iBAAiB,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;IAEjE,IAAI,CAAC,mBAAmB,EAAE;QACxB,mBAAmB,GAAG,iBAAiB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KACrE;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAjCD,8DAiCC"}

package/src/lib/fix-missing-imports.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FixMissingImports = void 0;
-const ts_morph_1 = require("ts-morph");
+const ts_morph_1 = require("@rxap/ts-morph");
 const path_1 = require("path");
 /**
  *
@@ -10,14 +10,7 @@ const path_1 = require("path");
  */
 function FixMissingImports(basePath) {
     return (tree) => {
-        const project = new ts_morph_1.Project({
-            useInMemoryFileSystem: true,
-            manipulationSettings: {
-                indentationText: ts_morph_1.IndentationText.TwoSpaces,
-                quoteKind: ts_morph_1.QuoteKind.Single,
-                useTrailingCommas: true,
-            },
-        });
+        const project = (0, ts_morph_1.CreateProject)();
         console.debug('fix missing imports for ts files');
         function AddFiles(dir) {
             for (const file of dir.subfiles) {

package/src/lib/fix-missing-imports.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fix-missing-imports.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/fix-missing-imports.ts"],"names":[],"mappings":";;;AAKA,~~uCAIkB~~;~~AAClB~~,+BAA4B;AAE5B;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,~~IAAI~~,~~kBAAO~~,~~CAAC;YAC1B~~,~~qBAAqB,EAAE,IAAI;YAC3B,oBAAoB,EAAE;gBACpB,eAAe,EAAE,0BAAe,~~CAAC~~,SAAS~~;~~gBAC1C~~,~~SAAS,EAAE,oBAAS,CAAC,MAAM;gBAC3B,iBAAiB,EAAE,IAAI;aACxB;SACF,CAAC,CAAC;QACH,~~OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAElD,SAAS,QAAQ,CAAC,GAAa;YAC7B,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAC/B,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;oBACrD,OAAO,CAAC,gBAAgB,CACtB,IAAA,WAAI,EAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EACzC,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;iBACH;aACF;YACD,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE;gBAChC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;aAC3B;QACH,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;YACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;gBAEnB,KAAK,GAAG,CAAC;gBACT,KAAK,GAAG;oBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;wBAC9B,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC9F;oBACD,MAAM;aAET;SACF;QAED,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEhC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;gBACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;oBAEnB,KAAK,GAAG,CAAC;oBACT,KAAK,GAAG;wBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;4BAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;4BACtD,IAAI,UAAU,EAAE;gCACd,UAAU,CAAC,iBAAiB,EAAE,CAAC;gCAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;6BACvD;iCAAM;gCACL,OAAO,CAAC,IAAI,CAAC,4CAA6C,MAAM,CAAC,IAAK,IAAI,CAAC,CAAC;6BAC7E;yBACF;wBACD,MAAM;iBAET;aACF;SAEF;aAAM;YACL,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC5C,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;~~AArED~~,~~8CAqEC~~"}
1	+ {"version":3,"file":"fix-missing-imports.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/fix-missing-imports.ts"],"names":[],"mappings":";;;AAKA,6CAA+C;AAM/C,+BAA4B;AAE5B;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,IAAA,wBAAa,GAAE,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAElD,SAAS,QAAQ,CAAC,GAAa;YAC7B,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAC/B,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE;oBACrD,OAAO,CAAC,gBAAgB,CACtB,IAAA,WAAI,EAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EACpB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EACzC,EAAE,SAAS,EAAE,IAAI,EAAE,CACpB,CAAC;iBACH;aACF;YACD,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE;gBAChC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;aAC3B;QACH,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;YACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;gBAEnB,KAAK,GAAG,CAAC;gBACT,KAAK,GAAG;oBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;wBAC9B,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;qBAC9F;oBACD,MAAM;aAET;SACF;QAED,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEhC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE;gBACzC,QAAQ,MAAM,CAAC,IAAI,EAAE;oBAEnB,KAAK,GAAG,CAAC;oBACT,KAAK,GAAG;wBACN,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;4BAC9B,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;4BACtD,IAAI,UAAU,EAAE;gCACd,UAAU,CAAC,iBAAiB,EAAE,CAAC;gCAC/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;6BACvD;iCAAM;gCACL,OAAO,CAAC,IAAI,CAAC,4CAA6C,MAAM,CAAC,IAAK,IAAI,CAAC,CAAC;6BAC7E;yBACF;wBACD,MAAM;iBAET;aACF;SAEF;aAAM;YACL,OAAO,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC5C,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBAC/B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AA9DD,8CA8DC"}

package/src/lib/get-class-decorator-arguments.d.ts CHANGED Viewed

@@ -1,3 +1,6 @@
 import { ClassDeclaration, Decorator, Node } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function GetClassDecoratorArguments(classDeclaration: ClassDeclaration, findFunction: (declaration: Decorator) => boolean): Node[];
 export declare function GetClassDecoratorArguments(classDeclaration: ClassDeclaration, name: string): Node[];

package/src/lib/get-class-decorator-arguments.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-class-decorator-arguments.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/get-class-decorator-arguments.ts"],"names":[],"mappings":";;;~~AAcA~~,SAAgB,0BAA0B,CACxC,gBAAkC,EAClC,kBAAkE;;IAGlE,IAAI,SAAgC,CAAC;IAErC,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE;QAC1C,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;KAC/D;SAAM;QACL,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;KAC/D;IAED,OAAO,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,EAAE,mCAAI,EAAE,CAAC;AAEzC,CAAC;AAfD,gEAeC"}
1	+ {"version":3,"file":"get-class-decorator-arguments.js","sourceRoot":"","sources":["../../../../../../packages/schematic/ts-morph/src/lib/get-class-decorator-arguments.ts"],"names":[],"mappings":";;;AAiBA,SAAgB,0BAA0B,CACxC,gBAAkC,EAClC,kBAAkE;;IAGlE,IAAI,SAAgC,CAAC;IAErC,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE;QAC1C,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;KAC/D;SAAM;QACL,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;KAC/D;IAED,OAAO,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,YAAY,EAAE,mCAAI,EAAE,CAAC;AAEzC,CAAC;AAfD,gEAeC"}

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

@@ -1,2 +1,5 @@
 import { ArrayLiteralExpression, ObjectLiteralExpression } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 export declare function GetCoerceArrayLiteralFromObjectLiteral(objectLiteral: ObjectLiteralExpression, propertyKey: string): ArrayLiteralExpression;

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

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetCoerceArrayLiteralFromObjectLiteral = void 0;
 const ts_morph_1 = require("ts-morph");
+/**
+ * @deprecated import from @rxap/ts-morph
+ */
 function GetCoerceArrayLiteralFromObjectLiteral(objectLiteral, propertyKey) {
     let arrayLiteralAssignment = objectLiteral.getProperty(propertyKey);
     if (!arrayLiteralAssignment) {

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

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

package/src/lib/nest/add-nest-module-import.d.ts CHANGED Viewed

@@ -1,2 +1,5 @@
 import { ImportDeclarationStructure, OptionalKind, SourceFile, WriterFunction } from 'ts-morph';
+/**
+ * @deprecated import from @rxap/ts-morph as CoerceNestModuleImport
+ */
 export declare function AddNestModuleImport(sourceFile: SourceFile, moduleName: string, structures?: ReadonlyArray<OptionalKind<ImportDeclarationStructure>>, importWriter?: WriterFunction, overwrite?: boolean): void;

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

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddNestModuleImport = void 0;
-const get_nest_module_metadata_1 = require("./get-nest-module-metadata");
 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_nest_module_metadata_1 = require("./get-nest-module-metadata");
+/**
+ * @deprecated import from @rxap/ts-morph as CoerceNestModuleImport
+ */
 function AddNestModuleImport(sourceFile, moduleName, structures = [], importWriter, overwrite = false) {
     (0, coerce_imports_1.CoerceImports)(sourceFile, structures);
     const metadata = (0, get_nest_module_metadata_1.GetNestModuleMetadata)(sourceFile);
     const importsArray = (0, get_coerce_array_literal_form_object_literal_1.GetCoerceArrayLiteralFromObjectLiteral)(metadata, 'imports');
-    const hasModule = importsArray.getElements().find(element => element.getFullText().trim().startsWith(moduleName));
+    const hasModule = importsArray.getElements().find(element => element.getText().trim().startsWith(moduleName));
     if (!hasModule || overwrite) {
         if (hasModule) {
             importsArray.removeElement(hasModule.getChildIndex());

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

	@@ -1 +1 @@
1	- {"version":3,"file":"add-nest-module-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-module-import.ts"],"names":[],"mappings":";;;AAMA,~~yEAAmE;AACnE,~~kHAAyG;AACzG,+DAA2D;~~AAE3D~~,SAAgB,mBAAmB,CACjC,UAAsB,EACtB,UAAkB,EAClB,aAAsE,EAAE,EACxE,YAA6B,EAC7B,SAAS,GAAG,KAAK;IAGjB,IAAA,8BAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,IAAA,gDAAqB,EAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEjF,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;~~IAElH~~,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE;QAE3B,IAAI,SAAS,EAAE;YACb,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;SACvD;QAED,YAAY,CAAC,UAAU,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,UAAU,CAAC,CAAC;KAErD;AAEH,CAAC;AA1BD,kDA0BC"}
1	+ {"version":3,"file":"add-nest-module-import.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-module-import.ts"],"names":[],"mappings":";;;AAMA,kHAAyG;AACzG,+DAA2D;AAC3D,yEAAmE;AAEnE;;GAEG;AACH,SAAgB,mBAAmB,CACjC,UAAsB,EACtB,UAAkB,EAClB,aAAsE,EAAE,EACxE,YAA6B,EAC7B,SAAS,GAAG,KAAK;IAGjB,IAAA,8BAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,IAAA,gDAAqB,EAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,IAAA,qFAAsC,EAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAEjF,MAAM,SAAS,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9G,IAAI,CAAC,SAAS,IAAI,SAAS,EAAE;QAE3B,IAAI,SAAS,EAAE;YACb,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC;SACvD;QAED,YAAY,CAAC,UAAU,CAAC,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,UAAU,CAAC,CAAC;KAErD;AAEH,CAAC;AA1BD,kDA0BC"}

package/src/lib/nest/add-nest-module-provider.d.ts CHANGED Viewed

@@ -1,3 +1,6 @@
 import { ImportDeclarationStructure, OptionalKind, SourceFile } from 'ts-morph';
 import { NestProviderObject } from './nest-provider-object';
+/**
+ * @deprecated import from @rxap/ts-morph as CoerceNestModuleProvider
+ */
 export declare function AddNestModuleProvider(sourceFile: SourceFile, providerObject: NestProviderObject | string, structures?: ReadonlyArray<OptionalKind<ImportDeclarationStructure>>, overwrite?: boolean): void;

package/src/lib/nest/add-nest-module-provider.js CHANGED Viewed

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddNestModuleProvider = void 0;
 const get_coerce_array_literal_form_object_literal_1 = require("../get-coerce-array-literal-form-object-literal");
-const get_nest_module_metadata_1 = require("./get-nest-module-metadata");
-const add_nest_provider_to_array_1 = require("./add-nest-provider-to-array");
 const coerce_imports_1 = require("../ts-morph/coerce-imports");
+const add_nest_provider_to_array_1 = require("./add-nest-provider-to-array");
+const get_nest_module_metadata_1 = require("./get-nest-module-metadata");
+/**
+ * @deprecated import from @rxap/ts-morph as CoerceNestModuleProvider
+ */
 function AddNestModuleProvider(sourceFile, providerObject, structures = [], overwrite = false) {
     (0, coerce_imports_1.CoerceImports)(sourceFile, structures);
     const metadata = (0, get_nest_module_metadata_1.GetNestModuleMetadata)(sourceFile);

package/src/lib/nest/add-nest-module-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-nest-module-provider.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-module-provider.ts"],"names":[],"mappings":";;;AAKA,kHAAyG;AACzG~~,yEAAmE~~;~~AACnE~~,6EAAsE;~~AAEtE,+DAA2D~~;~~AAE3D~~,SAAgB,qBAAqB,CACnC,UAAsB,EACtB,cAA2C,EAC3C,aAAsE,EAAE,EACxE,SAAS,GAAG,KAAK;IAGjB,IAAA,8BAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,IAAA,gDAAqB,EAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,aAAa,GAAG,IAAA,qFAAsC,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAEpF,IAAA,mDAAsB,EAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAEnE,CAAC;AAfD,sDAeC"}
1	+ {"version":3,"file":"add-nest-module-provider.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-module-provider.ts"],"names":[],"mappings":";;;AAKA,kHAAyG;AACzG,+DAA2D;AAC3D,6EAAsE;AACtE,yEAAmE;AAGnE;;GAEG;AACH,SAAgB,qBAAqB,CACnC,UAAsB,EACtB,cAA2C,EAC3C,aAAsE,EAAE,EACxE,SAAS,GAAG,KAAK;IAGjB,IAAA,8BAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,IAAA,gDAAqB,EAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,aAAa,GAAG,IAAA,qFAAsC,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAEpF,IAAA,mDAAsB,EAAC,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAEnE,CAAC;AAfD,sDAeC"}

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

@@ -1,3 +1,6 @@
-import { NestProviderObject } from './nest-provider-object';
 import { ArrayLiteralExpression } from 'ts-morph';
-export declare function AddNestProviderToArray(providerObject: NestProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean): void;
+import { NestProviderObject } from './nest-provider-object';
+/**
+ * @deprecated import from @rxap/ts-morph as CoerceNestProviderToArray
+ */
+export declare function AddNestProviderToArray(providerObject: NestProviderObject | string, providerArray: ArrayLiteralExpression, overwrite?: boolean | string[]): void;

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

@@ -1,29 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddNestProviderToArray = void 0;
-const ts_morph_1 = require("ts-morph");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const ts_morph_1 = require("ts-morph");
+/**
+ * @deprecated import from @rxap/ts-morph as CoerceNestProviderToArray
+ */
 function AddNestProviderToArray(providerObject, providerArray, overwrite = false) {
     if (typeof providerObject === 'string') {
-        if (!providerArray.getElements().some(element => element.getFullText().trim() === providerObject)) {
+        if (!providerArray.getElements().some(element => element.getText().trim() === providerObject)) {
             providerArray.addElement(providerObject);
         }
     }
     else {
-        const index = providerArray.getElements().findIndex(element => {
+        let index = providerArray.getElements().findIndex(element => {
             var _a;
             if (element instanceof ts_morph_1.ObjectLiteralExpression) {
                 const provideProperty = element.getProperty('provide');
                 if (provideProperty instanceof ts_morph_1.PropertyAssignment) {
-                    return ((_a = provideProperty.getInitializer()) === null || _a === void 0 ? void 0 : _a.getFullText().trim()) === providerObject.provide;
+                    return ((_a = provideProperty.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().trim()) === providerObject.provide;
                 }
             }
             return false;
         });
-        if (overwrite && index !== -1) {
+        if ((overwrite === true || (Array.isArray(overwrite) && overwrite.includes('provider'))) && index !== -1) {
             providerArray.removeElement(index);
+            index = -1;
         }
-        if (overwrite || index === -1) {
+        if (index === -1) {
             providerArray.addElement(ts_morph_1.Writers.object((0, schematics_utilities_1.DeleteUndefinedProperties)({
                 provide: providerObject.provide,
                 useClass: providerObject.useClass,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"add-nest-provider-to-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-provider-to-array.ts"],"names":[],"mappings":";;;~~AACA~~,~~uCAKkB~~;~~AAClB~~,~~qEAAuE~~;~~AAEvE~~,SAAgB,sBAAsB,CACpC,cAA2C,EAC3C,aAAqC,EACrC,~~SAAS~~,~~GAAG,~~KAAK;~~IAGjB~~,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QAEtC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,EAAE,CAAC,IAAI,EAAE,KAAK,cAAc,CAAC,EAAE;~~YACjG~~,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SAC1C;KAEF;SAAM;QAEL,~~MAAM~~,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;;~~YAC5D~~,IAAI,OAAO,YAAY,kCAAuB,EAAE;gBAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;gBACvD,IAAI,eAAe,YAAY,6BAAkB,EAAE;oBACjD,OAAO,CAAA,MAAA,eAAe,CAAC,cAAc,EAAE,0CAAE,~~WAAW~~,GAAG,IAAI,EAAE,MAAK,cAAc,CAAC,OAAO,CAAC;~~iBAC1F~~;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;~~YAC7B~~,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;~~SACpC~~;QAED,IAAI,~~SAAS,IAAI,~~KAAK,KAAK,CAAC,CAAC,EAAE;~~YAC7B~~,aAAa,CAAC,UAAU,CAAC,kBAAO,CAAC,MAAM,CAAC,IAAA,gDAAyB,EAAC;gBAChE,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,KAAK,EAAE,cAAc,CAAC,KAAK;gBAC3B,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC7B,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAM,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAE,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC3G,SAAS;aACZ,CAAC,CAAC,CAAC,CAAC;SACN;KAEF;AAEH,CAAC;~~AA5CD~~,~~wDA4CC~~"}
1	+ {"version":3,"file":"add-nest-provider-to-array.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/add-nest-provider-to-array.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,uCAKkB;AAGlB;;GAEG;AACH,SAAgB,sBAAsB,CACpC,cAA2C,EAC3C,aAAqC,EACrC,YAAgC,KAAK;IAGrC,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QAEtC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,cAAc,CAAC,EAAE;YAC7F,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SAC1C;KAEF;SAAM;QAEL,IAAI,KAAK,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;;YAC1D,IAAI,OAAO,YAAY,kCAAuB,EAAE;gBAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;gBACvD,IAAI,eAAe,YAAY,6BAAkB,EAAE;oBACjD,OAAO,CAAA,MAAA,eAAe,CAAC,cAAc,EAAE,0CAAE,OAAO,GAAG,IAAI,EAAE,MAAK,cAAc,CAAC,OAAO,CAAC;iBACtF;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,CACE,SAAS,KAAK,IAAI,IAAI,CACV,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAC3D,CACZ,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACrB,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnC,KAAK,GAAG,CAAC,CAAC,CAAC;SACZ;QAED,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,aAAa,CAAC,UAAU,CAAC,kBAAO,CAAC,MAAM,CAAC,IAAA,gDAAyB,EAAC;gBAChE,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,UAAU,EAAE,cAAc,CAAC,UAAU;gBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;gBACvC,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,KAAK,EAAE,cAAc,CAAC,KAAK;gBAC3B,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC7B,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAM,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAE,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC3G,SAAS;aACZ,CAAC,CAAC,CAAC,CAAC;SACN;KAEF;AAEH,CAAC;AAjDD,wDAiDC"}

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

@@ -4,6 +4,7 @@ export interface OperationParameter {
     type?: string | WriterFunction;
     pipeList?: Array<string | WriterFunction>;
     defaultValue?: string | WriterFunction;
+    hasQuestionToken?: boolean;
     required?: boolean;
     isArray?: boolean;
     /**

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

@@ -35,19 +35,17 @@ function buildMethodQueryParameters(queryList, importStructures) {
             });
             return Object.assign(Object.assign({}, query), { pipeList });
         }).map(query => {
-            var _a, _b;
+            var _a, _b, _c;
             return ({
                 name: (_a = query.alias) !== null && _a !== void 0 ? _a : query.name,
                 type: query.type,
-                hasQuestionToken: !query.required &&
-                    query.defaultValue ===
-                        undefined,
+                hasQuestionToken: (_b = query.hasQuestionToken) !== null && _b !== void 0 ? _b : (!query.required && query.defaultValue === undefined),
                 decorators: [
                     {
                         name: 'Query',
                         arguments: [
                             w => w.quote(query.name),
-                            ...((_b = query.pipeList) !== null && _b !== void 0 ? _b : []),
+                            ...((_c = query.pipeList) !== null && _c !== void 0 ? _c : []),
                         ],
                     },
                 ],

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

	@@ -1 +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":";;;AAAA,qEAGoC;AACpC,uCAckB;AAClB,gEAA2D;AAC3D,mEAA+D;AAC/D,+DAA2D;AAC3D,qEAAiE;~~AA+CjE~~,SAAS,0BAA0B,CACjC,SAA+B,EAC/B,gBAAiE;IAEjE,IAAI,SAAS,CAAC,MAAM,EAAE;QACpB,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;;YAC3B,IAAI,KAAK,CAAC,YAAY;gBACpB,SAAS,EAAE;gBACX,OAAO,KAAK,CAAC;aACd;YACD,gBAAgB,CAAC,IAAI,CAAC;gBACpB,YAAY,EAAE,CAAE,kBAAkB,CAAE;gBACpC,eAAe,EAAE,gBAAgB;aAClC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,MAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,KAAK,EAAE,mCAAI,EAAE,CAAC;YAC/C,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBAChB,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBACjC,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,EAAE;oBAC1C,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;iBAC7B;qBAAM,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,UAAU,EAAE;oBACnD,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;iBACvB;qBAAM;oBACL,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;iBAC1E;gBACD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;YACH,uCACK,KAAK,KACR,QAAQ,IACR;QACJ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;;YAAC,OAAA,CAAC;gBACf,IAAI,EAAE,MAAA,KAAK,CAAC,KAAK,mCACf,KAAK,CAAC,IAAI;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,gBAAgB,EAAE,CAAC,KAAK,CAAC,QAAQ~~;oBAC/B~~,KAAK,CAAC,YAAY~~;wBAClB~~,SAAS;~~gBACX~~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"}
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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"}

package/src/lib/nest/build-nest-controller-name.js CHANGED Viewed

@@ -6,7 +6,14 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
 function BuildNestControllerName(options) {
     let { controllerName, controllerNameSuffix, nestModule, } = options;
     if (nestModule && nestModule !== controllerName) {
-        controllerName = [nestModule, controllerName].join('-');
+        if (controllerName) {
+            if (!controllerName.startsWith(nestModule)) {
+                controllerName = [nestModule, controllerName].join('-');
+            }
+        }
+        else {
+            controllerName = nestModule;
+        }
     }
     if (controllerNameSuffix) {
         controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-' + controllerNameSuffix);

package/src/lib/nest/build-nest-controller-name.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,qEAA0D;AAQ1D,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,IAAI,EACF,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,IAAI,UAAU,KAAK,cAAc,EAAE;QAC/C,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;~~KAC3D~~;IAED,IAAI,oBAAoB,EAAE;QACxB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAe,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;KAC1E;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;~~AArBD~~,~~0DAqBC~~"}
1	+ {"version":3,"file":"build-nest-controller-name.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/build-nest-controller-name.ts"],"names":[],"mappings":";;;AAAA,2DAAiE;AACjE,qEAA0D;AAQ1D,SAAgB,uBAAuB,CAAC,OAAuC;IAC7E,IAAI,EACF,cAAc,EACd,oBAAoB,EACpB,UAAU,GACX,GAAG,OAAO,CAAC;IAEZ,IAAI,UAAU,IAAI,UAAU,KAAK,cAAc,EAAE;QAC/C,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC1C,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3D;SACF;aAAM;YACL,cAAc,GAAG,UAAU,CAAC;SAC7B;KACF;IAED,IAAI,oBAAoB,EAAE;QACxB,cAAc,GAAG,IAAA,mCAAY,EAAC,cAAe,EAAE,GAAG,GAAG,oBAAoB,CAAC,CAAC;KAC5E;IAED,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,gCAAmB,CAAC,yCAAyC,CAAC,CAAC;KAC1E;IAED,OAAO,cAAc,CAAC;AAExB,CAAC;AA3BD,0DA2BC"}

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

@@ -3,6 +3,8 @@ import { DtoClassProperty } from './create-dto-class';
 export interface CoerceDtoClassOutput {
     className: string;
     filePath: string;
+    sourceFile: SourceFile;
+    classDeclaration: ClassDeclaration;
 }
 export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
 export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;

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

@@ -102,7 +102,7 @@ function CoerceDtoClass(options) {
             });
         }
         if (property.isOptional) {
-            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsInstance', {
+            (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsOptional', {
                 arguments: [],
             });
             importStructureList.push({
@@ -135,7 +135,7 @@ function CoerceDtoClass(options) {
                         namedImports: ['IsUUID'],
                         moduleSpecifier: 'class-validator',
                     });
-                    (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
+                    (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
                         arguments: [],
                     });
                 }
@@ -144,13 +144,13 @@ function CoerceDtoClass(options) {
                         namedImports: ['IsString'],
                         moduleSpecifier: 'class-validator',
                     });
-                    (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
+                    (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsString', {
                         arguments: [],
                     });
                 }
                 break;
             case 'uuid':
-                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsUUID', {
                     arguments: [],
                 });
                 importStructureList.push({
@@ -159,7 +159,7 @@ function CoerceDtoClass(options) {
                 });
                 break;
             case 'boolean':
-                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsNumber', {
+                (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'IsBoolean', {
                     arguments: [],
                 });
                 importStructureList.push({
@@ -174,6 +174,8 @@ function CoerceDtoClass(options) {
     return {
         className,
         filePath: '.' + (0, path_1.join)(sourceFile.getDirectoryPath(), sourceFile.getBaseNameWithoutExtension()),
+        sourceFile,
+        classDeclaration,
     };
 }
 exports.CoerceDtoClass = CoerceDtoClass;

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,+BAA4B;AAC5B,uCAckB;AAClB,kDAA8C;AAC9C,8DAAyD;AACzD,mEAA+D;AAC/D,+DAA2D;AAC3D,uDAAmD;~~AAkBnD~~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~~UAAU~~,~~EACV~~;wBACE,SAAS,EAAE,EAAE;qBACd,CACF,CAAC;iBACH;qBAAM;oBACL,mBAAmB,CAAC,IAAI,CAAC;wBACvB,YAAY,EAAE,CAAE,UAAU,CAAE;wBAC5B,eAAe,EAAE,iBAAiB;qBACnC,CAAC,CAAC;oBACH,IAAA,kCAAe,EACb,mBAAmB,EACnB,UAAU,EACV;wBACE,SAAS,EAAE,EAAE;qBACd,CACF,CAAC;iBACH;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,IAAA,kCAAe,EACb,mBAAmB,EACnB,~~UAAU~~,~~EACV~~;oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;gBACF,mBAAmB,CAAC,IAAI,CAAC;oBACvB,YAAY,EAAE,CAAE,QAAQ,CAAE;oBAC1B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,SAAS;gBACZ,IAAA,kCAAe,EACb,mBAAmB,EACnB,~~UAAU~~,~~EACV~~;oBACE,SAAS,EAAE,EAAE;iBACd,CACF,CAAC;gBACF,mBAAmB,CAAC,IAAI,CAAC;oBACvB,YAAY,EAAE,CAAE,WAAW,CAAE;oBAC7B,eAAe,EAAE,iBAAiB;iBACnC,CAAC,CAAC;gBACH,MAAM;SACT;KAEF;IAED,IAAA,8BAAa,EAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IAE/C,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;~~KAC9F~~,CAAC;AAEJ,CAAC;~~AAvND~~,~~wCAuNC~~"}
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-page-operation.d.ts CHANGED Viewed

@@ -1,17 +1,18 @@
+import { TypeImport } from '@rxap/ts-morph';
 import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
 import { OperationOptions } from './add-operation-to-controller';
 import { CoerceOperationOptions } from './coerce-operation';
 import { DtoClassProperty } from './create-dto-class';
-export interface GetPageOperationColumn {
+export interface GetPageOperationProperty {
     name: string;
-    type?: string;
+    type?: TypeImport;
     /**
      * the property name of the source object. if not defined the name will be used
      */
     source?: string;
 }
 export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperationOptions, 'operationName'>, 'tsMorphTransform'> {
-    columnList: GetPageOperationColumn[];
+    propertyList: GetPageOperationProperty[];
     tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration, controllerName: string, pageClassName: string, rowClassName: string) => Partial<OperationOptions>;
     /**
      * the name of the property used as row id value. defaults to the value 'uuid'. If null the __rowId property will be
@@ -29,9 +30,11 @@ export interface CoerceGetPageOperationOptions extends Omit<Omit<CoerceOperation
     responseDtoName?: string;
     coerceToRowDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
     coerceToPageDtoMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions) => void;
+    coerceGetPageDataMethod?: (sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceGetPageOperationOptions) => void;
 }
-export declare function GetPageOperationColumnToDtoClassProperty(column: GetPageOperationColumn): DtoClassProperty;
-export declare function GetPageOperationColumnToCodeText(column: GetPageOperationColumn): string;
+export declare function GetPageOperationColumnToDtoClassProperty(property: GetPageOperationProperty): DtoClassProperty;
+export declare function GetPageOperationColumnToCodeText(property: GetPageOperationProperty): string;
 export declare function CoerceToRowDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, rowClassName: string, options: CoerceGetPageOperationOptions): void;
 export declare function CoerceToPageDtoMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, pageClassName: string, rowClassName: string, options: CoerceGetPageOperationOptions): void;
+export declare function CoerceGetPageDataMethod(sourceFile: SourceFile, classDeclaration: ClassDeclaration, options: CoerceGetPageOperationOptions): void;
 export declare function CoerceGetPageOperation(options: Readonly<CoerceGetPageOperationOptions>): import("@angular-devkit/schematics").Rule;