@snowtop/ent 0.1.0-alpha40 → 0.1.0-alpha43

package/action/action.d.ts

@@ -56,7 +56,7 @@ export interface Action<TEnt extends Ent<TViewer>, TBuilder extends Builder<TEnt
     transformWrite?: (stmt: UpdateOperation<TEnt, TViewer>) => Promise<TransformedUpdateOperation<TEnt>> | TransformedUpdateOperation<TEnt> | null;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
-    viewerForEntLoad?(data: Data): TViewer | Promise<TViewer>;
+    viewerForEntLoad?(data: Data, context?: Context<TViewer>): TViewer | Promise<TViewer>;
 }
 export declare function saveBuilder<TEnt extends Ent<TViewer>, TViewer extends Viewer>(builder: Builder<TEnt, TViewer>): Promise<void>;
 export declare function saveBuilderX<TEnt extends Ent<TViewer>, TViewer extends Viewer>(builder: Builder<TEnt, TViewer>): Promise<void>;

package/action/orchestrator.js

@@ -615,7 +615,7 @@ class Orchestrator {
         if (!action || !action.viewerForEntLoad) {
             return this.options.viewer;
         }
-        return action.viewerForEntLoad(data);
+        return action.viewerForEntLoad(data, action.builder.viewer.context);
     }
     async returnedRow() {
         if (this.mainOp && this.mainOp.returnedRow) {

package/core/context.js

@@ -39,7 +39,7 @@ class ContextCache {
         const key = this.getkey(options);
         let rows = m.get(key);
         if (rows) {
-            (0, logger_1.log)("query", {
+            (0, logger_1.log)("cache", {
                 "cache-hit": key,
                 "tableName": options.tableName,
             });
@@ -54,7 +54,7 @@ class ContextCache {
         const key = this.getkey(options);
         let row = m.get(key);
         if (row) {
-            (0, logger_1.log)("query", {
+            (0, logger_1.log)("cache", {
                 "cache-hit": key,
                 "tableName": options.tableName,
             });

package/core/ent.js

@@ -38,7 +38,7 @@ class cacheMap {
     get(key) {
         const ret = this.m.get(key);
         if (ret) {
-            (0, logger_1.log)("query", {
+            (0, logger_1.log)("cache", {
                 "dataloader-cache-hit": key,
                 "tableName": this.options.tableName,
             });

package/core/loaders/loader.js

@@ -37,12 +37,12 @@ class cacheMap {
             // might be a lot?
             // TODO this is not the best log format
             // was designed for ObjectLoader time. Now we have different needs e.g. count, assoc etc
-            (0, logger_1.log)("query", {
+            (0, logger_1.log)("cache", {
                 "dataloader-cache-hit": key,
                 "tableName": this.options.tableName,
             });
             // } else {
-            //   log("query", {
+            //   log("cache", {
             //     "dataloader-cache-miss": key,
             //     "tableName": options.tableName,
             //   });
@@ -50,21 +50,21 @@ class cacheMap {
         return ret;
     }
     set(key, value) {
-        // log("query", {
+        // log("cache", {
         //   "dataloader-cache-set": key,
         //   "tableName": options.tableName,
         // });
         return this.m.set(key, value);
     }
     delete(key) {
-        // log("query", {
+        // log("cache", {
         //   "dataloader-cache-delete": key,
         //   "tableName": options.tableName,
         // });
         return this.m.delete(key);
     }
     clear() {
-        // log("query", {
+        // log("cache", {
         //   "dataloader-cache-clear": true,
         //   "tableName": options.tableName,
         // });

package/core/logger.d.ts

@@ -1,4 +1,4 @@
-declare type logType = "query" | "warn" | "info" | "error" | "debug";
+declare type logType = "query" | "warn" | "info" | "error" | "debug" | "cache";
 export declare function setLogLevels(levels: logType | logType[]): void;
 export declare function clearLogLevels(): void;
 export declare function log(level: logType, msg: any): void;

package/core/logger.js

@@ -7,6 +7,7 @@ var m = {
     info: "log",
     error: "error",
     debug: "debug",
+    cache: "log",
 };
 var logLevels = new Map();
 function setLogLevels(levels) {

package/package.json

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

package/schema/struct_field.js

@@ -83,6 +83,12 @@ class StructField extends field_1.BaseField {
             }
             promises.push(field.valid(val));
         }
+        for (const k in obj) {
+            // extra undefined fields are invalid
+            if (this.options.fields[k] === undefined) {
+                return false;
+            }
+        }
         if (!valid) {
             return valid;
         }