@snowtop/ent 0.1.0-alpha1 → 0.1.0-alpha2

package/package.json

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

package/parse_schema/parse.js

@@ -3,8 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseSchema = void 0;
 function processFields(src, patternName) {
     const ret = [];
-    for (const name in src) {
-        const field = src[name];
+    let m = {};
+    if (Array.isArray(src)) {
+        for (const field of src) {
+            const name = field.name;
+            if (!name) {
+                throw new Error(`name is required`);
+            }
+            m[name] = field;
+        }
+    }
+    else {
+        m = src;
+    }
+    for (const name in m) {
+        const field = m[name];
         let f = { name, ...field };
         f.hasDefaultValueOnCreate = field.defaultValueOnCreate != undefined;
         f.hasDefaultValueOnEdit = field.defaultValueOnEdit != undefined;

package/schema/schema.d.ts

@@ -4,7 +4,7 @@ export declare type FieldMap = {
     [key: string]: Field;
 };
 export default interface Schema {
-    fields: FieldMap;
+    fields: FieldMap | Field[];
     tableName?: string;
     patterns?: Pattern[];
     edges?: Edge[];
@@ -60,7 +60,7 @@ export interface AssocEdgeGroup {
 export declare type Edge = AssocEdge;
 export interface Pattern {
     name: string;
-    fields: FieldMap;
+    fields: FieldMap | Field[];
     edges?: Edge[];
 }
 export declare enum DBType {
@@ -139,6 +139,7 @@ export interface FieldOptions {
     derivedWhenEmbedded?: boolean;
     polymorphic?: boolean | PolymorphicOptions;
     getDerivedFields?(name: string): FieldMap;
+    [x: string]: any;
 }
 export interface PolymorphicOptions {
     types?: string[];

package/schema/schema.js

@@ -37,6 +37,19 @@ function getFields(value) {
         schema = new value();
     }
     function addFields(fields) {
+        if (Array.isArray(fields)) {
+            for (const field of fields) {
+                const name = field.name;
+                if (!name) {
+                    throw new Error(`name required`);
+                }
+                if (field.getDerivedFields !== undefined) {
+                    addFields(field.getDerivedFields(name));
+                }
+                m.set(name, field);
+            }
+            return;
+        }
         for (const name in fields) {
             const field = fields[name];
             if (field.getDerivedFields !== undefined) {