@solidstarters/solid-code-builder 1.0.12 → 1.0.13

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

@@ -1,5 +1,5 @@
 import { Tree } from '@angular-devkit/schematics';
-import ts, { SourceFile } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
+import ts, { ClassDeclaration, SourceFile } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from '@schematics/angular/utility/change';
 import { DecoratorManager, DecoratorType, DefaultValueInitializer, FieldChange, FieldManager, FieldType, ManagerForDtoOptions, PartialAddFieldChange } from '../../FieldManager';
 export declare abstract class BaseFieldManagerForDto implements FieldManager {
@@ -8,6 +8,7 @@ export declare abstract class BaseFieldManagerForDto implements FieldManager {
     protected readonly field: any;
     protected readonly options: ManagerForDtoOptions;
     source: SourceFile;
+    updatedSourceClassNode?: ts.ClassDeclaration;
     decoratorManagers: DecoratorManager[];
     constructor(tree: Tree, moduleName: string, modelName: string, field: any, options: ManagerForDtoOptions);
     removeField(): FieldChange[];
@@ -19,6 +20,7 @@ export declare abstract class BaseFieldManagerForDto implements FieldManager {
     private buildPropertyLine;
     addField(): FieldChange[];
     protected updateFieldInternal(fieldName: string, fieldType: ts.TypeNode, decoratorManagers: DecoratorManager[], field: any, source: ts.SourceFile): FieldChange;
+    updateClassNode(sourceClassNode: ts.ClassDeclaration, updatedFieldNode: ts.PropertyDeclaration, fieldName: string): ClassDeclaration;
     updateField(): FieldChange[];
     protected addAdditionalField(): FieldChange[];
     protected addOrUpdateAdditionalField(): FieldChange[];
@@ -43,10 +45,11 @@ export declare abstract class BaseFieldManagerForDto implements FieldManager {
     protected isApplyApiProperty(): boolean;
     protected applyUpdateDecoratorTransformations(fieldPropertyDeclarationNode: ts.PropertyDeclaration, ...transformers: DecoratorManager[]): [ts.PropertyDeclaration, Change[]];
     protected applyBuildDecoratorTransformations(...transformers: DecoratorManager[]): PartialAddFieldChange[];
-    protected calculateReplaceChanges(updatedPropertyDeclarationNodeText: string, fieldPropertyDeclarationNode: ts.PropertyDeclaration, source: ts.SourceFile): Change[];
-    protected printNode(updatedPropertyDeclarationNode: ts.PropertyDeclaration, nodeSource: SourceFile): string;
+    protected calculateReplaceChanges(updatedSourceNodeText: string, sourceNode: ts.Node, sourceFileName: string): Change[];
+    protected printNode(updatedPropertyDeclarationNode: ts.Node, nodeSource: SourceFile): string;
     protected isAdditionalFieldRequired(): boolean;
     protected getFieldDecoratorManagers(field: any, source: SourceFile, ...decoratorTypes: DecoratorType[]): DecoratorManager[];
     protected parseDefaultValue(defaultValueConfig: string): any | null;
     protected defaultValueInitializer(defaultValueConfig: string): DefaultValueInitializer | null;
+    private getClassNode;
 }

package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.js

@@ -108,13 +108,7 @@ class BaseFieldManagerForDto {
             changes.push(...builderChange.changes);
             fieldSourceLines.push(...builderChange.fieldSourceLines);
         });
-        // Create the field definition changes
-        // const classNode = findNodes(source, ts.SyntaxKind.ClassDeclaration)[0];
-        const className = (this.options.sourceType === FieldManager_1.DtoSourceType.Create) ? `Create${(0, strings_1.classify)(modelName)}Dto` : `Update${(0, strings_1.classify)(modelName)}Dto`;
-        const classNode = (0, FieldManager_1.getClassNode)(className, source);
-        if (!classNode) {
-            throw new Error(`Class ${className} not found in file ${source.fileName}`);
-        }
+        const classNode = this.getClassNode(modelName, this.options, source);
         const fieldDefinition = `\n${fieldSourceLines.reverse().join('\n')}\n`;
         changes.push(new change_1.InsertChange(source.fileName, classNode.end - 1, fieldDefinition));
         return {
@@ -151,7 +145,7 @@ class BaseFieldManagerForDto {
         return fieldChanges;
     }
     updateFieldInternal(fieldName, fieldType, decoratorManagers, field, source) {
-        var _a;
+        var _a, _b;
         const changes = [];
         // Get the field property declaration node
         const fieldPropertyDeclarationNode = (_a = this.getFieldIdentifierNode(fieldName, source)) === null || _a === void 0 ? void 0 : _a.parent;
@@ -162,13 +156,42 @@ class BaseFieldManagerForDto {
         const [updatedPropertyDeclarationNodeTransformed, decoratorChanges] = this.applyUpdateDecoratorTransformations(updatedPropertyDeclarationNode, ...decoratorManagers);
         updatedPropertyDeclarationNode = updatedPropertyDeclarationNodeTransformed;
         changes.push(...decoratorChanges);
-        changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+        // changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+        // if (!this.isAdditionalFieldRequired()) {
+        // Get the source class node i.e CreateDto or UpdateDto
+        const sourceClassNode = this.getClassNode(this.modelName, this.options, source); // FIXME Avoid this.model to avoid stateful behaviour
+        const classNode = (_b = this.updatedSourceClassNode) !== null && _b !== void 0 ? _b : sourceClassNode;
+        // Set the updated property declaration node to the source class node
+        const updatedClassNode = this.updateClassNode(classNode, updatedPropertyDeclarationNode, fieldName);
+        this.updatedSourceClassNode = updatedClassNode; // Set the updated class node to the source class node, so it can be used for additional operations e.g for additional field updates
+        changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), sourceClassNode, source.fileName));
+        // }
+        // else {
+        //   changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source.fileName));
+        // }
         return {
             filePath: source.fileName,
             field: field,
             changes: changes,
         };
     }
+    updateClassNode(sourceClassNode, updatedFieldNode, fieldName) {
+        // Replace the class memeber matching the field name with the updated field node
+        const newMembers = sourceClassNode.members.map((member) => {
+            // Check if the member is a PropertyDeclaration
+            if (typescript_1.default.isPropertyDeclaration(member)) {
+                // Compare the name of the property with the field name
+                const memberName = member.name.getText();
+                if (memberName === fieldName) {
+                    return updatedFieldNode;
+                }
+            }
+            return member;
+        });
+        // Update the class node with the new modifiers
+        const updatedClass = typescript_1.default.factory.updateClassDeclaration(sourceClassNode, sourceClassNode.modifiers, sourceClassNode.name, sourceClassNode.typeParameters, sourceClassNode.heritageClauses, newMembers);
+        return updatedClass;
+    }
     updateField() {
         const fieldChanges = [];
         console.log(`\ncreate Dto updateField ${this.fieldName()} called ...`);
@@ -265,13 +288,13 @@ class BaseFieldManagerForDto {
             };
         }
     }
-    calculateReplaceChanges(updatedPropertyDeclarationNodeText, fieldPropertyDeclarationNode, source) {
+    calculateReplaceChanges(updatedSourceNodeText, sourceNode, sourceFileName) {
         const changes = [];
-        if (updatedPropertyDeclarationNodeText.trim() !==
-            fieldPropertyDeclarationNode.getFullText().trim()) {
-            console.log(`Updated Code:\n${updatedPropertyDeclarationNodeText.trim()}\nwith length ${updatedPropertyDeclarationNodeText.trim().length}\n`);
-            console.log(`Old Code:\n${fieldPropertyDeclarationNode.getFullText().trim()}\nwith length ${fieldPropertyDeclarationNode.getFullText().trim().length}\n`);
-            const replaceChange = new FieldManager_1.ReplaceChangeSSS(source.fileName, fieldPropertyDeclarationNode.pos, fieldPropertyDeclarationNode.getFullText(), `\n\n${updatedPropertyDeclarationNodeText}`);
+        if (updatedSourceNodeText.trim() !==
+            sourceNode.getFullText().trim()) {
+            console.log(`Updated Code:\n${updatedSourceNodeText.trim()}\nwith length ${updatedSourceNodeText.trim().length}\n`);
+            console.log(`Old Code:\n${sourceNode.getFullText().trim()}\nwith length ${sourceNode.getFullText().trim().length}\n`);
+            const replaceChange = new FieldManager_1.ReplaceChangeSSS(sourceFileName, sourceNode.pos, sourceNode.getFullText(), `\n\n${updatedSourceNodeText}`);
             changes.push(replaceChange);
         }
         return changes;
@@ -348,6 +371,18 @@ class BaseFieldManagerForDto {
             expression: typescript_1.default.factory.createStringLiteral(defaultValue.toString())
         };
     }
+    getClassNode(modelName, options, source) {
+        // if (this.updatedSourceClassNode) {
+        //   return this.updatedSourceClassNode;
+        // }
+        const classifiedModelName = (0, strings_1.classify)(modelName);
+        const sourceClassName = (options.sourceType === FieldManager_1.DtoSourceType.Create) ? `Create${classifiedModelName}Dto` : `Update${classifiedModelName}Dto`;
+        const classNode = (0, FieldManager_1.getClassNode)(sourceClassName, source);
+        if (!classNode) {
+            throw new Error(`Class ${sourceClassName} not found in file ${source.fileName}`);
+        }
+        return classNode;
+    }
 }
 exports.BaseFieldManagerForDto = BaseFieldManagerForDto;
 //# sourceMappingURL=BaseFieldManagerForDto.js.map

package/dist/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseFieldManagerForDto.js","sourceRoot":"","sources":["../../../../../../src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.ts"],"names":[],"mappings":"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"}

package/dist/files/generate-model/controllers/__model@dasherize__.controller.ts

@@ -5,6 +5,11 @@ import { <%= classify(model) %>Service } from '../services/<%= dasherize(model)
 import { Create<%= classify(model) %>Dto } from '../dtos/create-<%= dasherize(model) %>.dto';
 import { Update<%= classify(model) %>Dto } from '../dtos/update-<%= dasherize(model) %>.dto';
 
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
 @ApiTags('<%= unSnakeCase(moduleDisplayName) %>')
 @Controller('<%= dasherize(model) %>')
 export class <%= classify(model) %>Controller {
@@ -52,8 +57,7 @@ export class <%= classify(model) %>Controller {
   }
     
   @ApiBearerAuth("jwt")
-  @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
-  @ApiQuery({ name: 'showOnlySoftDeleted', required: false, type: Boolean })
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
   @ApiQuery({ name: 'limit', required: false, type: Number })
   @ApiQuery({ name: 'offset', required: false, type: Number })
   @ApiQuery({ name: 'fields', required: false, type: Array })

package/files/generate-model/controllers/__model@dasherize__.controller.ts

@@ -5,6 +5,11 @@ import { <%= classify(model) %>Service } from '../services/<%= dasherize(model)
 import { Create<%= classify(model) %>Dto } from '../dtos/create-<%= dasherize(model) %>.dto';
 import { Update<%= classify(model) %>Dto } from '../dtos/update-<%= dasherize(model) %>.dto';
 
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
 @ApiTags('<%= unSnakeCase(moduleDisplayName) %>')
 @Controller('<%= dasherize(model) %>')
 export class <%= classify(model) %>Controller {
@@ -52,8 +57,7 @@ export class <%= classify(model) %>Controller {
   }
     
   @ApiBearerAuth("jwt")
-  @ApiQuery({ name: 'showSoftDeleted', required: false, type: Boolean })
-  @ApiQuery({ name: 'showOnlySoftDeleted', required: false, type: Boolean })
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
   @ApiQuery({ name: 'limit', required: false, type: Number })
   @ApiQuery({ name: 'offset', required: false, type: Number })
   @ApiQuery({ name: 'fields', required: false, type: Array })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-code-builder",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "This package is use to generate code for the @solidstarters projects",
   "private": false,
   "publishConfig": {

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

@@ -1,6 +1,7 @@
 import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
 import { Tree } from '@angular-devkit/schematics';
 import ts, {
+  ClassDeclaration,
   PropertyDeclaration,
   SourceFile,
 } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
@@ -48,6 +49,7 @@ import { ApiPropertyDecoratorManager } from '../../decorator-managers/dto/ApiPro
 // The validation decorators added use the class-validator library
 export abstract class BaseFieldManagerForDto implements FieldManager {
   source: SourceFile;
+  updatedSourceClassNode?: ts.ClassDeclaration;
   decoratorManagers: DecoratorManager[];
 
   constructor(
@@ -137,7 +139,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
   protected addFieldInternal(fieldName: string, fieldType: string, decoratorManagers: DecoratorManager[], field: any, modelName: any, source: ts.SourceFile): FieldChange {
     //FIXME There might a case where the main field is not present, but additional field is present. Do we update the fields or throw an error. Needs to be discussed
     // For now, we assume, that if primary field is not present, then additional field is also not present
-    if (this.isFieldPresent(fieldName, source)) { 
+    if (this.isFieldPresent(fieldName, source)) {
       return {
         filePath: source.fileName,
         field: field,
@@ -166,14 +168,8 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
       fieldSourceLines.push(...builderChange.fieldSourceLines);
     });
 
-    // Create the field definition changes
-    // const classNode = findNodes(source, ts.SyntaxKind.ClassDeclaration)[0];
-    const className = (this.options.sourceType === DtoSourceType.Create) ? `Create${classify(modelName)}Dto` : `Update${classify(modelName)}Dto`;
-    const classNode = getClassNode(className,source);
-    if (!classNode) {
-      throw new Error(`Class ${className} not found in file ${source.fileName}`);
-    }
-    
+    const classNode = this.getClassNode(modelName, this.options, source);
+
     const fieldDefinition = `\n${fieldSourceLines.reverse().join('\n')}\n`;
     changes.push(
       new InsertChange(
@@ -208,9 +204,9 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
 
     const fieldName = this.fieldName();
     const fieldType = this.fieldType().text;
-    const source= this.source
+    const source = this.source
     const field = this.field
-    const modelName = this.modelName        
+    const modelName = this.modelName
     const decoratorManagers = this.decoratorManagers;
 
     fieldChanges.push(this.addFieldInternal(fieldName, fieldType, decoratorManagers, field, modelName, source));
@@ -241,7 +237,20 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     updatedPropertyDeclarationNode = updatedPropertyDeclarationNodeTransformed;
     changes.push(...decoratorChanges);
 
-    changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+    // changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+
+    // if (!this.isAdditionalFieldRequired()) {
+      // Get the source class node i.e CreateDto or UpdateDto
+      const sourceClassNode = this.getClassNode(this.modelName, this.options, source); // FIXME Avoid this.model to avoid stateful behaviour
+      const classNode = this.updatedSourceClassNode ?? sourceClassNode;
+      // Set the updated property declaration node to the source class node
+      const updatedClassNode = this.updateClassNode(classNode, updatedPropertyDeclarationNode, fieldName);
+      this.updatedSourceClassNode = updatedClassNode; // Set the updated class node to the source class node, so it can be used for additional operations e.g for additional field updates
+      changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), sourceClassNode, source.fileName)); 
+    // }
+    // else {
+    //   changes.push(...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source.fileName));
+    // }
 
     return {
       filePath: source.fileName,
@@ -250,6 +259,32 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     };
   }
 
+  updateClassNode(sourceClassNode: ts.ClassDeclaration, updatedFieldNode: ts.PropertyDeclaration, fieldName: string): ClassDeclaration {
+    // Replace the class memeber matching the field name with the updated field node
+    const newMembers = sourceClassNode.members.map((member) => {
+      // Check if the member is a PropertyDeclaration
+      if (ts.isPropertyDeclaration(member)) {
+        // Compare the name of the property with the field name
+        const memberName = member.name.getText();
+        if (memberName === fieldName) {
+          return updatedFieldNode!;
+        }
+      }
+      return member;
+    });
+
+    // Update the class node with the new modifiers
+    const updatedClass = ts.factory.updateClassDeclaration(
+      sourceClassNode,
+      sourceClassNode.modifiers,
+      sourceClassNode.name,
+      sourceClassNode.typeParameters,
+      sourceClassNode.heritageClauses,
+      newMembers,
+    );
+    return updatedClass;
+  }
+
   updateField(): FieldChange[] {
     const fieldChanges: FieldChange[] = [];
 
@@ -257,7 +292,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
 
     const fieldName = this.fieldName();
     const fieldType = this.fieldType().node(this.field);
-    const source= this.source
+    const source = this.source
     const field = this.field
     const decoratorManagers = this.decoratorManagers;
 
@@ -365,7 +400,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
         }
       }
     }
-  }  
+  }
 
   protected applyBuildDecoratorTransformations(...transformers: DecoratorManager[]): PartialAddFieldChange[] {
     const partialFieldChanges: PartialAddFieldChange[] = [];
@@ -385,24 +420,24 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     }
   }
 
-  protected calculateReplaceChanges(updatedPropertyDeclarationNodeText: string, fieldPropertyDeclarationNode: ts.PropertyDeclaration, source: ts.SourceFile): Change[] {
+  protected calculateReplaceChanges(updatedSourceNodeText: string, sourceNode:ts.Node, sourceFileName: string): Change[] {
     const changes: Change[] = [];
-    if (updatedPropertyDeclarationNodeText.trim() !==
-      fieldPropertyDeclarationNode.getFullText().trim()) {
-      console.log(`Updated Code:\n${updatedPropertyDeclarationNodeText.trim()}\nwith length ${updatedPropertyDeclarationNodeText.trim().length}\n`);
-      console.log(`Old Code:\n${fieldPropertyDeclarationNode.getFullText().trim()}\nwith length ${fieldPropertyDeclarationNode.getFullText().trim().length}\n`);
+    if (updatedSourceNodeText.trim() !==
+      sourceNode.getFullText().trim()) {
+      console.log(`Updated Code:\n${updatedSourceNodeText.trim()}\nwith length ${updatedSourceNodeText.trim().length}\n`);
+      console.log(`Old Code:\n${sourceNode.getFullText().trim()}\nwith length ${sourceNode.getFullText().trim().length}\n`);
       const replaceChange = new ReplaceChangeSSS(
-        source.fileName,
-        fieldPropertyDeclarationNode.pos,
-        fieldPropertyDeclarationNode.getFullText(),
-        `\n\n${updatedPropertyDeclarationNodeText}`
+        sourceFileName,
+        sourceNode.pos,
+        sourceNode.getFullText(),
+        `\n\n${updatedSourceNodeText}`
       );
       changes.push(replaceChange);
     }
     return changes;
   }
 
-  protected printNode(updatedPropertyDeclarationNode: ts.PropertyDeclaration, nodeSource: SourceFile): string {
+  protected printNode(updatedPropertyDeclarationNode: ts.Node, nodeSource: SourceFile): string {
     const printer = ts.createPrinter({
       newLine: ts.NewLineKind.LineFeed,
       removeComments: false,
@@ -432,7 +467,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
         case DecoratorType.MinLength:
           return new MinLengthDecoratorManager({ isApplyMinLength: this.isApplyMinLength(), length: field.min, source: source, field: field });
         case DecoratorType.MaxLength:
-          return new MaxLengthDecoratorManager({ isApplyMaxLength: this.isApplyMaxLength(), length: field.max, source: source, field: field });  
+          return new MaxLengthDecoratorManager({ isApplyMaxLength: this.isApplyMaxLength(), length: field.max, source: source, field: field });
         case DecoratorType.Required:
           return new RequiredDecoratorManager({ isApplyRequired: true, required: field.required, source: source, field: field });
         case DecoratorType.Optional:
@@ -447,7 +482,7 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
           return new IntDecoratorManager({ isInt: this.isInt(), source: source, field: field });
         case DecoratorType.Decimal:
           return new DecimalDecoratorManager({ isDecimal: this.isDecimal(), source: source, field: field });
-        case DecoratorType.BigInt:  
+        case DecoratorType.BigInt:
           return new BigIntDecoratorManager({ isBigInt: this.isBigInt(), source: source, field: field });
         case DecoratorType.Date:
           return new DateDecoratorManager({ isDate: this.isDate(), source: source, field: field });
@@ -482,4 +517,17 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     }
   }
 
+  private getClassNode(modelName: any, options: ManagerForDtoOptions, source: ts.SourceFile) {
+    // if (this.updatedSourceClassNode) {
+    //   return this.updatedSourceClassNode;
+    // }
+    const classifiedModelName = classify(modelName);
+    const sourceClassName = (options.sourceType === DtoSourceType.Create) ? `Create${classifiedModelName}Dto` : `Update${classifiedModelName}Dto`;
+    const classNode = getClassNode(sourceClassName, source);
+    if (!classNode) {
+      throw new Error(`Class ${sourceClassName} not found in file ${source.fileName}`);
+    }
+    return classNode;
+  }
+
 }