@solidstarters/solid-core 1.2.180 → 1.2.184

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.180",
+  "version": "1.2.184",
   "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",
@@ -70,9 +70,9 @@
     "pluralize": "^8.0.0",
     "puppeteer": "^23.2.0",
     "r2r-js": "^0.4.43",
-    "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "swagger-ui-express": "^5.0.0",
+    "ts-morph": "^27.0.2",
     "twilio": "^5.8.0",
     "uuid": "^9.0.1",
     "xlsx": "^0.18.5"
@@ -97,7 +97,8 @@
     "nestjs-cls": "^5.4.3",
     "typeorm": "^0.3.20",
     "typeorm-naming-strategies": "^4.1.0",
-    "winston": "^3.17.0"
+    "winston": "^3.17.0",
+    "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {
     "@angular-devkit/schematics": "^19.2.6",
@@ -152,7 +153,8 @@
     "typeorm": "^0.3.20",
     "typeorm-naming-strategies": "^4.1.0",
     "typescript": "^5.1.3",
-    "winston": "^3.17.0"
+    "winston": "^3.17.0",
+    "reflect-metadata": "^0.2.2"
   },
   "jest": {
     "moduleFileExtensions": [

package/solid_seed_fixes.ts.txt

@@ -0,0 +1,93 @@
+import { In } from "typeorm";
+import { MenuItemMetadata } from "src/entities/menu-item-metadata.entity";
+import { RoleMetadata } from "src/entities/role-metadata.entity";
+import { ActionMetadata } from "src/entities/action-metadata.entity";
+import { ModuleMetadata } from "src/entities/module-metadata.entity";
+
+const JOIN_TABLE = "ss_menu_item_metadata_roles_role_metadata"; // <-- your actual join table
+const MENU_COL = "menuItemId"; // <-- actual column name in the join table
+const ROLE_COL = "roleId";     // <-- actual column name in the join table
+
+await this.dataSource.transaction(async (trx) => {
+  const menuRepo   = trx.getRepository(MenuItemMetadata);
+  const roleRepo   = trx.getRepository(RoleMetadata);
+  const actionRepo = trx.getRepository(ActionMetadata);
+  const moduleRepo = trx.getRepository(ModuleMetadata);
+
+  // 1) Upsert menus WITHOUT roles
+  for (const m of menus) {
+    const entity = menuRepo.create({
+      name: m.name,
+      displayName: m.displayName,
+      action: m.actionUserKey
+        ? await actionRepo.findOne({ where: { userKey: m.actionUserKey }, select: ["id"] })
+        : null,
+      module: m.moduleUserKey
+        ? await moduleRepo.findOne({ where: { userKey: m.moduleUserKey }, select: ["id"] })
+        : null,
+      parentMenuItem: m.parentMenuItemUserKey
+        ? await menuRepo.findOne({ where: { userKey: m.parentMenuItemUserKey }, select: ["id"] })
+        : null,
+    });
+    await menuRepo.upsert(entity, ["name"]); // or ["userKey"]
+  }
+
+  // 2) Fetch ids for batching
+  const seeded = await menuRepo.find({
+    where: { name: In(menus.map(m => m.name)) },
+    select: ["id", "name"],
+  });
+  const idByName = new Map(seeded.map(s => [s.name, s.id]));
+
+  // 3) Build desired join rows once
+  const admin = await roleRepo.findOne({ where: { name: ADMIN_ROLE_NAME }, select: ["id","name"] });
+  const allRoleNames = new Set<string>();
+  for (const m of menus) (m.roles ?? []).forEach((r: string) => allRoleNames.add(r));
+  if (admin) allRoleNames.add(admin.name);
+
+  const roles = await roleRepo.find({
+    where: { name: In([...allRoleNames]) },
+    select: ["id","name"],
+  });
+  const roleByName = new Map(roles.map(r => [r.name, r]));
+
+  const joinRows: Array<{ menuId: number; roleId: number }> = [];
+  for (const m of menus) {
+    const menuId = idByName.get(m.name)!;
+    const roleNames = new Set<string>([...(m.roles ?? []), admin?.name].filter(Boolean) as string[]);
+    for (const rn of roleNames) {
+      const role = roleByName.get(rn);
+      if (role) joinRows.push({ menuId, roleId: role.id });
+    }
+  }
+
+  // 4) Replace in bulk — QueryBuilder version
+
+  // 4a) delete existing for affected menus
+  const menuIds = [...new Set(joinRows.map(r => r.menuId))];
+  if (menuIds.length) {
+    await trx
+      .createQueryBuilder()
+      .delete()
+      .from(JOIN_TABLE) // string table name is fine
+      .where(`${MENU_COL} IN (:...ids)`, { ids: menuIds })
+      .execute();
+  }
+
+  // 4b) bulk insert all pairs
+  if (joinRows.length) {
+    // Build objects with the exact column names used by the join table
+    const values = joinRows.map(r => ({
+      [MENU_COL]: r.menuId,
+      [ROLE_COL]: r.roleId,
+    }));
+
+    await trx
+      .createQueryBuilder()
+      .insert()
+      .into(JOIN_TABLE) // string table name
+      .values(values)
+      .orIgnore() // optional if you have a UNIQUE(menuItemId, roleId) and want to skip dups
+      .execute();
+  }
+});

package/src/config/iam.config.ts

@@ -1,4 +1,5 @@
 import { registerAs } from '@nestjs/config';
+import { Environment } from 'src';
 
 export const iamConfig = registerAs('iam', () => {
     return {
@@ -32,7 +33,7 @@ export const jwtConfig = registerAs('jwt', () => {
         secret: process.env.IAM_JWT_SECRET,
         audience: process.env.IAM_JWT_TOKEN_AUDIENCE,
         issuer: process.env.IAM_JWT_TOKEN_ISSUER,
-        accessTokenTtl: parseInt(process.env.IAM_JWT_ACCESS_TOKEN_TTL ?? '1200', 10), // 20 minutes 
+        accessTokenTtl: parseInt(process.env.IAM_JWT_ACCESS_TOKEN_TTL ?? (process.env.ENV as Environment) === Environment.Production ? '1200' : '86400', 10), // 20 minutes in prod, 1 day otherwise
         refreshTokenTtl: parseInt(process.env.IAM_JWT_REFRESH_TOKEN_TTL ?? '604800', 10), // 7 days
     };
 });

package/src/controllers/service.controller.ts

@@ -136,7 +136,10 @@ export class ServiceController {
         // Run the Solid ingestion command
         if (config.runSolidIngestion) {
             this.logger.debug(`Running the Solid ingestion command as part of post-process code generation`);
-            await this.ingestMetadataService.ingest();
+
+            // TODO: disabled this till we figure out a way to make this stable...
+            // This keeps failing for a variety of reasons... 
+            // await this.ingestMetadataService.ingest();
         }
     }
 

package/src/dtos/create-menu-item-metadata.dto.ts

@@ -65,4 +65,8 @@ export class CreateMenuItemMetadataDto {
     @ApiProperty()
     iconName: string;
 
-}
+}
+
+export const MENU_ROLE_JOIN_TABLE_NAME = "ss_menu_item_metadata_roles_ss_role_metadata"; // <-- your actual join table
+export const MENU_ROLE_JOIN_TABLE_NAME_MENU_COL = "ss_menu_item_metadata_id"; // <-- actual column name in the join table
+export const MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL = "ss_role_metadata_id";     // <-- actual column name in the join table

package/src/dtos/create-role-metadata.dto.ts

@@ -53,4 +53,63 @@ export class CreateRoleMetadataDto {
     @IsOptional()
     @ApiProperty()
     menuItemsCommand: string;
-}
+}
+export const ADMIN_ROLE_NAME = 'Admin';
+export const INTERNAL_ROLE_NAME = 'Internal User';
+export const PUBLIC_ROLE_NAME = 'Public';
+export const INTERNAL_ROLE_PERMISSIONS = [
+    // User permissions
+    'UserController.findMany', //Why do we need this?
+    'UserController.checkIfPermissionExists',
+    'UserController.findOne',
+    // Menu permissions
+    'MenuItemMetadataController.findMany',
+    'MenuItemMetadataController.findUserMenus',
+    'MenuItemMetadataController.findOne',
+    // View metadata permissions
+    'ViewMetadataController.getLayout',
+    'ViewMetadataController.findMany',
+    'ViewMetadataController.findOne',
+    // User View metadata permissions
+    'UserViewMetadataController.upsert',
+    'UserViewMetadataController.findMany',
+    'UserViewMetadataController.findOne',
+    // IAM permissions
+    'AuthenticationController.changePassword',
+    // Field Metadata permissions
+    'FieldMetadataController.getSelectionDynamicValues',
+    'FieldMetadataController.getSelectionDynamicValue',
+    'FieldMetadataController.findFieldDefaultMetaData',
+    // Saved Filters permissions
+    'SavedFiltersController.delete',
+    'SavedFiltersController.deleteMany',
+    'SavedFiltersController.findOne',
+    'SavedFiltersController.findMany',
+    'SavedFiltersController.recover',
+    'SavedFiltersController.recoverMany',
+    'SavedFiltersController.partialUpdate',
+    'SavedFiltersController.update',
+    'SavedFiltersController.insertMany',
+    'SavedFiltersController.create',
+    // Logout permissions
+    'AuthenticationController.logout',
+    // Other permissions can be added here as required.
+    // Chatter permissions
+    'ChatterMessageController.create',
+    'ChatterMessageController.getChatterMessages',
+    // 'ChatterMessageController.postMessage', // Does not seem to be used from ui
+    // Import
+    'ImportTransactionController.getImportTemplate',
+    'ImportTransactionController.getImportInstructions',
+    'ImportTransactionController.getImportMappingInfo',
+    'ImportTransactionController.startImportSync',
+    'ImportTransactionController.startImportAsync',
+    'ImportTransactionController.exportFailedImportedImports',
+    // Export permissions
+    'ExportTemplateController.startExportSync',
+    'ExportTemplateController.startExportAsync',
+    // List of values
+    'ListOfValuesController.findMany',
+    'ListOfValuesController.findOne',
+    // Media // [Not required], since media is always populated as part of a model
+]

package/src/interfaces.ts

@@ -66,7 +66,7 @@ export interface CodeGenerationOptions {
 
 export interface TriggerMcpClientOptions {
   aiInteractionId: number;
-  moduleName:string;
+  moduleName: string;
 }
 
 export interface McpResponse {
@@ -274,4 +274,31 @@ export interface IErrorCodeProvider {
    * If omitted, the ErrorMapperService will rely on the rule.meta of the first matching rule.
    */
   resolve?(code: ErrorCode): ErrorMeta | undefined;
-}
+}
+
+// MCP Tool Related
+
+export type PlanStep = CreateNewFileStep | RegisterNestProviderStep;
+
+export interface CreateNewFileStep {
+  type: "createNewFile";
+  path: string;         // repo-relative e.g. solid-api/api/src/computed-providers/foo.provider.ts
+  content: string;      // full file content
+  overwrite?: boolean;  // default=false
+  rationale?: string;   // optional, ignored by executor
+}
+
+export interface RegisterNestProviderStep {
+  type: "registerNestProvider";
+  modulePath: string;           // e.g. apps/api/src/address-master/address-master.module.ts
+  providerClassName: string;    // e.g. StateTotalCitiesComputedFieldProvider
+  importFrom: string;           // e.g. "@/computed-providers/state-total-cities.provider"
+  registerIn: Array<"providers" | "exports">; // which arrays to add to
+  uniqueGuard?: boolean;        // default=true
+  rationale?: string;           // optional, ignored by executor
+}
+
+export interface McpComputedProviderResponse {
+  plan: PlanStep[];
+  // provider?: any;  // (intentionally ignored per your note)
+}

package/src/jobs/database/trigger-mcp-client-subscriber-database.service.ts

@@ -1,13 +1,17 @@
 import { Injectable, Logger } from '@nestjs/common';
-
+import { ModelMetadataService } from 'src';
+import { SolidRegistry } from 'src/helpers/solid-registry';
 import { QueueMessage } from 'src/interfaces/mq';
-import { MqMessageService } from '../../services/mq-message.service';
-import { MqMessageQueueService } from '../../services/mq-message-queue.service';
-import { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
-import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
-import triggerMcpClientQueueOptions from "./trigger-mcp-client-queue-options";
+import { DashboardRepository } from 'src/repository/dashboard.repository';
 import { AiInteractionService } from 'src/services/ai-interaction.service';
+import { ModuleMetadataService } from 'src/services/module-metadata.service';
 import { PollerService } from 'src/services/poller.service';
+import { DatabaseSubscriber } from 'src/services/queues/database-subscriber.service';
+import { Not } from 'typeorm';
+import { McpResponse, QueuesModuleOptions, TriggerMcpClientOptions } from "../../interfaces";
+import { MqMessageQueueService } from '../../services/mq-message-queue.service';
+import { MqMessageService } from '../../services/mq-message.service';
+import triggerMcpClientQueueOptions from "./trigger-mcp-client-queue-options";
 
 @Injectable()
 export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<TriggerMcpClientOptions> {
@@ -18,6 +22,12 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
         readonly mqMessageQueueService: MqMessageQueueService,
         readonly poller: PollerService,
         readonly aiInteractionService: AiInteractionService,
+        readonly moduleMetadataService: ModuleMetadataService,
+        readonly modelMetadataService: ModelMetadataService,
+        private readonly solidRegistry: SolidRegistry,
+        // private readonly dashboardService: DashboardService
+        private readonly dashboardRepository: DashboardRepository
+
     ) {
         super(mqMessageService, mqMessageQueueService, poller);
     }
@@ -95,23 +105,111 @@ export class TriggerMcpClientSubscriberDatabase extends DatabaseSubscriber<Trigg
             status: 'pending' // Updated after we receive the response
         });
 
+        const existingComputationProviders = this.solidRegistry.getComputedFieldProviders();
+
+        const { records: existingModules } = await this.moduleMetadataService.findMany({
+            filters: {
+                name: { $ne: 'solid-core' }
+            },
+            fields: ['id', 'name', 'displayName', 'description'],
+            limit: 1000
+        });
+        const { records: existingModels } = await this.modelMetadataService.findMany({
+            filters: {
+                module: {
+                    name: {
+                        $ne: 'solid-core',
+                    }
+                }
+            },
+            limit: 1000,
+            populate: ['module']
+        });
+
+        // Get the list of dashboards
+        //TODO: Ideally we should fetch dashboard like below, but used below approach to avoid below CLS issues for now.
+        // Cannot set the key "filter". No CLS context available, please make sure that a ClsMiddleware/Guard/Interceptor has set up the context, or wrap any calls that depend on CLS with "ClsService#run"
+        // const { records: existingDashboards } = await this.dashboardService.find({
+        //     fields
+        // })
+        const existingDashboards = await this.dashboardRepository.find(
+            {
+                where: {
+                    module: {
+                        name: Not('solid-core')
+                    }
+                },
+            }
+        );
+
+        // Build markdown sections using template interpolation
+        const modulesSection = (existingModules ?? [])
+            .map(m => [
+                `### ${m.displayName}`,
+                `- name: ${m.name}`,
+                `- description: ${m.description ?? ""}`,
+            ].join('\n'))
+            .join('\n\n');
+
+        const modelsSection = (existingModels ?? [])
+            .map(m => [
+                `### ${m.displayName}`,
+                `- singularName: ${m.singularName}`,
+                `- description: ${m.description ?? ""}`,
+                `- moduleName: ${m.module.name}`,
+            ].join('\n'))
+            .join('\n\n');
+
+        const dashboardsSection = (existingDashboards ?? [])
+            .map(d => [
+                `### ${d.displayName}`,
+                `- name: ${d.name}`,
+                `- description: ${d.description ?? ""}`,
+            ].join('\n'))
+            .join('\n\n');    
+
+        const computationProvidersSection = (existingComputationProviders ?? [])
+            .map(m => [
+                `### ${m.instance.name()}`,
+                `- name: ${m.instance.name()}`,
+                `- description: ${m.instance.help() ?? ""}`,
+            ].join('\n'))
+            .join('\n\n');
+
+
         const finalPrompt = `
 # User Prompt: 
 ${prompt}
 
 # System Instructions:
 - aiInteractionId: ${genAiInteraction.id}
-- moduleName:${message.payload.moduleName}
-- You will be invoking tools if needed.
+- You will be invoking tools if needed, hence you will have to choose the applicable tools based on the tool context given to you.
 - If a tool is invoked, you must return **exactly** the raw output from the tool, without any json envelopes, additional formatting, commentary, or text.
 - Do not wrap the result in quotes, JSON, or markdown fences.
 - Do not explain what the result means.
 
-# Past Interactions: 
-This section contains the last 10 interactions done between the human and LLM. These are sorted by oldest first. 
-Use these interactions to further identify concerns based on the current User Prompt.
+# LISTS FOR REFERENCE AND VALIDATIONS
 
-`
+## LIST OF EXISTING MODULES
+Use the below list of models with module names to infer which module & models the user is referring to, you can try to pull out the singularName incase of models.
+
+${modulesSection}
+
+## LIST OF EXISTING MODELS
+Use the below list of modules to infer which module the user is referring to.
+
+${modelsSection}
+
+## LIST OF EXISTING DASHBOARDS
+Use the below list of dashboards to infer which dashboard the user is referring to.
+
+${dashboardsSection}
+
+## LIST OF EXISTING COMPUTED FIELD PROVIDERS
+Use the below list of computed field providers to infer which provider the user is referring to.
+
+${computationProvidersSection}
+`.trim();
 
         const aiResponse = await this.aiInteractionService.runMcpPrompt(finalPrompt);
         this.triggerMcpClientSubscriberLogger.log(`aiResponse: `);
@@ -170,7 +268,9 @@ Use these interactions to further identify concerns based on the current User Pr
             // });
 
             // TODO: Update the previously created genAiInteraction record with the respective success fields and save to DB
-            const errorsStr = nestedResponse.status == "error" && nestedResponse.errors.join('\n ');
+            const errorsStr = nestedResponse?.status == "error" && nestedResponse?.errors.join('\n ');
+            // const errorTrace = nestedResponse?.status == "error" && nestedResponse?.error_trace?.join('\n');
+
 
             await this.aiInteractionService.update(genAiInteraction.id, {
                 errorMessage: nestedResponse.status == "error" ? `${errorsStr}` : "",

package/src/repository/view-metadata.repository.ts

@@ -28,4 +28,19 @@ export class ViewMetadataRepository extends Repository<ViewMetadata> {
         });
         return viewMetadata;
     }
+
+    async findByTypeModelNameAndModuleName(type: string, modelUserKey: string, moduleUserKey: string): Promise<ViewMetadata | null> {
+        const viewMetadata = await this.findOne({
+            where: {
+                type: type,
+                model: {
+                    singularName: modelUserKey,
+                    module: {
+                        name: moduleUserKey
+                    }
+                }
+            }
+        });
+        return viewMetadata;
+    }
 }