@voxgig/system 1.0.0 → 1.1.0

package/dist/lib/structure.js

@@ -12,8 +12,26 @@ function entity(model) {
         // let ent = EntShape(entry[1])
         let ent = entry[1];
         // console.log('ENT', path, ent)
+        let valid = ent.valid || {};
+        Object.entries(ent.field).map((n) => {
+            let name = n[0];
+            let field = n[1];
+            // console.log('FV', name, field)
+            let fv = field.kind;
+            if (field.valid) {
+                let vt = typeof field.valid;
+                if ('string' === vt) {
+                    fv += '.' + field.valid;
+                }
+                else {
+                    fv = field.valid;
+                }
+            }
+            valid[name] = fv;
+        });
+        // console.log(path, valid)
         entMap[path[0] + '/' + path[1]] = {
-            valid_json: ent.valid
+            valid_json: valid
         };
     }
     return entMap;

package/dist/lib/structure.js.map

@@ -1 +1 @@
-{"version":3,"file":"structure.js","sourceRoot":"","sources":["../../lib/structure.ts"],"names":[],"mappings":";;;AACA,yCAA2D;AAI3D,SAAS,MAAM,CAAC,KAAU;IACxB,IAAI,OAAO,GAAG,IAAA,YAAI,EAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClC,IAAI,MAAM,GAAQ,EAAE,CAAA;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAExB,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAEnB,uCAAuC;QACvC,+BAA+B;QAC/B,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAElB,gCAAgC;QAEhC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAChC,UAAU,EAAE,GAAG,CAAC,KAAK;SACtB,CAAA;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAID,MAAM,SAAS,GAAG;IAChB,MAAM;CACP,CAAA;AAKC,8BAAS"}
+{"version":3,"file":"structure.js","sourceRoot":"","sources":["../../lib/structure.ts"],"names":[],"mappings":";;;AACA,yCAA2D;AAI3D,SAAS,MAAM,CAAC,KAAU;IACxB,IAAI,OAAO,GAAG,IAAA,YAAI,EAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClC,IAAI,MAAM,GAAQ,EAAE,CAAA;IACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;QAExB,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAEnB,uCAAuC;QACvC,+BAA+B;QAC/B,IAAI,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QAElB,gCAAgC;QAEhC,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE,CAAA;QAE3B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;YACzC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YACf,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;YAEhB,iCAAiC;YAEjC,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAA;YACnB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,IAAI,EAAE,GAAG,OAAO,KAAK,CAAC,KAAK,CAAA;gBAC3B,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;oBACpB,EAAE,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,CAAA;gBACzB,CAAC;qBACI,CAAC;oBACJ,EAAE,GAAG,KAAK,CAAC,KAAK,CAAA;gBAClB,CAAC;YACH,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QAEF,2BAA2B;QAE3B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;YAChC,UAAU,EAAE,KAAK;SAClB,CAAA;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAID,MAAM,SAAS,GAAG;IAChB,MAAM;CACP,CAAA;AAKC,8BAAS"}

package/lib/structure.ts

@@ -17,8 +17,31 @@ function entity(model: any) {
 
     // console.log('ENT', path, ent)
 
+    let valid = ent.valid || {}
+
+    Object.entries(ent.field).map((n: any[]) => {
+      let name = n[0]
+      let field = n[1]
+
+      // console.log('FV', name, field)
+
+      let fv = field.kind
+      if (field.valid) {
+        let vt = typeof field.valid
+        if ('string' === vt) {
+          fv += '.' + field.valid
+        }
+        else {
+          fv = field.valid
+        }
+      }
+      valid[name] = fv
+    })
+
+    // console.log(path, valid)
+
     entMap[path[0] + '/' + path[1]] = {
-      valid_json: ent.valid
+      valid_json: valid
     }
   }
   return entMap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/system",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "main": "dist/system.js",
   "type": "commonjs",
   "types": "dist/system.d.ts",