@solidstarters/solid-code-builder 1.0.31 → 1.0.33

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

@@ -2,33 +2,63 @@ 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';
 
 //FIXME Implementation pending
 export class LongTextFieldManagerForEntity
   extends BaseFieldManagerForEntity
-  implements FieldManager
-{
+  implements FieldManager {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
-    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any, dataSourceType?: SupportedDatabases) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete, dataSourceType);
   }
 
   fieldType(): FieldType {
     return {
       text: 'string',
-      node:  (_field: any) => ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+      node: (_field: any) => ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
     };
   }
 
   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,
+      )
+      );
+    }
+
     options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.value ?? null);
-    return options; 
+    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 (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/rich-text/RichTextFieldHandler.ts

@@ -2,6 +2,7 @@ import { Tree } from '@angular-devkit/schematics';
 import { DtoSourceType, FieldChange, FieldHandler, FieldManager, ManagerForDtoOptions } from '../../FieldManager';
 import { RichTextFieldManagerForDto } from './RichTextFieldManagerForDto';
 import { RichTextFieldManagerForEntity } from './RichTextFieldManagerForEntity';
+import { SupportedDatabases } from '../../db-helpers';
 
 export class RichTextFieldHandler implements FieldHandler {
   entityFieldManager: FieldManager;
@@ -12,14 +13,16 @@ export class RichTextFieldHandler implements FieldHandler {
     moduleName: string,
     modelName: string,
     field: string,
-    modelEnableSoftDelete: any
+    modelEnableSoftDelete: any,
+    dataSourceType?: SupportedDatabases
   ) {
     this.entityFieldManager = new RichTextFieldManagerForEntity(
       tree,
       moduleName,
       modelName,
       field,
-      modelEnableSoftDelete
+      modelEnableSoftDelete,
+      dataSourceType
     );
     this.createDtoFieldManager = new RichTextFieldManagerForDto(
       tree,

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

@@ -2,33 +2,60 @@ 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';
 
 //FIXME Implementation pending
 export class RichTextFieldManagerForEntity
   extends BaseFieldManagerForEntity
-  implements FieldManager
-{
+  implements FieldManager {
   source: ts.SourceFile;
 
-  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any) {
-    super(tree, moduleName, modelName, field, modelEnableSoftDelete);
+  constructor(tree: Tree, moduleName: string, modelName: string, field: any, modelEnableSoftDelete: any, dataSourceType?: SupportedDatabases) {
+    super(tree, moduleName, modelName, field, modelEnableSoftDelete, dataSourceType);
   }
 
   fieldType(): FieldType {
     return {
       text: 'string',
-      node:  (_field: any) => ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+      node: (_field: any) => ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
     };
   }
 
   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,
+      )
+      );
+    }
     options.set('default', this.defaultValueInitializer(this.field.defaultValue)?.value ?? null);
-    return options; 
+    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 (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

@@ -12,6 +12,7 @@ import {
   ReplaceChangeSSS,
   getFieldHandler,
 } from '../field/FieldManager';
+import { SupportedDatabases } from '../field/db-helpers';
 
 export const SOLID_CORE_MODULE_NAME = 'solid-core';
 export const SOLID_CORE_MODULE_NPM_PACKAGE_NAME = '@solidstarters/solid-core';
@@ -346,7 +347,8 @@ export function updateField(tree: Tree, options: any, field: any) {
       options.module,
       options.model,
       field,
-      options.modelEnableSoftDelete
+      options.modelEnableSoftDelete,
+      options.dataSourceType as SupportedDatabases
     );
     const entityFieldChanges = fieldHandler.updateEntityField();
     // console.log('entityFieldChanges:', entityFieldChanges.map((change) => change.changes));
@@ -533,9 +535,9 @@ export function calculateModuleFileImportPath(moduleName: string, internalPath:
   return (moduleName === SOLID_CORE_MODULE_NAME) ? internalPath : SOLID_CORE_MODULE_NPM_PACKAGE_NAME;
 }
 
-export function outputParentImportPathForEntity(parentModel: string | null = null, parentModule: string = "solid-core") {
+export function outputEntitySuperClassImport(isLegacyTable: boolean = false, isLegacyTableWithId: boolean = false, parentModel: string | null = null, parentModule: string = "solid-core") {
   let importPath: string = SOLID_CORE_MODULE_NPM_PACKAGE_NAME;
-  let importSymbol: string = "CommonEntity";
+  let importSymbol: string = isLegacyTableWithId ? "LegacyCommonWithIdEntity" : isLegacyTable ? "LegacyCommonEntity" : "CommonEntity";
   if (parentModel != null) {
     importPath = parentModule === SOLID_CORE_MODULE_NAME ? SOLID_CORE_MODULE_NPM_PACKAGE_NAME : `src/${dasherize(parentModule)}/entities/${dasherize(parentModel)}.entity.ts`;
     importSymbol = `${classify(parentModel)}`;

package/src/code-builder/lib/model/refresh-model.schema.json

@@ -37,6 +37,21 @@
       "description": "Whether the draft publish workflow is enabled for the model",
       "default": "false"
     },
+    "isLegacyTable": {
+      "type": "string",
+      "description": "Indicates whether the table is a legacy table",
+      "default": "false"
+    },
+    "isLegacyTableWithId": {
+      "type": "string",
+      "description": "Indicates whether the legacy table has an 'id' column",
+      "default": "false"
+    },
+    "dataSourceType": {
+      "type": "string",
+      "description": "The data source type of the model",
+      "enum": ["postgres", "mssql"]
+    },
     "fields": {
       "oneOf": [
         {