@solidxai/core 0.1.11-beta.1 → 0.1.11-beta.4

package/src/index.ts

@@ -119,8 +119,8 @@ export * from './dtos/update-dashboard-user-layout.dto'
 
 export * from './entities/action-metadata.entity'
 export * from './entities/common.entity'
-export * from './entities/legacy-common.entity'
-export * from './entities/legacy-common-with-id.entity'
+export * from './entities/legacy-common.entity-with-existing-id.entity'
+export * from './entities/legacy-common-with-generated-id.entity'
 export * from './entities/email-attachment.entity'
 export * from './entities/email-template.entity'
 export * from './entities/field-metadata.entity'

package/src/interfaces/datasource-introspection-provider.interface.ts

@@ -11,6 +11,7 @@ export type DatasourceIntrospectionColumn = {
     columnName: string;
     dataType: string;
     isAutoGenerated: boolean;
+    isPrimaryKey: boolean;
     isNullable: boolean;
     defaultValue: string | null;
     characterMaximumLength: number | null;

package/src/seeders/module-metadata-seeder.service.ts

@@ -39,12 +39,14 @@ import { SignUpDto } from '../dtos/sign-up.dto';
 import { ADMIN_ROLE_NAME, CreateRoleMetadataDto } from 'src/dtos/create-role-metadata.dto';
 import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
+import { CreateLocaleDto } from 'src/dtos/create-locale.dto';
 import { PermissionMetadataRepository } from 'src/repository/permission-metadata.repository';
 import { SavedFiltersRepository } from 'src/repository/saved-filters.repository';
 import { ScheduledJobRepository } from 'src/repository/scheduled-job.repository';
 import { SettingRepository } from 'src/repository/setting.repository';
 import { CreateModelSequenceDto } from 'src/dtos/create-model-sequence.dto';
 import { ModelSequenceRepository } from 'src/repository/model-sequence.repository';
+import { LocaleRepository } from 'src/repository/locale.repository';
 import { ModelSequence } from 'src/entities/model-sequence.entity';
 import { SavedFilters } from 'src/entities/saved-filters.entity';
 import { ScheduledJob } from 'src/entities/scheduled-job.entity';
@@ -116,6 +118,7 @@ export class ModuleMetadataSeederService {
         readonly savedFiltersRepo: SavedFiltersRepository,
         readonly dataSource: DataSource,
         readonly modelSequenceRepo: ModelSequenceRepository,
+        readonly localeRepo: LocaleRepository,
     ) { }
 
     async seed(conf?: any) {
@@ -194,6 +197,11 @@ export class ModuleMetadataSeederService {
                         const moduleModelFieldCounts = await this.timeOperation('seed-module-model-fields', () => this.seedModuleModelFields(moduleMetadata), { moduleName: moduleMetadata.name, component: 'module-model-fields' });
                         console.log(`${this.formatSeedResult(moduleMetadata.name, 'Module/Model/Fields', moduleModelFieldCounts)}`);
 
+                currentStep = 'seedLocales';
+                this.logger.log(`Seeding Locales`);
+                const localeCounts = await this.seedLocales(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Locales', localeCounts)}`);
+
                         currentStep = 'seedPermissions';
                         this.logger.log(`Seeding Permissions`);
                         const permissionCounts = await this.timeOperation('seed-permissions', () => this.seedPermissions(overallMetadata), { moduleName: moduleMetadata.name, component: 'permissions' });
@@ -466,6 +474,22 @@ export class ModuleMetadataSeederService {
         return { pruned, upserted: listOfValues.length };
     }
 
+    private async seedLocales(overallMetadata: any): Promise<{ pruned: number; upserted: number }> {
+        this.logger.debug(`[Start] Processing locales`);
+        const locales = this.getSeedArray<CreateLocaleDto>(overallMetadata?.locales);
+        const existingLocales = await this.localeRepo.find();
+
+        if (existingLocales.length > 0) {
+            this.solidRegistry.registerlocales(existingLocales);
+            this.logger.debug(`[End] Skipping locale seed because locales already exist`);
+            return { pruned: 0, upserted: 0 };
+        }
+
+        await this.handleSeedLocales(locales);
+        this.logger.debug(`[End] Processing locales`);
+        return { pruned: 0, upserted: locales.length };
+    }
+
     private async setupDefaultRolesWithPermissions() {
         this.logger.debug(`About to add all permissions to the Admin role`);
         await this.timeOperation('role-add-all-permissions', () => this.roleService.addAllPermissionsToRole(ADMIN_ROLE_NAME), {
@@ -592,11 +616,15 @@ export class ModuleMetadataSeederService {
     // OK
     private async seedRoles(overallMetadata: any): Promise<{ pruned: number; upserted: number }> {
         const roles = this.getSeedArray<CreateRoleMetadataDto>(overallMetadata?.roles);
-        // While creating roles we are only passing the role name to be used. 
+        // Preserve module linkage metadata so RoleMetadata.module is populated from the defining module.
         await this.timeOperation('roles-create-if-not-exists', () => this.roleService.createRolesIfNotExists(
             roles
                 .filter((role) => role?.name)
-                .map((role) => ({ name: role.name } as any)),
+                .map((role) => ({
+                    name: role.name,
+                    moduleId: role.moduleId,
+                    moduleUserKey: role.moduleUserKey ?? overallMetadata?.moduleMetadata?.name,
+                } as CreateRoleMetadataDto)),
         ), {
             moduleName: overallMetadata?.moduleMetadata?.name,
             component: 'roles',
@@ -1872,6 +1900,48 @@ export class ModuleMetadataSeederService {
         }
     }
 
+    private async handleSeedLocales(localesDto: CreateLocaleDto[]) {
+        if (!localesDto || localesDto.length === 0) {
+            this.logger.debug(`No locales found to seed`);
+            return;
+        }
+
+        for (const dto of localesDto) {
+            if (dto.isDefault) {
+                const existingDefaultLocales = await this.localeRepo.find({
+                    where: {
+                        isDefault: true,
+                    } as any,
+                });
+
+                for (const locale of existingDefaultLocales) {
+                    if (locale.locale !== dto.locale) {
+                        await this.localeRepo.save({
+                            ...locale,
+                            isDefault: false,
+                        });
+                    }
+                }
+            }
+
+            const existingLocale = await this.localeRepo.findOne({
+                where: {
+                    locale: dto.locale,
+                } as any,
+            });
+
+            await this.localeRepo.save(
+                this.localeRepo.create({
+                    ...existingLocale,
+                    ...dto,
+                })
+            );
+        }
+
+        const locales = await this.localeRepo.find();
+        this.solidRegistry.registerlocales(locales);
+    }
+
     private validateSavedFilterQueryJsonWrapper(dto: CreateSavedFiltersDto): void {
         const filterName = dto?.name ?? '<unnamed>';
         const filterQueryJson = dto?.filterQueryJson;

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

@@ -1077,15 +1077,24 @@
           {
             "name": "type",
             "displayName": "Type",
-            "type": "shortText",
+            "type": "selectionStatic",
             "ormType": "varchar",
+            "length": 256,
             "required": true,
             "unique": false,
             "index": true,
             "private": false,
             "encrypt": false,
             "columnName": "type",
-            "isSystem": true
+            "isSystem": true,
+            "selectionValueType": "string",
+            "selectionStaticValues": [
+              "list:List",
+              "form:Form",
+              "tree:Tree",
+              "kanban:Kanban",
+              "card:Card"
+            ]
           },
           {
             "name": "context",
@@ -1584,7 +1593,7 @@
             "name": "roles",
             "displayName": "Roles",
             "type": "relation",
-            "required": true,
+            "required": false,
             "unique": false,
             "index": true,
             "private": false,
@@ -5244,6 +5253,13 @@
       }
     ]
   },
+  "locales": [
+    {
+      "locale": "en",
+      "displayName": "English",
+      "isDefault": true
+    }
+  ],
   "permissions": [
     "mcp:invoke",
     "agent:invoke",

package/src/services/1.js

@@ -0,0 +1,6 @@
+1. Do i need to create a storeStreams method for aws service too?
+    - Handle later
+2. queues handling -> if queues is enabled by default, i.e triggerExport(exportTransactionEntity.id).
+    - startExport should either return the data or return the transaction id
+3. How to handle scenarios wherein, nested related exist.(do i need to only get the userkey)
+    - show the userKey

package/src/services/computed-fields/entity/alpha-num-external-id-computed-field-provider.ts

@@ -45,7 +45,12 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
       }
     }
 
-    const uniqueCode = await this.generateUniqueExternalId(resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
+    // Use the originating transaction's EntityManager so the uniqueness check runs on the
+    // active connection. Falls back to the injected manager only when no event context is
+    // available (e.g. direct invocation outside a TypeORM lifecycle event).
+    const manager = eventContext?.manager ?? this.entityManager;
+
+    const uniqueCode = await this.generateUniqueExternalId(manager, resolvedPrefix, codeLength, computedFieldMetadata.fieldName, entityName);
     const finalExternalId = resolvedPrefix ? `${resolvedPrefix}-${uniqueCode}` : uniqueCode;
 
     triggerEntity[computedFieldMetadata.fieldName] = finalExternalId;
@@ -60,8 +65,8 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return result;
   }
 
-  private async isExternalIdUnique(externalId: string, fieldName: string, entityName: string): Promise<boolean> {
-    const count = await this.entityManager.count(entityName as any,
+  private async isExternalIdUnique(manager: EntityManager, externalId: string, fieldName: string, entityName: string): Promise<boolean> {
+    const count = await manager.count(entityName as any,
       {
         where: { [fieldName]: externalId },
       }
@@ -69,7 +74,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
     return count === 0;
   }
 
-  private async generateUniqueExternalId(resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
+  private async generateUniqueExternalId(manager: EntityManager, resolvedPrefix: string, codeLength: number, fieldName: string, entityName: string): Promise<string> {
     const maxAttempts = 10;
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
@@ -78,7 +83,7 @@ export class AlphaNumExternalIdComputationProvider<T extends CommonEntity> imple
 
       const fullId = resolvedPrefix ? `${resolvedPrefix}-${newId}` : newId;
 
-      const isUnique = await this.isExternalIdUnique(fullId, fieldName, entityName);
+      const isUnique = await this.isExternalIdUnique(manager, fullId, fieldName, entityName);
 
       if (isUnique) {
         return newId;

package/src/services/datasource-introspection/mssql-datasource-introspection-provider.service.ts

@@ -39,6 +39,7 @@ export class MssqlDatasourceIntrospectionProviderService implements DatasourceIn
                 c.name AS columnName,
                 ty.name AS dataType,
                 c.is_identity AS isAutoGenerated,
+                CASE WHEN pk.column_id IS NOT NULL THEN 1 ELSE 0 END AS isPrimaryKey,
                 CASE WHEN c.is_nullable = 1 THEN 'YES' ELSE 'NO' END AS isNullable,
                 dc.definition AS defaultValue,
                 CASE
@@ -52,6 +53,16 @@ export class MssqlDatasourceIntrospectionProviderService implements DatasourceIn
             INNER JOIN sys.columns c ON c.object_id = t.object_id
             INNER JOIN sys.types ty ON ty.user_type_id = c.user_type_id
             LEFT JOIN sys.default_constraints dc ON dc.object_id = c.default_object_id
+            LEFT JOIN (
+                SELECT ic.object_id, ic.column_id
+                FROM sys.index_columns ic
+                INNER JOIN sys.key_constraints kc
+                    ON kc.parent_object_id = ic.object_id
+                   AND kc.unique_index_id = ic.index_id
+                WHERE kc.type = 'PK'
+            ) pk
+                ON pk.object_id = c.object_id
+               AND pk.column_id = c.column_id
             WHERE schema_name(t.schema_id) NOT IN ('sys', 'INFORMATION_SCHEMA')
             ORDER BY schema_name(t.schema_id), t.name, c.column_id
         `);
@@ -62,6 +73,7 @@ export class MssqlDatasourceIntrospectionProviderService implements DatasourceIn
             columnName: row.columnName,
             dataType: row.dataType,
             isAutoGenerated: Boolean(row.isAutoGenerated),
+            isPrimaryKey: Boolean(row.isPrimaryKey),
             isNullable: String(row.isNullable).toUpperCase() === "YES",
             defaultValue: row.defaultValue ?? null,
             characterMaximumLength: this.toNumberOrNull(row.characterMaximumLength),

package/src/services/datasource-introspection/mysql-datasource-introspection-provider.service.ts

@@ -39,6 +39,7 @@ export class MysqlDatasourceIntrospectionProviderService implements DatasourceIn
                 COLUMN_NAME AS columnName,
                 DATA_TYPE AS dataType,
                 EXTRA AS extra,
+                COLUMN_KEY AS columnKey,
                 IS_NULLABLE AS isNullable,
                 COLUMN_DEFAULT AS defaultValue,
                 CHARACTER_MAXIMUM_LENGTH AS characterMaximumLength,
@@ -56,6 +57,7 @@ export class MysqlDatasourceIntrospectionProviderService implements DatasourceIn
             columnName: row.columnName,
             dataType: row.dataType,
             isAutoGenerated: String(row.extra ?? "").toLowerCase().includes("auto_increment"),
+            isPrimaryKey: String(row.columnKey ?? "").toUpperCase() === "PRI",
             isNullable: String(row.isNullable).toUpperCase() === "YES",
             defaultValue: row.defaultValue ?? null,
             characterMaximumLength: this.toNumberOrNull(row.characterMaximumLength),

package/src/services/datasource-introspection/postgres-datasource-introspection-provider.service.ts

@@ -34,24 +34,36 @@ export class PostgresDatasourceIntrospectionProviderService implements Datasourc
     async listColumns(dataSource: DataSource): Promise<DatasourceIntrospectionColumn[]> {
         const rows = await dataSource.query(`
             SELECT
-                TABLE_SCHEMA AS "tableSchema",
-                TABLE_NAME AS "tableName",
-                COLUMN_NAME AS "columnName",
-                DATA_TYPE AS "dataType",
+                c.TABLE_SCHEMA AS "tableSchema",
+                c.TABLE_NAME AS "tableName",
+                c.COLUMN_NAME AS "columnName",
+                c.DATA_TYPE AS "dataType",
                 CASE
-                    WHEN is_identity = 'YES' THEN true
-                    WHEN COLUMN_DEFAULT LIKE 'nextval(%' THEN true
+                    WHEN c.is_identity = 'YES' THEN true
+                    WHEN c.COLUMN_DEFAULT LIKE 'nextval(%' THEN true
                     ELSE false
                 END AS "isAutoGenerated",
-                IS_NULLABLE AS "isNullable",
-                COLUMN_DEFAULT AS "defaultValue",
-                CHARACTER_MAXIMUM_LENGTH AS "characterMaximumLength",
-                NUMERIC_PRECISION AS "numericPrecision",
-                NUMERIC_SCALE AS "numericScale",
-                ORDINAL_POSITION AS "ordinalPosition"
-            FROM INFORMATION_SCHEMA.COLUMNS
-            WHERE TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')
-            ORDER BY TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION
+                EXISTS (
+                    SELECT 1
+                    FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc
+                    INNER JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu
+                        ON kcu.CONSTRAINT_NAME = tc.CONSTRAINT_NAME
+                       AND kcu.TABLE_SCHEMA = tc.TABLE_SCHEMA
+                       AND kcu.TABLE_NAME = tc.TABLE_NAME
+                    WHERE tc.CONSTRAINT_TYPE = 'PRIMARY KEY'
+                      AND tc.TABLE_SCHEMA = c.TABLE_SCHEMA
+                      AND tc.TABLE_NAME = c.TABLE_NAME
+                      AND kcu.COLUMN_NAME = c.COLUMN_NAME
+                ) AS "isPrimaryKey",
+                c.IS_NULLABLE AS "isNullable",
+                c.COLUMN_DEFAULT AS "defaultValue",
+                c.CHARACTER_MAXIMUM_LENGTH AS "characterMaximumLength",
+                c.NUMERIC_PRECISION AS "numericPrecision",
+                c.NUMERIC_SCALE AS "numericScale",
+                c.ORDINAL_POSITION AS "ordinalPosition"
+            FROM INFORMATION_SCHEMA.COLUMNS c
+            WHERE c.TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')
+            ORDER BY c.TABLE_SCHEMA, c.TABLE_NAME, c.ORDINAL_POSITION
         `);
 
         return rows.map((row: any) => ({
@@ -60,6 +72,7 @@ export class PostgresDatasourceIntrospectionProviderService implements Datasourc
             columnName: row.columnName,
             dataType: row.dataType,
             isAutoGenerated: Boolean(row.isAutoGenerated),
+            isPrimaryKey: Boolean(row.isPrimaryKey),
             isNullable: String(row.isNullable).toUpperCase() === "YES",
             defaultValue: row.defaultValue ?? null,
             characterMaximumLength: this.toNumberOrNull(row.characterMaximumLength),