@snowtop/ent 0.0.21 → 0.0.22

package/core/convert.d.ts

@@ -10,3 +10,5 @@ export declare function convertBoolList(val: any): boolean[];
 export declare function convertNullableBoolList(val: any): boolean[] | null;
 export declare function convertJSON(val: any): any;
 export declare function convertNullableJSON(val: any): any | null;
+export declare function convertJSONList(val: any): boolean[];
+export declare function convertNullableJSONList(val: any): any[] | null;

package/core/convert.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertNullableJSON = exports.convertJSON = exports.convertNullableBoolList = exports.convertBoolList = exports.convertNullableDateList = exports.convertDateList = exports.convertNullableList = exports.convertList = exports.convertNullableBool = exports.convertBool = exports.convertNullableDate = exports.convertDate = void 0;
+exports.convertNullableJSONList = exports.convertJSONList = exports.convertNullableJSON = exports.convertJSON = exports.convertNullableBoolList = exports.convertBoolList = exports.convertNullableDateList = exports.convertDateList = exports.convertNullableList = exports.convertList = exports.convertNullableBool = exports.convertBool = exports.convertNullableDate = exports.convertDate = void 0;
 const luxon_1 = require("luxon");
 // these are needed to deal with SQLite having different types stored in the db vs the representation
 // gotten back from the db/needed in ent land
@@ -95,3 +95,11 @@ function convertNullableJSON(val) {
     return convertJSON(val);
 }
 exports.convertNullableJSON = convertNullableJSON;
+function convertJSONList(val) {
+    return convertList(val, convertJSON);
+}
+exports.convertJSONList = convertJSONList;
+function convertNullableJSONList(val) {
+    return convertNullableList(val, convertJSON);
+}
+exports.convertNullableJSONList = convertNullableJSONList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/field.d.ts

@@ -128,6 +128,7 @@ export declare class ListField extends BaseField {
     constructor(field: Field, options: FieldOptions);
     validate(validator: (val: any[]) => boolean): this;
     valid(val: any): boolean;
+    private postgresVal;
     format(val: any): any;
     minLen(l: number): this;
     maxLen(l: number): this;

package/schema/field.js

@@ -521,22 +521,45 @@ class ListField extends BaseField {
         }
         return true;
     }
+    postgresVal(val, jsonType) {
+        if (!jsonType) {
+            return val;
+        }
+        return JSON.stringify(val);
+    }
     format(val) {
         if (!Array.isArray(val)) {
             throw new Error(`need an array to format`);
         }
-        if (this.field.format) {
-            for (let i = 0; i < val.length; i++) {
-                val[i] = this.field.format(val[i]);
+        const elemDBType = this.type.listElemType.dbType;
+        const jsonType = elemDBType === "JSON" || elemDBType === "JSONB";
+        const postgres = db_1.default.getDialect() === db_1.Dialect.Postgres;
+        if (!postgres && !this.field.format) {
+            return JSON.stringify(val);
+        }
+        let ret = [];
+        let postgresRet = "{";
+        for (let i = 0; i < val.length; i++) {
+            let formatted = val[i];
+            if (this.field.format) {
+                formatted = this.field.format(val[i]);
+            }
+            // postgres supports arrays natively so we
+            // structure it in the expected format
+            if (postgres) {
+                postgresRet += this.postgresVal(formatted, jsonType);
+                if (i !== val.length - 1) {
+                    postgresRet += ",";
+                }
+            }
+            else {
+                ret[i] = formatted;
             }
         }
-        // postgres supports arrays natively so we
-        // structure it in the expected format
-        if (db_1.default.getDialect() === db_1.Dialect.Postgres) {
-            return `{${val.join(",")}}`;
+        if (postgres) {
+            return postgresRet + "}";
         }
-        // For SQLite, we store a JSON string
-        return JSON.stringify(val);
+        return JSON.stringify(ret);
     }
     minLen(l) {
         return this.validate((val) => val.length >= l);

package/schema/json_field.d.ts

@@ -1,5 +1,5 @@
 import { FieldOptions, Type, Field, ImportType } from "./schema";
-import { BaseField } from "./field";
+import { BaseField, ListField } from "./field";
 export interface JSONOptions extends FieldOptions {
     validator?: (val: any) => boolean;
     importType?: ImportType;
@@ -13,3 +13,5 @@ export declare class JSONField extends BaseField implements Field {
 }
 export declare function JSONType(options: JSONOptions): JSONField;
 export declare function JSONBType(options: JSONOptions): JSONField;
+export declare function JSONBListType(options: JSONOptions): ListField;
+export declare function JSONListType(options: JSONOptions): ListField;

package/schema/json_field.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSONBType = exports.JSONType = exports.JSONField = void 0;
+exports.JSONListType = exports.JSONBListType = exports.JSONBType = exports.JSONType = exports.JSONField = void 0;
 const schema_1 = require("./schema");
 const field_1 = require("./field");
 class JSONField extends field_1.BaseField {
@@ -38,3 +38,11 @@ function JSONBType(options) {
     return Object.assign(result, options);
 }
 exports.JSONBType = JSONBType;
+function JSONBListType(options) {
+    return new field_1.ListField(JSONBType(options), options);
+}
+exports.JSONBListType = JSONBListType;
+function JSONListType(options) {
+    return new field_1.ListField(JSONType(options), options);
+}
+exports.JSONListType = JSONListType;