@rws-framework/db 3.2.0 → 3.3.1

package/dist/decorators/IdType.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 function IdType(type, opts = null, tags = []) {
     const metaOpts = { type, dbOptions: opts && opts.dbOptions ? opts.dbOptions : null };
+    if (opts && opts.dbOptions) {
+        metaOpts.dbOptions = opts.dbOptions;
+    }
+    if (opts && opts.noAuto) {
+        metaOpts.noAuto = opts.noAuto;
+    }
     return function (target, key) {
         Reflect.defineMetadata(`IdType:${key}`, metaOpts, target);
     };

package/dist/decorators/InverseRelation.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const ModelUtils_1 = require("../models/utils/ModelUtils");
 function guessForeignKey(inversionModel, bindingModel, decoratorsData) {
-    var _a;
     let key = null;
     let defaultKey = `${bindingModel._collection}_id`;
     const relDecorators = {};
@@ -21,7 +20,7 @@ function guessForeignKey(inversionModel, bindingModel, decoratorsData) {
         }
     }
     for (const relKey of Object.keys(relDecorators)) {
-        const prodMeta = (_a = relDecorators[relKey]) === null || _a === void 0 ? void 0 : _a.metadata;
+        const prodMeta = relDecorators[relKey]?.metadata;
         if (prodMeta && prodMeta.relatedTo._collection === bindingModel._collection) {
             return prodMeta.relationField;
         }
@@ -41,8 +40,8 @@ function InverseRelation(inversionModel, sourceModel, relationOptions = null) {
                 foreignKey: relationOptions && relationOptions.foreignKey ? relationOptions.foreignKey : guessForeignKey(model, source, decoratorsData),
                 // Generate a unique relation name if one is not provided
                 relationName: relationOptions && relationOptions.relationName ?
-                    relationOptions.relationName.toLowerCase() :
-                    `${model._collection}_${key}_${source._collection}`.toLowerCase()
+                    relationOptions.relationName :
+                    null
             };
             return metaOpts;
         });

package/dist/decorators/Relation.js

@@ -16,8 +16,8 @@ function Relation(theModel, relationOptions = _DEFAULTS) {
                 key,
                 // Generate a unique relation name if one is not provided
                 relationName: relationOptions.relationName ?
-                    relationOptions.relationName.toLowerCase() :
-                    `${target.constructor.name.toLowerCase()}_${key}_${relatedTo._collection.toLowerCase()}`
+                    relationOptions.relationName :
+                    null
             };
             if (relationOptions.required) {
                 metaOpts.cascade.onDelete = 'Restrict';

package/dist/decorators/TrackType.js

@@ -8,10 +8,10 @@ function TrackType(type, opts = null, tags = []) {
             isArray: false
         };
     }
-    if (!(opts === null || opts === void 0 ? void 0 : opts.required)) {
+    if (!opts?.required) {
         opts.required = false;
     }
-    if (!(opts === null || opts === void 0 ? void 0 : opts.isArray)) {
+    if (!opts?.isArray) {
         opts.isArray = false;
     }
     const required = opts.required;

package/dist/helper/DbHelper.d.ts

@@ -60,7 +60,7 @@ export declare class DbHelper {
     /**
      * Convert a JavaScript type to a Prisma schema type
      */
-    static toConfigCase(modelType: any, dbType?: string): string;
+    static toConfigCase(modelType: any, dbType?: IDbConfigParams['db_type']): string;
     /**
      * Process type functions metadata to extract database-specific options
      */

package/dist/helper/DbHelper.js

@@ -10,6 +10,10 @@ const db_1 = require("./db");
  * It delegates to the specialized modules for specific functionality.
  */
 class DbHelper {
+    /**
+     * The environment variable name for the Prisma database URL
+     */
+    static dbUrlVarName = db_1.SchemaGenerator.dbUrlVarName;
     /**
      * Install Prisma with the generated schema
      * @param configService The configuration service
@@ -30,7 +34,7 @@ class DbHelper {
     }
     static async migrateDBModels(configService, dbService, leaveFile = false) {
         process.env = { ...process.env, [this.dbUrlVarName]: configService.get('db_url') };
-        const [_, schemaPath] = db_1.DbUtils.getSchemaDir();
+        const [_, schemaPath] = db_1.DbUtils.getProcessedSchemaDir();
         await console_1.rwsShell.runCommand(`${db_1.DbUtils.detectInstaller()} prisma migrate dev --create-only --schema=${schemaPath}`, process.cwd());
     }
     /**
@@ -107,7 +111,3 @@ class DbHelper {
     }
 }
 exports.DbHelper = DbHelper;
-/**
- * The environment variable name for the Prisma database URL
- */
-DbHelper.dbUrlVarName = db_1.SchemaGenerator.dbUrlVarName;

package/dist/helper/db/relation-manager.js

@@ -5,6 +5,7 @@ exports.RelationManager = void 0;
  * Manages database relations for schema generation
  */
 class RelationManager {
+    static allRelations = new Map();
     /**
      * Mark a relation between two models
      * @param relationKey A unique key for the relation
@@ -102,4 +103,3 @@ class RelationManager {
     }
 }
 exports.RelationManager = RelationManager;
-RelationManager.allRelations = new Map();

package/dist/helper/db/schema-generator.js

@@ -11,10 +11,13 @@ const _model_1 = require("../../models/_model");
 const utils_1 = require("./utils");
 const type_converter_1 = require("./type-converter");
 const relation_manager_1 = require("./relation-manager");
+const _EXECUTE_PRISMA_CMD = true;
+const _REMOVE_SCHEMA_FILE = true;
 /**
  * Handles Prisma schema generation
  */
 class SchemaGenerator {
+    static dbUrlVarName = 'PRISMA_DB_URL';
     /**
      * Generate the base schema for Prisma
      * @param dbType The database type
@@ -39,21 +42,31 @@ datasource db {
      * @returns The model section
      */
     static async generateModelSections(model, configService) {
-        var _a, _b;
         let section = '';
         const modelMetadatas = await _model_1.RWSModel.getModelAnnotations(model);
         const dbType = configService.get('db_type') || 'mongodb';
         const modelName = model._collection;
         section += `model ${modelName} {\n`;
-        if (!model._NO_ID) {
+        let hasIdType = false;
+        let idFieldName;
+        for (const someModelMetaKey in modelMetadatas) {
+            const isIdTyped = modelMetadatas[someModelMetaKey].annotationType === 'IdType';
+            if (isIdTyped) {
+                hasIdType = true;
+                idFieldName = someModelMetaKey;
+            }
+        }
+        let idGenerated = false;
+        if (!model._NO_ID && !hasIdType) {
             section += `\t${utils_1.DbUtils.generateId(dbType, modelMetadatas)}\n`;
+            idGenerated = true;
         }
         for (const key in modelMetadatas) {
             const modelMetadata = modelMetadatas[key].metadata;
             let requiredString = modelMetadata.required ? '' : '?';
             const annotationType = modelMetadatas[key].annotationType;
             let indexedId = false;
-            if (model._NO_ID) {
+            if (model._NO_ID || hasIdType) {
                 indexedId = true;
                 requiredString = '';
             }
@@ -65,17 +78,17 @@ datasource db {
                 const relatedModel = relationMeta.relatedTo;
                 const isMany = relationMeta.many;
                 const cascadeOpts = [];
-                if ((_a = relationMeta.cascade) === null || _a === void 0 ? void 0 : _a.onDelete) {
+                if (relationMeta.cascade?.onDelete) {
                     cascadeOpts.push(`onDelete: ${relationMeta.cascade.onDelete}`);
                 }
-                if ((_b = relationMeta.cascade) === null || _b === void 0 ? void 0 : _b.onUpdate) {
+                if (relationMeta.cascade?.onUpdate) {
                     cascadeOpts.push(`onUpdate: ${relationMeta.cascade.onUpdate}`);
                 }
                 const relatedModelName = relatedModel._collection;
                 const relationKey = [modelName, relatedModelName].join('_');
                 const relationIndex = relation_manager_1.RelationManager.getRelationCounter(relationKey);
-                const relationName = relation_manager_1.RelationManager.getShortenedRelationName(modelName, relatedModelName, relationIndex);
-                const mapName = relationName;
+                const relationName = relationMeta.relationName ? relationMeta.relationName : null;
+                const mapName = relationMeta.mappingName ? relationMeta.mappingName : null;
                 const relatedModelMetadatas = await _model_1.RWSModel.getModelAnnotations(relatedModel);
                 const relationFieldName = modelMetadata.relationField ? modelMetadata.relationField : key.toLowerCase() + '_' + modelMetadata.relationField.toLowerCase();
                 const relatedToField = modelMetadata.relatedToField || 'id';
@@ -86,10 +99,10 @@ datasource db {
                 const cascadeStr = cascadeOpts.length ? `, ${cascadeOpts.join(', ')}` : '';
                 if (isMany) {
                     // Add an inverse field to the related model if it doesn't exist
-                    section += `\t${key} ${relatedModel._collection}[] @relation("${relationName}", fields: [${relationFieldName}], references: [${relatedToField}], map: "${mapName}"${cascadeStr})\n`;
+                    section += `\t${key} ${relatedModel._collection}[] @relation(${relationName ? `"${relationName}", ` : ''}fields: [${relationFieldName}], references: [${relatedToField}]${mapName ? `, map: "${mapName}"` : ''}${cascadeStr})\n`;
                 }
                 else {
-                    section += `\t${key} ${relatedModel._collection}${requiredString} @relation("${relationName}", fields: [${relationFieldName}], references: [${relatedToField}], map: "${mapName}"${cascadeStr})\n`;
+                    section += `\t${key} ${relatedModel._collection}${requiredString} @relation(${relationName ? `"${relationName}", ` : ''}fields: [${relationFieldName}], references: [${relatedToField}]${mapName ? `, map: "${mapName}"` : ''}${cascadeStr})\n`;
                     if (!bindingFieldExists) {
                         const relatedFieldMeta = relatedModelMetadatas[relatedToField];
                         if (!relatedFieldMeta.metadata.required) {
@@ -131,8 +144,11 @@ datasource db {
                 const relationKey = [relatedModelName, modelName].join('_');
                 const relationIndex = relation_manager_1.RelationManager.getRelationCounter(relationKey, true);
                 const relationName = relation_manager_1.RelationManager.getShortenedRelationName(relatedModelName, modelName, relationIndex);
-                const mapName = relationName;
-                section += `\t${key} ${relationMeta.inversionModel._collection}[] @relation("${relationName}", map: "${mapName}")\n`;
+                let relationTag = '';
+                if (relationMeta.relationName) {
+                    relationTag = ` @relation("${relationMeta.relationName}")`;
+                }
+                section += `\t${key} ${relationMeta.inversionModel._collection}[]${relationTag}\n`;
                 relation_manager_1.RelationManager.completeRelation(relationKey, relationIndex, true);
             }
             else if (annotationType === 'InverseTimeSeries') {
@@ -151,10 +167,16 @@ datasource db {
                     section += `\t${key} String[]\n`;
                 }
             }
-            else if (annotationType === 'TrackType') {
+            else {
                 const trackMeta = modelMetadata;
-                const tags = trackMeta.tags.map((item) => '@' + item);
-                if (key === 'id' && model._NO_ID && !model._SUPER_TAGS.some(tag => tag.tagType === 'id' && tag.fields.includes('id'))) {
+                const trackTags = trackMeta.tags || [];
+                const tags = trackTags.map((item) => '@' + item);
+                const isNoIdBehavior = model._NO_ID || idFieldName;
+                const isOverrideBehavior = (hasIdType && annotationType === 'IdType' && key === 'id' && idFieldName === 'id')
+                    ||
+                        (model._NO_ID && model._SUPER_TAGS.some(a => a.fields.includes('id')) && key === 'id');
+                if (key === 'id' &&
+                    isNoIdBehavior && !isOverrideBehavior) {
                     continue;
                 }
                 if (trackMeta.unique) {
@@ -173,7 +195,17 @@ datasource db {
                 // Process any database-specific options from the metadata
                 const dbSpecificTags = type_converter_1.TypeConverter.processTypeOptions(trackMeta, dbType);
                 tags.push(...dbSpecificTags);
-                section += `\t${key} ${type_converter_1.TypeConverter.toConfigCase(trackMeta, dbType, key === 'id')}${requiredString} ${tags.join(' ')}\n`;
+                const isIdTypeField = modelMetadatas[key].annotationType === 'IdType';
+                const fieldInUniqueSuperTag = model._SUPER_TAGS.some(st => st.tagType === 'unique' && st.fields.includes(key));
+                if (isIdTypeField) {
+                    requiredString = '';
+                }
+                let trackField = `${key} ${type_converter_1.TypeConverter.toConfigCase(trackMeta, dbType, key === 'id', isOverrideBehavior)}${requiredString} ${tags.join(' ')}`;
+                if (isIdTypeField) {
+                    trackField += utils_1.DbUtils.addIdPart(dbType, utils_1.DbUtils.doesUseUuid(modelMetadatas), trackMeta.noAuto);
+                    idGenerated = true;
+                }
+                section += `\t${trackField}\n`;
             }
         }
         if (model._SUPER_TAGS.length) {
@@ -250,11 +282,11 @@ datasource db {
                 fs_1.default.unlinkSync(schemaPath);
             }
             fs_1.default.writeFileSync(schemaPath, template);
-            await console_1.rwsShell.runCommand(`${utils_1.DbUtils.detectInstaller()} prisma generate --schema=${schemaPath}`, process.cwd());
-            leaveFile = false;
+            if (_EXECUTE_PRISMA_CMD)
+                await console_1.rwsShell.runCommand(`${utils_1.DbUtils.detectInstaller()} prisma generate --schema=${schemaPath}`, process.cwd());
             console.log(chalk_1.default.green('[RWS Init]') + ' prisma schema generated from ', schemaPath);
-            if (!leaveFile) {
-                // fs.unlinkSync(schemaPath);
+            if (_REMOVE_SCHEMA_FILE) {
+                fs_1.default.unlinkSync(schemaPath);
             }
         }
     }
@@ -266,9 +298,8 @@ datasource db {
      */
     static async pushDBModels(configService, dbService, leaveFile = false) {
         process.env = { ...process.env, [this.dbUrlVarName]: configService.get('db_url') };
-        const [_, schemaPath] = utils_1.DbUtils.getSchemaDir();
+        const [_, schemaPath] = utils_1.DbUtils.getProcessedSchemaDir();
         await console_1.rwsShell.runCommand(`${utils_1.DbUtils.detectInstaller()} prisma db push --schema=${schemaPath}`, process.cwd());
     }
 }
 exports.SchemaGenerator = SchemaGenerator;
-SchemaGenerator.dbUrlVarName = 'PRISMA_DB_URL';

package/dist/helper/db/type-converter.d.ts

@@ -1,6 +1,7 @@
 import { IDbOpts } from '../../models/interfaces/IDbOpts';
 import { ITrackerMetaOpts } from '../../models/_model';
 import { IIdMetaOpts } from 'src/decorators/IdType';
+import { IDbConfigParams } from 'src/types/DbConfigHandler';
 /**
  * Handles type conversion for database schema generation
  */
@@ -8,7 +9,7 @@ export declare class TypeConverter {
     /**
      * Convert a JavaScript type to a Prisma schema type
      */
-    static toConfigCase(modelType: ITrackerMetaOpts | IIdMetaOpts, dbType?: string, isId?: boolean): string;
+    static toConfigCase(modelType: ITrackerMetaOpts | IIdMetaOpts, dbType?: IDbConfigParams['db_type'], isId?: boolean, isIdOverride?: boolean): string;
     /**
      * Process type functions metadata to extract database-specific options
      * @param metadata The metadata from a type function

package/dist/helper/db/type-converter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeConverter = void 0;
+const utils_1 = require("./utils");
 /**
  * Handles type conversion for database schema generation
  */
@@ -8,7 +9,7 @@ class TypeConverter {
     /**
      * Convert a JavaScript type to a Prisma schema type
      */
-    static toConfigCase(modelType, dbType = 'mongodb', isId = false) {
+    static toConfigCase(modelType, dbType = 'mongodb', isId = false, isIdOverride = false) {
         const type = modelType.type;
         let input = type.name;
         // Handle basic types
@@ -30,6 +31,9 @@ class TypeConverter {
                 input = 'Int';
             }
         }
+        if (input == 'BigInt') {
+            input = 'BigInt';
+        }
         if (input == 'Object') {
             input = 'Json';
         }
@@ -53,8 +57,8 @@ class TypeConverter {
         const firstChar = input.charAt(0).toUpperCase();
         const restOfString = input.slice(1);
         let resultField = firstChar + restOfString;
-        if (isId) {
-            return dbType === 'mongodb' ? 'String' : 'Int';
+        if (isId && !isIdOverride) {
+            return utils_1.DbUtils.getDefaultPrismaType(dbType, false);
         }
         const trackerModelType = modelType;
         if (trackerModelType.isArray) {
@@ -81,7 +85,6 @@ class TypeConverter {
      * @returns Array of tags to apply to the field
      */
     static processTypeOptions(metadata, dbType) {
-        var _a, _b, _c, _d;
         const tags = [...(metadata.tags || [])];
         // Extract any database-specific options from the metadata
         // and convert them to appropriate Prisma schema tags
@@ -91,7 +94,7 @@ class TypeConverter {
                 let tag = null;
                 if (metadata.dbOptions.mysql.useType && !metadata.dbOptions.mysql.useText) {
                     const tagName = metadata.dbOptions.mysql.useType === 'VarChar' ? 'db.' + metadata.dbOptions.mysql.useType : metadata.dbOptions.mysql.useType;
-                    let tagParams = tagName === 'db.VarChar' && metadata.dbOptions.mysql.maxLength ? metadata.dbOptions.mysql.maxLength : (((_b = (_a = metadata.dbOptions.mysql) === null || _a === void 0 ? void 0 : _a.params) === null || _b === void 0 ? void 0 : _b.join(', ')) || '');
+                    let tagParams = tagName === 'db.VarChar' && metadata.dbOptions.mysql.maxLength ? metadata.dbOptions.mysql.maxLength : (metadata.dbOptions.mysql?.params?.join(', ') || '');
                     tag = `@${tagName}(${tagParams})`;
                 }
                 if (metadata.dbOptions.mysql.useText) {
@@ -100,7 +103,7 @@ class TypeConverter {
                 if (tag) {
                     tags.push(tag);
                 }
-                if (metadata.dbOptions.mysql.useUuid && ((_c = metadata.tags) === null || _c === void 0 ? void 0 : _c.includes('id'))) {
+                if (metadata.dbOptions.mysql.useUuid && metadata.tags?.includes('id')) {
                     tags.push('default(uuid())');
                 }
             }
@@ -109,7 +112,7 @@ class TypeConverter {
                 if (metadata.dbOptions.postgres.useText) {
                     tags.push('@db.Text');
                 }
-                if (metadata.dbOptions.postgres.useUuid && ((_d = metadata.tags) === null || _d === void 0 ? void 0 : _d.includes('id'))) {
+                if (metadata.dbOptions.postgres.useUuid && metadata.tags?.includes('id')) {
                     tags.push('@default(uuid())');
                     tags.push('@db.Uuid');
                 }

package/dist/helper/db/utils.d.ts

@@ -8,6 +8,7 @@ export declare class DbUtils {
      * Get the directory and path for the Prisma schema file
      */
     static getSchemaDir(): [string, string];
+    static getProcessedSchemaDir(): [string, string];
     /**
      * Detect the package installer (yarn or npx)
      */
@@ -19,6 +20,13 @@ export declare class DbUtils {
         annotationType: string;
         metadata: IIdMetaOpts;
     }>, optional?: boolean): string;
+    static getDefaultPrismaType(dbType: IDbConfigParams['db_type'], useUuid: boolean): string;
+    static doesUseUuid(modelMeta: Record<string, {
+        annotationType: string;
+        metadata: IIdMetaOpts;
+    }>): boolean;
+    static addIdPart(dbType: IDbConfigParams['db_type'], useUuid: boolean, noAuto?: boolean): string;
+    static generateIdDefault(dbType: IDbConfigParams['db_type'], useUuid: boolean): string;
 }
 export declare const workspaceRootPath: string;
 export declare const moduleDirPath: string;

package/dist/helper/db/utils.js

@@ -22,6 +22,11 @@ class DbUtils {
         const schemaPath = path_1.default.join(schemaDir, 'schema.prisma');
         return [schemaDir, schemaPath];
     }
+    static getProcessedSchemaDir() {
+        const schemaDir = path_1.default.join(workspaceRoot, 'node_modules', '.prisma', 'client');
+        const schemaPath = path_1.default.join(schemaDir, 'schema.prisma');
+        return [schemaDir, schemaPath];
+    }
     /**
      * Detect the package installer (yarn or npx)
      */
@@ -35,8 +40,7 @@ class DbUtils {
      * Generate an ID field based on the database type
      */
     static generateId(dbType, modelMeta, optional = false) {
-        var _a, _b, _c, _d;
-        let useUuid = false;
+        let useUuid = this.doesUseUuid(modelMeta);
         let field = 'id';
         const tags = [];
         for (const key in modelMeta) {
@@ -47,50 +51,105 @@ class DbUtils {
                     const dbSpecificTags = type_converter_1.TypeConverter.processTypeOptions({ tags: [], dbOptions: modelMetadata.dbOptions }, dbType);
                     tags.push(...dbSpecificTags);
                     field = key;
-                    if ((_b = (_a = modelMetadata.dbOptions) === null || _a === void 0 ? void 0 : _a.mysql) === null || _b === void 0 ? void 0 : _b.useUuid) {
-                        useUuid = true;
-                    }
-                    if ((_d = (_c = modelMetadata.dbOptions) === null || _c === void 0 ? void 0 : _c.postgres) === null || _d === void 0 ? void 0 : _d.useUuid) {
-                        useUuid = true;
-                    }
-                    if (modelMetadata.type.name === 'String') {
-                        useUuid = true;
-                    }
                 }
             }
         }
-        let idString;
+        const idPrismaType = this.getDefaultPrismaType(dbType, useUuid);
         let reqStr = '';
         if (optional) {
             reqStr = '?';
         }
+        let idString = `${field} ${idPrismaType}${reqStr}`;
+        idString += this.addIdPart(dbType, useUuid, modelMeta[field].metadata.noAuto);
+        if (dbType === 'mongodb') {
+            tags.push('@map("_id")');
+            tags.push('@db.ObjectId');
+        }
+        if (tags.length) {
+            idString += ' ' + tags.join(' ');
+        }
+        if (!idString) {
+            throw new Error(`DB type "${dbType}" is not supported!`);
+        }
+        return idString;
+    }
+    static getDefaultPrismaType(dbType, useUuid) {
+        let idPrismaType = 'String';
         switch (dbType) {
-            case 'mongodb':
-                idString = `${field} String${reqStr} @id @default(auto()) @map("_id") @db.ObjectId`;
-                break;
             case 'mysql':
-                idString = useUuid
-                    ? `${field} String${reqStr} @id @default(uuid())`
-                    : `${field} Int${reqStr} @id @default(autoincrement())`;
+                if (useUuid) {
+                    idPrismaType = 'String';
+                }
+                else {
+                    idPrismaType = 'Int';
+                }
                 break;
             case 'postgresql':
             case 'postgres':
-                idString = useUuid
-                    ? `${field} String${reqStr} @id @default(uuid())`
-                    : `${field} Int${reqStr} @id @default(autoincrement())`;
+                if (useUuid) {
+                    idPrismaType = 'String';
+                }
+                else {
+                    idPrismaType = 'Int';
+                }
                 break;
             case 'sqlite':
-                idString = `${field} Int${reqStr} @id @default(autoincrement())`;
+                if (useUuid) {
+                    idPrismaType = 'String';
+                }
+                else {
+                    idPrismaType = 'Int';
+                }
                 break;
         }
-        if (tags.length) {
-            idString += ' ' + tags.join(' ');
+        return idPrismaType;
+    }
+    static doesUseUuid(modelMeta) {
+        let useUuid = false;
+        for (const key in modelMeta) {
+            const modelMetadata = modelMeta[key].metadata;
+            const annotationType = modelMeta[key].annotationType;
+            if (key !== 'id') {
+                if (annotationType == 'IdType') {
+                    if (modelMetadata.dbOptions?.mysql?.useUuid) {
+                        useUuid = true;
+                    }
+                    if (modelMetadata.dbOptions?.postgres?.useUuid) {
+                        useUuid = true;
+                    }
+                    if (modelMetadata.type.name === 'String') {
+                        useUuid = true;
+                    }
+                }
+            }
         }
-        if (!idString) {
-            throw new Error(`DB type "${dbType}" is not supported!`);
+        return useUuid;
+    }
+    static addIdPart(dbType, useUuid, noAuto = false) {
+        let idString = ` @id${!noAuto ? ` @default(${this.generateIdDefault(dbType, useUuid)})` : ''}`;
+        if (dbType === 'mongodb') {
+            idString += ' @map("_id")';
+            idString += ' @db.ObjectId';
         }
         return idString;
     }
+    static generateIdDefault(dbType, useUuid) {
+        switch (dbType) {
+            case 'mongodb':
+                return `auto()`;
+            case 'mysql':
+                return useUuid
+                    ? `uuid()`
+                    : `autoincrement()`;
+            case 'postgresql':
+            case 'postgres':
+                return useUuid
+                    ? `uuid()`
+                    : `autoincrement()`;
+            case 'sqlite':
+                return 'autoincrement()';
+        }
+    }
 }
 exports.DbUtils = DbUtils;
 exports.workspaceRootPath = workspaceRoot;

package/dist/models/core/RWSModel.js

@@ -17,6 +17,15 @@ const TimeSeriesUtils_1 = require("../utils/TimeSeriesUtils");
 const ModelUtils_1 = require("../utils/ModelUtils");
 const HydrateUtils_1 = require("../utils/HydrateUtils");
 class RWSModel {
+    static services = {};
+    id;
+    static _collection = null;
+    static _RELATIONS = {};
+    static _NO_ID = false;
+    static _SUPER_TAGS = [];
+    static _BANNED_KEYS = ['_collection'];
+    static allModels = [];
+    static _CUT_KEYS = [];
     constructor(data = null) {
         if (!this.getCollection()) {
             throw new Error('Model must have a collection defined');
@@ -110,12 +119,11 @@ class RWSModel {
         return RelationUtils_1.RelationUtils.getRelationManyMeta(model, classFields);
     }
     static async paginate(paginateParams, findParams) {
-        var _a, _b, _c, _d, _e;
-        const conditions = (_a = findParams === null || findParams === void 0 ? void 0 : findParams.conditions) !== null && _a !== void 0 ? _a : {};
-        const ordering = (_b = findParams === null || findParams === void 0 ? void 0 : findParams.ordering) !== null && _b !== void 0 ? _b : null;
-        const fields = (_c = findParams === null || findParams === void 0 ? void 0 : findParams.fields) !== null && _c !== void 0 ? _c : null;
-        const allowRelations = (_d = findParams === null || findParams === void 0 ? void 0 : findParams.allowRelations) !== null && _d !== void 0 ? _d : true;
-        const fullData = (_e = findParams === null || findParams === void 0 ? void 0 : findParams.fullData) !== null && _e !== void 0 ? _e : false;
+        const conditions = findParams?.conditions ?? {};
+        const ordering = findParams?.ordering ?? null;
+        const fields = findParams?.fields ?? null;
+        const allowRelations = findParams?.allowRelations ?? true;
+        const fullData = findParams?.fullData ?? false;
         const collection = Reflect.get(this, '_collection');
         this.checkForInclusionWithThrow(this.name);
         try {
@@ -231,12 +239,11 @@ class RWSModel {
         return await this.services.dbService.watchCollection(collection, preRun);
     }
     static async findOneBy(findParams) {
-        var _a, _b, _c, _d, _e;
-        const conditions = (_a = findParams === null || findParams === void 0 ? void 0 : findParams.conditions) !== null && _a !== void 0 ? _a : {};
-        const ordering = (_b = findParams === null || findParams === void 0 ? void 0 : findParams.ordering) !== null && _b !== void 0 ? _b : null;
-        const fields = (_c = findParams === null || findParams === void 0 ? void 0 : findParams.fields) !== null && _c !== void 0 ? _c : null;
-        const allowRelations = (_d = findParams === null || findParams === void 0 ? void 0 : findParams.allowRelations) !== null && _d !== void 0 ? _d : true;
-        const fullData = (_e = findParams === null || findParams === void 0 ? void 0 : findParams.fullData) !== null && _e !== void 0 ? _e : false;
+        const conditions = findParams?.conditions ?? {};
+        const ordering = findParams?.ordering ?? null;
+        const fields = findParams?.fields ?? null;
+        const allowRelations = findParams?.allowRelations ?? true;
+        const fullData = findParams?.fullData ?? false;
         this.checkForInclusionWithThrow('');
         const collection = Reflect.get(this, '_collection');
         const dbData = await this.services.dbService.findOneBy(collection, conditions, fields, ordering, allowRelations);
@@ -247,11 +254,10 @@ class RWSModel {
         return null;
     }
     static async find(id, findParams = null) {
-        var _a, _b, _c, _d;
-        const ordering = (_a = findParams === null || findParams === void 0 ? void 0 : findParams.ordering) !== null && _a !== void 0 ? _a : null;
-        const fields = (_b = findParams === null || findParams === void 0 ? void 0 : findParams.fields) !== null && _b !== void 0 ? _b : null;
-        const allowRelations = (_c = findParams === null || findParams === void 0 ? void 0 : findParams.allowRelations) !== null && _c !== void 0 ? _c : true;
-        const fullData = (_d = findParams === null || findParams === void 0 ? void 0 : findParams.fullData) !== null && _d !== void 0 ? _d : false;
+        const ordering = findParams?.ordering ?? null;
+        const fields = findParams?.fields ?? null;
+        const allowRelations = findParams?.allowRelations ?? true;
+        const fullData = findParams?.fullData ?? false;
         const collection = Reflect.get(this, '_collection');
         this.checkForInclusionWithThrow(this.name);
         const dbData = await this.services.dbService.findOneBy(collection, { id }, fields, ordering, allowRelations);
@@ -262,16 +268,15 @@ class RWSModel {
         return null;
     }
     static async findBy(findParams) {
-        var _a, _b, _c, _d, _e;
-        const conditions = (_a = findParams === null || findParams === void 0 ? void 0 : findParams.conditions) !== null && _a !== void 0 ? _a : {};
-        const ordering = (_b = findParams === null || findParams === void 0 ? void 0 : findParams.ordering) !== null && _b !== void 0 ? _b : null;
-        const fields = (_c = findParams === null || findParams === void 0 ? void 0 : findParams.fields) !== null && _c !== void 0 ? _c : null;
-        const allowRelations = (_d = findParams === null || findParams === void 0 ? void 0 : findParams.allowRelations) !== null && _d !== void 0 ? _d : true;
-        const fullData = (_e = findParams === null || findParams === void 0 ? void 0 : findParams.fullData) !== null && _e !== void 0 ? _e : false;
+        const conditions = findParams?.conditions ?? {};
+        const ordering = findParams?.ordering ?? null;
+        const fields = findParams?.fields ?? null;
+        const allowRelations = findParams?.allowRelations ?? true;
+        const fullData = findParams?.fullData ?? false;
         const collection = Reflect.get(this, '_collection');
         this.checkForInclusionWithThrow(this.name);
         try {
-            const paginateParams = (findParams === null || findParams === void 0 ? void 0 : findParams.pagination) ? findParams === null || findParams === void 0 ? void 0 : findParams.pagination : undefined;
+            const paginateParams = findParams?.pagination ? findParams?.pagination : undefined;
             const dbData = await this.services.dbService.findBy(collection, conditions, fields, ordering, paginateParams);
             if (dbData.length) {
                 const instanced = [];
@@ -327,14 +332,6 @@ class RWSModel {
     }
 }
 exports.RWSModel = RWSModel;
-RWSModel.services = {};
-RWSModel._collection = null;
-RWSModel._RELATIONS = {};
-RWSModel._NO_ID = false;
-RWSModel._SUPER_TAGS = [];
-RWSModel._BANNED_KEYS = ['_collection'];
-RWSModel.allModels = [];
-RWSModel._CUT_KEYS = [];
 __decorate([
     (0, decorators_1.TrackType)(String),
     __metadata("design:type", Object)