@solidxai/core 0.1.11-beta.9 → 0.1.11

package/dist/services/menu-item-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-item-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/menu-item-metadata.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,qBACa,uBAAwB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IAGtE,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,0BAA0B;IACzC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB;IACjD,QAAQ,CAAC,SAAS,EAAE,SAAS;gBALpB,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,0BAA0B,EAChC,gBAAgB,EAAE,sBAAsB,EACxC,SAAS,EAAE,SAAS;IAOzB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,KAAK;IAU7C,MAAM,CAAC,sBAAsB,EAAE,yBAAyB;IA2BxD,aAAa,CAAC,UAAU,EAAE,cAAc;YAiFhC,aAAa;CAmE5B"}
+{"version":3,"file":"menu-item-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/menu-item-metadata.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAG3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,qBACa,uBAAwB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IAGtE,QAAQ,CAAC,aAAa,EAAE,aAAa;IAGrC,QAAQ,CAAC,IAAI,EAAE,0BAA0B;IACzC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB;IACjD,QAAQ,CAAC,SAAS,EAAE,SAAS;gBALpB,aAAa,EAAE,aAAa,EAG5B,IAAI,EAAE,0BAA0B,EAChC,gBAAgB,EAAE,sBAAsB,EACxC,SAAS,EAAE,SAAS;IAOzB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,KAAK;IAU7C,MAAM,CAAC,sBAAsB,EAAE,yBAAyB;IA2BxD,aAAa,CAAC,UAAU,EAAE,cAAc;YAiFhC,aAAa;CAoE5B"}

package/dist/services/menu-item-metadata.service.js

@@ -137,6 +137,7 @@ let MenuItemMetadataService = class MenuItemMetadataService extends crud_service
                 path: path,
                 key: rootItem.name.toLowerCase().replace(/\s+/g, '-'),
                 icon: rootItem.iconName,
+                isSystem: (rootItem.action?.model?.isSystem ?? false) || rootItem.module?.name === "solid-core",
             };
             if (children.length > 0) {
                 data["children"] = await this.buildMenuTree(children, allMenuItems, activeUser);

package/dist/services/menu-item-metadata.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-item-metadata.service.js","sourceRoot":"","sources":["../../src/services/menu-item-metadata.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { EntityManager } from 'typeorm';\nimport { CRUDService } from 'src/services/crud.service';\n\n\nimport { MenuItemMetadata } from '../entities/menu-item-metadata.entity';\nimport { UpdateMenuItemMetadataDto } from '../dtos/update-menu-item-metadata.dto';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { ModuleMetadata } from '../entities/module-metadata.entity';\nimport { kebabCase } from 'lodash';\nimport { MenuItemMetadataRepository } from 'src/repository/menu-item-metadata.repository';\nimport { SavedFiltersRepository } from 'src/repository/saved-filters.repository';\n\n@Injectable()\nexport class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(MenuItemMetadata, 'default')\n    // readonly repo: Repository<MenuItemMetadata>,\n    readonly repo: MenuItemMetadataRepository,\n    readonly savedFiltersRepo: SavedFiltersRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(entityManager, repo, 'menuItemMetadata', 'solid-core', moduleRef);\n  }\n\n\n  async findOneByUserKey(name: string, relations = {}) {\n    const entity = await this.repo.findOne({\n      where: {\n        name: name,\n      },\n      relations: relations,\n    });\n    return entity;\n  }\n\n  async upsert(updateSolidMenuItemDto: UpdateMenuItemMetadataDto) {\n    // Leave out all the extra attributes only keep the ones we are interested in updating.\n    const { moduleUserKey, parentMenuItemUserKey, actionUserKey, rolesIds, rolesCommand, ...cleanUpdateSolidMenuItemDto } = updateSolidMenuItemDto;\n\n    // First check if module already exists using name\n    const existingMenuItem = await this.repo.findOne({\n      where: {\n        name: updateSolidMenuItemDto.name\n      },\n      relations: [\"roles\"]\n    });\n\n    // if found\n    if (existingMenuItem) {\n      // TODO: This is very slow disabling this for now..\n      // const updatedSolidActionDto = { ...existingMenuItem, ...cleanUpdateSolidMenuItemDto };\n      // return this.repo.save(updatedSolidActionDto);\n    }\n    // if not found - create new \n    else {\n      // @ts-ignore\n      const moduleMetadata = this.repo.create(cleanUpdateSolidMenuItemDto);\n      return this.repo.save(moduleMetadata);\n    }\n  }\n\n\n  async findUserMenus(activeUser: ActiveUserData) {\n    // 1. For the users role, fire a query to load all menus that this role has access to. \n    // const usersMenuItems = this.solidMenuItemRepo.find({\n    //     where: {\n    //         roles: {\n    //             name: In(activeUser.roles)\n    //         }\n    //     },\n    //     relations: ['module', 'parentMenuItem', 'action']\n    // });\n    const qb = await this.repo.createSecurityRuleAwareQueryBuilder('menuItem')\n\n    const menuItems = await qb\n      .leftJoinAndSelect('menuItem.module', 'module')\n      .leftJoinAndSelect('menuItem.parentMenuItem', 'parentMenuItem')\n      .leftJoinAndSelect('menuItem.action', 'action')\n      .leftJoinAndSelect('action.model', 'model') // Join the model relation of action\n      .leftJoinAndSelect('action.view', 'view') // Join the view relation of action\n      .leftJoinAndSelect('menuItem.roles', 'roles')\n      .where('roles.name IN (:...roleNames)', { roleNames: activeUser.roles })\n      .addOrderBy('module.menuSequenceNumber', 'ASC')\n      .addOrderBy('menuItem.sequenceNumber', 'ASC')\n      .getMany();\n\n    // 2. First arrange the output of the above query by module based on module\n    const modulesToMenuItemsMap = new Map<string, MenuItemMetadata[]>();\n    const modulesMap = new Map<string, ModuleMetadata>();\n    menuItems.forEach(menuItem => {\n      const moduleName = menuItem.module.name;\n\n      // Keep track of all menu items under a given module.\n      if (!modulesToMenuItemsMap.has(moduleName)) {\n        modulesToMenuItemsMap.set(moduleName, []);\n      }\n      modulesToMenuItemsMap.get(moduleName).push(menuItem);\n\n      // Keep track of the modules information separately.\n      if (!modulesMap.has(moduleName)) {\n        modulesMap.set(moduleName, menuItem.module);\n      }\n    });\n\n    // 3. Then for each module, do a recursive compilation of children based on parentMenuItem, while doing this use the relation - action to get hold of the path. \n    const menu: any[] = [];\n\n    // modulesToMenuItemsMap.forEach((menuItems, moduleName) => {\n    //   const rootMenuItems = menuItems.filter(item => !item.parentMenuItem);\n    //   const moduleMetadata = modulesMap.get(moduleName);\n\n    //   const moduleMenu = {\n    //     title: moduleMetadata.displayName,\n    //     // No need for path the module level.\n    //     // path: ``,\n    //     key: moduleName.toLowerCase().replace(/\\s+/g, '-'),\n    //     // TODO: We need to add the module icon as part of the metadata so it can be brought here. \n    //     // icon: `/images/menu/${moduleName.toLowerCase().replace(/\\s+/g, '-')}.svg`,\n    //     children: this.buildMenuTree(rootMenuItems, menuItems, activeUser),\n    //     icon: moduleMetadata.menuIconUrl,\n    //   };\n\n    //   menu.push(moduleMenu);\n    // });\n    for (const [moduleName, menuItemsForModule] of modulesToMenuItemsMap.entries()) {\n      const rootMenuItems = menuItemsForModule.filter(item => !item.parentMenuItem);\n      const moduleMetadata = modulesMap.get(moduleName);\n\n      const moduleMenu = {\n        title: moduleMetadata.displayName,\n        key: moduleName.toLowerCase().replace(/\\s+/g, '-'),\n        children: await this.buildMenuTree(rootMenuItems, menuItemsForModule, activeUser), // ✅ await here\n        icon: moduleMetadata.menuIconUrl,\n      };\n\n      menu.push(moduleMenu);\n    }\n\n\n    return menu.filter(m => m.children.length > 0);\n  }\n\n  // Recursive function to build the tree\n  private async buildMenuTree(rootItems: MenuItemMetadata[], allMenuItems: MenuItemMetadata[], activeUser: ActiveUserData): Promise<any[]> {\n    const menuItemsData = await Promise.all(\n      rootItems.map(async rootItem => {\n        const allowedMenuItems = allMenuItems.filter(i => {\n          if (!i.parentMenuItem) {\n            return true\n          } else {\n            if(i.action.type === 'custom'){\n              return true;\n            }\n            return this.crudHelperService.hasReadPermissionOnModel(activeUser, i.action.model.singularName)\n          }\n        });\n        // Get immediate children of the current loop variable menuItem.\n        const children = allowedMenuItems.filter(item => item.parentMenuItem && item.parentMenuItem.id === rootItem.id);\n        const menuItemId = rootItem?.id ?? \"\";\n        const menuItemName = rootItem?.name ?? \"\";\n        const actionId = rootItem?.action?.id ?? \"\";\n        const actionName = rootItem?.action?.name ?? \"\";\n        // TODO: We should specify path only if there are no more children present. \n        // For now adding path everywhere. \n        let path = '';\n\n        const layout = rootItem?.action?.view && rootItem?.action?.view?.layout ? JSON.parse(rootItem?.action?.view?.layout) : null\n        let savedFilterId = null;\n        if (layout && layout?.attrs?.defaultSavedFilter) {\n          const savedFilter = await this.savedFiltersRepo.findOne({\n            where: {\n              name: layout?.attrs?.defaultSavedFilter,\n              isPrivate: false\n            },\n          });\n          if (savedFilter) {\n            savedFilterId = savedFilter.id\n          }\n        }\n        if (rootItem.action && rootItem.action.type === 'custom') {\n          path = `${rootItem.action.customComponent}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;\n        }\n        if (rootItem.action && rootItem.action.type === 'solid') {\n          if (this.crudHelperService.hasReadPermissionOnModel(activeUser, rootItem.action.model.singularName)) {\n            // TODO: Here we are assuming that we will always take the user to collection view of a model. \n            // We can make provision to take them other views also in the future. \n            // path = `/admin/core/${rootItem.module.name}/${rootItem.action.model.singularName}/${rootItem.action.view.name}`;\n            path = `/admin/core/${rootItem.module.name}/${kebabCase(rootItem.action?.model?.singularName ?? 'unknown')}/${rootItem.action?.view?.type ?? 'list'}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;\n\n          }\n        }\n\n        // We are not checking for empty path coz, this is required for parent menu items.\n        const data = {\n          title: rootItem.displayName || rootItem.name,\n          path: path,\n          key: rootItem.name.toLowerCase().replace(/\\s+/g, '-'),\n          icon: rootItem.iconName,\n          // iconVariant : rootItem.iconVariant\n        }\n        if (children.length > 0) {\n          data[\"children\"] = await this.buildMenuTree(children, allMenuItems, activeUser);\n        }\n        return data;\n\n      }));\n    return menuItemsData.filter(mi => mi && mi)\n  }\n\n\n}\n"]}
+{"version":3,"file":"menu-item-metadata.service.js","sourceRoot":"","sources":["../../src/services/menu-item-metadata.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@nestjs/common';\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { ModuleRef } from \"@nestjs/core\";\nimport { EntityManager } from 'typeorm';\nimport { CRUDService } from 'src/services/crud.service';\n\n\nimport { MenuItemMetadata } from '../entities/menu-item-metadata.entity';\nimport { UpdateMenuItemMetadataDto } from '../dtos/update-menu-item-metadata.dto';\nimport { ActiveUserData } from 'src/interfaces/active-user-data.interface';\nimport { ModuleMetadata } from '../entities/module-metadata.entity';\nimport { kebabCase } from 'lodash';\nimport { MenuItemMetadataRepository } from 'src/repository/menu-item-metadata.repository';\nimport { SavedFiltersRepository } from 'src/repository/saved-filters.repository';\n\n@Injectable()\nexport class MenuItemMetadataService extends CRUDService<MenuItemMetadata> {\n  constructor(\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(MenuItemMetadata, 'default')\n    // readonly repo: Repository<MenuItemMetadata>,\n    readonly repo: MenuItemMetadataRepository,\n    readonly savedFiltersRepo: SavedFiltersRepository,\n    readonly moduleRef: ModuleRef\n\n  ) {\n    super(entityManager, repo, 'menuItemMetadata', 'solid-core', moduleRef);\n  }\n\n\n  async findOneByUserKey(name: string, relations = {}) {\n    const entity = await this.repo.findOne({\n      where: {\n        name: name,\n      },\n      relations: relations,\n    });\n    return entity;\n  }\n\n  async upsert(updateSolidMenuItemDto: UpdateMenuItemMetadataDto) {\n    // Leave out all the extra attributes only keep the ones we are interested in updating.\n    const { moduleUserKey, parentMenuItemUserKey, actionUserKey, rolesIds, rolesCommand, ...cleanUpdateSolidMenuItemDto } = updateSolidMenuItemDto;\n\n    // First check if module already exists using name\n    const existingMenuItem = await this.repo.findOne({\n      where: {\n        name: updateSolidMenuItemDto.name\n      },\n      relations: [\"roles\"]\n    });\n\n    // if found\n    if (existingMenuItem) {\n      // TODO: This is very slow disabling this for now..\n      // const updatedSolidActionDto = { ...existingMenuItem, ...cleanUpdateSolidMenuItemDto };\n      // return this.repo.save(updatedSolidActionDto);\n    }\n    // if not found - create new \n    else {\n      // @ts-ignore\n      const moduleMetadata = this.repo.create(cleanUpdateSolidMenuItemDto);\n      return this.repo.save(moduleMetadata);\n    }\n  }\n\n\n  async findUserMenus(activeUser: ActiveUserData) {\n    // 1. For the users role, fire a query to load all menus that this role has access to. \n    // const usersMenuItems = this.solidMenuItemRepo.find({\n    //     where: {\n    //         roles: {\n    //             name: In(activeUser.roles)\n    //         }\n    //     },\n    //     relations: ['module', 'parentMenuItem', 'action']\n    // });\n    const qb = await this.repo.createSecurityRuleAwareQueryBuilder('menuItem')\n\n    const menuItems = await qb\n      .leftJoinAndSelect('menuItem.module', 'module')\n      .leftJoinAndSelect('menuItem.parentMenuItem', 'parentMenuItem')\n      .leftJoinAndSelect('menuItem.action', 'action')\n      .leftJoinAndSelect('action.model', 'model') // Join the model relation of action\n      .leftJoinAndSelect('action.view', 'view') // Join the view relation of action\n      .leftJoinAndSelect('menuItem.roles', 'roles')\n      .where('roles.name IN (:...roleNames)', { roleNames: activeUser.roles })\n      .addOrderBy('module.menuSequenceNumber', 'ASC')\n      .addOrderBy('menuItem.sequenceNumber', 'ASC')\n      .getMany();\n\n    // 2. First arrange the output of the above query by module based on module\n    const modulesToMenuItemsMap = new Map<string, MenuItemMetadata[]>();\n    const modulesMap = new Map<string, ModuleMetadata>();\n    menuItems.forEach(menuItem => {\n      const moduleName = menuItem.module.name;\n\n      // Keep track of all menu items under a given module.\n      if (!modulesToMenuItemsMap.has(moduleName)) {\n        modulesToMenuItemsMap.set(moduleName, []);\n      }\n      modulesToMenuItemsMap.get(moduleName).push(menuItem);\n\n      // Keep track of the modules information separately.\n      if (!modulesMap.has(moduleName)) {\n        modulesMap.set(moduleName, menuItem.module);\n      }\n    });\n\n    // 3. Then for each module, do a recursive compilation of children based on parentMenuItem, while doing this use the relation - action to get hold of the path. \n    const menu: any[] = [];\n\n    // modulesToMenuItemsMap.forEach((menuItems, moduleName) => {\n    //   const rootMenuItems = menuItems.filter(item => !item.parentMenuItem);\n    //   const moduleMetadata = modulesMap.get(moduleName);\n\n    //   const moduleMenu = {\n    //     title: moduleMetadata.displayName,\n    //     // No need for path the module level.\n    //     // path: ``,\n    //     key: moduleName.toLowerCase().replace(/\\s+/g, '-'),\n    //     // TODO: We need to add the module icon as part of the metadata so it can be brought here. \n    //     // icon: `/images/menu/${moduleName.toLowerCase().replace(/\\s+/g, '-')}.svg`,\n    //     children: this.buildMenuTree(rootMenuItems, menuItems, activeUser),\n    //     icon: moduleMetadata.menuIconUrl,\n    //   };\n\n    //   menu.push(moduleMenu);\n    // });\n    for (const [moduleName, menuItemsForModule] of modulesToMenuItemsMap.entries()) {\n      const rootMenuItems = menuItemsForModule.filter(item => !item.parentMenuItem);\n      const moduleMetadata = modulesMap.get(moduleName);\n\n      const moduleMenu = {\n        title: moduleMetadata.displayName,\n        key: moduleName.toLowerCase().replace(/\\s+/g, '-'),\n        children: await this.buildMenuTree(rootMenuItems, menuItemsForModule, activeUser), // ✅ await here\n        icon: moduleMetadata.menuIconUrl,\n      };\n\n      menu.push(moduleMenu);\n    }\n\n\n    return menu.filter(m => m.children.length > 0);\n  }\n\n  // Recursive function to build the tree\n  private async buildMenuTree(rootItems: MenuItemMetadata[], allMenuItems: MenuItemMetadata[], activeUser: ActiveUserData): Promise<any[]> {\n    const menuItemsData = await Promise.all(\n      rootItems.map(async rootItem => {\n        const allowedMenuItems = allMenuItems.filter(i => {\n          if (!i.parentMenuItem) {\n            return true\n          } else {\n            if (i.action.type === 'custom') {\n              return true;\n            }\n            return this.crudHelperService.hasReadPermissionOnModel(activeUser, i.action.model.singularName)\n          }\n        });\n        // Get immediate children of the current loop variable menuItem.\n        const children = allowedMenuItems.filter(item => item.parentMenuItem && item.parentMenuItem.id === rootItem.id);\n        const menuItemId = rootItem?.id ?? \"\";\n        const menuItemName = rootItem?.name ?? \"\";\n        const actionId = rootItem?.action?.id ?? \"\";\n        const actionName = rootItem?.action?.name ?? \"\";\n        // TODO: We should specify path only if there are no more children present. \n        // For now adding path everywhere. \n        let path = '';\n\n        const layout = rootItem?.action?.view && rootItem?.action?.view?.layout ? JSON.parse(rootItem?.action?.view?.layout) : null\n        let savedFilterId = null;\n        if (layout && layout?.attrs?.defaultSavedFilter) {\n          const savedFilter = await this.savedFiltersRepo.findOne({\n            where: {\n              name: layout?.attrs?.defaultSavedFilter,\n              isPrivate: false\n            },\n          });\n          if (savedFilter) {\n            savedFilterId = savedFilter.id\n          }\n        }\n        if (rootItem.action && rootItem.action.type === 'custom') {\n          path = `${rootItem.action.customComponent}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;\n        }\n        if (rootItem.action && rootItem.action.type === 'solid') {\n          if (this.crudHelperService.hasReadPermissionOnModel(activeUser, rootItem.action.model.singularName)) {\n            // TODO: Here we are assuming that we will always take the user to collection view of a model. \n            // We can make provision to take them other views also in the future. \n            // path = `/admin/core/${rootItem.module.name}/${rootItem.action.model.singularName}/${rootItem.action.view.name}`;\n            path = `/admin/core/${rootItem.module.name}/${kebabCase(rootItem.action?.model?.singularName ?? 'unknown')}/${rootItem.action?.view?.type ?? 'list'}?menuItemId=${menuItemId}&menuItemName=${menuItemName}&actionId=${actionId}&actionName=${actionName}${savedFilterId ? `&savedQuery=${savedFilterId}` : ''}`;\n\n          }\n        }\n\n        // We are not checking for empty path coz, this is required for parent menu items.\n        const data = {\n          title: rootItem.displayName || rootItem.name,\n          path: path,\n          key: rootItem.name.toLowerCase().replace(/\\s+/g, '-'),\n          icon: rootItem.iconName,\n          // iconVariant : rootItem.iconVariant\n          isSystem: (rootItem.action?.model?.isSystem ?? false) || rootItem.module?.name === \"solid-core\",\n        }\n        if (children.length > 0) {\n          data[\"children\"] = await this.buildMenuTree(children, allMenuItems, activeUser);\n        }\n        return data;\n\n      }));\n    return menuItemsData.filter(mi => mi && mi)\n  }\n\n\n}\n"]}

package/dist/services/model-metadata.service.d.ts

@@ -46,6 +46,8 @@ export declare class ModelMetadataService {
     deleteMany(ids: number[]): Promise<any>;
     remove(id: number): Promise<ModelMetadata>;
     cleanupOnDelete(modelEntityId: number): Promise<void>;
+    private resolveSolidApiRoot;
+    private cleanupAssociatedTypeormDatasourceFiles;
     private cleanupAssociatedViewsActionsAndMenus;
     private cleanupAssociatedImports;
     private cleanupAssociatedPermissions;

package/dist/services/model-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/model-metadata.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/model-metadata.service.ts"],"names":[],"mappings":"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"}

package/dist/services/model-metadata.service.js

@@ -49,6 +49,7 @@ exports.ModelMetadataService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const fs = __importStar(require("fs/promises"));
+const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const typeorm_2 = require("typeorm");
 const model_metadata_entity_1 = require("../entities/model-metadata.entity");
@@ -70,8 +71,6 @@ const permission_metadata_entity_1 = require("../entities/permission-metadata.en
 const role_metadata_entity_1 = require("../entities/role-metadata.entity");
 const view_metadata_entity_1 = require("../entities/view-metadata.entity");
 const command_service_1 = require("../helpers/command.service");
-const environment_helper_1 = require("../helpers/environment.helper");
-const nodemon_heartbeat_1 = require("../helpers/nodemon-heartbeat");
 const schematic_service_1 = require("../helpers/schematic.service");
 const string_helper_1 = require("../helpers/string.helper");
 const crud_helper_service_1 = require("./crud-helper.service");
@@ -607,6 +606,54 @@ let ModelMetadataService = class ModelMetadataService {
                 this.logger.error(`Failed to clean up module file for model '${modelEntity.singularName}':`, error);
             }
         }
+        await this.cleanupAssociatedTypeormDatasourceFiles(modelEntity, modulePath);
+    }
+    resolveSolidApiRoot() {
+        const cwd = process.cwd();
+        const candidates = [
+            cwd,
+            path.join(cwd, 'solid-api'),
+        ];
+        for (const candidate of candidates) {
+            const srcRoot = path.join(candidate, 'src');
+            if ((0, fs_1.existsSync)(srcRoot)) {
+                return candidate;
+            }
+        }
+        return null;
+    }
+    async cleanupAssociatedTypeormDatasourceFiles(modelEntity, modulePath) {
+        if (!modulePath) {
+            return;
+        }
+        const solidApiRoot = this.resolveSolidApiRoot();
+        if (!solidApiRoot) {
+            this.logger.warn(`Unable to locate consuming solid-api workspace while cleaning datasource files for model '${modelEntity.singularName}'`);
+            return;
+        }
+        const srcRoot = path.join(solidApiRoot, 'src');
+        const srcEntries = await fs.readdir(srcRoot).catch(() => []);
+        const datasourceFiles = srcEntries
+            .filter((entry) => /^typeorm-.*-datasource\.ts$/.test(entry))
+            .map((entry) => path.join(srcRoot, entry));
+        if (datasourceFiles.length === 0) {
+            return;
+        }
+        const moduleDirName = path.basename(modulePath);
+        const entityClassName = (0, string_helper_1.classify)(modelEntity.singularName);
+        const entityImportPath = `./${moduleDirName}/entities/${(0, lodash_1.kebabCase)(modelEntity.singularName)}.entity`;
+        this.logger.log(`Scanning ${datasourceFiles.length} TypeORM datasource file(s) for model '${modelEntity.singularName}' cleanup`);
+        try {
+            this.solidTsMorphService.begin();
+            for (const datasourceFile of datasourceFiles) {
+                this.solidTsMorphService.cleanupTypeormDatasourceEntity(datasourceFile, entityImportPath, entityClassName);
+            }
+            await this.solidTsMorphService.commit();
+        }
+        catch (error) {
+            this.solidTsMorphService.rollback();
+            this.logger.error(`Failed to clean datasource files for model '${modelEntity.singularName}':`, error);
+        }
     }
     async cleanupAssociatedViewsActionsAndMenus(modelId) {
         const viewRepo = this.dataSource.getRepository(view_metadata_entity_1.ViewMetadata);
@@ -791,20 +838,6 @@ let ModelMetadataService = class ModelMetadataService {
     }
     async generateCodeViaCtl(modelId) {
         const model = await this.findOne(modelId);
-        const isEmbedded = (0, environment_helper_1.isEmbeddedDb)();
-        if (isEmbedded) {
-            this.logger.log('Embedded database detected — generating API code in-process');
-            const heartbeat = (0, nodemon_heartbeat_1.startNodemonHeartbeat)(path.join(process.cwd(), 'src'));
-            try {
-                return await this.handleGenerateCode({
-                    modelUserKey: model.singularName,
-                    dryRun: false,
-                });
-            }
-            finally {
-                heartbeat.stop();
-            }
-        }
         return this.commandService.executeCommandWithArgs({
             command: 'npx',
             args: ['@solidxai/solidctl@latest', 'generate', 'model', `--name=${model.singularName}`],