@snowtop/ent 0.1.0-alpha80 → 0.1.0-alpha81

package/package.json

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

package/schema/field.d.ts

@@ -165,11 +165,15 @@ export declare class IntegerEnumField extends BaseField implements Field {
     format(val: any): any;
 }
 export declare function IntegerEnumType(options: IntegerEnumOptions): IntegerEnumField;
+interface ListOptions extends FieldOptions {
+    disableJSONStringify?: boolean;
+}
 export declare class ListField extends BaseField {
     private field;
+    private options?;
     type: Type;
     private validators;
-    constructor(field: Field, options?: FieldOptions);
+    constructor(field: Field, options?: ListOptions | undefined);
     __getElemField(): Field;
     validate(validator: (val: any[]) => boolean): this;
     valid(val: any): Promise<boolean>;

package/schema/field.js

@@ -22,10 +22,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const snake_case_1 = require("snake-case");
-const db_1 = __importStar(require("../core/db"));
-const schema_1 = require("./schema");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
+const db_1 = __importStar(require("../core/db"));
+const schema_1 = require("./schema");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -608,6 +608,7 @@ class ListField extends BaseField {
     constructor(field, options) {
         super();
         this.field = field;
+        this.options = options;
         this.validators = [];
         if (field.type.dbType === schema_1.DBType.List) {
             throw new Error(`nested lists not currently supported`);
@@ -648,11 +649,12 @@ class ListField extends BaseField {
         return result;
     }
     postgresVal(val, jsonType) {
-        if (!jsonType) {
+        if (!jsonType && val === "") {
             // support empty strings in list
-            if (val === "") {
-                val = '"' + val + '"';
-            }
+            val = '"' + val + '"';
+            return val;
+        }
+        if (this.options?.disableJSONStringify) {
             return val;
         }
         return JSON.stringify(val);
@@ -789,6 +791,9 @@ function IntegerEnumListType(options) {
 }
 exports.IntegerEnumListType = IntegerEnumListType;
 function UUIDListType(options) {
-    return new ListField(UUIDType(options), options);
+    return new ListField(UUIDType(options), {
+        ...options,
+        disableJSONStringify: true,
+    });
 }
 exports.UUIDListType = UUIDListType;

package/schema/struct_field.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructTypeAsList = exports.StructListType = exports.StructType = exports.StructField = void 0;
+const camel_case_1 = require("camel-case");
 const field_1 = require("./field");
 const schema_1 = require("./schema");
-const camel_case_1 = require("camel-case");
 class StructField extends field_1.BaseField {
     constructor(options) {
         super();

package/scripts/custom_graphql.js

@@ -26,10 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const glob_1 = __importDefault(require("glob"));
 const json5_1 = __importDefault(require("json5"));
 const minimist_1 = __importDefault(require("minimist"));
-const graphql_1 = require("../graphql/graphql");
-const readline = __importStar(require("readline"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
+const graphql_1 = require("../graphql/graphql");
+const readline = __importStar(require("readline"));
 const imports_1 = require("../imports");
 const process_1 = require("process");
 // need to use the GQLCapture from the package so that when we call GQLCapture.enable()

package/scripts/migrate_v0.1.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const minimist_1 = __importDefault(require("minimist"));
 const transform_1 = require("../tsc/transform");
 const transform_schema_1 = require("../tsc/transform_schema");
 const transform_ent_1 = require("../tsc/transform_ent");
 const move_generated_1 = require("../tsc/move_generated");
 const transform_action_1 = require("../tsc/transform_action");
-const minimist_1 = __importDefault(require("minimist"));
 const ast_1 = require("../tsc/ast");
 // todo-sqlite
 //  ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/migrate_v0.1.ts --transform_schema --old_base_class BaseEntTodoSchema --new_schema_class TodoEntSchema  --transform_path src/schema/patterns/base