@snowtop/ent 0.1.0-alpha92-7ebc5680-4591-11ed-b331-8b0a5597e9d8 → 0.1.0-alpha92

package/action/action.d.ts

@@ -70,3 +70,4 @@ interface Orchestrator {
     viewer: Viewer;
 }
 export declare function setEdgeTypeInGroup<T extends string>(orchestrator: Orchestrator, inputEnumValue: string, id1: ID, id2: ID, nodeType: string, m: Map<T, string>): Promise<void>;
+export declare function clearEdgeTypeInGroup<T extends string>(orchestrator: Orchestrator, id1: ID, id2: ID, m: Map<T, string>): Promise<void>;

package/action/action.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
+exports.clearEdgeTypeInGroup = exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
 const base_1 = require("../core/base");
 Object.defineProperty(exports, "WriteOperation", { enumerable: true, get: function () { return base_1.WriteOperation; } });
 const ent_1 = require("../core/ent");
@@ -84,3 +84,22 @@ async function setEdgeTypeInGroup(orchestrator, inputEnumValue, id1, id2, nodeTy
     await Promise.all(promises);
 }
 exports.setEdgeTypeInGroup = setEdgeTypeInGroup;
+async function clearEdgeTypeInGroup(orchestrator, id1, id2, m) {
+    let promises = [];
+    for (const [_, edgeType] of m) {
+        promises.push((async () => {
+            let edge = await (0, ent_1.loadEdgeForID2)({
+                id1,
+                id2,
+                edgeType,
+                ctr: ent_1.AssocEdge,
+                context: orchestrator.viewer.context,
+            });
+            if (edge) {
+                orchestrator.removeOutboundEdge(id2, edgeType);
+            }
+        })());
+    }
+    await Promise.all(promises);
+}
+exports.clearEdgeTypeInGroup = clearEdgeTypeInGroup;

package/action/orchestrator.js

@@ -241,7 +241,7 @@ class Orchestrator {
                     ops.push(edgeOp);
                     const edgeData = edgeDatas.get(edgeType);
                     if (!edgeData) {
-                        throw new Error(`could not load edge data for ${edgeType}`);
+                        throw new Error(`could not load edge data for '${edgeType}'`);
                     }
                     if (edgeData.symmetricEdge) {
                         ops.push(edgeOp.symmetricEdge());

package/core/config.d.ts

@@ -38,6 +38,7 @@ interface CodegenConfig {
     fieldPrivacyEvaluated?: fieldPrivacyEvaluated;
     templatizedViewer?: importedObject;
     customAssocEdgePath?: importedObject;
+    globalImportPath?: string;
 }
 interface PrettierConfig {
     custom?: boolean;

package/core/ent.d.ts

@@ -213,9 +213,8 @@ interface loadCustomEdgesOptions<T extends AssocEdge> extends loadEdgesOptions {
     ctr: AssocEdgeConstructor<T>;
 }
 export declare const DefaultLimit = 1000;
-export declare function defaultEdgeQueryOptions(id1: ID, edgeType: string): EdgeQueryableDataOptions;
 export declare function loadEdges(options: loadEdgesOptions): Promise<AssocEdge[]>;
-export declare function getEdgeClauseAndFields(cls: clause.Clause, options: loadEdgesOptions): {
+export declare function getEdgeClauseAndFields(cls: clause.Clause, options: Pick<loadEdgesOptions, "disableTransformations">): {
     cls: clause.Clause;
     fields: string[];
 };

package/core/ent.js

@@ -26,8 +26,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.defaultEdgeQueryOptions = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = exports.EditNodeOperation = exports.RawQueryOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = void 0;
+exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.__hasGlobalSchema = exports.clearGlobalSchema = exports.setGlobalSchema = exports.EditNodeOperation = exports.RawQueryOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomCount = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = exports.getEntKey = void 0;
+exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -135,6 +135,7 @@ function createEntLoader(viewer, options, map) {
             return [];
         }
         let result = [];
+        const tableName = options.loaderFactory.options?.tableName;
         const loader = options.loaderFactory.createLoader(viewer.context);
         const rows = await loader.loadMany(ids);
         // this is a loader which should return the same order based on passed-in ids
@@ -147,7 +148,12 @@ function createEntLoader(viewer, options, map) {
                 continue;
             }
             else if (!row) {
-                result[idx] = new ErrorWrapper(new Error(`couldn't find row for value ${ids[idx]}`));
+                if (tableName) {
+                    result[idx] = new ErrorWrapper(new Error(`couldn't find row for value ${ids[idx]} in table ${tableName}`));
+                }
+                else {
+                    result[idx] = new ErrorWrapper(new Error(`couldn't find row for value ${ids[idx]}`));
+                }
             }
             else {
                 const r = await applyPrivacyPolicyForRowImpl(viewer, options, row);
@@ -1404,14 +1410,17 @@ const edgeFields = [
 ];
 exports.DefaultLimit = 1000;
 // TODO default limit from somewhere
-function defaultEdgeQueryOptions(id1, edgeType) {
+function defaultEdgeQueryOptions(id1, edgeType, id2) {
+    let cls = clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType));
+    if (id2) {
+        cls = clause.And(cls, clause.Eq("id2", id2));
+    }
     return {
-        clause: clause.And(clause.Eq("id1", id1), clause.Eq("edge_type", edgeType)),
+        clause: cls,
         orderby: "time DESC",
         limit: exports.DefaultLimit,
     };
 }
-exports.defaultEdgeQueryOptions = defaultEdgeQueryOptions;
 async function loadEdges(options) {
     return loadCustomEdges({ ...options, ctr: AssocEdge });
 }
@@ -1432,30 +1441,37 @@ function getEdgeClauseAndFields(cls, options) {
 }
 exports.getEdgeClauseAndFields = getEdgeClauseAndFields;
 async function loadCustomEdges(options) {
-    const { id1, edgeType, context } = options;
-    const edgeData = await loadEdgeData(edgeType);
-    if (!edgeData) {
-        throw new Error(`error loading edge data for ${edgeType}`);
-    }
-    const defaultOptions = defaultEdgeQueryOptions(id1, edgeType);
-    let cls = defaultOptions.clause;
-    if (options.queryOptions?.clause) {
-        cls = clause.And(cls, options.queryOptions.clause);
-    }
-    const { cls: actualClause, fields } = getEdgeClauseAndFields(cls, options);
+    const { cls: actualClause, fields, defaultOptions, tableName, } = await loadEgesInfo(options);
     const rows = await loadRows({
-        tableName: edgeData.edgeTable,
+        tableName,
         fields: fields,
         clause: actualClause,
         orderby: options.queryOptions?.orderby || defaultOptions.orderby,
         limit: options.queryOptions?.limit || defaultOptions.limit,
-        context,
+        context: options.context,
     });
     return rows.map((row) => {
         return new options.ctr(row);
     });
 }
 exports.loadCustomEdges = loadCustomEdges;
+async function loadEgesInfo(options, id2) {
+    const { id1, edgeType } = options;
+    const edgeData = await loadEdgeData(edgeType);
+    if (!edgeData) {
+        throw new Error(`error loading edge data for ${edgeType}`);
+    }
+    const defaultOptions = defaultEdgeQueryOptions(id1, edgeType, id2);
+    let cls = defaultOptions.clause;
+    if (options.queryOptions?.clause) {
+        cls = clause.And(cls, options.queryOptions.clause);
+    }
+    return {
+        ...getEdgeClauseAndFields(cls, options),
+        defaultOptions,
+        tableName: edgeData.edgeTable,
+    };
+}
 async function loadUniqueEdge(options) {
     const { id1, edgeType, context } = options;
     const edgeData = await loadEdgeData(edgeType);
@@ -1505,10 +1521,16 @@ async function loadRawEdgeCountX(options) {
 }
 exports.loadRawEdgeCountX = loadRawEdgeCountX;
 async function loadEdgeForID2(options) {
-    // TODO at some point, same as in go, we can be smart about this and have heuristics to determine if we fetch everything here or not
-    // we're assuming a cache here but not always true and this can be expensive if not...
-    const edges = await loadCustomEdges(options);
-    return edges.find((edge) => edge.id2 == options.id2);
+    const { cls: actualClause, fields, tableName, } = await loadEgesInfo(options, options.id2);
+    const row = await loadRow({
+        tableName,
+        fields: fields,
+        clause: actualClause,
+        context: options.context,
+    });
+    if (row) {
+        return new options.ctr(row);
+    }
 }
 exports.loadEdgeForID2 = loadEdgeForID2;
 async function loadNodesByEdge(viewer, id1, edgeType, options) {
@@ -1565,26 +1587,45 @@ async function applyPrivacyPolicyForRows(viewer, rows, options) {
     return result.filter((r) => r !== undefined);
 }
 exports.applyPrivacyPolicyForRows = applyPrivacyPolicyForRows;
-async function loadEdgeWithConst(viewer, id1, id2, edgeEnum, edgeType) {
-    const edge = await loadEdgeForID2({
-        id1: id1,
-        id2: id2,
-        edgeType: edgeType,
-        context: viewer.context,
-        ctr: AssocEdge,
-    });
-    return [edgeEnum, edge];
-}
 // given a viewer, an id pair, and a map of edgeEnum to EdgeType
 // return the edgeEnum that's set in the group
 async function getEdgeTypeInGroup(viewer, id1, id2, m) {
     let promises = [];
-    for (const [k, v] of m) {
-        promises.push(loadEdgeWithConst(viewer, id1, id2, k, v));
+    const edgeDatas = await loadEdgeDatas(...Array.from(m.values()));
+    let tableToEdgeEnumMap = new Map();
+    for (const [edgeEnum, edgeType] of m) {
+        const edgeData = edgeDatas.get(edgeType);
+        if (!edgeData) {
+            throw new Error(`could not load edge data for '${edgeType}'`);
+        }
+        const l = tableToEdgeEnumMap.get(edgeData.edgeTable) ?? [];
+        l.push(edgeEnum);
+        tableToEdgeEnumMap.set(edgeData.edgeTable, l);
     }
+    tableToEdgeEnumMap.forEach((edgeEnums, tableName) => {
+        promises.push((async () => {
+            const edgeTypes = edgeEnums.map((edgeEnum) => m.get(edgeEnum));
+            const { cls, fields } = getEdgeClauseAndFields(clause.And(clause.Eq("id1", id1), clause.In("edge_type", edgeTypes), clause.Eq("id2", id2)), {});
+            const rows = await loadRows({
+                tableName,
+                fields,
+                clause: cls,
+                context: viewer.context,
+            });
+            const row = rows[0];
+            if (row) {
+                const edgeType = row.edge_type;
+                for (const [k, v] of m) {
+                    if (v === edgeType) {
+                        return [k, new AssocEdge(row)];
+                    }
+                }
+            }
+        })());
+    });
     const results = await Promise.all(promises);
     for (const res of results) {
-        if (res[1]) {
+        if (res && res[1]) {
             return [res[0], res[1]];
         }
     }

package/core/loaders/assoc_count_loader.js

@@ -45,11 +45,7 @@ class AssocEdgeCountLoader {
         if (!edgeData) {
             throw new Error(`error loading edge data for ${this.edgeType}`);
         }
-        const { cls } = (0, ent_1.getEdgeClauseAndFields)(clause.Eq("edge_type", this.edgeType), {
-            // don't need this..
-            id1: "1",
-            edgeType: this.edgeType,
-        });
+        const { cls } = (0, ent_1.getEdgeClauseAndFields)(clause.Eq("edge_type", this.edgeType), {});
         this.loader = (0, raw_count_loader_1.createCountDataLoader)({
             tableName: edgeData.edgeTable,
             groupCol: "id1",

package/graphql/index.d.ts

@@ -7,5 +7,4 @@ export { GraphQLNodeInterface } from "./builtins/node";
 export { GraphQLConnectionInterface } from "./builtins/connection";
 export { GraphQLEdgeInterface } from "./builtins/edge";
 export { NodeResolver, EntNodeResolver, registerResolver, clearResolvers, resolveID, nodeIDEncoder, mustDecodeIDFromGQLID, mustDecodeNullableIDFromGQLID, encodeGQLID, } from "./node_resolver";
-export { convertFromGQLEnum, convertToGQLEnum } from "./enums";
 export { transformUnionTypes } from "./mutations/union";

package/graphql/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformUnionTypes = exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
+exports.transformUnionTypes = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
 var graphql_1 = require("./graphql");
 Object.defineProperty(exports, "gqlField", { enumerable: true, get: function () { return graphql_1.gqlField; } });
 Object.defineProperty(exports, "gqlArg", { enumerable: true, get: function () { return graphql_1.gqlArg; } });
@@ -37,8 +37,5 @@ Object.defineProperty(exports, "nodeIDEncoder", { enumerable: true, get: functio
 Object.defineProperty(exports, "mustDecodeIDFromGQLID", { enumerable: true, get: function () { return node_resolver_1.mustDecodeIDFromGQLID; } });
 Object.defineProperty(exports, "mustDecodeNullableIDFromGQLID", { enumerable: true, get: function () { return node_resolver_1.mustDecodeNullableIDFromGQLID; } });
 Object.defineProperty(exports, "encodeGQLID", { enumerable: true, get: function () { return node_resolver_1.encodeGQLID; } });
-var enums_1 = require("./enums");
-Object.defineProperty(exports, "convertFromGQLEnum", { enumerable: true, get: function () { return enums_1.convertFromGQLEnum; } });
-Object.defineProperty(exports, "convertToGQLEnum", { enumerable: true, get: function () { return enums_1.convertToGQLEnum; } });
 var union_1 = require("./mutations/union");
 Object.defineProperty(exports, "transformUnionTypes", { enumerable: true, get: function () { return union_1.transformUnionTypes; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha92-7ebc5680-4591-11ed-b331-8b0a5597e9d8",
+  "version": "0.1.0-alpha92",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/parse_schema/parse.js

@@ -229,6 +229,7 @@ async function parseSchema(potentialSchemas, globalSchema) {
         }
         let processedSchema = {
             fields: [],
+            fieldOverrides: schema.fieldOverrides,
             schemaPath: schema.schemaPath,
             tableName: schema.tableName,
             enumTable: schema.enumTable,

package/schema/base_schema.d.ts

@@ -1,4 +1,4 @@
-import { Field, FieldMap, Pattern } from "./schema";
+import { Field, FieldMap, Pattern, FieldOverrideMap } from "./schema";
 import { Action, AssocEdgeGroup, Constraint, Edge, Index, Schema } from ".";
 export declare const Timestamps: Pattern;
 export declare const Node: Pattern;
@@ -6,6 +6,7 @@ export interface SchemaConfig extends Schema {
 }
 export declare class EntSchema implements Schema {
     fields: FieldMap | Field[];
+    fieldOverrides: FieldOverrideMap | undefined;
     tableName: string | undefined;
     patterns: Pattern[];
     edges: Edge[] | undefined;
@@ -22,6 +23,7 @@ export declare class EntSchema implements Schema {
 }
 export declare class EntSchemaWithTZ implements Schema {
     fields: FieldMap | Field[];
+    fieldOverrides: FieldOverrideMap | undefined;
     tableName: string | undefined;
     patterns: Pattern[];
     edges: Edge[] | undefined;

package/schema/base_schema.js

@@ -74,6 +74,7 @@ class EntSchema {
     constructor(cfg) {
         this.patterns = [exports.Node];
         this.fields = cfg.fields;
+        this.fieldOverrides = cfg.fieldOverrides;
         this.tableName = cfg.tableName;
         if (cfg.patterns) {
             this.patterns.push(...cfg.patterns);
@@ -100,6 +101,7 @@ class EntSchemaWithTZ {
             },
         ];
         this.fields = cfg.fields;
+        this.fieldOverrides = cfg.fieldOverrides;
         this.tableName = cfg.tableName;
         if (cfg.patterns) {
             this.patterns.push(...cfg.patterns);

package/schema/field.d.ts

@@ -152,7 +152,6 @@ export declare class EnumField extends BaseField implements Field {
     private values?;
     private map?;
     constructor(options: StringEnumOptions);
-    convertForGQL(value: string): string;
     valid(val: any): boolean;
     format(val: any): any;
 }

package/schema/field.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
-const snake_case_1 = require("snake-case");
 const camel_case_1 = require("camel-case");
 const util_1 = require("util");
 const uuid_1 = require("uuid");
@@ -553,10 +552,6 @@ class EnumField extends BaseField {
         this.values = options.values;
         this.map = options.map;
     }
-    // TODO need to update this for map
-    convertForGQL(value) {
-        return (0, snake_case_1.snakeCase)(value).toUpperCase();
-    }
     valid(val) {
         // lookup table enum and indicated via presence of foreignKey
         if (!this.values && !this.map) {
@@ -564,45 +559,17 @@ class EnumField extends BaseField {
         }
         if (this.values) {
             let str = String(val);
-            return this.values.some((value) => value === str || this.convertForGQL(value) === str);
+            return this.values.some((value) => value === str);
         }
         for (const k in this.map) {
             const v = this.map[k];
-            if (v === val || this.convertForGQL(k) === val) {
-                // TODO decide on behavior for GQL since GQL only supports one type
+            if (v === val) {
                 return true;
             }
         }
         return false;
     }
     format(val) {
-        // TODO need to format correctly for graphql purposes...
-        // how to best get the values in the db...
-        if (!this.values && !this.map) {
-            return val;
-        }
-        let str = String(val);
-        if (this.values) {
-            for (let i = 0; i < this.values.length; i++) {
-                let value = this.values[i];
-                // store the format that maps to the given value in the db instead of saving the upper case value
-                if (str === value || str === this.convertForGQL(value)) {
-                    return value;
-                }
-            }
-        }
-        if (this.map) {
-            for (const k in this.map) {
-                const v = this.map[k];
-                if (str === v) {
-                    return v;
-                }
-                if (str === this.convertForGQL(k)) {
-                    return v;
-                }
-            }
-        }
-        // whelp, just return what's passed
         return val;
     }
 }

package/schema/schema.d.ts

@@ -18,8 +18,13 @@ export interface GlobalSchema {
     transformEdgeRead?: () => Clause;
     transformEdgeWrite?: (stmt: EdgeUpdateOperation) => TransformedEdgeUpdateOperation | null;
 }
+declare type FieldOverride = Pick<FieldOptions, "nullable" | "storageKey" | "serverDefault" | "unique" | "hideFromGraphQL" | "graphqlName" | "index">;
+export declare type FieldOverrideMap = {
+    [key: string]: FieldOverride;
+};
 export default interface Schema {
     fields: FieldMap | Field[];
+    fieldOverrides?: FieldOverrideMap;
     tableName?: string;
     patterns?: Pattern[];
     edges?: Edge[];
@@ -260,6 +265,7 @@ export interface ActionField {
     list?: boolean;
     actionName?: string;
     excludedFields?: string[];
+    hideFromGraphQL?: boolean;
     [x: string]: any;
 }
 export interface Action {

package/schema/schema.js

@@ -211,6 +211,9 @@ var ActionOperation;
     // RemoveEdge is used to provide the ability to remove an edge in an AssociationEdge.
     ActionOperation[ActionOperation["RemoveEdge"] = 32] = "RemoveEdge";
     // EdgeGroup is used to provide the ability to edit an edge group in an AssociationEdgeGroup.
+    // if you want to clear this edge group e.g. any set edge with id1 and id2,
+    // you should create a custom action that takes the id as an action only field,
+    // and then calls `clearEdgeTypeInGroup` in a trigger to clear
     ActionOperation[ActionOperation["EdgeGroup"] = 64] = "EdgeGroup";
 })(ActionOperation = exports.ActionOperation || (exports.ActionOperation = {}));
 // sentinel that indicates an action has no fields

package/schema/struct_field.js

@@ -31,9 +31,6 @@ class StructField extends field_1.BaseField {
         for (const k in this.options.fields) {
             const field = this.options.fields[k];
             // check two values
-            // wait, two different things
-            // getStoragetKey and getCamelCase()
-            // for weird graphql case and for typescript format...
             // store in dbKey format
             // TODO more #510
             let dbKey = (0, schema_1.getStorageKey)(field, k);

package/testutils/builder.d.ts

@@ -2,7 +2,7 @@ import { Ent, ID, Viewer, Data, EntConstructor, PrivacyPolicy } from "../core/ba
 import { Orchestrator } from "../action/orchestrator";
 import { Action, Builder, Changeset, WriteOperation, Validator, Trigger, Observer } from "../action";
 import { FieldMap, Schema } from "../schema";
-import { SchemaConfig } from "../schema/base_schema";
+import { SchemaConfig, EntSchema } from "../schema/base_schema";
 import { FieldInfoMap } from "../schema/schema";
 export declare class User implements Ent {
     viewer: Viewer;
@@ -62,6 +62,10 @@ export declare class Address implements Ent {
 export interface BuilderSchema<T extends Ent> extends Schema {
     ent: EntConstructor<T>;
 }
+export declare class EntBuilderSchema<T extends Ent> extends EntSchema {
+    ent: EntConstructor<T>;
+    constructor(ent: EntConstructor<T>, cfg: SchemaConfig);
+}
 export declare function getBuilderSchema<T extends Ent>(cfg: SchemaConfig, ent: EntConstructor<T>): BuilderSchema<T>;
 export declare function getBuilderSchemaFromFields<T extends Ent>(fields: FieldMap, ent: EntConstructor<T>): BuilderSchema<T>;
 export declare function getBuilderSchemaTZFromFields<T extends Ent>(fields: FieldMap, ent: EntConstructor<T>): BuilderSchema<T>;

package/testutils/builder.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = void 0;
+exports.SimpleAction = exports.SimpleBuilder = exports.getFieldInfo = exports.getTableName = exports.getSchemaName = exports.getBuilderSchemaTZFromFields = exports.getBuilderSchemaFromFields = exports.getBuilderSchema = exports.EntBuilderSchema = exports.Address = exports.Message = exports.Group = exports.Contact = exports.Event = exports.User = void 0;
 const privacy_1 = require("../core/privacy");
 const orchestrator_1 = require("../action/orchestrator");
 const action_1 = require("../action");
@@ -99,6 +99,13 @@ class Address {
     }
 }
 exports.Address = Address;
+class EntBuilderSchema extends base_schema_1.EntSchema {
+    constructor(ent, cfg) {
+        super(cfg);
+        this.ent = ent;
+    }
+}
+exports.EntBuilderSchema = EntBuilderSchema;
 function getBuilderSchema(cfg, ent) {
     return {
         ...new base_schema_1.EntSchema(cfg),

package/testutils/db/temp_db.js

@@ -355,9 +355,6 @@ function randomDB() {
     // always ensure it starts with an alpha character
     return "abcdefghijklmnopqrstuvwxyz"[Math.floor(Math.random() * 26)] + str;
 }
-function isDialect(dialect) {
-    return !Array.isArray(dialect);
-}
 class TempDB {
     constructor(dialect, tables) {
         this.tables = new Map();

package/graphql/enums.d.ts

@@ -1,3 +0,0 @@
-import { GraphQLEnumValue } from "graphql";
-export declare function convertToGQLEnum(val: string | null, tsValues: string[], gqlValues: GraphQLEnumValue[]): any;
-export declare function convertFromGQLEnum(val: string, tsValues: string[], gqlValues: GraphQLEnumValue[]): string;

package/graphql/enums.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertFromGQLEnum = exports.convertToGQLEnum = void 0;
-function convertToGQLEnum(val, tsValues, gqlValues) {
-    for (let i = 0; i < tsValues.length; i++) {
-        let tsVal = tsValues[i];
-        let gqlValue = gqlValues[i];
-        if (val === tsVal) {
-            return gqlValue.value;
-        }
-    }
-    return val;
-}
-exports.convertToGQLEnum = convertToGQLEnum;
-function convertFromGQLEnum(val, tsValues, gqlValues) {
-    for (let i = 0; i < tsValues.length; i++) {
-        let tsVal = tsValues[i];
-        let gqlValue = gqlValues[i];
-        if (val === gqlValue.value) {
-            return tsVal;
-        }
-    }
-    return val;
-}
-exports.convertFromGQLEnum = convertFromGQLEnum;