@reldens/storage 0.88.0 → 0.90.0

package/lib/prisma/prisma-type-caster.js

@@ -1,260 +1,280 @@
-/**
- *
- * Reldens - PrismaTypeCaster
- *
- */
-
-const { Logger, sc } = require('@reldens/utils');
-const { Prisma } = require('@prisma/client');
-
-class PrismaTypeCaster
-{
-
-    constructor(props)
-    {
-        this.idFieldType = sc.get(props, 'idFieldType', 'String');
-        this.jsonFields = sc.get(props, 'jsonFields', new Set());
-        this.fieldTypes = sc.get(props, 'fieldTypes', {});
-        this.fieldDefaults = sc.get(props, 'fieldDefaults', {});
-        this.requiredFields = sc.get(props, 'requiredFields', []);
-        this.optionalFields = sc.get(props, 'optionalFields', []);
-        this.rawModel = sc.get(props, 'rawModel', false);
-    }
-
-    updateMetadata(metadata)
-    {
-        this.idFieldType = sc.get(metadata, 'idFieldType', this.idFieldType);
-        this.jsonFields = sc.get(metadata, 'jsonFields', this.jsonFields);
-        this.fieldTypes = sc.get(metadata, 'fieldTypes', this.fieldTypes);
-        this.fieldDefaults = sc.get(metadata, 'fieldDefaults', this.fieldDefaults);
-        this.requiredFields = sc.get(metadata, 'requiredFields', this.requiredFields);
-        this.optionalFields = sc.get(metadata, 'optionalFields', this.optionalFields);
-    }
-
-    isNumericFieldType(fieldType)
-    {
-        return ('Int' === fieldType || 'BigInt' === fieldType || 'Float' === fieldType || 'Decimal' === fieldType);
-    }
-
-    isBooleanFieldType(fieldType)
-    {
-        return 'Boolean' === fieldType;
-    }
-
-    isDateTimeFieldType(fieldType)
-    {
-        return 'DateTime' === fieldType || 'Date' === fieldType;
-    }
-
-    isJsonFieldType(fieldType)
-    {
-        return 'Json' === fieldType;
-    }
-
-    isJsonFieldByName(fieldName)
-    {
-        if(this.jsonFields.has(fieldName)){
-            return true;
-        }
-        if(!this.rawModel || !this.rawModel.properties){
-            return false;
-        }
-        return 'json' === sc.get(this.rawModel.properties[fieldName], 'dbType', '');
-    }
-
-    isStringFieldType(fieldType)
-    {
-        return 'String' === fieldType;
-    }
-
-    isNullOrEmpty(value)
-    {
-        return null === value || undefined === value || '' === value;
-    }
-
-    isValidCastedValue(value)
-    {
-        return undefined !== value;
-    }
-
-    castValue(value, fieldType, fieldName = null)
-    {
-        if('id' === fieldName){
-            return this.castToIdType(value);
-        }
-        if(this.isNullOrEmpty(value)){
-            if(sc.hasOwn(this.fieldDefaults, fieldName)){
-                return undefined;
-            }
-            if(-1 !== this.optionalFields.indexOf(fieldName)){
-                return null;
-            }
-            if(-1 !== this.requiredFields.indexOf(fieldName)){
-                Logger.warning('Required field '+fieldName+' cannot be null or empty');
-                return undefined;
-            }
-            return null;
-        }
-        if(this.isJsonFieldByName(fieldName)){
-            return this.castToJsonType(value);
-        }
-        if(this.isNumericFieldType(fieldType)){
-            return this.castToNumericType(value, fieldType);
-        }
-        if(this.isBooleanFieldType(fieldType)){
-            return this.castToBooleanType(value);
-        }
-        if(this.isDateTimeFieldType(fieldType)){
-            return this.castToDateType(value);
-        }
-        if(this.isStringFieldType(fieldType)){
-            return this.castToStringType(value);
-        }
-        return value;
-    }
-
-    castToIdType(value)
-    {
-        if(this.isNullOrEmpty(value)){
-            return value;
-        }
-        if(this.isNumericFieldType(this.idFieldType)){
-            let numeric = Number(value);
-            if(!isNaN(numeric)){
-                return ('Int' === this.idFieldType || 'BigInt' === this.idFieldType) ? Math.floor(numeric) : numeric;
-            }
-            Logger.warning('Cannot cast non-numeric value "'+value+'" to ID type '+this.idFieldType);
-            return null;
-        }
-        return String(value);
-    }
-
-    castToNumericType(value, fieldType)
-    {
-        if(this.isNullOrEmpty(value)){
-            return null;
-        }
-        let numericValue = Number(value);
-        if(isNaN(numericValue)){
-            Logger.warning('Cannot convert value to numeric: '+value);
-            return null;
-        }
-        if('Int' === fieldType || 'BigInt' === fieldType){
-            return Math.floor(numericValue);
-        }
-        return numericValue;
-    }
-
-    castToBooleanType(value)
-    {
-        if(this.isNullOrEmpty(value)){
-            return null;
-        }
-        if('boolean' === typeof value){
-            return value;
-        }
-        if('number' === typeof value){
-            return 0 !== value;
-        }
-        if('string' === typeof value){
-            let lowerValue = value.toLowerCase();
-            if('true' === lowerValue || '1' === lowerValue || 'yes' === lowerValue){
-                return true;
-            }
-            if('false' === lowerValue || '0' === lowerValue || 'no' === lowerValue){
-                return false;
-            }
-        }
-        return Boolean(value);
-    }
-
-    castToDateType(dateValue)
-    {
-        if(dateValue instanceof Date){
-            return dateValue;
-        }
-        if(this.isNullOrEmpty(dateValue)){
-            return null;
-        }
-        let dateString = String(dateValue);
-        if(dateString.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/)){
-            return new Date(dateString.replace(' ', 'T')+'Z');
-        }
-        if(dateString.match(/^\d{4}-\d{2}-\d{2}$/)){
-            return new Date(dateString+'T00:00:00Z');
-        }
-        try {
-            let parsedDate = new Date(dateString);
-            if(isNaN(parsedDate.getTime())){
-                Logger.warning('Invalid date value: '+dateString);
-                return null;
-            }
-            return parsedDate;
-        } catch(error) {
-            Logger.warning('Failed to convert date value: '+dateString);
-            return null;
-        }
-    }
-
-    castToJsonType(value)
-    {
-        if(this.isNullOrEmpty(value)){
-            return Prisma.DbNull;
-        }
-        if('object' === typeof value){
-            return value;
-        }
-        if('string' === typeof value){
-            if(value.startsWith('%') && value.endsWith('%')){
-                return value;
-            }
-            try {
-                return JSON.parse(value);
-            } catch(error) {
-                return value;
-            }
-        }
-        return value;
-    }
-
-    castToStringType(value)
-    {
-        if(null === value || undefined === value){
-            return null;
-        }
-        if('string' === typeof value){
-            if('null' === value){
-                return null;
-            }
-            return value;
-        }
-        return String(value);
-    }
-
-    normalizeReturnData(data)
-    {
-        if(null === data || undefined === data){
-            return data;
-        }
-        if('bigint' === typeof data){
-            return Number(data);
-        }
-        if(data instanceof Date){
-            return data;
-        }
-        if(sc.isArray(data)){
-            return data.map(item => this.normalizeReturnData(item));
-        }
-        if(sc.isObject(data)){
-            let result = {};
-            for(let key of Object.keys(data)){
-                result[key] = this.normalizeReturnData(data[key]);
-            }
-            return result;
-        }
-        return data;
-    }
-
-}
-
-module.exports.PrismaTypeCaster = PrismaTypeCaster;
+/**
+ *
+ * Reldens - PrismaTypeCaster
+ *
+ */
+
+const { Logger, sc } = require('@reldens/utils');
+
+class PrismaTypeCaster
+{
+
+    constructor(props)
+    {
+        this.idFieldType = sc.get(props, 'idFieldType', 'String');
+        this.jsonFields = sc.get(props, 'jsonFields', new Set());
+        this.fieldTypes = sc.get(props, 'fieldTypes', {});
+        this.fieldDefaults = sc.get(props, 'fieldDefaults', {});
+        this.requiredFields = sc.get(props, 'requiredFields', []);
+        this.optionalFields = sc.get(props, 'optionalFields', []);
+        this.rawModel = sc.get(props, 'rawModel', false);
+        this.prismaDbNull = sc.get(props, 'prismaDbNull', null);
+    }
+
+    updateMetadata(metadata)
+    {
+        this.idFieldType = sc.get(metadata, 'idFieldType', this.idFieldType);
+        this.jsonFields = sc.get(metadata, 'jsonFields', this.jsonFields);
+        this.fieldTypes = sc.get(metadata, 'fieldTypes', this.fieldTypes);
+        this.fieldDefaults = sc.get(metadata, 'fieldDefaults', this.fieldDefaults);
+        this.requiredFields = sc.get(metadata, 'requiredFields', this.requiredFields);
+        this.optionalFields = sc.get(metadata, 'optionalFields', this.optionalFields);
+    }
+
+    isNumericFieldType(fieldType)
+    {
+        return ('Int' === fieldType || 'BigInt' === fieldType || 'Float' === fieldType || 'Decimal' === fieldType);
+    }
+
+    isBooleanFieldType(fieldType)
+    {
+        return 'Boolean' === fieldType;
+    }
+
+    isDateTimeFieldType(fieldType)
+    {
+        return 'DateTime' === fieldType || 'Date' === fieldType;
+    }
+
+    isJsonFieldType(fieldType)
+    {
+        return 'Json' === fieldType;
+    }
+
+    isJsonFieldByName(fieldName)
+    {
+        if(this.jsonFields.has(fieldName)){
+            return true;
+        }
+        if(!this.rawModel || !this.rawModel.properties){
+            return false;
+        }
+        return 'json' === sc.get(this.rawModel.properties[fieldName], 'dbType', '');
+    }
+
+    isStringFieldType(fieldType)
+    {
+        return 'String' === fieldType;
+    }
+
+    isNullOrEmpty(value)
+    {
+        return null === value || undefined === value || '' === value;
+    }
+
+    isValidCastedValue(value)
+    {
+        return undefined !== value;
+    }
+
+    castValue(value, fieldType, fieldName = null)
+    {
+        if('id' === fieldName){
+            return this.castToIdType(value);
+        }
+        if(this.isNullOrEmpty(value)){
+            if(sc.hasOwn(this.fieldDefaults, fieldName)){
+                return undefined;
+            }
+            if(-1 !== this.optionalFields.indexOf(fieldName)){
+                return null;
+            }
+            if(-1 !== this.requiredFields.indexOf(fieldName)){
+                Logger.warning('Required field '+fieldName+' cannot be null or empty');
+                return undefined;
+            }
+            return null;
+        }
+        if(this.isJsonFieldByName(fieldName)){
+            return this.castToJsonType(value);
+        }
+        if(this.isNumericFieldType(fieldType)){
+            return this.castToNumericType(value, fieldType);
+        }
+        if(this.isBooleanFieldType(fieldType)){
+            return this.castToBooleanType(value);
+        }
+        if(this.isDateTimeFieldType(fieldType)){
+            return this.castToDateType(value);
+        }
+        if(this.isStringFieldType(fieldType)){
+            return this.castToStringType(value);
+        }
+        return value;
+    }
+
+    castToIdType(value)
+    {
+        if(this.isNullOrEmpty(value)){
+            return value;
+        }
+        if(this.isNumericFieldType(this.idFieldType)){
+            let numeric = Number(value);
+            if(!isNaN(numeric)){
+                return ('Int' === this.idFieldType || 'BigInt' === this.idFieldType) ? Math.floor(numeric) : numeric;
+            }
+            Logger.warning('Cannot cast non-numeric value "'+value+'" to ID type '+this.idFieldType);
+            return null;
+        }
+        return String(value);
+    }
+
+    castToNumericType(value, fieldType)
+    {
+        if(this.isNullOrEmpty(value)){
+            return null;
+        }
+        let numericValue = Number(value);
+        if(isNaN(numericValue)){
+            Logger.warning('Cannot convert value to numeric: '+value);
+            return null;
+        }
+        if('Int' === fieldType || 'BigInt' === fieldType){
+            return Math.floor(numericValue);
+        }
+        return numericValue;
+    }
+
+    castToBooleanType(value)
+    {
+        if(this.isNullOrEmpty(value)){
+            return null;
+        }
+        if('boolean' === typeof value){
+            return value;
+        }
+        if('number' === typeof value){
+            return 0 !== value;
+        }
+        if('string' === typeof value){
+            let lowerValue = value.toLowerCase();
+            if('true' === lowerValue || '1' === lowerValue || 'yes' === lowerValue){
+                return true;
+            }
+            if('false' === lowerValue || '0' === lowerValue || 'no' === lowerValue){
+                return false;
+            }
+        }
+        return Boolean(value);
+    }
+
+    castToDateType(dateValue)
+    {
+        if(dateValue instanceof Date){
+            return dateValue;
+        }
+        if(this.isNullOrEmpty(dateValue)){
+            return null;
+        }
+        let dateString = String(dateValue);
+        if(dateString.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/)){
+            return new Date(dateString.replace(' ', 'T')+'Z');
+        }
+        if(dateString.match(/^\d{4}-\d{2}-\d{2}$/)){
+            return new Date(dateString+'T00:00:00Z');
+        }
+        try {
+            let parsedDate = new Date(dateString);
+            if(isNaN(parsedDate.getTime())){
+                Logger.warning('Invalid date value: '+dateString);
+                return null;
+            }
+            return parsedDate;
+        } catch(error) {
+            Logger.warning('Failed to convert date value: '+dateString);
+            return null;
+        }
+    }
+
+    castToJsonType(value)
+    {
+        if(this.isNullOrEmpty(value)){
+            return this.prismaDbNull || null;
+        }
+        if('object' === typeof value){
+            return value;
+        }
+        if('string' === typeof value){
+            if(value.startsWith('%') && value.endsWith('%')){
+                return value;
+            }
+            try {
+                return JSON.parse(value);
+            } catch(error) {
+                return value;
+            }
+        }
+        return value;
+    }
+
+    castToStringType(value)
+    {
+        if(null === value || undefined === value){
+            return null;
+        }
+        if('string' === typeof value){
+            if('null' === value){
+                return null;
+            }
+            return value;
+        }
+        return String(value);
+    }
+
+    castFieldsInData(data)
+    {
+        if(!sc.isObject(data)){
+            return data;
+        }
+        let casted = {};
+        for(let key of Object.keys(data)){
+            let value = data[key];
+            if('number' === typeof value && (0 === value || 1 === value)){
+                casted[key] = 0 !== value;
+                continue;
+            }
+            casted[key] = value;
+        }
+        return casted;
+    }
+
+    normalizeReturnData(data)
+    {
+        if(null === data || undefined === data){
+            return data;
+        }
+        if('boolean' === typeof data){
+            return data ? 1 : 0;
+        }
+        if('bigint' === typeof data){
+            return Number(data);
+        }
+        if(data instanceof Date){
+            return data;
+        }
+        if(sc.isArray(data)){
+            return data.map(item => this.normalizeReturnData(item));
+        }
+        if(sc.isObject(data)){
+            let result = {};
+            for(let key of Object.keys(data)){
+                result[key] = this.normalizeReturnData(data[key]);
+            }
+            return result;
+        }
+        return data;
+    }
+
+}
+
+module.exports.PrismaTypeCaster = PrismaTypeCaster;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.88.0",
+    "version": "0.90.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -41,16 +41,25 @@
     "bugs": {
         "url": "https://github.com/damian-pastorini/reldens-storage/issues"
     },
+    "scripts": {
+        "test": "node tests/run-tests.js",
+        "test:watch": "node --watch tests/run-tests.js",
+        "test:filter": "node tests/run-tests.js --filter=",
+        "test:unit": "node tests/run-tests.js --suite=unit",
+        "test:integration": "node tests/run-tests.js --suite=integration",
+        "test:coverage": "node --test --experimental-test-coverage tests/run-tests.js",
+        "test:driver": "node tests/run-tests.js --driver="
+    },
     "dependencies": {
-        "@mikro-orm/core": "6.6.4",
-        "@mikro-orm/mongodb": "6.6.4",
-        "@mikro-orm/mysql": "6.6.4",
+        "@mikro-orm/core": "6.6.6",
+        "@mikro-orm/mongodb": "6.6.6",
+        "@mikro-orm/mysql": "6.6.6",
         "@prisma/client": "6.19.2",
-        "@reldens/server-utils": "^0.44.0",
+        "@reldens/server-utils": "^0.46.0",
         "@reldens/utils": "^0.54.0",
         "knex": "3.1.0",
         "mysql": "2.18.1",
-        "mysql2": "3.16.0",
+        "mysql2": "3.16.2",
         "objection": "3.1.5",
         "prisma": "6.19.2"
     }

package/tests/.env.test.example

@@ -0,0 +1,7 @@
+RELDENS_TEST_DB_HOST=localhost
+RELDENS_TEST_DB_PORT=3306
+RELDENS_TEST_DB_USER=test_user
+RELDENS_TEST_DB_PASSWORD=test_password
+RELDENS_TEST_DB_NAME=reldens_storage_test
+RELDENS_TEST_DB_CLIENT=mysql
+RELDENS_DB_URL=mysql://test_user:test_password@localhost:3306/reldens_storage_test