@snowtop/ent 0.1.0-alpha147 → 0.1.0-alpha149

package/action/orchestrator.js

@@ -75,7 +75,7 @@ class EntCannotEditEntError extends Error {
 }
 class EntCannotEditEntFieldError extends Error {
     constructor(privacyPolicy, viewer, field, ent) {
-        let msg = `${getViewer(viewer)} does not have permission to edit field ${field} ${ent.constructor.name}`;
+        let msg = `${getViewer(viewer)} does not have permission to edit field ${field} in ${ent.constructor.name}`;
         super(msg);
         this.privacyPolicy = privacyPolicy;
     }
@@ -422,7 +422,15 @@ class Orchestrator {
         // future optimization: can get schemaFields to memoize based on different values
         const schemaFields = (0, schema_1.getFields)(this.options.schema);
         // also future optimization, no need to go through the list of fields multiple times
-        const editPrivacyFields = (0, schema_1.getFieldsWithEditPrivacy)(this.options.schema, this.options.fieldInfo);
+        let editPrivacyFields = new Map();
+        switch (this.actualOperation) {
+            case action_1.WriteOperation.Edit:
+                editPrivacyFields = (0, schema_1.getFieldsWithEditPrivacy)(this.options.schema, this.options.fieldInfo);
+                break;
+            case action_1.WriteOperation.Insert:
+                editPrivacyFields = (0, schema_1.getFieldsForCreateAction)(this.options.schema, this.options.fieldInfo);
+                break;
+        }
         const editedFields = await this.options.editedFields();
         let { data: editedData, userDefinedKeys } = await this.getFieldsWithDefaultValues(builder, schemaFields, editedFields, action);
         return {

package/package.json

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

package/parse_schema/parse.js

@@ -275,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;
@@ -237,6 +238,7 @@ export interface FieldOptions {
     polymorphic?: boolean | PolymorphicOptions;
     privacyPolicy?: PrivacyPolicy | (() => PrivacyPolicy);
     editPrivacyPolicy?: PrivacyPolicy | (() => PrivacyPolicy);
+    createOnlyOverrideEditPrivacyPolicy?: PrivacyPolicy | (() => PrivacyPolicy);
     getDerivedFields?(name: string): FieldMap;
     convert?: ConvertType;
     fetchOnDemand?: boolean;
@@ -270,6 +272,7 @@ export declare function getFields(value: SchemaInputType): Map<string, Field>;
 export declare function getStorageKey(field: Field, fieldName: string): string;
 export declare function getFieldsWithPrivacy(value: SchemaInputType, fieldInfoMap: FieldInfoMap): Map<string, PrivacyPolicy>;
 export declare function getFieldsWithEditPrivacy(value: SchemaInputType, fieldInfoMap: FieldInfoMap): Map<string, PrivacyPolicy>;
+export declare function getFieldsForCreateAction(value: SchemaInputType, fieldInfoMap: FieldInfoMap): Map<string, PrivacyPolicy>;
 export declare function getTransformedReadClause(value: SchemaInputType): Clause | undefined;
 interface objectLoaderOptions {
     clause?: () => Clause | undefined;

package/schema/schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConstraintType = exports.optionalField = exports.requiredField = exports.NoFields = exports.ActionOperation = exports.getTransformedUpdateOp = exports.getObjectLoaderProperties = exports.getTransformedReadClause = exports.getFieldsWithEditPrivacy = exports.getFieldsWithPrivacy = exports.getStorageKey = exports.getFields = exports.getSchema = exports.DBType = exports.SQLStatementOperation = void 0;
+exports.ConstraintType = exports.optionalField = exports.requiredField = exports.NoFields = exports.ActionOperation = exports.getTransformedUpdateOp = exports.getObjectLoaderProperties = exports.getTransformedReadClause = exports.getFieldsForCreateAction = exports.getFieldsWithEditPrivacy = exports.getFieldsWithPrivacy = exports.getStorageKey = exports.getFields = exports.getSchema = exports.DBType = exports.SQLStatementOperation = void 0;
 const snake_case_1 = require("snake-case");
 // we also want this transformation to exist on a per-action basis
 // if it exists on an action, we don't do the global schema transformation
@@ -86,14 +86,21 @@ function getStorageKey(field, fieldName) {
 exports.getStorageKey = getStorageKey;
 // returns a mapping of storage key to field privacy
 function getFieldsWithPrivacy(value, fieldInfoMap) {
-    return getFieldsWithPrivacyImpl(value, fieldInfoMap, "privacyPolicy");
+    return getFieldsWithPrivacyImpl(value, fieldInfoMap, ["privacyPolicy"]);
 }
 exports.getFieldsWithPrivacy = getFieldsWithPrivacy;
 function getFieldsWithEditPrivacy(value, fieldInfoMap) {
-    return getFieldsWithPrivacyImpl(value, fieldInfoMap, "editPrivacyPolicy");
+    return getFieldsWithPrivacyImpl(value, fieldInfoMap, ["editPrivacyPolicy"]);
 }
 exports.getFieldsWithEditPrivacy = getFieldsWithEditPrivacy;
-function getFieldsWithPrivacyImpl(value, fieldInfoMap, key) {
+function getFieldsForCreateAction(value, fieldInfoMap) {
+    return getFieldsWithPrivacyImpl(value, fieldInfoMap, [
+        "createOnlyOverrideEditPrivacyPolicy",
+        "editPrivacyPolicy",
+    ]);
+}
+exports.getFieldsForCreateAction = getFieldsForCreateAction;
+function getFieldsWithPrivacyImpl(value, fieldInfoMap, keys) {
     const schema = getSchema(value);
     function addFields(fields) {
         for (const name in fields) {
@@ -104,16 +111,19 @@ function getFieldsWithPrivacyImpl(value, fieldInfoMap, key) {
             if (field.getDerivedFields !== undefined) {
                 addFields(field.getDerivedFields(name));
             }
-            let privacyPolicy = field[key];
-            if (privacyPolicy) {
-                if (typeof privacyPolicy === "function") {
-                    privacyPolicy = privacyPolicy();
-                }
-                const info = fieldInfoMap[name];
-                if (!info) {
-                    throw new Error(`field with name ${name} not passed in fieldMap`);
+            for (const key of keys) {
+                let privacyPolicy = field[key];
+                if (privacyPolicy) {
+                    if (typeof privacyPolicy === "function") {
+                        privacyPolicy = privacyPolicy();
+                    }
+                    const info = fieldInfoMap[name];
+                    if (!info) {
+                        throw new Error(`field with name ${name} not passed in fieldMap`);
+                    }
+                    m.set(info.dbCol, privacyPolicy);
+                    break;
                 }
-                m.set(info.dbCol, privacyPolicy);
             }
         }
     }