@solidxai/code-builder 0.1.4 → 0.1.6-beta.0

package/src/code-builder/lib/field/field-managers/long-text/LongTextFieldManagerForEntity.ts

@@ -2,7 +2,7 @@ import { Tree } from '@angular-devkit/schematics';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { FieldManager, FieldType } from '../../FieldManager';
 import { BaseFieldManagerForEntity } from '../base/BaseFieldManagerForEntity';
-import { SupportedDatabases, transformColumnOptionForDatabase } from '../../db-helpers';
+import { SupportedDatabases } from '../../db-helpers';
 
 //FIXME Implementation pending
 export class LongTextFieldManagerForEntity
@@ -24,15 +24,15 @@ export class LongTextFieldManagerForEntity
   protected override additionalColumnDecoratorOptions(): Map<string, any> {
     const options = new Map<string, any>();
     //console.log(`Configuring LongText field with max length ${this.field.max} for database ${this.dataSourceType}`);
-    if (this.field.max) {
-      options.set('length', transformColumnOptionForDatabase(
-        'length',
-        this.field.max,
-        this.field.ormType,
-        this.dataSourceType,
-      )
-      );
-    }
+    // if (this.field.max) {
+    //   options.set('length', transformColumnOptionForDatabase(
+    //     'length',
+    //     this.field.max,
+    //     this.field.ormType,
+    //     this.dataSourceType,
+    //   )
+    //   );
+    // }
 
     options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.value ?? null);
     return options;
@@ -40,24 +40,24 @@ export class LongTextFieldManagerForEntity
 
   protected override additionalColumnDecoratorOptionExpressions(): Map<string, ts.Expression | null> {
     const options = new Map<string, ts.Expression | null>();
-    if (this.field.max) {
-      const lengthValue = transformColumnOptionForDatabase(
-        'length',
-        this.field.max,
-        this.field.ormType,
-        this.dataSourceType,
-      );
+    // if (this.field.max) {
+    //   const lengthValue = transformColumnOptionForDatabase(
+    //     'length',
+    //     this.field.max,
+    //     this.field.ormType,
+    //     this.dataSourceType,
+    //   );
 
-      if (typeof lengthValue === 'number') {
-        options.set('length', ts.factory.createNumericLiteral(lengthValue));
-      } else if (typeof lengthValue === 'string') {
-        options.set('length', ts.factory.createStringLiteral(lengthValue));
-      } else {
-        options.set('length', null);
-      }
-    } else {
-      options.set('length', null);
-    }
+    //   if (typeof lengthValue === 'number') {
+    //     options.set('length', ts.factory.createNumericLiteral(lengthValue));
+    //   } else if (typeof lengthValue === 'string') {
+    //     options.set('length', ts.factory.createStringLiteral(lengthValue));
+    //   } else {
+    //     options.set('length', null);
+    //   }
+    // } else {
+    //   options.set('length', null);
+    // }
 
     options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.expression ?? null);
     return options

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

@@ -1,4 +1,5 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import { Tree } from '@angular-devkit/schematics';
 import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from '@schematics/angular/utility/change';
@@ -270,7 +271,7 @@ export class ManyToManyRelationFieldManagerForDto
     }
 
     relatedFieldImport(): Change {
-        const relatedEntityImportName = `update-${dasherize(this.field.relationCoModelSingularName)}.dto`;
+        const relatedEntityImportName = `update-${kebabCase(this.field.relationCoModelSingularName)}.dto`;
         const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
         return safeInsertImport(this.source, `Update${classify(this.field.relationCoModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
         // return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationCoModelSingularName)}Dto`, relatedEntityPath);

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

@@ -1,4 +1,5 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from '@schematics/angular/utility/change';
 import { FieldChange, FieldManager, FieldType, safeInsertImport } from '../../FieldManager';
@@ -51,8 +52,8 @@ export class ManyToManyRelationFieldManagerForEntity
     }
 
     relatedFieldImport(): Change {
-        const relatedEntityImportName = `${dasherize(this.field.relationCoModelSingularName)}.entity`;
-        const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
+        const relatedEntityImportName = `${kebabCase(this.field.relationCoModelSingularName)}.entity`;
+        const relatedEntityPath = this.field.relationModelModuleName ? `src/${kebabCase(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
         return safeInsertImport(this.source, classify(this.field.relationCoModelSingularName), relatedEntityPath, this.moduleName);
     }
 

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

@@ -1,4 +1,5 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from '@schematics/angular/utility/change';
 import { FieldChange, FieldManager, FieldType, safeInsertImport } from '../../FieldManager';
@@ -45,8 +46,8 @@ export class ManyToOneRelationFieldManagerForEntity
   }
 
   relatedFieldImport(): Change {
-    const relatedEntityImportName = `${dasherize(this.field.relationCoModelSingularName)}.entity`;
-    const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
+    const relatedEntityImportName = `${kebabCase(this.field.relationCoModelSingularName)}.entity`;
+    const relatedEntityPath = this.field.relationModelModuleName ? `src/${kebabCase(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
     return safeInsertImport(this.source, classify(this.field.relationCoModelSingularName), relatedEntityPath, this.moduleName);
   }
 

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

@@ -1,4 +1,5 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import { Tree } from '@angular-devkit/schematics';
 import ts, { PropertyDeclaration } from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from '@schematics/angular/utility/change';
@@ -134,7 +135,6 @@ export class OneToManyRelationFieldManagerForDto
 
   }
 
-
   override updateField(): FieldChange[] {
     const fieldChanges: FieldChange[] = super.updateField();
 
@@ -215,7 +215,6 @@ export class OneToManyRelationFieldManagerForDto
     }
   }
 
-
   override removeAdditionalField(): FieldChange[] {
     const fieldChanges: FieldChange[] = [];
 
@@ -243,7 +242,7 @@ export class OneToManyRelationFieldManagerForDto
   }
 
   relatedFieldImport(): Change {
-    const relatedEntityImportName = `update-${dasherize(this.field.relationCoModelSingularName)}.dto`;
+    const relatedEntityImportName = `update-${kebabCase(this.field.relationCoModelSingularName)}.dto`;
     const relatedEntityPath = this.field.relationModelModuleName ? `src/${this.field.relationModelModuleName}/dtos/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
     return safeInsertImport(this.source, `Update${classify(this.field.relationCoModelSingularName)}Dto`, relatedEntityPath, this.moduleName);
     // return insertImport(this.source, this.source.fileName, `Update${classify(this.field.relationCoModelSingularName)}Dto`, relatedEntityPath);

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

@@ -1,4 +1,5 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change } from '@schematics/angular/utility/change';
 import { FieldChange, FieldManager, FieldType, safeInsertImport } from '../../FieldManager';
@@ -29,12 +30,11 @@ export class OneToManyRelationFieldManagerForEntity
   }
 
   relatedFieldImport(): Change {
-    const relatedEntityImportName = `${dasherize(this.field.relationCoModelSingularName)}.entity`;
-    const relatedEntityPath = this.field.relationModelModuleName ? `src/${dasherize(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
+    const relatedEntityImportName = `${kebabCase(this.field.relationCoModelSingularName)}.entity`;
+    const relatedEntityPath = this.field.relationModelModuleName ? `src/${kebabCase(this.field.relationModelModuleName)}/entities/${relatedEntityImportName}` : `./${relatedEntityImportName}`;
     return safeInsertImport(this.source, classify(this.field.relationCoModelSingularName), relatedEntityPath, this.moduleName);
   }
 
-
   fieldType(): FieldType { // The inverse field type will remain the same for both one-to-many and many-to-many relations
     const type = `${classify(this.field.relationCoModelSingularName)}`
     const text = `${type}[]`

package/src/code-builder/lib/field/field-managers/rich-text/RichTextFieldManagerForEntity.ts

@@ -2,7 +2,7 @@ import { Tree } from '@angular-devkit/schematics';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { FieldManager, FieldType } from '../../FieldManager';
 import { BaseFieldManagerForEntity } from '../base/BaseFieldManagerForEntity';
-import { SupportedDatabases, transformColumnOptionForDatabase } from '../../db-helpers';
+import { SupportedDatabases } from '../../db-helpers';
 
 //FIXME Implementation pending
 export class RichTextFieldManagerForEntity
@@ -23,39 +23,39 @@ export class RichTextFieldManagerForEntity
 
   protected override additionalColumnDecoratorOptions(): Map<string, any> {
     const options = new Map<string, any>();
-    if (this.field.max) {
-      options.set('length', transformColumnOptionForDatabase(
-        'length',
-        this.field.max,
-        this.field.ormType,
-        this.dataSourceType,
-      )
-      );
-    }
+    // if (this.field.max) {
+    //   options.set('length', transformColumnOptionForDatabase(
+    //     'length',
+    //     this.field.max,
+    //     this.field.ormType,
+    //     this.dataSourceType,
+    //   )
+    //   );
+    // }
     options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.value ?? null);
     return options;
   }
 
   protected override additionalColumnDecoratorOptionExpressions(): Map<string, ts.Expression | null> {
     const options = new Map<string, ts.Expression | null>();
-    if (this.field.max) {
-      const lengthValue = transformColumnOptionForDatabase(
-        'length',
-        this.field.max,
-        this.field.ormType,
-        this.dataSourceType,
-      );
+    // if (this.field.max) {
+    //   const lengthValue = transformColumnOptionForDatabase(
+    //     'length',
+    //     this.field.max,
+    //     this.field.ormType,
+    //     this.dataSourceType,
+    //   );
 
-      if (typeof lengthValue === 'number') {
-        options.set('length', ts.factory.createNumericLiteral(lengthValue));
-      } else if (typeof lengthValue === 'string') {
-        options.set('length', ts.factory.createStringLiteral(lengthValue));
-      } else {
-        options.set('length', null);
-      }
-    } else {
-      options.set('length', null);
-    }
+    //   if (typeof lengthValue === 'number') {
+    //     options.set('length', ts.factory.createNumericLiteral(lengthValue));
+    //   } else if (typeof lengthValue === 'string') {
+    //     options.set('length', ts.factory.createStringLiteral(lengthValue));
+    //   } else {
+    //     options.set('length', null);
+    //   }
+    // } else {
+    //   options.set('length', null);
+    // }
     options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.expression ?? null);
     return options
   }

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

@@ -1,4 +1,5 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
+import { kebabCase } from 'lodash';
+import { classify } from '../string.utils';
 import { Tree } from '@angular-devkit/schematics';
 import { MetadataManager } from '@nestjs/schematics';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
@@ -17,7 +18,6 @@ import { SupportedDatabases } from '../field/db-helpers';
 export const SOLID_CORE_MODULE_NAME = 'solid-core';
 export const SOLID_CORE_MODULE_NPM_PACKAGE_NAME = '@solidxai/core';
 
-
 // export const CHECKSUM_FILE_PATH = 'code-builder/output/checksums.json';
 export const CHECKSUM_HASH_ALGORITHM = 'md5';
 export enum Command {
@@ -95,27 +95,27 @@ export function getSolidImports(
     case SolidProviderType.Dto:
       return {
         symbolName: `Create${classify(modelName)}Dto`,
-        importPath: `./dtos/create-${dasherize(modelName)}.dto`,
+        importPath: `./dtos/create-${kebabCase(modelName)}.dto`,
       };
     case SolidProviderType.Service:
       return {
         symbolName: `${classify(modelName)}Service`,
-        importPath: `./services/${dasherize(modelName)}.service`,
+        importPath: `./services/${kebabCase(modelName)}.service`,
       };
     case SolidProviderType.Controller:
       return {
         symbolName: `${classify(modelName)}Controller`,
-        importPath: `./controllers/${dasherize(modelName)}.controller`,
+        importPath: `./controllers/${kebabCase(modelName)}.controller`,
       };
     case SolidProviderType.Entity:
       return {
         symbolName: `${classify(modelName)}`,
-        importPath: `./entities/${dasherize(modelName)}.entity`,
+        importPath: `./entities/${kebabCase(modelName)}.entity`,
       };
       case SolidProviderType.Repository:
         return {
           symbolName: `${classify(modelName)}Repository`,
-          importPath: `./repositories/${dasherize(modelName)}.repository`,
+          importPath: `./repositories/${kebabCase(modelName)}.repository`,
         };
     default:
       throw Error('Invalid SolidProviderType');
@@ -251,7 +251,7 @@ function getModuleMetadataFilePath(moduleName: string) {
     return `src/${moduleName}/seeders/seed-data/${moduleName}-metadata.json`
   }
   else {
-    return `module-metadata/${dasherize(moduleName)}/${dasherize(moduleName)}-metadata.json`;
+    return `module-metadata/${kebabCase(moduleName)}/${kebabCase(moduleName)}-metadata.json`;
   }
 }
 
@@ -262,7 +262,6 @@ function getModuleMetadataFilePath(moduleName: string) {
 //   return checksums.filter((checksum: Checksum) => checksum.filePath === filePath).pop();
 // }
 
-
 function applyChanges(tree: Tree, filePath: string, changes: Change[]) {
   /*
   //Given the filePath, generate a checksum of the file from the content of the file
@@ -416,15 +415,15 @@ export function getSourceFilePathsAffected(command: Command, options: any): stri
   const sourceFilePaths: string[] = [];
   switch (command) {
     case Command.AddModule:
-      sourceFilePaths.push(`src/${dasherize(options.module)}/${dasherize(options.module)}.module.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/${kebabCase(options.module)}.module.ts`);
       break;
     case Command.AddModel:
-      sourceFilePaths.push(`src/${dasherize(options.module)}/${dasherize(options.module)}.module.ts`);
-      sourceFilePaths.push(`src/${dasherize(options.module)}/services/${dasherize(options.model)}.service.ts`);
-      sourceFilePaths.push(`src/${dasherize(options.module)}/controllers/${dasherize(options.model)}.controller.ts`);
-      sourceFilePaths.push(`src/${dasherize(options.module)}/entities/${dasherize(options.model)}.entity.ts`);
-      sourceFilePaths.push(`src/${dasherize(options.module)}/dtos/create-${dasherize(options.model)}.dto.ts`);
-      sourceFilePaths.push(`src/${dasherize(options.module)}/dtos/update-${dasherize(options.model)}.dto.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/${kebabCase(options.module)}.module.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/services/${kebabCase(options.model)}.service.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/controllers/${kebabCase(options.model)}.controller.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/entities/${kebabCase(options.model)}.entity.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/dtos/create-${kebabCase(options.model)}.dto.ts`);
+      sourceFilePaths.push(`src/${kebabCase(options.module)}/dtos/update-${kebabCase(options.model)}.dto.ts`);
       break;
     default:
       throw Error('Invalid command');
@@ -543,7 +542,7 @@ export function outputEntitySuperClassImport(module: string, isLegacyTable: bool
   let importPath: string = isLegacyTableWithId ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : isLegacyTable ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : calculateModuleFileImportPath(module, `src/entities/common.entity`);
   let importSymbol: string = isLegacyTableWithId ? "LegacyCommonWithIdEntity" : isLegacyTable ? "LegacyCommonEntity" : "CommonEntity";
   if (parentModel != null) {
-    importPath = calculateParentModuleFileImportPath(parentModule, `src/${dasherize(parentModule)}/entities/${dasherize(parentModel)}.entity`);
+    importPath = calculateParentModuleFileImportPath(parentModule, `src/${kebabCase(parentModule)}/entities/${kebabCase(parentModel)}.entity`);
     importSymbol = `${classify(parentModel)}`;
   }
   return `import { ${importSymbol} } from '${importPath}';`;
@@ -556,10 +555,10 @@ export function outputParentImportPathForDto(parentModel: string | null = null,
   let importPath = ``;
   let importSymbol = ``;
   if (context === DtoSourceType.Update) {
-    importPath = parentModule === SOLID_CORE_MODULE_NAME ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : `src/${dasherize(parentModule)}/dtos/update-${dasherize(parentModel)}.dto.ts`;
+    importPath = parentModule === SOLID_CORE_MODULE_NAME ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : `src/${kebabCase(parentModule)}/dtos/update-${kebabCase(parentModel)}.dto.ts`;
     importSymbol = `Update${classify(parentModel)}Dto`;
   } else if (context === DtoSourceType.Create) {
-    importPath = parentModule === SOLID_CORE_MODULE_NAME ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : `src/${dasherize(parentModule)}/dtos/create-${dasherize(parentModel)}.dto.ts`;
+    importPath = parentModule === SOLID_CORE_MODULE_NAME ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : `src/${kebabCase(parentModule)}/dtos/create-${kebabCase(parentModel)}.dto.ts`;
     importSymbol = `Create${classify(parentModel)}Dto`;
   }
   return `import { ${importSymbol} } from '${importPath}';`;

package/src/code-builder/lib/string.utils.ts

@@ -0,0 +1,3 @@
+import { upperFirst, camelCase } from 'lodash';
+
+export const classify = (s: string): string => upperFirst(camelCase(s));