@rxap/schematics-ts-morph 16.1.0-dev.2 → 16.1.0-dev.21

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

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddOperationToController = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
-const ts_morph_1 = require("ts-morph");
-const coerce_class_method_1 = require("../coerce-class-method");
-const coerce_decorator_1 = require("../ts-morph/coerce-decorator");
-const coerce_imports_1 = require("../ts-morph/coerce-imports");
-const coerce_statements_1 = require("../ts-morph/coerce-statements");
-const ts_morph_2 = require("@rxap/ts-morph");
+const ts_morph_1 = require("@rxap/ts-morph");
+const utilities_1 = require("@rxap/utilities");
+const ts_morph_2 = require("ts-morph");
 function buildMethodQueryParameters(queryList, sourceFile) {
     if (queryList.length) {
         return queryList.map(query => {
@@ -16,7 +13,7 @@ function buildMethodQueryParameters(queryList, sourceFile) {
                 undefined) {
                 return query;
             }
-            (0, coerce_imports_1.CoerceImports)(sourceFile, {
+            (0, ts_morph_1.CoerceImports)(sourceFile, {
                 namedImports: ['DefaultValuePipe'],
                 moduleSpecifier: '@nestjs/common',
             });
@@ -35,23 +32,28 @@ function buildMethodQueryParameters(queryList, sourceFile) {
                 w.write(')');
             });
             return Object.assign(Object.assign({}, query), { pipeList });
-        }).map(query => {
-            var _a, _b, _c;
-            return ({
-                name: (_a = query.alias) !== null && _a !== void 0 ? _a : query.name,
-                type: query.type ? (0, ts_morph_2.WriteType)({ type: query.type, isArray: false }, sourceFile) : undefined,
-                hasQuestionToken: (_b = query.hasQuestionToken) !== null && _b !== void 0 ? _b : (!query.required && query.defaultValue === undefined),
-                decorators: [
-                    {
-                        name: 'Query',
-                        arguments: [
-                            w => w.quote(query.name),
-                            ...((_c = query.pipeList) !== null && _c !== void 0 ? _c : []),
-                        ],
-                    },
-                ],
-            });
-        });
+        }).map(({ alias, name, type, hasQuestionToken, required, defaultValue, pipeList = [], isArray }) => ({
+            name: alias !== null && alias !== void 0 ? alias : name,
+            type: (0, ts_morph_1.WriteType)({ type: type !== null && type !== void 0 ? type : 'unknown', isArray: isArray }, sourceFile),
+            hasQuestionToken: hasQuestionToken !== null && hasQuestionToken !== void 0 ? hasQuestionToken : (!required && defaultValue === undefined),
+            decorators: [
+                {
+                    name: 'Query',
+                    arguments: [
+                        w => w.quote(name),
+                        ...pipeList.map(pipe => {
+                            if (typeof pipe === 'string') {
+                                return pipe;
+                            }
+                            if (typeof pipe === 'function') {
+                                return pipe;
+                            }
+                            return (0, ts_morph_1.WriteType)(pipe, sourceFile);
+                        }),
+                    ],
+                },
+            ],
+        }));
     }
     return [];
 }
@@ -59,7 +61,7 @@ function buildMethodParamParameters(paramList, sourceFile) {
     if (paramList.length) {
         return paramList.map(({ alias, name, type }) => ({
             name: alias !== null && alias !== void 0 ? alias : name,
-            type: type ? (0, ts_morph_2.WriteType)({
+            type: type ? (0, ts_morph_1.WriteType)({
                 type: type,
                 isArray: false
             }, sourceFile) : undefined,
@@ -115,30 +117,28 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
         }
         (_a = param.type) !== null && _a !== void 0 ? _a : (param.type = 'string');
     });
-    const importStructures = [
-        {
-            namedImports: [method, 'NotImplementedException'],
-            moduleSpecifier: '@nestjs/common',
-        },
-    ];
+    (0, ts_morph_1.CoerceImports)(sourceFile, {
+        namedImports: [method, 'NotImplementedException'],
+        moduleSpecifier: '@nestjs/common',
+    });
     if (queryList.length) {
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['Query'],
             moduleSpecifier: '@nestjs/common',
         });
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['ApiQuery'],
             moduleSpecifier: '@nestjs/swagger',
         });
     }
     if (paramList.length) {
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['Param'],
             moduleSpecifier: '@nestjs/common',
         });
     }
     if (body) {
-        importStructures.push({
+        (0, ts_morph_1.CoerceImports)(sourceFile, {
             namedImports: ['Body'],
             moduleSpecifier: '@nestjs/common',
         });
@@ -161,19 +161,9 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
     }
     // TODO : check that all defined param in the paramList are present in the path
     returnType !== null && returnType !== void 0 ? returnType : (returnType = 'void');
-    const methodDeclaration = (0, coerce_class_method_1.CoerceClassMethod)(classDeclaration, (0, schematics_utilities_1.camelize)(name), {
-        scope: ts_morph_1.Scope.Public,
+    const methodDeclaration = (0, ts_morph_1.CoerceClassMethod)(classDeclaration, (0, schematics_utilities_1.camelize)(name), {
+        scope: ts_morph_2.Scope.Public,
         isAsync,
-        parameters: [
-            ...buildMethodQueryParameters(queryList, sourceFile),
-            ...buildMethodParamParameters(paramList, sourceFile),
-            ...buildMethodBodyParameters(body),
-        ].sort((a, b) => {
-            if (a.hasQuestionToken && b.hasQuestionToken) {
-                return 0;
-            }
-            return a.hasQuestionToken ? 1 : -1;
-        }),
         returnType: !isAsync ? returnType : returnType ? (w) => {
             w.write('Promise<');
             if (typeof returnType === 'string') {
@@ -188,21 +178,35 @@ function AddOperationToController(sourceFile, classDeclaration, name, options) {
             w.write('>');
         } : undefined,
     });
+    const existingParameters = methodDeclaration.getParameters().map(p => p.getStructure());
+    (0, utilities_1.CoerceArrayItems)(existingParameters, [
+        ...buildMethodQueryParameters(queryList, sourceFile),
+        ...buildMethodParamParameters(paramList, sourceFile),
+        ...buildMethodBodyParameters(body),
+    ], (a, b) => a.name === b.name);
+    methodDeclaration.getParameters().forEach(p => p.remove());
+    for (const parameter of existingParameters.sort((a, b) => {
+        if (a.hasQuestionToken && b.hasQuestionToken) {
+            return 0;
+        }
+        return a.hasQuestionToken ? 1 : -1;
+    })) {
+        methodDeclaration.addParameter(parameter);
+    }
     decorators.forEach(decorator => {
-        (0, coerce_decorator_1.CoerceDecorator)(methodDeclaration, decorator.name, decorator);
+        (0, ts_morph_1.CoerceDecorator)(methodDeclaration, decorator.name, decorator);
     });
-    (0, coerce_decorator_1.CoerceDecorator)(methodDeclaration, method, { arguments: path ? [w => w.quote(path)] : [] });
+    (0, ts_morph_1.CoerceDecorator)(methodDeclaration, method, { arguments: path ? [w => w.quote(path)] : [] });
     coerceApiQueryDecorators(queryList, methodDeclaration);
-    (0, coerce_statements_1.CoerceStatements)(methodDeclaration, statements !== null && statements !== void 0 ? statements : ['throw new NotImplementedException();']);
-    (0, coerce_imports_1.CoerceImports)(sourceFile, importStructures);
+    (0, ts_morph_1.CoerceStatements)(methodDeclaration, statements !== null && statements !== void 0 ? statements : ['throw new NotImplementedException();']);
     tsMorphTransform(sourceFile, classDeclaration, methodDeclaration, options);
 }
 exports.AddOperationToController = AddOperationToController;
 function coerceApiQueryDecorators(queryList, methodDeclaration) {
     for (const query of queryList) {
-        (0, coerce_decorator_1.CoerceDecorator)(methodDeclaration, 'ApiQuery', {
+        (0, ts_morph_1.CoerceDecorator)(methodDeclaration, 'ApiQuery', {
             arguments: [
-                ts_morph_1.Writers.object({
+                ts_morph_2.Writers.object({
                     name: w => w.quote(query.name),
                     required: query.required ? 'true' : 'false',
                     isArray: query.isArray ? 'true' : 'false',
@@ -212,9 +216,9 @@ function coerceApiQueryDecorators(queryList, methodDeclaration) {
             var _a;
             if (decorator.getArguments().length) {
                 const [objectLiteralExpression] = decorator.getArguments();
-                if (objectLiteralExpression instanceof ts_morph_1.ObjectLiteralExpression) {
+                if (objectLiteralExpression instanceof ts_morph_2.ObjectLiteralExpression) {
                     const namePropertyElement = objectLiteralExpression.getProperty('name');
-                    if (namePropertyElement instanceof ts_morph_1.PropertyAssignment) {
+                    if (namePropertyElement instanceof ts_morph_2.PropertyAssignment) {
                         const name = (_a = namePropertyElement.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText().trim().replace(/^'/, '').replace(/'$/, '');
                         return name === query.name;
                     }

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

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

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

@@ -6,15 +6,25 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
 function BuildNestControllerName(options) {
     let { controllerName, controllerNameSuffix, nestModule, } = options;
     if (nestModule && nestModule !== controllerName) {
+        console.log('The nest module name is different from the controller name');
         if (controllerName) {
+            console.log('controllerName', controllerName);
             if (!controllerName.startsWith(nestModule)) {
+                console.log('The controller name is not prefixed with the nest module name');
                 controllerName = [nestModule, controllerName].join('-');
             }
+            else {
+                console.warn('The controller name is already prefixed with the nest module name');
+            }
         }
         else {
+            console.warn('The controller name is not defined');
             controllerName = nestModule;
         }
     }
+    else {
+        console.log('The nest module name is the same as the controller name');
+    }
     if (controllerNameSuffix) {
         controllerName = (0, schematics_utilities_1.CoerceSuffix)(controllerName, '-' + controllerNameSuffix);
     }

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

@@ -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,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"}
+{"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,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;QAC1E,IAAI,cAAc,EAAE;YAClB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC1C,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;gBAC7E,cAAc,GAAG,CAAE,UAAU,EAAE,cAAc,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3D;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;aACnF;SACF;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACnD,cAAc,GAAG,UAAU,CAAC;SAC7B;KACF;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;KACxE;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;AAnCD,0DAmCC"}

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

@@ -0,0 +1,12 @@
+import { Rule } from '@angular-devkit/schematics';
+import { NormalizedDataProperty } from '@rxap/ts-morph';
+import { ClassDeclaration, SourceFile, WriterFunction } from 'ts-morph';
+import { CoerceDtoClassOutput } from './coerce-dto-class';
+import { CoerceOperationOptions, TransformOperation } from './coerce-operation';
+export interface CoerceAutocompleteOptionsOperationRuleOptions extends CoerceOperationOptions {
+    toDisplayProperty: NormalizedDataProperty;
+    toValueProperty: NormalizedDataProperty;
+}
+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

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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, 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 }),
+        Object.assign(Object.assign({}, options.toDisplayProperty), { name: 'display', source: options.toDisplayProperty.name }),
+    ], (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;
+//# sourceMappingURL=coerce-autocomplete-options-operation.js.map

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

@@ -0,0 +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":";;;AACA,6CAGwB;AACxB,+CAAmD;AACnD,uCAKkB;AAElB,yDAI4B;AAO5B,SAAgB,mDAAmD,CACjE,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAgE;IAEhE,MAAM,EACJ,OAAO,GACR,GAAG,OAAO,CAAC;IACZ,OAAO,GAAG,EAAE;QACV,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;QACjE,IAAI,QAAQ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;YAC5D,OAAO,CAAC,CAAC,EAAE;gBACT,CAAC,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAChD,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE;oBACZ,CAAC,CAAC,SAAS,CAAC,eAAe,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC;oBACpD,CAAC,CAAC,SAAS,CAAC,iBAAiB,iBAAiB,CAAC,IAAI,GAAG,CAAC,CAAC;oBACxD,CAAC,CAAC,SAAS,CAAC,GAAG,iBAAiB,CAAC,IAAI,UAAU,iBAAiB,CAAC,IAAI,GAAG,CAAC,CAAC;oBAC1E,CAAC,CAAC,SAAS,CAAC,GAAG,eAAe,CAAC,IAAI,UAAU,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;gBACvE,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,CAAC;SACH;QACD,mCAAmC;QACnC,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AA1BD,kHA0BC;AAED,SAAgB,2DAA2D,CACzE,gBAAkC,EAClC,gBAA4B,EAC5B,GAAgC,EAChC,OAAgE;IAEhE,OAAO,GAAG,EAAE;QACV,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;QAChD,IAAI,QAAQ,IAAI,IAAA,6CAAkC,EAAC,QAAQ,CAAC,EAAE;YAC5D,OAAO,kBAAO,CAAC,MAAM,CAAC;gBACpB,UAAU,EAAE,kBAAO,CAAC,MAAM,CAAC;oBACzB,MAAM,EAAE,CAAC,CAAC,EAAE;wBACV,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;wBACrB,CAAC,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC,IAAI,iBAAiB,CAAC,CAAC;wBACtD,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACnB,CAAC;oBACD,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC;oBACjC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;oBAC3B,IAAI,EAAE,GAAG;oBACT,IAAI,EAAE,IAAI;iBACX,CAAC;aACH,CAAC,CAAC;SACJ;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;AACJ,CAAC;AAzBD,kIAyBC;AAED,SAAgB,sCAAsC,CAAC,OAAgE;IACrH,MAAM,EACJ,gCAAgC,GAAG,mDAAmD,EACtF,wCAAwC,GAAG,2DAA2D,EACtG,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,SAAS;QACT,wCAAwC;QACxC,gCAAgC,IAChC,CAAC;AACL,CAAC;AA7BD,wFA6BC"}

package/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.d.ts

@@ -0,0 +1,7 @@
+import { NormalizedDataProperty } from '@rxap/ts-morph';
+import { CoerceOperationOptions } from './coerce-operation';
+export interface CoerceAutocompleteTableSelectValueResolveOperationOptions extends CoerceOperationOptions {
+    rowDisplayProperty: NormalizedDataProperty;
+    rowValueProperty: NormalizedDataProperty;
+}
+export declare function CoerceAutocompleteTableSelectValueResolveOperationRule(options: CoerceAutocompleteTableSelectValueResolveOperationOptions): import("@angular-devkit/schematics").Rule;

package/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CoerceAutocompleteTableSelectValueResolveOperationRule = void 0;
+const utilities_1 = require("@rxap/utilities");
+const coerce_operation_1 = require("./coerce-operation");
+const coerce_table_select_value_resolve_operation_1 = require("./coerce-table-select-value-resolve-operation");
+function CoerceAutocompleteTableSelectValueResolveOperationRule(options) {
+    const { buildUpstreamGetParametersImplementation = coerce_table_select_value_resolve_operation_1.BuildTableSelectValueResolveUpstreamGetParametersImplementation, propertyList = [], rowDisplayProperty, rowValueProperty, } = options;
+    (0, utilities_1.CoerceArrayItems)(propertyList, [
+        Object.assign(Object.assign({}, rowValueProperty), { name: 'value', source: rowValueProperty.name }),
+        Object.assign(Object.assign({}, rowDisplayProperty), { name: 'display', source: rowDisplayProperty.name }),
+    ], { compareTo: (a, b) => a.name === b.name, unshift: true });
+    return (0, coerce_operation_1.CoerceOperation)(Object.assign(Object.assign({}, options), { buildUpstreamGetParametersImplementation }));
+}
+exports.CoerceAutocompleteTableSelectValueResolveOperationRule = CoerceAutocompleteTableSelectValueResolveOperationRule;
+//# sourceMappingURL=coerce-autocomplete-table-select-value-resolve-operation.js.map

package/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"coerce-autocomplete-table-select-value-resolve-operation.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/ts-morph/src/lib/nest/coerce-autocomplete-table-select-value-resolve-operation.ts"],"names":[],"mappings":";;;AACA,+CAAmD;AACnD,yDAG4B;AAC5B,+GAAgI;AAQhI,SAAgB,sDAAsD,CAAC,OAAkE;IACvI,MAAM,EACJ,wCAAwC,GAAG,6GAA+D,EAC1G,YAAY,GAAG,EAAE,EACjB,kBAAkB,EAClB,gBAAgB,GACjB,GAAG,OAAO,CAAC;IAEZ,IAAA,4BAAgB,EAAC,YAAY,EAAE;wCAExB,gBAAgB,KACnB,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,gBAAgB,CAAC,IAAI;wCAG1B,kBAAkB,KACrB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,kBAAkB,CAAC,IAAI;KAElC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAE9D,OAAO,IAAA,kCAAe,kCACjB,OAAO,KACV,wCAAwC,IACxC,CAAC;AACL,CAAC;AAzBD,wHAyBC"}

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

@@ -1,28 +1,16 @@
-import { ClassDeclaration, ClassDeclarationStructure, ClassLikeDeclarationBase, ImportDeclarationStructure, OptionalKind, Project, PropertyDeclaration, PropertyDeclarationStructure, PropertySignature, SourceFile, TypeElementMemberedNode } from 'ts-morph';
-import { DtoClassProperty } from './create-dto-class';
+import { ClassDeclaration, Project, SourceFile } from 'ts-morph';
+import { DtoClassProperty } from './dto-class-property';
+import 'colors';
 export interface CoerceDtoClassOutput {
     className: string;
     filePath: string;
     sourceFile: SourceFile;
     classDeclaration: ClassDeclaration;
 }
-/**
- * @deprecated import from @rxap/ts-morph
- */
-export declare function CoercePropertyDeclaration(typeElementMemberedNode: TypeElementMemberedNode, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertySignature;
-export declare function CoercePropertyDeclaration(classLikeDeclarationBase: ClassLikeDeclarationBase, name: string, structure?: Partial<PropertyDeclarationStructure>): PropertyDeclaration;
 export interface CoerceDtoClassOptions {
     project: Project;
     name: string;
     propertyList?: DtoClassProperty[];
-    /**
-     * @deprecated use the tsMorphTransform to adapt the class
-     */
-    classStructure?: Omit<OptionalKind<ClassDeclarationStructure>, 'name'>;
-    /**
-     * @deprecated use the tsMorphTransform to add imports
-     */
-    importStructureList?: Array<OptionalKind<ImportDeclarationStructure>>;
     tsMorphTransform?: (project: Project, sourceFile: SourceFile, classDeclaration: ClassDeclaration) => void;
 }
 export declare function CoerceDtoClass(options: CoerceDtoClassOptions): CoerceDtoClassOutput;