@solidstarters/solid-code-builder 1.0.8 → 1.0.10

package/src/code-builder/lib/field/decorator-managers/dto/ApiPropertyDecoratorManager.ts

@@ -0,0 +1,127 @@
+import ts, { ModifierLike, PropertyDeclaration } from "@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript";
+import { DecoratorManager, PartialAddFieldChange } from "../../FieldManager";
+import { insertImport } from "@schematics/angular/utility/ast-utils";
+import { Change } from "@schematics/angular/utility/change";
+
+
+export interface ApiPropertyDecoratorOptions {
+  isApplyApiProperty: boolean;
+  source: ts.SourceFile;
+  field: any;
+}
+export class ApiPropertyDecoratorManager implements DecoratorManager {
+  constructor(public options: ApiPropertyDecoratorOptions, public fieldNode?: any) { }
+  isApplyDecorator(): boolean {
+    return true;
+  }
+
+  setFieldNode(fieldNode: ts.PropertyDeclaration): void {
+    this.fieldNode = fieldNode;
+  }
+
+  buildDecorator(): PartialAddFieldChange {
+    const fieldSourceLines = [];
+    const changes: Change[] = [];
+    fieldSourceLines.push(`@${this.decoratorName()}()`);
+    changes.push(...this.decoratorImports());
+    return {
+      filePath: this.options.source.fileName,
+      field: this.options.field,
+      changes: changes,
+      fieldSourceLines: fieldSourceLines,
+    };
+  }
+
+  decoratorName(): string {
+    return 'ApiProperty';
+  }
+
+  decoratorImports(): Change[] {
+    return [insertImport(
+        this.options.source,
+        this.options.source.fileName,
+        this.decoratorName(),
+        '@nestjs/swagger')]
+}
+
+  updateDecorator(): [PropertyDeclaration, Change[]] {
+    if (!this.fieldNode) throw new Error(`Field node is required for updating the ${this.decoratorName()} decorator`);
+
+    let newModifiers: ModifierLike[] = [];
+    let existingModifiers: ts.NodeArray<ModifierLike> | undefined = this.fieldNode.modifiers;
+
+    // Check if the field has an Length decorator.
+    //@ts-ignore
+    const existingDecorator = this.findDecorator(this.decoratorName(), existingModifiers);
+
+    //Remove the column decorator if the column decorator exists
+    //TODO probably this too can be done in a lesser intrusive way i.e update everything instead of removing and adding
+    newModifiers = [...this.filterNonDecorators(existingModifiers), ...this.filterOtherDecorators(this.decoratorName(), existingModifiers)];
+
+    //Add the column decorator if column decorator is required  
+    // console.log('this.options.isApplyLength', this.options.isApplyLength, this.options.length)
+    const changes: Change[] = [];  
+
+    if (this.isApplyDecorator()) {
+      newModifiers = [...newModifiers, this.createDecorator(existingDecorator)];
+      changes.push(...this.decoratorImports());
+    }
+
+    const updatedProperty = ts.factory.updatePropertyDeclaration(
+      this.fieldNode,
+      newModifiers, //Replace with new modifiers
+      this.fieldNode.name,
+      this.fieldNode.questionToken,
+      this.fieldNode.type,
+      this.fieldNode.initializer,
+    );
+    return [updatedProperty,changes];
+  }
+
+  createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
+    // Capture the existing validation options
+    let validationOptions: ts.ObjectLiteralElementLike[] = [];
+    if (existingDecorator !== undefined) {
+      //Pre-set the column options from the existing column decorator
+      const existingCallExpression = existingDecorator.expression as ts.CallExpression;
+      // Check if  call expression has at least 1 arguments
+      if (existingCallExpression.arguments.length > 1) {
+        if (!ts.isObjectLiteralExpression(existingCallExpression.arguments[1])) { throw new Error(`${this.decoratorName()} decorator 2nd argument must be an object literal containing the validation options`); }
+        const existingObjectLiteralExpression = existingCallExpression.arguments[1] as ts.ObjectLiteralExpression;
+        validationOptions.push(...existingObjectLiteralExpression.properties);
+      }
+    }
+
+    // Re-create the column decorator with the merged column decorator options
+    const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
+    const argumentsArray: ts.Expression[] = [];
+    // const length = ts.factory.createNumericLiteral(this.options.length);
+    // argumentsArray.push(length);
+    if (validationOptions.length > 0) {
+      const validationOptionsObjectLiteral = ts.factory.createObjectLiteralExpression(validationOptions);
+      argumentsArray.push(validationOptionsObjectLiteral);
+    }
+    const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
+    return ts.factory.createDecorator(call)
+
+  }
+
+  private findDecorator(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator | undefined {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => this.containsIdentifierName(m, name)).pop() : undefined;
+  }
+
+  private filterOtherDecorators(name: string, existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Decorator[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind === ts.SyntaxKind.Decorator)).map(m => m as ts.Decorator).filter(m => !this.containsIdentifierName(m, name)) : [];
+  }
+
+  private filterNonDecorators(existingModifiers: ts.NodeArray<ts.ModifierLike> | undefined): ts.Modifier[] {
+    return existingModifiers ? existingModifiers.filter((m) => (m.kind !== ts.SyntaxKind.Decorator)).map(m => m as ts.Modifier) : [];
+  }
+
+  private containsIdentifierName(m: ts.Decorator, identifierName: string): boolean {
+    const callExpression = m.expression as ts.CallExpression;
+    const identifier = callExpression.expression as ts.Identifier;
+    return identifier.text === identifierName;
+  }
+
+}

package/src/code-builder/lib/field/decorator-managers/entity/JoinTableDecoratorManager.ts

@@ -10,8 +10,8 @@ interface JoinTableDecoratorOptions {
     fieldName: string;
     modelName: string;
     relationJoinTableName: string;
-    relationTableModelName: string;
-    relationTableModelNameInverse: string;
+    relationJoinColumnName: string;
+    joinColumnName: string;
 }
 
 export class JoinTableDecoratorManager implements DecoratorManager {
@@ -102,15 +102,15 @@ export class JoinTableDecoratorManager implements DecoratorManager {
             options['name'] = `${this.options.relationJoinTableName}`;
         }
     
-        if (this.options.relationTableModelName) {
+        if (this.options.relationJoinColumnName) {
             options['joinColumn'] = {
-                name: `${this.options.relationTableModelName}_id`,
+                name: `${this.options.relationJoinColumnName}_id`,
             };
         }
     
-        if (this.options.relationTableModelNameInverse) {
+        if (this.options.joinColumnName) {
             options['inverseJoinColumn'] = {
-                name: `${this.options.relationTableModelNameInverse}_id`,
+                name: `${this.options.joinColumnName}_id`,
             };
         }
     
@@ -140,28 +140,28 @@ export class JoinTableDecoratorManager implements DecoratorManager {
             );
         }
     
-        if (this.options.relationTableModelName) {
+        if (this.options.relationJoinColumnName) {
             newRelationOptions.push(
                 ts.factory.createPropertyAssignment(
                     'joinColumn',
                     ts.factory.createObjectLiteralExpression([
                         ts.factory.createPropertyAssignment(
                             'name',
-                            ts.factory.createStringLiteral(`${this.options.relationTableModelName}_id`)
+                            ts.factory.createStringLiteral(`${this.options.relationJoinColumnName}_id`)
                         ),
                     ])
                 )
             );
         }
     
-        if (this.options.relationTableModelNameInverse) {
+        if (this.options.joinColumnName) {
             newRelationOptions.push(
                 ts.factory.createPropertyAssignment(
                     'inverseJoinColumn',
                     ts.factory.createObjectLiteralExpression([
                         ts.factory.createPropertyAssignment(
                             'name',
-                            ts.factory.createStringLiteral(`${this.options.relationTableModelNameInverse}_id`)
+                            ts.factory.createStringLiteral(`${this.options.joinColumnName}_id`)
                         ),
                     ])
                 )

package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts

@@ -41,6 +41,7 @@ import { ValidateNestedDecoratorManager } from '../../decorator-managers/dto/Val
 import { BigIntDecoratorManager } from '../../decorator-managers/dto/BigIntDecoratorManager';
 import { MaxLengthDecoratorManager } from '../../decorator-managers/dto/MaxLengthDecoratorManager';
 import { MinLengthDecoratorManager } from '../../decorator-managers/dto/MinLengthDecoratorManager';
+import { ApiPropertyDecoratorManager } from '../../decorator-managers/dto/ApiPropertyDecoratorManager';
 
 // This class manages the field generation for the DTOs
 // It adds validation decorators to the fields
@@ -79,6 +80,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
       DecoratorType.Date,
       DecoratorType.Boolean,
       DecoratorType.Json,
+      DecoratorType.ApiProperty
     );
   }
 
@@ -190,9 +192,11 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
 
   private buildPropertyLine(fieldName: string, fieldType: string, defaultConfigValue: string) {
     let entityPropertyLine = `${fieldName}: ${fieldType}`;
-    const defaultValue = this.defaultValueInitializer(defaultConfigValue)?.text ?? null;
-    if (defaultValue) {
-      entityPropertyLine += ` = ${defaultValue}`;
+    if (this.options.sourceType === DtoSourceType.Create) {
+      const defaultValue = this.defaultValueInitializer(defaultConfigValue)?.text ?? null;
+      if (defaultValue) {
+        entityPropertyLine += ` = ${defaultValue}`;
+      }
     }
     entityPropertyLine += ';';
     return entityPropertyLine;
@@ -338,6 +342,10 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     return false;
   }
 
+  protected isApplyApiProperty(): boolean { // Not keeping this abstract, as this abstract approach will be deprecated in future
+    return true;
+  }
+
   protected applyUpdateDecoratorTransformations(fieldPropertyDeclarationNode: ts.PropertyDeclaration, ...transformers: DecoratorManager[]): [ts.PropertyDeclaration, Change[]] {
     let updatedPropertyDeclarationNode = fieldPropertyDeclarationNode;
     const changes: Change[] = [];
@@ -453,6 +461,8 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
           return new ArrayDecoratorManager({ isArray: true, source: source, field: field });
         case DecoratorType.ValidateNested:
           return new ValidateNestedDecoratorManager({ isValidateNested: true, source: source, field: field });
+        case DecoratorType.ApiProperty:
+          return new ApiPropertyDecoratorManager({ isApplyApiProperty: this.isApplyApiProperty(), source: source, field: field });
       }
     });
   }

package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForEntity.ts

@@ -116,8 +116,8 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
         fieldName: this.fieldName(),
         modelName: this.modelName,
         relationJoinTableName: this.field.relationJoinTableName,
-        relationTableModelName: this.field.relationTableModelName,
-        relationTableModelNameInverse: this. field.relationTableModelNameInverse
+        relationJoinColumnName: this.field.relationJoinColumnName,
+        joinColumnName: this. field.joinColumnName
       },
     );
     this.uniqueIndexDecoratorManager = new UniqueIndexDecoratorManager(

package/src/code-builder/lib/model/helpers.ts

@@ -483,4 +483,8 @@ export function takeBackupIfChecksumsMismatch(tree: Tree, moduleName: string) {
 
 export function calculateModuleFileImportPath(moduleName: string, internalPath: string) {
  return (moduleName === SOLID_CORE_MODULE_NAME) ? internalPath : SOLID_CORE_MODULE_NPM_PACKAGE_NAME;
+}
+
+export function unSnakeCase(name: string) {
+  return name.split("_").map(word => word.charAt(0).toUpperCase() + word.slice(1)).join(" ")
 }

package/src/code-builder/index.d.ts

@@ -1,9 +0,0 @@
-import { Rule } from '@angular-devkit/schematics';
-export declare function addModule(options: any): Rule;
-export declare function refreshModel(options: any): Rule;
-export declare function addModel(options: any): Rule;
-export declare function addFields(options: any): Rule;
-export declare function updateFields(options: any): Rule;
-export declare function removeFields(options: any): Rule;
-export declare function showAST(options: any): Rule;
-export declare function updateChecksum(moduleName: string, generateChecksum?: boolean, ...filePaths: string[]): Rule;

package/src/code-builder/index.js

@@ -1,178 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateChecksum = exports.showAST = exports.removeFields = exports.updateFields = exports.addFields = exports.addModel = exports.refreshModel = exports.addModule = void 0;
-const strings_1 = require("@angular-devkit/core/src/utils/strings");
-const schematics_1 = require("@angular-devkit/schematics");
-const generateModelHelpers = __importStar(require("./lib/model/helpers"));
-const helpers_1 = require("./lib/model/helpers");
-const helpers_2 = require("./lib/model/helpers");
-const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
-const generateModelUtils = Object.assign({ dasherize: strings_1.dasherize, classify: strings_1.classify }, generateModelHelpers);
-// You don't have to export the function as default. You can also have more than one rule factory
-// per file.
-function addModule(options) {
-    return (_tree, _context) => {
-        //Link to nestjs schematic
-        return (0, schematics_1.chain)([
-            (0, schematics_1.externalSchematic)('@nestjs/schematics', 'module', {
-                name: options === null || options === void 0 ? void 0 : options.module,
-            }),
-            updateChecksum(options === null || options === void 0 ? void 0 : options.module, options === null || options === void 0 ? void 0 : options.generateChecksum, ...generateModelHelpers.getSourceFilePathsAffected(generateModelHelpers.Command.AddModule, options)),
-        ]);
-    };
-}
-exports.addModule = addModule;
-function refreshModel(options) {
-    return (tree, _context) => {
-        // If the model related code is not present, then add it by call addModel, else call update field with the fields provided
-        const modelEntityFilePath = `src/${options.module}/entities/${(0, strings_1.dasherize)(options.model)}.entity.ts`;
-        // console.log('Model Entity File Path: ', modelEntityFilePath);
-        if (!tree.exists(modelEntityFilePath)) {
-            // console.log('Model does not exist, adding model');
-            return addModel(options)(tree, _context);
-        }
-        else {
-            // console.log('Model does not exist, updating fields');
-            return updateFields(options)(tree, _context);
-        }
-    };
-}
-exports.refreshModel = refreshModel;
-function addModel(options) {
-    return (tree, context) => {
-        //Link to a templates folder
-        const sourceTemplates = (0, schematics_1.apply)((0, schematics_1.url)('../../files/generate-model'), [
-            (0, schematics_1.template)(Object.assign(Object.assign({}, generateModelUtils), options)),
-            (0, schematics_1.move)(`src/${options.module}`),
-        ]);
-        return (0, schematics_1.branchAndMerge)((0, schematics_1.chain)([
-            addModuleImportsAndMetadata(options),
-            (0, schematics_1.mergeWith)(sourceTemplates, schematics_1.MergeStrategy.Overwrite),
-            updateChecksum(options === null || options === void 0 ? void 0 : options.module, options === null || options === void 0 ? void 0 : options.generateChecksum, ...generateModelHelpers.getSourceFilePathsAffected(generateModelHelpers.Command.AddModel, options)),
-            addFields(options),
-            // removeFields(options),
-        ]))(tree, context);
-    };
-}
-exports.addModel = addModel;
-function normalizeFieldType(fields) {
-    // if field is a string, convert it to an array
-    if (typeof fields === 'string') {
-        fields = [fields];
-    }
-    return fields;
-}
-function addFields(options) {
-    return (tree, _context) => {
-        const normalizedFields = normalizeFieldType(options.fields);
-        const fields = normalizedFields.map((f) => JSON.parse(f));
-        fields.forEach((field) => {
-            (0, helpers_1.addField)(tree, options, field);
-        });
-        return tree;
-    };
-}
-exports.addFields = addFields;
-function updateFields(options) {
-    return (tree, _context) => {
-        const normalizedFields = normalizeFieldType(options.fields);
-        const fields = normalizedFields.map((f) => JSON.parse(f));
-        (options === null || options === void 0 ? void 0 : options.generateChecksum) ? generateModelHelpers.takeBackupIfChecksumsMismatch(tree, options.module) : "no-ops";
-        fields.forEach((field) => {
-            generateModelHelpers.updateField(tree, options, field);
-        });
-        return tree;
-    };
-}
-exports.updateFields = updateFields;
-function removeFields(options) {
-    return (tree, _context) => {
-        const normalizedFields = normalizeFieldType(options.fields);
-        const fields = normalizedFields.map((f) => JSON.parse(f));
-        (options === null || options === void 0 ? void 0 : options.generateChecksum) ? generateModelHelpers.takeBackupIfChecksumsMismatch(tree, options.module) : "no-ops";
-        fields.forEach((field) => {
-            (0, helpers_2.removeField)(tree, options, field);
-        });
-        return tree;
-    };
-}
-exports.removeFields = removeFields;
-function addModuleImportsAndMetadata(options) {
-    return (tree, _context) => {
-        // Handle the module imports
-        const moduleFilePath = `src/${(0, strings_1.dasherize)(options.module)}/${(0, strings_1.dasherize)(options.module)}.module.ts`;
-        const moduleImports = [
-            { symbolName: `TypeOrmModule`, importPath: `@nestjs/typeorm` },
-            generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Entity),
-            generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Service),
-            generateModelHelpers.getSolidImports(options.model, generateModelHelpers.SolidProviderType.Controller),
-        ];
-        generateModelHelpers.addImports(tree, moduleFilePath, moduleImports);
-        // Handle the module metadata
-        const moduleMetadata = [
-            generateModelHelpers.getModuleMetadata(options.model, generateModelHelpers.ModuleMetadataType.TypeOrmImports),
-            generateModelHelpers.getModuleMetadata(options.model, generateModelHelpers.ModuleMetadataType.Controllers),
-            generateModelHelpers.getModuleMetadata(options.model, generateModelHelpers.ModuleMetadataType.Providers),
-        ];
-        generateModelHelpers.addModuleMetadata(tree, moduleFilePath, moduleMetadata);
-        return tree;
-    };
-}
-function showAST(options) {
-    return (tree, _context) => {
-        showASTinfo(tree, options.name);
-        return tree;
-    };
-}
-exports.showAST = showAST;
-function showASTinfo(tree, filePath) {
-    //Show the source tree of the target file
-    const sourceNode = typescript_1.default.createSourceFile(filePath, tree.readText(filePath), typescript_1.default.ScriptTarget.ES2015, true);
-    showTree(sourceNode);
-}
-function showTree(sourceNode) {
-    function printAllChildren(node, depth) {
-        console.log(`${depth}.`.repeat(depth), typescript_1.default.SyntaxKind[node.kind]);
-        if (node.getChildCount() === 0) {
-            console.log(`${depth}.`.repeat(depth) + ' Text: ' + node.getText());
-        }
-        node.getChildren().forEach(child => printAllChildren(child, depth + 1));
-    }
-    printAllChildren(sourceNode, 0);
-}
-function updateChecksum(moduleName, generateChecksum = false, ...filePaths) {
-    return (tree, _context) => {
-        if (!generateChecksum) {
-            return tree;
-        }
-        return generateModelHelpers.handleUpdateChecksums(tree, moduleName, ...filePaths);
-    };
-}
-exports.updateChecksum = updateChecksum;
-//# sourceMappingURL=index.js.map

package/src/code-builder/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/src/code-builder/index_spec.d.ts

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

package/src/code-builder/index_spec.js

@@ -1,46 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const schematics_1 = require("@angular-devkit/schematics");
-const testing_1 = require("@angular-devkit/schematics/testing");
-const path = __importStar(require("path"));
-const collectionPath = path.join(__dirname, '../collection.json');
-describe('code-builder', () => {
-    it('works', () => __awaiter(void 0, void 0, void 0, function* () {
-        const runner = new testing_1.SchematicTestRunner('schematics', collectionPath);
-        const tree = yield runner.runSchematic('code-builder', {}, schematics_1.Tree.empty());
-        expect(tree.files).toEqual([]);
-    }));
-});
-//# sourceMappingURL=index_spec.js.map

package/src/code-builder/index_spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index_spec.js","sourceRoot":"","sources":["index_spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAyE;AACzE,2CAA6B;AAE7B,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAElE,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,OAAO,EAAE,GAAS,EAAE;QACrB,MAAM,MAAM,GAAG,IAAI,6BAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,EAAE,EAAE,iBAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAEzE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC,CAAA,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/code-builder/lib/field/FieldManager.d.ts

@@ -1,106 +0,0 @@
-import { Tree } from '@angular-devkit/schematics';
-import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { Change, RemoveChange, ReplaceChange } from '@schematics/angular/utility/change';
-import { ValidationOptions } from 'class-validator';
-export declare const MAX_EMAIL_LENGTH = 254;
-export declare const UUID_REGEX = "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$";
-export declare enum DecoratorType {
-    Max = "max",
-    Min = "min",
-    Required = "required",
-    Optional = "optional",
-    Regex = "regex",
-    Number = "number",
-    String = "string",
-    Int = "int",
-    Decimal = "decimal",
-    Date = "date",
-    Boolean = "boolean",
-    Json = "json",
-    Transform = "transform",
-    Array = "array",
-    ValidateNested = "validateNested",
-    BigInt = "bigint",
-    MinLength = "minLength",
-    MaxLength = "maxLength"
-}
-export declare enum DeleteType {
-    CASCADE = "CASCADE",
-    RESTRICT = "RESTRICT",
-    SET_NULL = "SET_NULL",
-    SET_DEFAULT = "SET_DEFAULT"
-}
-export interface FieldHandler {
-    entityFieldManager: FieldManager;
-    createDtoFieldManager: FieldManager;
-    updateDtoFieldManager: FieldManager;
-    addEntityField(): FieldChange[];
-    addDtoField(): FieldChange[];
-    removeEntityField(): FieldChange[];
-    removeDtoField(): FieldChange[];
-    updateEntityField(): FieldChange[];
-    updateDtoField(): FieldChange[];
-}
-export interface FieldType {
-    text: string;
-    node: (field: any) => ts.TypeNode;
-}
-export interface DefaultValueInitializer {
-    value: any;
-    text: string;
-    expression: ts.Expression;
-}
-export interface DecoratorManager {
-    fieldNode?: PropertyDeclaration;
-    options: any;
-    updateDecorator(): [ts.PropertyDeclaration, Change[]];
-    buildDecorator(): PartialAddFieldChange;
-    setFieldNode(fieldNode: PropertyDeclaration): void;
-    decoratorName(): string;
-    isApplyDecorator(): boolean;
-}
-export interface FieldManager {
-    source: ts.SourceFile;
-    addField(): FieldChange[];
-    removeField(): FieldChange[];
-    updateField(): FieldChange[];
-    fieldName(): string;
-    fieldType(): FieldType;
-}
-export interface FieldChange {
-    filePath: string;
-    field: any;
-    changes: Change[];
-}
-export declare class PartialAddFieldChange implements FieldChange {
-    filePath: string;
-    field: any;
-    changes: Change[];
-    fieldSourceLines: string[];
-}
-export declare class RemoveChangeSSS extends RemoveChange {
-    removePosition: number;
-    constructor(path: string, pos: number, toRemove: string);
-}
-export declare class ReplaceChangeSSS extends ReplaceChange {
-    replacePosition: number;
-    constructor(path: string, pos: number, oldText: string, newText: string);
-}
-export declare function getFieldHandler(tree: Tree, moduleName: string, modelName: string, field: any): FieldHandler;
-export declare function createSourceFile(tree: Tree, filePath: string): ts.SourceFile;
-export declare function getClassNode(className: string, source: ts.SourceFile): ts.ClassDeclaration | undefined;
-export declare function getClassExportKeywordNode(className: string, sourceFile: ts.SourceFile): ts.ExportKeyword | undefined;
-export declare enum RelationType {
-    ManyToOne = "many-to-one",
-    ManyToMany = "many-to-many"
-}
-export declare enum DtoSourceType {
-    Create = "create",
-    Update = "update"
-}
-export declare class ManagerForDtoOptions {
-    sourceType: DtoSourceType;
-    constructor(sourceType: DtoSourceType);
-}
-export declare function safeInsertImport(source: ts.SourceFile, symbolName: string, importFileName: string): Change;
-export declare function IsBigInt(validationOptions?: ValidationOptions): (object: Object, propertyName: string) => void;