@snowtop/ent 0.1.0-alpha120 → 0.1.0-alpha122

package/core/ent.d.ts

@@ -4,7 +4,6 @@ import { Executor } from "../action/action";
 import * as clause from "./clause";
 import { Builder } from "../action";
 import DataLoader from "dataloader";
-import { GlobalSchema } from "../schema/";
 export declare function getEntKey<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, id: ID, options: LoadEntOptions<TEnt, TViewer>): string;
 export declare function loadEnt<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, id: ID, options: LoadEntOptions<TEnt, TViewer>): Promise<TEnt | null>;
 export declare function loadEntViaKey<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, key: any, options: LoadEntOptions<TEnt, TViewer>): Promise<TEnt | null>;
@@ -114,9 +113,6 @@ export declare class EditNodeOperation<T extends Ent> implements DataOperation {
     returnedRow(): Data | null;
     createdEnt(viewer: Viewer): T | null;
 }
-export declare function setGlobalSchema(val: GlobalSchema): void;
-export declare function clearGlobalSchema(): void;
-export declare function __hasGlobalSchema(): boolean;
 export declare class EdgeOperation implements DataOperation {
     private builder;
     edgeInput: AssocEdgeInput;

package/core/ent.js

@@ -26,15 +26,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = exports.EditNodeOperation = exports.RawQueryOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = void 0;
+exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.EditNodeOperation = exports.RawQueryOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
+exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
 const action_1 = require("../action");
 const logger_1 = require("./logger");
 const dataloader_1 = __importDefault(require("dataloader"));
-const schema_1 = require("../schema/");
+const schema_1 = require("../schema/schema");
+const global_schema_1 = require("./global_schema");
 // TODO kill this and createDataLoader
 class cacheMap {
     constructor(options) {
@@ -816,20 +817,6 @@ class EditNodeOperation {
     }
 }
 exports.EditNodeOperation = EditNodeOperation;
-let globalSchema;
-function setGlobalSchema(val) {
-    globalSchema = val;
-}
-exports.setGlobalSchema = setGlobalSchema;
-function clearGlobalSchema() {
-    globalSchema = undefined;
-}
-exports.clearGlobalSchema = clearGlobalSchema;
-// used by tests. no guarantee will always exist
-function __hasGlobalSchema() {
-    return globalSchema !== undefined;
-}
-exports.__hasGlobalSchema = __hasGlobalSchema;
 class EdgeOperation {
     constructor(builder, edgeInput, options) {
         this.builder = builder;
@@ -872,8 +859,9 @@ class EdgeOperation {
         let op = schema_1.SQLStatementOperation.Delete;
         let updateData = null;
         // TODO respect disableTransformations
-        if (globalSchema?.transformEdgeWrite) {
-            transformed = globalSchema.transformEdgeWrite({
+        const transformedEdgeWrite = (0, global_schema_1.__getGlobalSchema)()?.transformEdgeWrite;
+        if (transformedEdgeWrite) {
+            transformed = transformedEdgeWrite({
                 op: schema_1.SQLStatementOperation.Delete,
                 edge,
             });
@@ -951,9 +939,10 @@ class EdgeOperation {
             fields["time"] = new Date().toISOString();
         }
         const onConflictFields = ["data"];
-        if (globalSchema?.extraEdgeFields) {
-            for (const name in globalSchema.extraEdgeFields) {
-                const f = globalSchema.extraEdgeFields[name];
+        const extraEdgeFields = (0, global_schema_1.__getGlobalSchema)()?.extraEdgeFields;
+        if (extraEdgeFields) {
+            for (const name in extraEdgeFields) {
+                const f = extraEdgeFields[name];
                 if (f.defaultValueOnCreate) {
                     const storageKey = (0, schema_1.getStorageKey)(f, name);
                     fields[storageKey] = f.defaultValueOnCreate(this.builder, {});
@@ -965,8 +954,9 @@ class EdgeOperation {
         }
         // TODO respect disableTransformations
         let transformed = null;
-        if (globalSchema?.transformEdgeWrite) {
-            transformed = globalSchema.transformEdgeWrite({
+        const transformEdgeWrite = (0, global_schema_1.__getGlobalSchema)()?.transformEdgeWrite;
+        if (transformEdgeWrite) {
+            transformed = transformEdgeWrite({
                 op: schema_1.SQLStatementOperation.Insert,
                 edge,
             });
@@ -1483,8 +1473,9 @@ async function loadEdges(options) {
 exports.loadEdges = loadEdges;
 function getEdgeClauseAndFields(cls, options) {
     let fields = edgeFields;
-    if (globalSchema?.transformEdgeRead) {
-        const transformClause = globalSchema.transformEdgeRead();
+    const transformEdgeRead = (0, global_schema_1.__getGlobalSchema)()?.transformEdgeRead;
+    if (transformEdgeRead) {
+        const transformClause = transformEdgeRead();
         if (!options.disableTransformations) {
             cls = clause.And(cls, transformClause);
         }

package/core/global_schema.d.ts

@@ -0,0 +1,7 @@
+import { Field, GlobalSchema } from "../schema/schema";
+export declare function setGlobalSchema(val: GlobalSchema): void;
+export declare function clearGlobalSchema(): void;
+export declare function __hasGlobalSchema(): boolean;
+export declare function __getGlobalSchema(): GlobalSchema | undefined;
+export declare function __getGlobalSchemaFields(): Map<string, Field>;
+export declare function __getGlobalSchemaField(type: string): Field | undefined;

package/core/global_schema.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.__getGlobalSchemaField = exports.__getGlobalSchemaFields = exports.__getGlobalSchema = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = void 0;
+const schema_1 = require("../schema/schema");
+let globalSchema;
+let globalSchemaFields = new Map();
+function isGlobalSchemaField(f) {
+    switch (f.type.dbType) {
+        case schema_1.DBType.Enum:
+        case schema_1.DBType.StringEnum:
+        case schema_1.DBType.IntEnum:
+        case schema_1.DBType.JSON:
+        case schema_1.DBType.JSONB:
+            return true;
+    }
+    return false;
+}
+function setGlobalSchema(val) {
+    globalSchema = val;
+    if (val.fields) {
+        for (const [k, v] of Object.entries(val.fields)) {
+            if (isGlobalSchemaField(v) && v.type.type) {
+                globalSchemaFields.set(v.type.type, v);
+            }
+        }
+    }
+}
+exports.setGlobalSchema = setGlobalSchema;
+function clearGlobalSchema() {
+    globalSchema = undefined;
+    globalSchemaFields.clear();
+}
+exports.clearGlobalSchema = clearGlobalSchema;
+// used by tests. no guarantee will always exist
+function __hasGlobalSchema() {
+    return globalSchema !== undefined;
+}
+exports.__hasGlobalSchema = __hasGlobalSchema;
+// used by tests. no guarantee will always exist
+function __getGlobalSchema() {
+    return globalSchema;
+}
+exports.__getGlobalSchema = __getGlobalSchema;
+function __getGlobalSchemaFields() {
+    return globalSchemaFields;
+}
+exports.__getGlobalSchemaFields = __getGlobalSchemaFields;
+function __getGlobalSchemaField(type) {
+    return globalSchemaFields.get(type);
+}
+exports.__getGlobalSchemaField = __getGlobalSchemaField;

package/core/query/shared_test.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonTests = void 0;
 const ent_1 = require("../ent");
+const global_schema_1 = require("../global_schema");
 const viewer_1 = require("../viewer");
 const index_1 = require("../../testutils/fake_data/index");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
@@ -289,7 +290,7 @@ const commonTests = (opts) => {
         return { verify, getCursor };
     }
     if (opts.globalSchema) {
-        (0, ent_1.setGlobalSchema)(test_edge_global_schema_1.testEdgeGlobalSchema);
+        (0, global_schema_1.setGlobalSchema)(test_edge_global_schema_1.testEdgeGlobalSchema);
     }
     let tdb;
     if (opts.sqlite) {

package/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./core/base";
-export { loadEnt, loadCustomData, loadCustomEnts, loadCustomCount, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, RawQueryOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, setGlobalSchema, } from "./core/ent";
+export { loadEnt, loadCustomData, loadCustomEnts, loadCustomCount, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, RawQueryOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, } from "./core/ent";
+export { setGlobalSchema } from "./core/global_schema";
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };

package/index.js

@@ -63,7 +63,8 @@ Object.defineProperty(exports, "loadRawEdgeCountX", { enumerable: true, get: fun
 Object.defineProperty(exports, "loadEdgeForID2", { enumerable: true, get: function () { return ent_1.loadEdgeForID2; } });
 Object.defineProperty(exports, "loadNodesByEdge", { enumerable: true, get: function () { return ent_1.loadNodesByEdge; } });
 Object.defineProperty(exports, "getEdgeTypeInGroup", { enumerable: true, get: function () { return ent_1.getEdgeTypeInGroup; } });
-Object.defineProperty(exports, "setGlobalSchema", { enumerable: true, get: function () { return ent_1.setGlobalSchema; } });
+var global_schema_1 = require("./core/global_schema");
+Object.defineProperty(exports, "setGlobalSchema", { enumerable: true, get: function () { return global_schema_1.setGlobalSchema; } });
 const db_1 = __importDefault(require("./core/db"));
 exports.DB = db_1.default;
 __exportStar(require("./core/loaders"), exports);

package/package.json

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

package/parse_schema/parse.d.ts

@@ -84,5 +84,6 @@ interface ProcessedGlobalSchema {
     globalEdges: ProcessedAssocEdge[];
     extraEdgeFields: ProcessedField[];
     initForEdges?: boolean;
+    globalFields?: ProcessedField[];
 }
 export {};

package/parse_schema/parse.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSchema = void 0;
 const cosmiconfig_1 = require("cosmiconfig");
 const const_1 = require("../core/const");
+const global_schema_1 = require("../core/global_schema");
 async function processFields(src, patternName) {
     const ret = [];
     let m = {};
@@ -236,6 +237,9 @@ async function parseSchema(potentialSchemas, globalSchema) {
     let parsedGlobalSchema;
     if (globalSchema) {
         parsedGlobalSchema = await parseGlobalSchema(globalSchema);
+        // set this so that we can use it, if we're trying to process server default or anything
+        // that ends up parsing,validating and formatting fields
+        (0, global_schema_1.setGlobalSchema)(globalSchema);
     }
     for (const key in potentialSchemas) {
         const value = potentialSchemas[key];
@@ -364,5 +368,8 @@ async function parseGlobalSchema(s) {
     if (s.edges) {
         ret.globalEdges = processEdges(s.edges);
     }
+    if (s.fields) {
+        ret.globalFields = await processFields(s.fields);
+    }
     return ret;
 }

package/schema/field.d.ts

@@ -149,6 +149,7 @@ export interface EnumOptions extends FieldOptions {
     graphQLType?: string;
     createEnumType?: boolean;
     disableUnknownType?: boolean;
+    globalType?: string;
 }
 /**
  * @deprecated Use StringEnumField
@@ -158,7 +159,7 @@ export declare class EnumField extends BaseField implements Field {
     private values?;
     private map?;
     constructor(options: StringEnumOptions);
-    valid(val: any): boolean;
+    valid(val: any): Promise<boolean>;
     format(val: any): any;
 }
 export declare class StringEnumField extends EnumField {
@@ -173,17 +174,18 @@ declare type IntEnumMap = {
     [key: string]: number;
 };
 export interface IntegerEnumOptions extends FieldOptions {
-    map: IntEnumMap;
+    map?: IntEnumMap;
     deprecated?: IntEnumMap;
     tsType?: string;
     graphQLType?: string;
     disableUnknownType?: boolean;
+    globalType?: string;
 }
 export declare class IntegerEnumField extends BaseField implements Field {
     type: Type;
     private map;
     constructor(options: IntegerEnumOptions);
-    valid(val: any): boolean;
+    valid(val: any): Promise<boolean>;
     format(val: any): any;
 }
 export declare function IntegerEnumType(options: IntegerEnumOptions): IntegerEnumField;

package/schema/field.js

@@ -31,6 +31,7 @@ const uuid_1 = require("uuid");
 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");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -525,10 +526,11 @@ class EnumField extends BaseField {
             type: options.tsType,
             graphQLType: options.graphQLType,
             disableUnknownType: options.disableUnknownType,
+            globalType: options.globalType,
         };
         if (!options.foreignKey) {
-            if (!options.values && !options.map) {
-                throw new Error("values or map required if not look up table enum. Look-up table enum indicated by foreignKey field");
+            if (!options.values && !options.map && !options.globalType) {
+                throw new Error("values, map or globalType required if not look up table enum. Look-up table enum indicated by foreignKey field");
             }
             if (options.values) {
                 if (!options.values.length) {
@@ -547,8 +549,8 @@ class EnumField extends BaseField {
             }
         }
         else {
-            if (options.values || options.map) {
-                throw new Error("cannot specify values or map and foreign key for lookup table enum type");
+            if (options.values || options.map || options.globalType) {
+                throw new Error("cannot specify values, map or globalType and foreign key for lookup table enum type");
             }
             if (options.createEnumType) {
                 throw new Error("cannot specify createEnumType without specifying values");
@@ -563,7 +565,14 @@ class EnumField extends BaseField {
         this.values = options.values;
         this.map = options.map;
     }
-    valid(val) {
+    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);
+            }
+            return false;
+        }
         // lookup table enum and indicated via presence of foreignKey
         if (!this.values && !this.map) {
             return true;
@@ -581,6 +590,13 @@ class EnumField extends BaseField {
         return false;
     }
     format(val) {
+        if (this.type.globalType) {
+            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
+            if (f && f.format) {
+                return f.format(val);
+            }
+            return val;
+        }
         return val;
     }
 }
@@ -603,21 +619,40 @@ class IntegerEnumField extends BaseField {
             graphQLType: options.graphQLType,
             deprecatedIntEnumMap: options.deprecated,
             disableUnknownType: options.disableUnknownType,
+            globalType: options.globalType,
         };
-        let count = 0;
-        for (const _ in options.map) {
-            count++;
-            break;
-        }
-        if (!count) {
-            throw new Error("need at least one entry in enum map");
-        }
         if (options.foreignKey) {
             throw new Error(`foreignKey on intEnum not supported`);
         }
-        this.map = options.map;
+        if (options.globalType) {
+            if (options.map) {
+                throw new Error(`cannot specify map and globalType`);
+            }
+            this.map = {};
+        }
+        else {
+            let count = 0;
+            for (const _ in options.map) {
+                count++;
+                break;
+            }
+            if (!count) {
+                throw new Error("need at least one entry in enum map");
+            }
+            if (!options.map) {
+                throw new Error("map required if not globalType");
+            }
+            this.map = options.map;
+        }
     }
-    valid(val) {
+    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);
+            }
+            return false;
+        }
         // lookup table enum and indicated via presence of foreignKey
         for (const k in this.map) {
             const v = this.map[k];
@@ -628,6 +663,12 @@ class IntegerEnumField extends BaseField {
         return false;
     }
     format(val) {
+        if (this.type.globalType) {
+            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
+            if (f && f.format) {
+                return f.format(val);
+            }
+        }
         return parseInt(val);
     }
 }

package/schema/schema.d.ts

@@ -17,6 +17,7 @@ export interface GlobalSchema {
     extraEdgeFields?: FieldMap;
     transformEdgeRead?: () => Clause;
     transformEdgeWrite?: (stmt: EdgeUpdateOperation) => TransformedEdgeUpdateOperation | null;
+    fields?: FieldMap;
 }
 type FieldOverride = Pick<FieldOptions, "nullable" | "storageKey" | "serverDefault" | "unique" | "hideFromGraphQL" | "graphqlName" | "index">;
 export type FieldOverrideMap = {
@@ -171,6 +172,7 @@ export interface Type {
     intEnumMap?: IntEnumMap;
     deprecatedIntEnumMap?: IntEnumMap;
     disableUnknownType?: boolean;
+    globalType?: string;
     importType?: DeprecatedImportType;
     subFields?: FieldMap;
     unionFields?: FieldMap;

package/schema/struct_field.d.ts

@@ -1,20 +1,22 @@
 import { BaseField, ListField } from "./field";
 import { FieldOptions, Field, Type, FieldMap } from "./schema";
-export interface StructOptions extends FieldOptions {
+interface structFieldOptions extends FieldOptions {
     tsType: string;
     fields: FieldMap;
     graphQLType?: string;
     jsonNotJSONB?: boolean;
 }
-interface allStructOptions extends StructOptions {
-    jsonAsList?: boolean;
+interface GlobalStructOptions extends FieldOptions {
+    globalType: string;
 }
+export type StructOptions = structFieldOptions | GlobalStructOptions;
 export declare class StructField extends BaseField implements Field {
     private options;
+    private jsonAsList?;
     type: Type;
-    constructor(options: allStructOptions);
+    constructor(options: StructOptions, jsonAsList?: boolean | undefined);
     formatImpl(obj: any, nested?: boolean): string | Object;
-    format(obj: any, nested?: boolean): string | Object;
+    format(obj: any, nested?: boolean): any;
     private validImpl;
     valid(obj: any): Promise<boolean>;
 }
@@ -23,5 +25,5 @@ export declare function StructType(options: StructOptions): StructField & Struct
  * @deprecated use StructTypeAsList
  */
 export declare function StructListType(options: StructOptions): ListField;
-export declare function StructTypeAsList(options: allStructOptions): StructField & allStructOptions;
+export declare function StructTypeAsList(options: StructOptions): StructField & StructOptions;
 export {};

package/schema/struct_field.js

@@ -4,20 +4,23 @@ exports.StructTypeAsList = exports.StructListType = exports.StructType = exports
 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");
 class StructField extends field_1.BaseField {
-    constructor(options) {
+    constructor(options, jsonAsList) {
         super();
         this.options = options;
+        this.jsonAsList = jsonAsList;
         this.type = {
             dbType: schema_1.DBType.JSONB,
         };
         this.type.subFields = options.fields;
         this.type.type = options.tsType;
         this.type.graphQLType = options.graphQLType || options.tsType;
+        this.type.globalType = this.options.globalType;
         if (options.jsonNotJSONB) {
             this.type.dbType = schema_1.DBType.JSON;
         }
-        if (options?.jsonAsList) {
+        if (jsonAsList) {
             this.type.listElemType = {
                 dbType: schema_1.DBType.JSONB,
             };
@@ -57,7 +60,37 @@ class StructField extends field_1.BaseField {
         return JSON.stringify(ret);
     }
     format(obj, nested) {
-        if (Array.isArray(obj) && this.options.jsonAsList) {
+        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);
+            }
+        }
+        if (Array.isArray(obj) && this.jsonAsList) {
             const ret = obj.map((v) => this.formatImpl(v, true));
             if (nested) {
                 return ret;
@@ -102,7 +135,30 @@ class StructField extends field_1.BaseField {
         return ret.every((v) => v);
     }
     async valid(obj) {
-        if (this.options.jsonAsList) {
+        if (this.type.globalType) {
+            const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
+            // list and global type is not valid. todo
+            if (f && 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 {
+                        // TODO handle test
+                        return f.valid([obj]);
+                    }
+                }
+                return f.valid(obj);
+            }
+            return false;
+        }
+        if (this.jsonAsList) {
             if (!Array.isArray(obj)) {
                 return false;
             }
@@ -129,10 +185,7 @@ function StructListType(options) {
 }
 exports.StructListType = StructListType;
 function StructTypeAsList(options) {
-    let result = new StructField({
-        ...options,
-        jsonAsList: true,
-    });
+    let result = new StructField(options, true);
     return Object.assign(result, options);
 }
 exports.StructTypeAsList = StructTypeAsList;

package/schema/union_field.d.ts

@@ -15,7 +15,7 @@ export declare class UnionField extends BaseField implements FieldOptions {
     type: Type;
     m: Map<Object, string>;
     constructor(options: UnionOptions);
-    format(obj: any): string | Object;
+    format(obj: any): any;
     private validField;
     valid(obj: any): Promise<boolean>;
 }