@solidstarters/solid-core 1.2.60 → 1.2.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.60",
+  "version": "1.2.62",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/refresh-model.command.ts

@@ -33,7 +33,7 @@ export class RefreshModelCommand extends CommandRunner {
       modelUserKey: options.name,
       dryRun: options.dryRun,
     };
-    await this.modelMetadataService.generateCode(codeGenerationOptions);
+    await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
   }
 
   @Option({

package/src/controllers/model-metadata.controller.ts

@@ -69,7 +69,7 @@ export class ModelMetadataController {
     @ApiBearerAuth("jwt")
     @Post(':id/generate-code')
     generateCode(@Param('id', ParseIntPipe) id: number) {
-        return this.modelMetadataService.generateCode({ modelId: id});
+        return this.modelMetadataService.handleGenerateCode({ modelId: id});
     }
 
 

package/src/providers/list-of-values-selection-providers.service.ts

@@ -4,6 +4,8 @@ import { PaginationQueryDto } from "src/dtos/pagination-query.dto";
 import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { Injectable } from "@nestjs/common";
 import { ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "../interfaces";
+import { filter } from "rxjs";
+import { BasicFilterDto } from "src/dtos/basic-filters.dto";
 
 interface ListOfValuesProviderContext extends ISelectionProviderContext {
     type: string;
@@ -31,8 +33,14 @@ export class ListOfValuesSelectionProvider implements ISelectionProvider<ListOfV
     }
 
     async values(query: string, ctxt: ListOfValuesProviderContext): Promise<readonly ISelectionProviderValues[]> {
-        const paginatedQuery = new PaginationQueryDto(DEFAULT_LIMIT, 0);
-        const lovs = await this.listOfValuesService.find(paginatedQuery);
+        const basicFilterQuery = new BasicFilterDto(DEFAULT_LIMIT, 0);
+        basicFilterQuery.filters = {
+            type: {
+                $eq: ctxt.type
+            }
+        }
+
+        const lovs = await this.listOfValuesService.find(basicFilterQuery);
         const selectionValues = lovs.records.map(lov => {
             return {
                 label: lov.display,

package/src/seeders/seed-data/solid-core-metadata.json

@@ -8674,13 +8674,5 @@
   ],
   "checksums": [],
   "listOfValues": [
-    {
-      "type": "industry",
-      "value": "IT",
-      "display": "IT",
-      "description": "Insdustry It list of value",
-      "default": true,
-      "sequence": 1
-    }
   ]
 }

package/src/services/model-metadata.service.ts

@@ -717,21 +717,22 @@ export class ModelMetadataService {
     return this.modelMetadataRepo.remove(entity);
   }
 
-  async generateCode(options: CodeGenerationOptions): Promise<string> {
-    const query = {
-      populate: ["module", "fields"]
-    };
-
-    const model = options.modelId
-      ? await this.findOne(options.modelId, query)
-      : await this.findOneByUserKey(options.modelUserKey, query.populate);
-
-    options.fieldIdsForRemoval = model.fields
-      .filter(field => field.isMarkedForRemoval)
-      .map(field => field.id);
-
-    const refreshModelCodeOutput = await this.generateModelCode(options);
-    const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
+  async handleGenerateCode(options: CodeGenerationOptions): Promise<string> {
+    const { model, removeFieldCodeOuput, refreshModelCodeOutput } = await this.generateCode(options);
+
+    // Generate the code for models which are linked to fields having an inverse relation
+    const coModelSingularNames = model.fields.
+                          filter(field => field.type === SolidFieldType.relation && field.relationCreateInverse === true)
+                          .map(field => field.relationCoModelSingularName);
+
+    for (const singularName of coModelSingularNames) {
+      const coModel = await this.findOneBySingularName(singularName);
+      const inverseOptions: CodeGenerationOptions = {
+        modelId: coModel.id,
+        dryRun: options.dryRun
+      };
+      await this.generateCode(inverseOptions);
+    }                      
 
     const jsonFieldsList = model.fields.filter((field: FieldMetadata) => field.isSystem !== true);
 
@@ -739,8 +740,7 @@ export class ModelMetadataService {
       type: "field",
       attrs: {
         name: `${field.name}`,
-        sortable: true,
-        filterable: true
+        isSearchable: true,
       }
     }));
 
@@ -876,6 +876,24 @@ export class ModelMetadataService {
     return `${removeFieldCodeOuput} \n ${refreshModelCodeOutput}`;
   }
 
+  private async generateCode(options: CodeGenerationOptions) {
+    const query = {
+      populate: ["module", "fields"]
+    };
+
+    const model = options.modelId
+      ? await this.findOne(options.modelId, query)
+      : await this.findOneByUserKey(options.modelUserKey, query.populate);
+
+    options.fieldIdsForRemoval = model.fields
+      .filter(field => field.isMarkedForRemoval)
+      .map(field => field.id);
+
+    const refreshModelCodeOutput = await this.generateModelCode(options);
+    const removeFieldCodeOuput = await this.generateRemoveFieldsCode(options);
+    return { model, removeFieldCodeOuput, refreshModelCodeOutput };
+  }
+
   async generateRemoveFieldsCode(options: CodeGenerationOptions): Promise<string> {
     if (!options.modelId && !options.modelUserKey) {
       throw new BadRequestException('Model ID or Model Name is required for generating code');

package/src/services/module-metadata.service.ts

@@ -375,7 +375,7 @@ export class ModuleMetadataService {
         modelId: model.id,
         dryRun: options.dryRun,
       };
-      const output = await this.modelMetadataService.generateCode(codeGenerationOptions);
+      const output = await this.modelMetadataService.handleGenerateCode(codeGenerationOptions);
       this.logger.debug(`Schematic output : ${output}`);
       outputLines.push(output)
     }

package/m21-12m.definition

@@ -1,43 +0,0 @@
-                // many-to-one field
-                // {
-                //     "name": "module",
-                //     "displayName": "Module",
-                //     "type": "relation",
-                //     "required": true,
-                //     "unique": false,
-                //     "index": true,
-                //     "private": false,
-                //     "encrypt": false,
-                //     "relationType": "many-to-one",
-                //     "relationModelSingularName": "moduleMetadata",
-                //     "relationCreateInverse": true,
-                //     "relationCascade": "set null",
-                //     "relationModelModuleName": "solid-core",
-                //     "isSystem": true
-                //   },
-
-                // one-to-many field
-                // {
-                //    "name": field.relationModelField,
-                // Logic to create a oneToMany field definition
-                // return [
-                //     "name",
-                //     "displayName",
-                //     "description",
-                //     "type",
-                //     "ormType",
-                //     "isSystem",
-                //     "relationType",
-                //     "relationModelFieldName",
-                //     "relationCreateInverse",
-                //     "relationModelSingularName",
-                //     "relationModelModuleName",
-                //     "required",
-                //     "unique",
-                //     "index",
-                //     "private",
-                //     "encrypt",
-                //     "encryptionType",
-                //     "decryptWhen",
-                //     "columnName"
-                // ];

package/src/entities/mysql-issues

@@ -1,14 +0,0 @@
-# Issues
-1. @Column("text", { array: true, name: 'media_types', nullable: true }) // array type not supported. No impact on code generation. not being used
-2. 
-default values not allowed for text,blog // Code generation impact. If we want to support default values for long text/rich text, then changes to be made.
-date value is not supported propertly in mysql
-i.e new Date("2025-02-11T00:00:00.000Z")
-3. Below type of code cannot exist. // No impact on code generation. Not being used.
-@Index({ unique: true })
-@Column({ unique: true })
-4.  // Impact on code generation. unique index to be generated by using @Index and not @Column.
-@Index({ unique: true })
-@Column({ })
-5. i.e new Date("2025-02-11T00:00:00.000Z")
--> Remove the column default value