@solidstarters/solid-code-builder 1.0.1 → 1.0.3

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

@@ -9,6 +9,9 @@ interface JoinTableDecoratorOptions {
     field: any;
     fieldName: string;
     modelName: string;
+    relationJoinTableName: string;
+    relationTableModelName: string;
+    relationTableModelNameInverse: string;
 }
 
 export class JoinTableDecoratorManager implements DecoratorManager {
@@ -35,7 +38,7 @@ export class JoinTableDecoratorManager implements DecoratorManager {
         //     changes.push(decoratorImport);
         // }
         fieldSourceLines.push(
-            `@${this.decoratorName()}()`,
+            `@${this.decoratorName()}(${this.buildRelationOptionsCode()})`,
         );
         changes.push(...this.decoratorImports());
 
@@ -92,14 +95,84 @@ export class JoinTableDecoratorManager implements DecoratorManager {
         return [updatedProperty, changes];
     }
 
+    private buildRelationOptionsCode(): string {
+        const options: Record<string, string | Record<string, string>> = {};
+    
+        // Add 'name' attribute
+        options['name'] = this.options.relationJoinTableName
+            ? `"${this.options.relationJoinTableName}"`
+            : `"${this.options.fieldName}"`;
+    
+        // Add 'joinColumn' attribute
+        options['joinColumn'] = {
+            name: `"${this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`}"`,
+        };
+    
+        // Add 'inverseJoinColumn' attribute
+        options['inverseJoinColumn'] = {
+            name: `"${this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`}"`,
+        };
+    
+        return `{ ${Object.entries(options)
+            .map(([key, value]) => {
+                if (typeof value === 'string') {
+                    return `${key}: ${value}`;
+                }
+                const nestedOptions = Object.entries(value)
+                    .map(([nestedKey, nestedValue]) => `${nestedKey}: ${nestedValue}`)
+                    .join(', ');
+                return `${key}: { ${nestedOptions} }`;
+            })
+            .join(', ')} }`;
+    }
+
     private createDecorator(existingDecorator: ts.Decorator | undefined): ts.Decorator {
         let existingRelationOptions: ts.ObjectLiteralElementLike[] = this.existingDecoratorOptions(existingDecorator);
 
         // const mergedRelationOptions: ObjectLiteralElementLike[] = this.mergeNewAndExistingDecoratorOptions(existingRelationOptions);
 
+        const newRelationOptions: ts.ObjectLiteralElementLike[] = [
+            ts.factory.createPropertyAssignment(
+                'name',
+                ts.factory.createStringLiteral(
+                    this.options.relationJoinTableName
+                        ? `${this.options.relationJoinTableName}`
+                        : `${this.options.fieldName}`
+                )
+            ),
+            ts.factory.createPropertyAssignment(
+                'joinColumn',
+                ts.factory.createObjectLiteralExpression([
+                    ts.factory.createPropertyAssignment(
+                        'name',
+                        ts.factory.createStringLiteral(
+                            this.options.relationTableModelName ? `${this.options.relationTableModelName}_id` : `${this.options.fieldName}_id`)
+                    )
+                ])
+            ),
+            ts.factory.createPropertyAssignment(
+                'inverseJoinColumn',
+                ts.factory.createObjectLiteralExpression([
+                    ts.factory.createPropertyAssignment(
+                        'name',
+                        ts.factory.createStringLiteral(
+                            this.options.relationTableModelNameInverse ? `${this.options.relationTableModelNameInverse}_id` : `${this.options.fieldName}_id`)
+                    )
+                ])
+            ),
+        ];
+    
+        // Merge existing and new options, avoiding duplicates
+        const mergedRelationOptions = [
+            ...existingRelationOptions.filter(
+                (option) => !(ts.isPropertyAssignment(option) && option.name.getText() === 'name')
+            ),
+            ...newRelationOptions,
+        ];
+
         // Re-create the decorator with the merged decorator options
         const decoratorIdentifier = ts.factory.createIdentifier(this.decoratorName());
-        const argumentsArray: ts.Expression[] = this.createDecoratorArguments(existingRelationOptions);
+        const argumentsArray: ts.Expression[] = this.createDecoratorArguments(mergedRelationOptions);
         const call = ts.factory.createCallExpression(decoratorIdentifier, undefined, argumentsArray);
         return ts.factory.createDecorator(call)
     }

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

@@ -55,7 +55,7 @@ export class UniqueIndexDecoratorManager {
         const existingUniqueIndexDecorator = this.findUniqueIndexDecorator(existingModifiers);
 
         //Remove the Index decorator if the Index decorator exists
-        newModifiers = [...this.filterOtherDecorators(this.decoratorName(), existingModifiers), ...this.filterOtherIndexDecorators(this.decoratorName(), this.options, existingModifiers), ...this.filterNonDecorators(existingModifiers)];
+        newModifiers = [...this.filterNonDecorators(existingModifiers),...this.filterOtherDecorators(this.decoratorName(), existingModifiers), ...this.filterOtherIndexDecorators(this.decoratorName(), this.options, existingModifiers)];
 
         //Add the column decorator if column decorator is required  
         const changes: Change[] = [];

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

@@ -48,7 +48,6 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
       tree,
       `src/${dasherize(moduleName)}/entities/${dasherize(modelName)}.entity.ts`,
     );
-    // this.relationInverseSource = createSourceFile(tree, `src/${dasherize(this.field.relationModelSingularName)}/dtos/create-${dasherize(this.field.relationModelSingularName)}.dto.ts`)
 
     const fieldPropertyDeclarationNode = this.getFieldIdentifierNode(
       this.fieldName(),
@@ -105,6 +104,9 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
         field: this.field,
         fieldName: this.fieldName(),
         modelName: this.modelName,
+        relationJoinTableName: this.field.relationJoinTableName,
+        relationTableModelName: this.field.relationTableModelName,
+        relationTableModelNameInverse: this. field.relationTableModelNameInverse
       },
     );
     this.uniqueIndexDecoratorManager = new UniqueIndexDecoratorManager(
@@ -258,16 +260,21 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     updatedPropertyDeclarationNode = updatedPropertyDeclarationNodeTransformed;
     changes.push(...decoratorChanges);
 
-    // Update the property declaration node in the class hierarchy with the updated property declaration node
-    // Then calculate the replace changes
-    this.uniqueIndexDecoratorManager.setFieldNode(updatedPropertyDeclarationNode);
-    // Apply the unique index decorator changes at the class node level
-    const [updatedClassNode, uniqueIndexDecoratorChanges] =  this.uniqueIndexDecoratorChanges();
-    changes.push(...uniqueIndexDecoratorChanges);
-    changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), this.getClassNode(this.modelName, source), source)); //FIXME: this.modelName to passed in for avoiding statefullness
-   
-    // this.uniqueIndexDecoratorChanges(changes, source, this.getClassNode(this.modelName, source));
-
+    // Currently additional field support is only limited to relation fields for entities, so there is no need to update the class nodes
+    // Since unique index decorator supported is only for fields which are not relation fields.
+    // Also the current additional field algorithm is not able to deal with the class where the primary field operations modifies the class node
+    if (!this.isAdditionalFieldRequired()) { 
+      // Update the property declaration node in the class hierarchy with the updated property declaration node
+      // Then calculate the replace changes
+      this.uniqueIndexDecoratorManager.setFieldNode(updatedPropertyDeclarationNode);
+      // Apply the unique index decorator changes at the class node level
+      const [updatedClassNode, uniqueIndexDecoratorChanges] =  this.uniqueIndexDecoratorChanges();
+      changes.push(...uniqueIndexDecoratorChanges);
+      changes.push(...this.calculateReplaceChanges(this.printNode(updatedClassNode, source), this.getClassNode(this.modelName, source), source)); //FIXME: avoid this.modelName to passed in for avoiding statefullness
+    }
+    else {
+      changes.push (...this.calculateReplaceChanges(this.printNode(updatedPropertyDeclarationNode, source), fieldPropertyDeclarationNode, source));
+    }
     return {
       filePath: source.fileName,
       field: field,

package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForDto.ts

@@ -4,10 +4,10 @@ import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.
 import { Change } from '@schematics/angular/utility/change';
 import { ArrayDecoratorManager } from '../../decorator-managers/dto/ArrayDecoratorManager';
 import { OptionalDecoratorManager } from '../../decorator-managers/dto/OptionalDecoratorManager';
+import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
 import { TransformDecoratorManager } from '../../decorator-managers/dto/TransformDecoratorManager';
 import { DecoratorManager, DecoratorType, DtoSourceType, FieldChange, FieldManager, FieldType, ManagerForDtoOptions, createSourceFile, safeInsertImport } from '../../FieldManager';
 import { BaseFieldManagerForDto } from '../base/BaseFieldManagerForDto';
-import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
 
 export class ManyToManyRelationFieldManagerForDto
     extends BaseFieldManagerForDto
@@ -191,10 +191,11 @@ export class ManyToManyRelationFieldManagerForDto
 
     }
 
-    private inverseFieldImport(modelName: string, moduleName: string, source: ts.SourceFile): Change {
+    private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
         const inverseEntityImportName = `update-${dasherize(modelName)}.dto`;
-        const inverseEntityPath = `src/${moduleName}/dtos/${inverseEntityImportName}`;
-        return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath);
+        const modulePath = `src/${currentModuleName}`;
+        const inverseEntityPath = `${modulePath}/dtos/${inverseEntityImportName}`;
+        return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath, currentModuleName);
     }
     
     private addAdditionalInverseField() : FieldChange {
@@ -439,7 +440,7 @@ export class ManyToManyRelationFieldManagerForDto
     relatedFieldImport(): Change {
         const relatedEntityImportName = `update-${dasherize(this.field.relationModelSingularName)}.dto`;
         const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
-        return safeInsertImport(this.source, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
+        return safeInsertImport(this.source, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
         // return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationModelSingularName)}Dto`, relatedEntityPath);
     } //Uncomment this method while implementing many-to-many relation changes
 }

package/src/code-builder/lib/field/field-managers/relation/ManyToManyRelationFieldManagerForEntity.ts

@@ -1,7 +1,6 @@
 import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
 import { Tree } from '@angular-devkit/schematics';
 import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { insertImport } from '@schematics/angular/utility/ast-utils';
 import { Change } from '@schematics/angular/utility/change';
 import { ManyToManyDecoratorManager } from '../../decorator-managers/entity/ManyToManyDecoratorManager';
 import { OneToManyDecoratorManager } from '../../decorator-managers/entity/OneToManyDecoratorManager';
@@ -90,7 +89,7 @@ export class ManyToManyRelationFieldManagerForEntity
     relatedFieldImport(): Change {
         const relatedEntityImportName = `${dasherize(this.field.relationModelSingularName)}.entity`;
         const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
-        return insertImport(this.source, this.source.fileName, classify(this.field.relationModelSingularName), relatedEntityPath);
+        return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
     }
 
     override removeAdditionalField(): FieldChange {
@@ -137,11 +136,13 @@ export class ManyToManyRelationFieldManagerForEntity
         return fieldChange;    
     }
 
-    private inverseFieldImport(modelName: string, moduleName: string, source: ts.SourceFile): Change {
+    private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
         const inverseEntityImportName = `${dasherize(modelName)}.entity`;
-        const inverseEntityPath = `src/${moduleName}/entities/${inverseEntityImportName}`;
+        const modulePath = `src/${currentModuleName}`;
+        
+        const inverseEntityPath = `${modulePath}/entities/${inverseEntityImportName}`;
     
-        return safeInsertImport(source, `${classify(modelName)}`, inverseEntityPath);
+        return safeInsertImport(source, `${classify(modelName)}`, inverseEntityPath, currentModuleName);
     }
 
     override addOrUpdateAdditionalField(): FieldChange[] {

package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForDto.ts

@@ -4,10 +4,10 @@ import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.
 import { Change } from '@schematics/angular/utility/change';
 import { ArrayDecoratorManager } from '../../decorator-managers/dto/ArrayDecoratorManager';
 import { OptionalDecoratorManager } from '../../decorator-managers/dto/OptionalDecoratorManager';
+import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
 import { TransformDecoratorManager } from '../../decorator-managers/dto/TransformDecoratorManager';
 import { DecoratorManager, DecoratorType, DtoSourceType, FieldChange, FieldManager, FieldType, ManagerForDtoOptions, createSourceFile, safeInsertImport } from '../../FieldManager';
 import { BaseFieldManagerForDto } from '../base/BaseFieldManagerForDto';
-import { StringDecoratorManager } from '../../decorator-managers/dto/StringDecoratorManager';
 
 export class ManyToOneRelationFieldManagerForDto
   extends BaseFieldManagerForDto
@@ -305,11 +305,13 @@ export class ManyToOneRelationFieldManagerForDto
     }
   }
 
-  private inverseFieldImport(modelName: string, moduleName: string,  source: ts.SourceFile): Change {
+  private inverseFieldImport(modelName: string, currentModuleName: string,  source: ts.SourceFile): Change {
     const inverseEntityImportName = `update-${dasherize(modelName)}.dto`;
-    const inverseEntityPath = `src/${moduleName}/dtos/${inverseEntityImportName}`;
+    const modulePath = `src/${currentModuleName}`;
+    
+    const inverseEntityPath = `${modulePath}/dtos/${inverseEntityImportName}`;
 
-    return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath);
+    return safeInsertImport(source, `Update${classify(modelName)}Dto`, inverseEntityPath, currentModuleName);
   }
 
   override removeAdditionalField(): FieldChange[] {

package/src/code-builder/lib/field/field-managers/relation/ManyToOneRelationFieldManagerForEntity.ts

@@ -1,7 +1,6 @@
 import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
 import { Tree } from '@angular-devkit/schematics';
 import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { insertImport } from '@schematics/angular/utility/ast-utils';
 import { Change } from '@schematics/angular/utility/change';
 import { OneToManyDecoratorManager } from '../../decorator-managers/entity/OneToManyDecoratorManager';
 import { DecoratorManager, FieldChange, FieldManager, FieldType, RelationType, createSourceFile, safeInsertImport } from '../../FieldManager';
@@ -29,7 +28,6 @@ export class ManyToOneRelationFieldManagerForEntity
         relatedEntityPath,
       );
 
-      // this.relationInverseSource = createSourceFile(tree, `src/${dasherize(this.field.relationModelSingularName)}/entities/${dasherize(this.field.relationModelSingularName)}.entity.ts`)
       this.oneToManyDecoratorManager = new OneToManyDecoratorManager(
         {
           isOneToMany: this.isOneToMany(),
@@ -113,7 +111,7 @@ export class ManyToOneRelationFieldManagerForEntity
   relatedFieldImport(): Change {
     const relatedEntityImportName = `${dasherize(this.field.relationModelSingularName)}.entity`;
     const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
-    return insertImport(this.source, this.source.fileName, classify(this.field.relationModelSingularName), relatedEntityPath);
+    return safeInsertImport(this.source, classify(this.field.relationModelSingularName), relatedEntityPath, this.moduleName);
   }
 
   private isOneToMany(): boolean {
@@ -164,10 +162,12 @@ export class ManyToOneRelationFieldManagerForEntity
     return fieldChange;    
   }
 
-  private inverseFieldImport(modelName: string, moduleName: string, source: ts.SourceFile): Change {
+  private inverseFieldImport(modelName: string, currentModuleName: string, source: ts.SourceFile): Change {
     const inverseEntityImportName = `${dasherize(modelName)}.entity`;
-    const inverseEntityPath = `src/${moduleName}/entities/${inverseEntityImportName}`;
-    return safeInsertImport(source, classify(modelName), inverseEntityPath);
+    const modulePath = `src/${currentModuleName}`;
+    
+    const inverseEntityPath = `${modulePath}/entities/${inverseEntityImportName}`;
+    return safeInsertImport(source, classify(modelName), inverseEntityPath, currentModuleName);
   }
 
   override addOrUpdateAdditionalField(): FieldChange[] {

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

@@ -5,6 +5,8 @@ import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/
 import { insertImport } from '@schematics/angular/utility/ast-utils';
 import { Change, InsertChange } from '@schematics/angular/utility/change';
 import * as crypto from 'crypto';
+export const SOLID_CORE_MODULE_NAME = 'solid-core';
+export const SOLID_CORE_MODULE_NPM_PACKAGE_NAME = '@solidstarters/solid-core';
 
 import {
   FieldChange,
@@ -199,7 +201,7 @@ export function loadModuleMetadata(tree: Tree, moduleName: string) : ModuleMetad
 }
 
 function getModuleMetadataFilePath(moduleName: string) {
-  if (['solid-core'].includes(moduleName)) {
+  if (moduleName === SOLID_CORE_MODULE_NAME) {
     return `src/${moduleName}/seeders/seed-data/${moduleName}-metadata.json`
   }
   else {
@@ -393,7 +395,6 @@ export function handleUpdateChecksums(tree: any, moduleName: string, ...filePath
 // Refer -> https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API
 // https://learning-notes.mistermicheels.com/javascript/typescript/compiler-api/
 export function removeUnusedImports(tree: Tree, filePath: string): string {
-  // const sourceFile = createSourceFile(tree, filePath);
   const sourceCode = tree.readText(filePath);
   // const compilerOptions = {
   //   getScriptFileNames: () => [filePath],
@@ -478,4 +479,8 @@ export function takeBackupIfChecksumsMismatch(tree: Tree, moduleName: string) {
       createBackup(tree, filePath, fileContent);
     }
   });
+}
+
+export function calculateModuleFileImportPath(moduleName: string, internalPath: string) {
+ return (moduleName === SOLID_CORE_MODULE_NAME) ? internalPath : SOLID_CORE_MODULE_NPM_PACKAGE_NAME;
 }