@snowtop/ent 0.1.0-alpha3 → 0.1.0-alpha8

package/core/loaders/object_loader.js

@@ -29,6 +29,9 @@ const clause = __importStar(require("../clause"));
 const logger_1 = require("../logger");
 const loader_1 = require("./loader");
 const memoizee_1 = __importDefault(require("memoizee"));
+// optional clause...
+// so ObjectLoaderFactory and createDataLoader need to take a new optional field which is a clause that's always added here
+// and we need a disableTransform which skips loader completely and uses loadRow...
 function createDataLoader(options) {
     const loaderOptions = {};
     // if query logging is enabled, we should log what's happening with loader
@@ -40,9 +43,22 @@ function createDataLoader(options) {
             return [];
         }
         let col = options.key;
+        let cls = clause.In(col, ...ids);
+        if (options.clause) {
+            let optionClause;
+            if (typeof options.clause === "function") {
+                optionClause = options.clause();
+            }
+            else {
+                optionClause = options.clause;
+            }
+            if (optionClause) {
+                cls = clause.And(optionClause, cls);
+            }
+        }
         const rowOptions = {
             ...options,
-            clause: clause.In(col, ...ids),
+            clause: cls,
         };
         let m = new Map();
         let result = [];
@@ -77,6 +93,9 @@ class ObjectLoader {
         }
         this.memoizedInitPrime = (0, memoizee_1.default)(this.initPrime.bind(this));
     }
+    getOptions() {
+        return this.options;
+    }
     initPrime() {
         if (!this.context || !this.toPrime) {
             return;
@@ -107,9 +126,22 @@ class ObjectLoader {
             }
             return result;
         }
+        let cls = clause.Eq(this.options.key, key);
+        if (this.options.clause) {
+            let optionClause;
+            if (typeof this.options.clause === "function") {
+                optionClause = this.options.clause();
+            }
+            else {
+                optionClause = this.options.clause;
+            }
+            if (optionClause) {
+                cls = clause.And(optionClause, cls);
+            }
+        }
         const rowOptions = {
             ...this.options,
-            clause: clause.Eq(this.options.key, key),
+            clause: cls,
             context: this.context,
         };
         return await (0, ent_1.loadRow)(rowOptions);
@@ -121,9 +153,22 @@ class ObjectLoader {
         if (this.loader) {
             return await this.loader.loadMany(keys);
         }
+        let cls = clause.In(this.options.key, ...keys);
+        if (this.options.clause) {
+            let optionClause;
+            if (typeof this.options.clause === "function") {
+                optionClause = this.options.clause();
+            }
+            else {
+                optionClause = this.options.clause;
+            }
+            if (optionClause) {
+                cls = clause.And(optionClause, cls);
+            }
+        }
         const rowOptions = {
             ...this.options,
-            clause: clause.In(this.options.key, ...keys),
+            clause: cls,
             context: this.context,
         };
         return await (0, ent_1.loadRows)(rowOptions);
@@ -142,7 +187,17 @@ class ObjectLoaderFactory {
     constructor(options) {
         this.options = options;
         this.toPrime = [];
-        this.name = `${options.tableName}:${options.key}`;
+        // we don't wanna do it here because we want it to be delayed
+        let instanceKey = "";
+        if (typeof this.options.clause === "function") {
+            if (!options.instanceKey) {
+                throw new Error(`need to pass an instanceKey to ObjectLoader if clause is a function`);
+            }
+        }
+        else if (this.options.clause) {
+            instanceKey = this.options.clause.instanceKey();
+        }
+        this.name = `${options.tableName}:${options.key}:${instanceKey}`;
     }
     createLoader(context) {
         return (0, loader_1.getLoader)(this, () => {

package/core/privacy.js

@@ -464,6 +464,9 @@ async function applyPrivacyPolicyX(v, policy, ent, throwErr) {
             if (res.error) {
                 throw res.error;
             }
+            if (res.getError) {
+                throw res.getError(policy, rule, ent);
+            }
             if (throwErr) {
                 throw throwErr();
             }

package/core/viewer.d.ts

@@ -17,6 +17,7 @@ export declare class IDViewer implements Viewer {
     context?: Context;
     constructor(viewerID: ID, opts?: Partial<IDViewerOptions>);
     constructor(opts: IDViewerOptions);
+    setContext(ctx: Context): this;
     viewer(): Promise<Ent | null>;
     instanceKey(): string;
 }

package/core/viewer.js

@@ -27,6 +27,10 @@ class IDViewer {
         this.ent = opts?.ent || null;
         this.context = opts?.context;
     }
+    setContext(ctx) {
+        this.context = ctx;
+        return this;
+    }
     async viewer() {
         return this.ent;
     }

package/graphql/graphql.d.ts

@@ -82,6 +82,9 @@ declare enum NullableResult {
     CONTENTS_AND_LIST = "contentsAndList",
     ITEM = "true"
 }
+export declare const knownAllowedNames: Map<string, string>;
+export declare const knownDisAllowedNames: Map<string, boolean>;
+export declare const isCustomType: (type: Type) => type is CustomType;
 export declare const addCustomType: (type: CustomType) => void;
 export declare class GQLCapture {
     private static enabled;
@@ -107,8 +110,6 @@ export declare class GQLCapture {
     static getProcessedCustomMutations(): ProcessedCustomField[];
     static getProcessedCustomQueries(): ProcessedCustomField[];
     private static getProcessedCustomFieldsImpl;
-    private static knownAllowedNames;
-    private static knownDisAllowedNames;
     private static getResultFromMetadata;
     static gqlField(options?: gqlFieldOptions): any;
     private static getCustomField;

package/graphql/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.CustomFieldType = void 0;
+exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.isCustomType = exports.knownDisAllowedNames = exports.knownAllowedNames = exports.CustomFieldType = void 0;
 require("reflect-metadata");
 // export interface gqlTopLevelOptions
 //   name?: string;
@@ -20,6 +20,22 @@ var NullableResult;
     NullableResult["CONTENTS_AND_LIST"] = "contentsAndList";
     NullableResult["ITEM"] = "true";
 })(NullableResult || (NullableResult = {}));
+exports.knownAllowedNames = new Map([
+    ["Date", "Date"],
+    ["Boolean", "boolean"],
+    ["Number", "number"],
+    ["String", "string"],
+    // TODO not right to have this and Number
+    ["Int", "number"],
+    ["Float", "number"],
+    ["ID", "ID"],
+]);
+exports.knownDisAllowedNames = new Map([
+    ["Function", true],
+    ["Object", true],
+    ["Array", true],
+    ["Promise", true],
+]);
 const isArray = (type) => {
     if (typeof type === "function") {
         return false;
@@ -41,6 +57,7 @@ const isString = (type) => {
 const isCustomType = (type) => {
     return type.importPath !== undefined;
 };
+exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
     return type.serialize !== undefined;
 };
@@ -92,7 +109,7 @@ const getType = (typ, result) => {
         }
         return;
     }
-    if (isCustomType(typ)) {
+    if ((0, exports.isCustomType)(typ)) {
         result.type = typ.type;
         (0, exports.addCustomType)(typ);
         return;
@@ -197,20 +214,20 @@ class GQLCapture {
             connection = r.connection;
             type = r.type;
         }
-        if (GQLCapture.knownDisAllowedNames.has(type)) {
+        if (exports.knownDisAllowedNames.has(type)) {
             throw new Error(`${type} isn't a valid type for accessor/function/property`);
         }
         let result = {
             name: metadata.paramName || "",
             type,
-            tsType: this.knownAllowedNames.get(type) || this.customTypes.get(type)?.tsType,
+            tsType: exports.knownAllowedNames.get(type) || this.customTypes.get(type)?.tsType,
             nullable: options?.nullable,
             list: list,
             connection: connection,
             isContextArg: metadata.isContextArg,
         };
         // unknown type. we need to flag that this field needs to eventually be resolved
-        if (!GQLCapture.knownAllowedNames.has(type)) {
+        if (!exports.knownAllowedNames.has(type)) {
             if (scalarType) {
                 throw new Error(`custom scalar type ${type} is not supported this way. use CustomType syntax. see \`gqlFileUpload\` as an example`);
             }
@@ -461,22 +478,6 @@ GQLCapture.customArgs = new Map();
 GQLCapture.customInputObjects = new Map();
 GQLCapture.customObjects = new Map();
 GQLCapture.customTypes = new Map();
-GQLCapture.knownAllowedNames = new Map([
-    ["Date", "Date"],
-    ["Boolean", "boolean"],
-    ["Number", "number"],
-    ["String", "string"],
-    // TODO not right to have this and Number
-    ["Int", "number"],
-    ["Float", "number"],
-    ["ID", "ID"],
-]);
-GQLCapture.knownDisAllowedNames = new Map([
-    ["Function", true],
-    ["Object", true],
-    ["Array", true],
-    ["Promise", true],
-]);
 // User -> add -> [{name, options}, {}, {}]
 GQLCapture.argMap = new Map();
 // why is this a static class lol?

package/graphql/index.d.ts

@@ -8,3 +8,4 @@ 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.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.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;
 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; } });
@@ -40,3 +40,5 @@ Object.defineProperty(exports, "encodeGQLID", { enumerable: true, get: function
 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/graphql/mutations/union.d.ts

@@ -0,0 +1,2 @@
+import { Data } from "../../core/base";
+export declare function transformUnionTypes<T extends Data>(input: T, pathsList: string[][]): T;

package/graphql/mutations/union.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformUnionTypes = void 0;
+// this transforms an input for union types from graphql format to TS format
+// in graphql, we represent it as UnionType =  {foo: FooType, bar: BarType, baz: BazType}
+// in TS, we repseent it as UnionType = FooType | BarType | BazType
+// this takes an input, paths to unions and transforms them as needed
+// only works on fields that are defined. depends on graphql to handle nullable/missing fields
+function transformUnionTypes(input, pathsList) {
+    for (const paths of pathsList) {
+        const lastPath = paths[paths.length - 1];
+        let last = input;
+        for (const path of paths) {
+            let curr = last[path];
+            if (curr === undefined) {
+                break;
+            }
+            if (path === lastPath) {
+                let count = 0;
+                let lastKey = undefined;
+                for (const k in curr) {
+                    count++;
+                    lastKey = k;
+                }
+                if (count != 1) {
+                    throw new Error(`can only only pass one key of union. passed ${count}`);
+                }
+                last[path] = curr[lastKey];
+            }
+            last = curr;
+        }
+    }
+    return input;
+}
+exports.transformUnionTypes = transformUnionTypes;

package/graphql/node_resolver.d.ts

@@ -5,7 +5,6 @@ interface Node {
     id: ID;
 }
 export interface NodeResolver {
-    encode(node: Node): string;
     decodeObj(viewer: Viewer, id: string): Promise<Node | null>;
 }
 interface loadEnt {

package/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./core/base";
-export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, applyPrivacyPolicyForEnt, applyPrivacyPolicyForEntX, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, } from "./core/ent";
+export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, } from "./core/ent";
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };
@@ -11,12 +11,27 @@ declare const query: {
     Eq: typeof q.Eq;
     NotEq: typeof q.NotEq;
     And: typeof q.And;
+    AndOptional: typeof q.AndOptional;
     Or: typeof q.Or;
     In: typeof q.In;
     Greater: typeof q.Greater;
     Less: typeof q.Less;
     GreaterEq: typeof q.GreaterEq;
     LessEq: typeof q.LessEq;
+    ArrayEq: typeof q.ArrayEq;
+    ArrayNotEq: typeof q.ArrayNotEq;
+    ArrayGreater: typeof q.ArrayGreater;
+    ArrayLess: typeof q.ArrayLess;
+    ArrayGreaterEq: typeof q.ArrayGreaterEq;
+    ArrayLessEq: typeof q.ArrayLessEq;
+    TsQuery: typeof q.TsQuery;
+    PlainToTsQuery: typeof q.PlainToTsQuery;
+    PhraseToTsQuery: typeof q.PhraseToTsQuery;
+    WebsearchToTsQuery: typeof q.WebsearchToTsQuery;
+    TsVectorColTsQuery: typeof q.TsVectorColTsQuery;
+    TsVectorPlainToTsQuery: typeof q.TsVectorPlainToTsQuery;
+    TsVectorPhraseToTsQuery: typeof q.TsVectorPhraseToTsQuery;
+    TsVectorWebsearchToTsQuery: typeof q.TsVectorWebsearchToTsQuery;
 };
 export { query };
 export { RequestContext, ContextCache } from "./core/context";

package/index.js

@@ -25,8 +25,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
-exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = void 0;
+exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
+exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = void 0;
 __exportStar(require("./core/base"), exports);
 var ent_1 = require("./core/ent");
 Object.defineProperty(exports, "loadEnt", { enumerable: true, get: function () { return ent_1.loadEnt; } });
@@ -38,8 +38,6 @@ Object.defineProperty(exports, "loadDerivedEnt", { enumerable: true, get: functi
 Object.defineProperty(exports, "loadDerivedEntX", { enumerable: true, get: function () { return ent_1.loadDerivedEntX; } });
 Object.defineProperty(exports, "loadEntViaKey", { enumerable: true, get: function () { return ent_1.loadEntViaKey; } });
 Object.defineProperty(exports, "loadEntXViaKey", { enumerable: true, get: function () { return ent_1.loadEntXViaKey; } });
-Object.defineProperty(exports, "applyPrivacyPolicyForEnt", { enumerable: true, get: function () { return ent_1.applyPrivacyPolicyForEnt; } });
-Object.defineProperty(exports, "applyPrivacyPolicyForEntX", { enumerable: true, get: function () { return ent_1.applyPrivacyPolicyForEntX; } });
 Object.defineProperty(exports, "performRawQuery", { enumerable: true, get: function () { return ent_1.performRawQuery; } });
 // even these 3 need to change...
 Object.defineProperty(exports, "loadRowX", { enumerable: true, get: function () { return ent_1.loadRowX; } });
@@ -62,7 +60,7 @@ Object.defineProperty(exports, "getEdgeTypeInGroup", { enumerable: true, get: fu
 const db_1 = __importDefault(require("./core/db"));
 exports.DB = db_1.default;
 __exportStar(require("./core/loaders"), exports);
-// TODO figure out if this should be its own
+// TODO figure out if this should be its own import path e.g. @snowtop/ent/privacy
 var privacy_1 = require("./core/privacy");
 Object.defineProperty(exports, "EntPrivacyError", { enumerable: true, get: function () { return privacy_1.EntPrivacyError; } });
 Object.defineProperty(exports, "AlwaysAllowRule", { enumerable: true, get: function () { return privacy_1.AlwaysAllowRule; } });
@@ -109,12 +107,27 @@ const query = {
     Eq: q.Eq,
     NotEq: q.NotEq,
     And: q.And,
+    AndOptional: q.AndOptional,
     Or: q.Or,
     In: q.In,
     Greater: q.Greater,
     Less: q.Less,
     GreaterEq: q.GreaterEq,
     LessEq: q.LessEq,
+    ArrayEq: q.ArrayEq,
+    ArrayNotEq: q.ArrayNotEq,
+    ArrayGreater: q.ArrayGreater,
+    ArrayLess: q.ArrayLess,
+    ArrayGreaterEq: q.ArrayGreaterEq,
+    ArrayLessEq: q.ArrayLessEq,
+    TsQuery: q.TsQuery,
+    PlainToTsQuery: q.PlainToTsQuery,
+    PhraseToTsQuery: q.PhraseToTsQuery,
+    WebsearchToTsQuery: q.WebsearchToTsQuery,
+    TsVectorColTsQuery: q.TsVectorColTsQuery,
+    TsVectorPlainToTsQuery: q.TsVectorPlainToTsQuery,
+    TsVectorPhraseToTsQuery: q.TsVectorPhraseToTsQuery,
+    TsVectorWebsearchToTsQuery: q.TsVectorWebsearchToTsQuery,
 };
 exports.query = query;
 var context_1 = require("./core/context");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha3",
+  "version": "0.1.0-alpha8",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,7 +17,7 @@
     "json5": "^2.1.3",
     "luxon": "^1.25.0",
     "memoizee": "^0.4.15",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "pascal-case": "^3.1.2",
     "pg": "^8.0.3",
     "prettier": "^2.3.2",

package/parse_schema/parse.d.ts

@@ -1,5 +1,5 @@
-import { Schema, Field, AssocEdge, AssocEdgeGroup, Action, Type } from "../schema";
-import { ActionField } from "../schema/schema";
+import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
+import { ActionField, Type } from "../schema/schema";
 declare enum NullableResult {
     CONTENTS = "contents",
     CONTENTS_AND_LIST = "contentsAndList",
@@ -12,7 +12,13 @@ declare type ProcessedAssocEdge = Omit<AssocEdge, "actionOnlyFields" | "edgeActi
     patternName?: string;
     edgeActions?: OutputAction[];
 };
-declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields"> & {
+interface TransformFlags {
+    transformsSelect?: boolean;
+    transformsDelete?: boolean;
+    transformsInsert?: boolean;
+    transformsUpdate?: boolean;
+}
+declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields"> & TransformFlags & {
     actions: OutputAction[];
     assocEdges: ProcessedAssocEdge[];
     assocEdgeGroups: ProcessedAssocEdgeGroup[];
@@ -37,11 +43,12 @@ declare type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFie
     listElemType?: ProcessedType;
     unionFields?: ProcessedField[];
 };
-declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "type"> & {
+declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type"> & {
     name: string;
     hasDefaultValueOnCreate?: boolean;
     hasDefaultValueOnEdit?: boolean;
     patternName?: string;
+    hasFieldPrivacy?: boolean;
     derivedFields?: ProcessedField[];
     type: ProcessedType;
 };

package/parse_schema/parse.js

@@ -22,6 +22,7 @@ function processFields(src, patternName) {
         let f = { name, ...field };
         f.hasDefaultValueOnCreate = field.defaultValueOnCreate != undefined;
         f.hasDefaultValueOnEdit = field.defaultValueOnEdit != undefined;
+        f.hasFieldPrivacy = field.privacyPolicy !== undefined;
         if (field.polymorphic) {
             // convert boolean into object
             // we keep boolean as an option to keep API simple
@@ -46,6 +47,7 @@ function processFields(src, patternName) {
         if (patternName) {
             f.patternName = patternName;
         }
+        transformType(field.type);
         if (field.getDerivedFields) {
             f.derivedFields = processFields(field.getDerivedFields(name));
         }
@@ -65,6 +67,24 @@ function processFields(src, patternName) {
     }
     return ret;
 }
+function transformImportType(typ) {
+    if (!typ.importType) {
+        return;
+    }
+    typ.importType = {
+        ...typ.importType,
+        // these 2 needed for forwards compatibility with new go schema
+        importPath: typ.importType.path,
+        import: typ.importType.type,
+    };
+}
+function transformType(typ) {
+    if (!typ) {
+        return;
+    }
+    transformImportType(typ);
+    transformType(typ.listElemType);
+}
 function processEdges(src, patternName) {
     const ret = [];
     for (const edge of src) {
@@ -89,6 +109,9 @@ function processEdgeGroups(processedSchema, edgeGroups) {
     }
 }
 function processPattern(patterns, pattern, processedSchema) {
+    let ret = {
+        ...pattern,
+    };
     const name = pattern.name;
     const fields = processFields(pattern.fields, pattern.name);
     processedSchema.fields.push(...fields);
@@ -96,6 +119,10 @@ function processPattern(patterns, pattern, processedSchema) {
         const edges = processEdges(pattern.edges, pattern.name);
         processedSchema.assocEdges.push(...edges);
     }
+    // flag transformsSelect
+    if (pattern.transformRead) {
+        ret.transformsSelect = true;
+    }
     if (patterns[name] === undefined) {
         // intentionally processing separately and not passing pattern.name
         const edges = processEdges(pattern.edges || []);
@@ -109,6 +136,7 @@ function processPattern(patterns, pattern, processedSchema) {
         // TODO ideally we want to make sure that different patterns don't have the same name
         // can't do a deepEqual check because function calls and therefore different instances in fields
     }
+    return ret;
 }
 var NullableResult;
 (function (NullableResult) {
@@ -149,11 +177,15 @@ function parseSchema(potentialSchemas) {
     for (const key in potentialSchemas) {
         const value = potentialSchemas[key];
         let schema;
-        if (value.constructor == Object) {
-            schema = value;
-        }
-        else {
-            schema = new value();
+        const name = value.constructor.name;
+        // named class e.g. new BaseEntSchema
+        switch (name) {
+            case "Function":
+                schema = new value();
+                break;
+            default:
+                // implicit schema or named class
+                schema = value;
         }
         let processedSchema = {
             fields: [],
@@ -171,7 +203,19 @@ function parseSchema(potentialSchemas) {
         // ¯\_(ツ)_/¯
         if (schema.patterns) {
             for (const pattern of schema.patterns) {
-                processPattern(patterns, pattern, processedSchema);
+                const ret = processPattern(patterns, pattern, processedSchema);
+                if (ret.transformsSelect) {
+                    if (processedSchema.transformsSelect) {
+                        throw new Error(`can only have one pattern which transforms default querying behavior`);
+                    }
+                    processedSchema.transformsSelect = true;
+                }
+                if (ret.transformsDelete) {
+                    if (processedSchema.transformsDelete) {
+                        throw new Error(`can only have one pattern which transforms default deletion behavior`);
+                    }
+                    processedSchema.transformsDelete = true;
+                }
             }
         }
         const fields = processFields(schema.fields);

package/schema/base_schema.d.ts

@@ -1,6 +1,41 @@
-import { Pattern } from "./schema";
+import { Field, FieldMap, Pattern } from "./schema";
+import { Action, AssocEdgeGroup, Constraint, Edge, Index, Schema } from ".";
 export declare const Timestamps: Pattern;
 export declare const Node: Pattern;
+export interface SchemaConfig extends Schema {
+}
+export declare class EntSchema implements Schema {
+    fields: FieldMap | Field[];
+    tableName: string | undefined;
+    patterns: Pattern[];
+    edges: Edge[] | undefined;
+    edgeGroups: AssocEdgeGroup[] | undefined;
+    actions: Action[] | undefined;
+    enumTable: boolean | undefined;
+    dbRows: {
+        [key: string]: any;
+    }[] | undefined;
+    constraints: Constraint[] | undefined;
+    indices: Index[] | undefined;
+    hideFromGraphQL?: boolean;
+    constructor(cfg: SchemaConfig);
+}
+export declare class EntSchemaWithTZ {
+    fields: FieldMap | Field[];
+    tableName: string | undefined;
+    patterns: Pattern[];
+    edges: Edge[] | undefined;
+    edgeGroups: AssocEdgeGroup[] | undefined;
+    actions: Action[] | undefined;
+    enumTable: boolean | undefined;
+    dbRows: {
+        [key: string]: any;
+    }[] | undefined;
+    constraints: Constraint[] | undefined;
+    indices: Index[] | undefined;
+    hideFromGraphQL?: boolean;
+    constructor(cfg: SchemaConfig);
+}
 export declare abstract class BaseEntSchema {
     addPatterns(...patterns: Pattern[]): void;
     patterns: Pattern[];