@solidstarters/solid-core 1.2.60 → 1.2.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.60",
+  "version": "1.2.61",
   "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/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);
 
@@ -876,6 +877,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)
     }