@solidxai/code-builder 0.1.4 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidxai/code-builder",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "This package is use to generate code for the @solidxai projects",
   "private": false,
   "publishConfig": {
@@ -18,7 +18,7 @@
     "schematics"
   ],
   "author": "",
-  "license": "MIT",
+  "license": "BUSL-1.1",
   "schematics": "./dist/collection.json",
   "dependencies": {
     "@angular-devkit/core": "^18.0.1",

package/src/code-builder/index.ts

@@ -1,4 +1,3 @@
-import { classify, dasherize } from '@angular-devkit/core/src/utils/strings';
 import {
   MergeStrategy,
   Rule,
@@ -17,16 +16,17 @@ import * as generateModelHelpers from './lib/model/helpers';
 import { addField, SOLID_CORE_MODULE_NAME, readModelOptionsFromMetadata, readFieldOptionsFromMetadata } from './lib/model/helpers';
 import { removeField } from './lib/model/helpers';
 import ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { strings } from '@angular-devkit/core';
+import { kebabCase } from 'lodash';
 
-const generateModelUtils = { dasherize, classify, ...generateModelHelpers };
+import { classify } from './lib/string.utils';
+const generateModelUtils = { dasherize: kebabCase, classify, ...generateModelHelpers };
 // You don't have to export the function as default. You can also have more than one rule factory
 // per file.
 export function addModule(options: any): Rule {
   return (_tree: Tree, _context: SchematicContext) => {
     const moduleName = options.module;
     const moduleFolderPath = `src/${moduleName}`;
-    const moduleFilePath = `${moduleFolderPath}/${strings.dasherize(moduleName)}.module.ts`;
+    const moduleFilePath = `${moduleFolderPath}/${kebabCase(moduleName)}.module.ts`;
 
     if (_tree.exists(moduleFilePath)) {
       throw new Error(`Module file already exists at ${moduleFilePath}. Please use a unique module name.`);
@@ -56,7 +56,7 @@ export function refreshModel(options: any): Rule {
     const modulePath = (options.module === SOLID_CORE_MODULE_NAME) ? `src` : `src/${options.module}`;
 
     // If the model related code is not present, then add it by call addModel, else call update field with the fields provided
-    const modelEntityFilePath = `${modulePath}/entities/${dasherize(options.model)}.entity.ts`;
+    const modelEntityFilePath = `${modulePath}/entities/${kebabCase(options.model)}.entity.ts`;
     const rules : Rule[] = [];
     if (!tree.exists(modelEntityFilePath)) {
       rules.push(addModel(options));
@@ -134,12 +134,11 @@ export function removeFields(options: any): Rule {
   };
 }
 
-
 function addModuleImportsAndMetadata(options: any) { // TODO This method should perhaps be moved elsewhere since this is not a seperate command
   return (tree: Tree, _context: SchematicContext) => {
     // Handle the module imports
     const modulePath = (options.module === SOLID_CORE_MODULE_NAME) ? `src` : `src/${options.module}`;
-    const moduleFilePath = `${modulePath}/${dasherize(options.module)}.module.ts`;
+    const moduleFilePath = `${modulePath}/${kebabCase(options.module)}.module.ts`;
     const moduleImports: generateModelHelpers.ImportData[] = [
       { symbolName: `TypeOrmModule`, importPath: `@nestjs/typeorm` },
       generateModelHelpers.getSolidImports(
@@ -214,5 +213,3 @@ function showTree(sourceNode: ts.SourceFile){
   printAllChildren(sourceNode, 0);
 }
 
-
-

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

@@ -1,4 +1,5 @@
-import { camelize, classify } from "@angular-devkit/core/src/utils/strings";
+import { camelCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import ts, { ModifierLike, ObjectLiteralElementLike, 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";
@@ -43,7 +44,7 @@ export class ManyToManyDecoratorManager implements DecoratorManager {
 
         const fieldSourceLineComponents: string[] = [];
         fieldSourceLineComponents.push(`() => ${classify(this.options.relationModelName)}`);
-        this.options.relationInverseFieldName ? fieldSourceLineComponents.push(`${camelize(this.options.relationModelName)} => ${camelize(this.options.relationModelName)}.${this.options.relationInverseFieldName}`) : "no-ops";
+        this.options.relationInverseFieldName ? fieldSourceLineComponents.push(`${camelCase(this.options.relationModelName)} => ${camelCase(this.options.relationModelName)}.${this.options.relationInverseFieldName}`) : "no-ops";
         fieldSourceLineComponents.push(`${this.buildRelationOptionsCode()}`);
         fieldSourceLines.push(`@${this.decoratorName()}(${fieldSourceLineComponents.join(', ')})`);
 
@@ -162,7 +163,7 @@ export class ManyToManyDecoratorManager implements DecoratorManager {
                 [ts.factory.createParameterDeclaration(
                     undefined,
                     undefined,
-                    ts.factory.createIdentifier(camelize(this.options.relationModelName)),
+                    ts.factory.createIdentifier(camelCase(this.options.relationModelName)),
                     undefined,
                     undefined,
                     undefined
@@ -170,7 +171,7 @@ export class ManyToManyDecoratorManager implements DecoratorManager {
                 undefined,
                 ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
                 ts.factory.createPropertyAccessExpression(
-                    ts.factory.createIdentifier(camelize(this.options.relationModelName)),
+                    ts.factory.createIdentifier(camelCase(this.options.relationModelName)),
                     ts.factory.createIdentifier(this.options.relationInverseFieldName)
                 )
             );
@@ -219,7 +220,6 @@ export class ManyToManyDecoratorManager implements DecoratorManager {
         return decoratorOptions;
     }
 
-
     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;
     }

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

@@ -1,9 +1,9 @@
-import { classify } from "@angular-devkit/core/src/utils/strings";
 import ts, { ModifierLike, ObjectLiteralElementLike, 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 { DecoratorManager, DeleteType, PartialAddFieldChange } from "../../FieldManager";
 import _ from 'lodash';
+import { classify } from '../../../string.utils';
 interface ManyToOneDecoratorOptions {
     isManyToOne: boolean;
     relationCoModelSingularName: string;

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

@@ -1,4 +1,5 @@
-import { camelize, classify } from "@angular-devkit/core/src/utils/strings";
+import { camelCase } from 'lodash';
+import { classify } from '../../../string.utils';
 import ts, { ModifierLike, ObjectLiteralElementLike, 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";
@@ -38,13 +39,13 @@ export class OneToManyDecoratorManager implements DecoratorManager {
         //     changes.push(oneToManyImport);
         // }
         // fieldSourceLines.push(
-        //     `@${this.decoratorName()}(() => ${classify(this.options.modelName)}, ${camelize(this.options.modelName)} => ${camelize(this.options.modelName)}.${this.options.fieldName}, ${this.buildRelationOptionsCode()})`,
+        //     `@${this.decoratorName()}(() => ${classify(this.options.modelName)}, ${camelCase(this.options.modelName)} => ${camelCase(this.options.modelName)}.${this.options.fieldName}, ${this.buildRelationOptionsCode()})`,
         // );
         changes.push(...this.decoratorImports());
 
         const fieldSourceLineComponents: string[] = [];
         fieldSourceLineComponents.push(`() => ${classify(this.options.relationModelName)}`);
-        this.options.relationInverseFieldName ? fieldSourceLineComponents.push(`${camelize(this.options.relationModelName)} => ${camelize(this.options.relationModelName)}.${this.options.relationInverseFieldName}`) : "no-ops";
+        this.options.relationInverseFieldName ? fieldSourceLineComponents.push(`${camelCase(this.options.relationModelName)} => ${camelCase(this.options.relationModelName)}.${this.options.relationInverseFieldName}`) : "no-ops";
         fieldSourceLineComponents.push(`${this.buildRelationOptionsCode()}`);
         fieldSourceLines.push(`@${this.decoratorName()}(${fieldSourceLineComponents.join(', ')})`);
 
@@ -147,7 +148,7 @@ export class OneToManyDecoratorManager implements DecoratorManager {
             [ts.factory.createParameterDeclaration(
                 undefined,
                 undefined,
-                ts.factory.createIdentifier(camelize(this.options.relationModelName)),
+                ts.factory.createIdentifier(camelCase(this.options.relationModelName)),
                 undefined,
                 undefined,
                 undefined
@@ -155,7 +156,7 @@ export class OneToManyDecoratorManager implements DecoratorManager {
             undefined,
             ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
             ts.factory.createPropertyAccessExpression(
-                ts.factory.createIdentifier(camelize(this.options.relationModelName)),
+                ts.factory.createIdentifier(camelCase(this.options.relationModelName)),
                 ts.factory.createIdentifier(this.options.relationInverseFieldName)
             )
         );
@@ -202,7 +203,6 @@ export class OneToManyDecoratorManager implements DecoratorManager {
         return decoratorOptions;
     }
 
-
     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;
     }

package/src/code-builder/lib/field/field-managers/base/BaseFieldManagerForDto.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, {
   ClassDeclaration,
@@ -59,8 +60,8 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     protected readonly field: any,
     protected readonly options: ManagerForDtoOptions,
   ) {
-    const sourceFileName = (options.sourceType === DtoSourceType.Create) ? `create-${dasherize(modelName)}.dto.ts` : `update-${dasherize(modelName)}.dto.ts`;
-    const sourcePath = `src/${dasherize(moduleName)}/dtos/${sourceFileName}`;
+    const sourceFileName = (options.sourceType === DtoSourceType.Create) ? `create-${kebabCase(modelName)}.dto.ts` : `update-${kebabCase(modelName)}.dto.ts`;
+    const sourcePath = `src/${kebabCase(moduleName)}/dtos/${sourceFileName}`;
     this.source = createSourceFile(
       tree,
       sourcePath,
@@ -96,7 +97,6 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     return fieldChanges;
   }
 
-
   fieldName(): string {
     return this.field.name;
   }
@@ -161,7 +161,6 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
     const builderChanges: PartialAddFieldChange[] = [];
     builderChanges.push(...this.applyBuildDecoratorTransformations(...decoratorManagers.reverse()));
 
-
     // Capture the changes and field source lines
     builderChanges.forEach((builderChange) => {
       changes.push(...builderChange.changes);
@@ -226,7 +225,6 @@ export abstract class BaseFieldManagerForDto implements FieldManager {
       source,
     )?.parent as PropertyDeclaration;
 
-
     // FIXME Handle the imports related to the updated field type
     // Update the entity property declaration type
     let updatedPropertyDeclarationNode: ts.PropertyDeclaration =

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

@@ -1,7 +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,
@@ -55,7 +53,7 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     // So every operation should use a new instance of the field manager, so updated tree/source is used before each operation
     this.source = createSourceFile(
       tree,
-      `src/${dasherize(moduleName)}/entities/${dasherize(modelName)}.entity.ts`,
+      `src/${kebabCase(moduleName)}/entities/${kebabCase(modelName)}.entity.ts`,
     );
     const fieldPropertyDeclarationNode = this.getFieldIdentifierNode(
       this.fieldName(),
@@ -181,7 +179,6 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     const builderChanges: PartialAddFieldChange[] = [];
     builderChanges.push(...this.applyBuildDecoratorTransformations(...decoratorManagers.reverse()));
 
-
     // Capture the changes and field source lines
     builderChanges.forEach((builderChange) => {
       changes.push(...builderChange.changes);
@@ -287,7 +284,6 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
       source,
     )?.parent as PropertyDeclaration;
 
-
     // FIXME Handle the imports related to the updated field type
     // Update the entity property declaration type
     let updatedPropertyDeclarationNode: ts.PropertyDeclaration =
@@ -483,7 +479,6 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     return `${this.field.relationCoModelSingularName}s`;
   }
 
-
   private isManyToOne(): boolean {
     return (this.field.type === 'relation' && this.field.relationType === RelationType.ManyToOne);
   }
@@ -492,7 +487,6 @@ export abstract class BaseFieldManagerForEntity implements FieldManager {
     return (this.field.type === 'relation' && this.field.relationType === RelationType.OneToMany);
   }
 
-
   protected isAdditionalFieldRequired(): boolean {
     return false;
   }

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/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));