@snowtop/ent 0.1.0-alpha146 → 0.1.0-alpha148

package/package.json

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

package/parse_schema/parse.d.ts

@@ -1,5 +1,5 @@
 import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
-import { ActionField, Type, GlobalSchema, TransformReadBetaResult } from "../schema/schema";
+import { ActionField, Type, GlobalSchema, TransformReadBetaResult, CanViewerDo } from "../schema/schema";
 declare enum NullableResult {
     CONTENTS = "contents",
     CONTENTS_AND_LIST = "contentsAndList",
@@ -30,8 +30,9 @@ type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields
 type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
     edgeAction?: OutputAction;
 };
-type OutputAction = Omit<Action, "actionOnlyFields"> & {
+type OutputAction = Omit<Action, "actionOnlyFields" | "canViewerDo"> & {
     actionOnlyFields?: ProcessedActionField[];
+    canViewerDo?: CanViewerDo;
 };
 interface schemasDict {
     [key: string]: ProcessedSchema;

package/parse_schema/parse.js

@@ -202,34 +202,39 @@ var NullableResult;
     NullableResult["ITEM"] = "true";
 })(NullableResult || (NullableResult = {}));
 function processAction(action) {
-    if (!action.actionOnlyFields) {
-        return { ...action };
-    }
-    let ret = { ...action };
-    let actionOnlyFields = action.actionOnlyFields.map((f) => {
-        let f2 = f;
-        if (!f.nullable) {
-            delete f2.nullable;
-            return f2;
-        }
-        if (typeof f.nullable === "boolean") {
-            f2.nullable = NullableResult.ITEM;
-        }
-        else {
-            if (f.nullable === "contentsAndList") {
-                f2.nullable = NullableResult.CONTENTS_AND_LIST;
-            }
-            else if (f.nullable === "contents") {
-                f2.nullable = NullableResult.CONTENTS;
+    const ret = { ...action };
+    if (action.actionOnlyFields !== undefined) {
+        let actionOnlyFields = action.actionOnlyFields.map((f) => {
+            let f2 = f;
+            if (!f.nullable) {
+                delete f2.nullable;
+                return f2;
             }
-            else if (f.nullable === "true") {
-                // shouldn't happen but ran into weirdness where it did...
+            if (typeof f.nullable === "boolean") {
                 f2.nullable = NullableResult.ITEM;
             }
+            else {
+                if (f.nullable === "contentsAndList") {
+                    f2.nullable = NullableResult.CONTENTS_AND_LIST;
+                }
+                else if (f.nullable === "contents") {
+                    f2.nullable = NullableResult.CONTENTS;
+                }
+                else if (f.nullable === "true") {
+                    // shouldn't happen but ran into weirdness where it did...
+                    f2.nullable = NullableResult.ITEM;
+                }
+            }
+            return f2;
+        });
+        ret.actionOnlyFields = actionOnlyFields;
+    }
+    if (action.canViewerDo !== undefined) {
+        if (typeof action.canViewerDo !== "object") {
+            delete ret.canViewerDo;
+            ret.canViewerDo = {};
         }
-        return f2;
-    });
-    ret.actionOnlyFields = actionOnlyFields;
+    }
     return ret;
 }
 async function parseSchema(potentialSchemas, globalSchema) {
@@ -270,7 +275,8 @@ async function parseSchema(potentialSchemas, globalSchema) {
             assocEdgeGroups: [],
             customGraphQLInterfaces: schema.customGraphQLInterfaces,
             supportUpsert: schema.supportUpsert,
-            supportCanViewerSee: schema.supportCanViewerSee,
+            showCanViewerSee: schema.showCanViewerSee,
+            showCanViewerEdit: schema.showCanViewerEdit,
         };
         // let's put patterns first just so we have id, created_at, updated_at first
         // ¯\_(ツ)_/¯

package/schema/base_schema.d.ts

@@ -21,7 +21,8 @@ export declare class EntSchema implements Schema {
     hideFromGraphQL?: boolean;
     customGraphQLInterfaces?: string[] | undefined;
     supportUpsert?: boolean | undefined;
-    supportCanViewerSee?: boolean | undefined;
+    showCanViewerSee?: boolean | undefined;
+    showCanViewerEdit?: boolean | undefined;
     constructor(cfg: SchemaConfig);
 }
 export declare class EntSchemaWithTZ implements Schema {
@@ -41,7 +42,8 @@ export declare class EntSchemaWithTZ implements Schema {
     hideFromGraphQL?: boolean;
     customGraphQLInterfaces?: string[] | undefined;
     supportUpsert?: boolean | undefined;
-    supportCanViewerSee?: boolean | undefined;
+    showCanViewerSee?: boolean | undefined;
+    showCanViewerEdit?: boolean | undefined;
     constructor(cfg: SchemaConfig);
 }
 export declare abstract class BaseEntSchema {

package/schema/base_schema.js

@@ -91,7 +91,8 @@ class EntSchema {
         // TODO annoying that have to list these...
         this.customGraphQLInterfaces = cfg.customGraphQLInterfaces;
         this.supportUpsert = cfg.supportUpsert;
-        this.supportCanViewerSee = cfg.supportCanViewerSee;
+        this.showCanViewerSee = cfg.showCanViewerSee;
+        this.showCanViewerEdit = cfg.showCanViewerEdit;
     }
 }
 exports.EntSchema = EntSchema;
@@ -122,7 +123,8 @@ class EntSchemaWithTZ {
         // TODO annoying that have to list these...
         this.customGraphQLInterfaces = cfg.customGraphQLInterfaces;
         this.supportUpsert = cfg.supportUpsert;
-        this.supportCanViewerSee = cfg.supportCanViewerSee;
+        this.showCanViewerSee = cfg.showCanViewerSee;
+        this.showCanViewerEdit = cfg.showCanViewerEdit;
     }
 }
 exports.EntSchemaWithTZ = EntSchemaWithTZ;

package/schema/schema.d.ts

@@ -40,7 +40,8 @@ export default interface Schema {
     hideFromGraphQL?: boolean;
     customGraphQLInterfaces?: string[];
     supportUpsert?: boolean;
-    supportCanViewerSee?: boolean;
+    showCanViewerSee?: boolean;
+    showCanViewerEdit?: boolean;
 }
 export interface AssocEdge {
     name: string;
@@ -59,6 +60,7 @@ export interface EdgeAction {
     hideFromGraphQL?: boolean;
     graphQLName?: string;
     actionOnlyFields?: ActionField[];
+    canViewerDo?: boolean | CanViewerDo;
 }
 export interface InverseAssocEdge {
     name: string;
@@ -70,6 +72,7 @@ export interface EdgeGroupAction {
     hideFromGraphQL?: boolean;
     graphQLName?: string;
     actionOnlyFields?: ActionField[];
+    canViewerDo?: boolean | CanViewerDo;
 }
 export interface AssocEdgeGroup {
     name: string;
@@ -309,8 +312,13 @@ export interface Action {
     optionalFields?: string[];
     requiredFields?: string[];
     noFields?: boolean;
+    canViewerDo?: boolean | CanViewerDo;
     [x: string]: any;
 }
+export interface CanViewerDo {
+    addAllFields?: boolean;
+    inputFields?: string[];
+}
 export declare const NoFields = "__NO_FIELDS__";
 export declare function requiredField(field: string): string;
 export declare function optionalField(field: string): string;

package/testutils/ent-graphql-tests/index.d.ts

@@ -2,7 +2,7 @@ import { Express, RequestHandler } from "express";
 import { Viewer } from "../../core/base";
 import { GraphQLSchema } from "graphql";
 import supertest from "supertest";
-export type Option = [string, any];
+export type Option = [string, any] | [string, any, string];
 interface queryConfig {
     viewer?: Viewer;
     init?: (app: Express) => void;

package/testutils/ent-graphql-tests/index.js

@@ -418,8 +418,9 @@ async function expectFromRoot(config, ...options) {
         }
     }
     await Promise.all(options.map(async (option) => {
-        let path = option[0];
-        let expected = option[1];
+        const path = option[0];
+        const expected = option[1];
+        const alias = option[2];
         let nullPath;
         let nullParts = [];
         let undefinedPath;
@@ -442,7 +443,7 @@ async function expectFromRoot(config, ...options) {
                 }
             }
         }
-        let parts = splitPath(path);
+        let parts = splitPath(alias ?? path);
         let current = result;
         // possible to make this smarter and better
         // e.g. when building up the tree above