@snowtop/ent 0.1.0-alpha121 → 0.1.0-alpha123

package/package.json

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

package/parse_schema/parse.d.ts

@@ -83,7 +83,7 @@ interface RomeConfig {
 interface ProcessedGlobalSchema {
     globalEdges: ProcessedAssocEdge[];
     extraEdgeFields: ProcessedField[];
-    initForEdges?: boolean;
+    init?: boolean;
     globalFields?: ProcessedField[];
 }
 export {};

package/parse_schema/parse.js

@@ -358,9 +358,10 @@ async function parseGlobalSchema(s) {
     const ret = {
         globalEdges: [],
         extraEdgeFields: [],
-        initForEdges: !!s.extraEdgeFields ||
+        init: !!s.extraEdgeFields ||
             s.transformEdgeRead !== undefined ||
-            s.transformEdgeWrite !== undefined,
+            s.transformEdgeWrite !== undefined ||
+            s.fields !== undefined,
     };
     if (s.extraEdgeFields) {
         ret.extraEdgeFields = await processFields(s.extraEdgeFields);

package/schema/field.js

@@ -32,6 +32,7 @@ const base_1 = require("../core/base");
 const db_1 = __importStar(require("../core/db"));
 const schema_1 = require("./schema");
 const global_schema_1 = require("../core/global_schema");
+const logger_1 = require("../core/logger");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -568,10 +569,16 @@ class EnumField extends BaseField {
     async valid(val) {
         if (this.type.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            if (f && f.valid) {
-                return f.valid(val);
+            if (f) {
+                if (f.valid) {
+                    return f.valid(val);
+                }
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
             }
-            return false;
         }
         // lookup table enum and indicated via presence of foreignKey
         if (!this.values && !this.map) {
@@ -648,10 +655,16 @@ class IntegerEnumField extends BaseField {
     async valid(val) {
         if (this.type?.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            if (f && f.valid) {
-                return f.valid(val);
+            if (f) {
+                if (f.valid) {
+                    return f.valid(val);
+                }
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
             }
-            return false;
         }
         // lookup table enum and indicated via presence of foreignKey
         for (const k in this.map) {

package/schema/struct_field.js

@@ -5,6 +5,7 @@ const camel_case_1 = require("camel-case");
 const field_1 = require("./field");
 const schema_1 = require("./schema");
 const global_schema_1 = require("../core/global_schema");
+const logger_1 = require("../core/logger");
 class StructField extends field_1.BaseField {
     constructor(options, jsonAsList) {
         super();
@@ -63,6 +64,30 @@ class StructField extends field_1.BaseField {
         if (this.type.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
             if (f && f.format) {
+                if (JSON.stringify(this.type.listElemType) !==
+                    JSON.stringify(f?.type.listElemType)) {
+                    if (this.jsonAsList) {
+                        // handle as nested
+                        // @ts-ignore
+                        const formatted = obj.map((v) => f.format(v, true));
+                        if (nested) {
+                            return formatted;
+                        }
+                        else {
+                            return JSON.stringify(formatted);
+                        }
+                    }
+                    else {
+                        const formatted = f.format([obj], true);
+                        if (nested) {
+                            return formatted[0];
+                        }
+                        else {
+                            return JSON.stringify(formatted[0]);
+                        }
+                    }
+                }
+                // TODO handle format code
                 return f.format(obj);
             }
         }
@@ -113,10 +138,31 @@ class StructField extends field_1.BaseField {
     async valid(obj) {
         if (this.type.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            if (f && f.valid) {
-                return f.valid(obj);
+            // list and global type is not valid.
+            if (f) {
+                if (f.valid) {
+                    if (JSON.stringify(this.type.listElemType) !==
+                        JSON.stringify(f?.type.listElemType)) {
+                        if (this.jsonAsList) {
+                            if (!Array.isArray(obj)) {
+                                return false;
+                            }
+                            // @ts-ignore
+                            const valid = await Promise.all(obj.map((v) => f.valid(v)));
+                            return valid.every((b) => b);
+                        }
+                        else {
+                            return f.valid([obj]);
+                        }
+                    }
+                    return f.valid(obj);
+                }
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
             }
-            return false;
         }
         if (this.jsonAsList) {
             if (!Array.isArray(obj)) {