pangea-server 3.2.3 → 3.2.5

package/dist/database/decorators/columns/json.columns.d.ts

@@ -1,2 +1,3 @@
-export declare function ColJson(): (target: any, propertyName: string) => void;
+import type { ColGeneralOptions } from '../../../database/database.types';
+export declare function ColJson(options?: ColGeneralOptions): (target: any, propertyName: string) => void;
 export declare function ColStrArray(): (target: any, propertyName: string) => void;

package/dist/database/decorators/columns/json.columns.js

@@ -26,8 +26,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColStrArray = exports.ColJson = void 0;
 const seq = __importStar(require("sequelize-typescript"));
 const column_1 = require("./column");
-function ColJson() {
-    return (0, column_1.Column)('JSON', { defaultValue: {} });
+function ColJson(options) {
+    return function (target, propertyName) {
+        (0, column_1.Column)(seq.DataType.TEXT('long'), {
+            ...options,
+            defaultValue: options?.defaultValue !== undefined ? JSON.stringify(options.defaultValue) : undefined,
+            get() {
+                const val = this.getDataValue(propertyName);
+                return val ? JSON.parse(val) : null;
+            },
+            set(val) {
+                this.setDataValue(propertyName, val ? JSON.stringify(val) : null);
+            },
+        })(target, propertyName);
+    };
 }
 exports.ColJson = ColJson;
 function ColStrArray() {
@@ -35,16 +47,10 @@ function ColStrArray() {
         (0, column_1.Column)(seq.DataType.TEXT('long'), {
             defaultValue: '',
             get() {
-                console.log('get: ', propertyName);
                 const val = this.getDataValue(propertyName);
-                console.log('val: ', val);
-                console.log('type: ', typeof val);
-                return typeof val === 'string' && val.length > 0 ? val.split(',') : [];
+                return val.length ? val.split(',') : [];
             },
             set(val) {
-                console.log('set: ', propertyName);
-                console.log('val: ', val);
-                console.log('type: ', typeof val);
                 this.setDataValue(propertyName, val.join(','));
             },
         })(target, propertyName);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "files": [
     "dist"
   ],