@snowtop/ent 0.1.0-alpha10 → 0.1.0-alpha101

package/core/viewer.d.ts

@@ -1,7 +1,7 @@
 import { ID, Ent, Viewer, Context } from "./base";
 export declare class LoggedOutViewer implements Viewer {
-    context?: Context | undefined;
-    constructor(context?: Context | undefined);
+    context?: Context<Viewer<Ent<any> | null, ID | null>> | undefined;
+    constructor(context?: Context<Viewer<Ent<any> | null, ID | null>> | undefined);
     viewerID: null;
     viewer(): Promise<null>;
     instanceKey(): string;
@@ -18,6 +18,6 @@ export declare class IDViewer implements Viewer {
     constructor(viewerID: ID, opts?: Partial<IDViewerOptions>);
     constructor(opts: IDViewerOptions);
     setContext(ctx: Context): this;
-    viewer(): Promise<Ent | null>;
+    viewer(): Promise<Ent<Viewer<Ent<any> | null, ID | null>> | null>;
     instanceKey(): string;
 }

package/core/viewer.js

@@ -35,7 +35,7 @@ class IDViewer {
         return this.ent;
     }
     instanceKey() {
-        return `idViewer: ${this.viewerID}`;
+        return `idViewer:${this.viewerID}`;
     }
 }
 exports.IDViewer = IDViewer;

package/graphql/graphql.d.ts

@@ -3,15 +3,20 @@ import { GraphQLScalarType } from "graphql";
 interface ClassType<T = any> {
     new (...args: any[]): T;
 }
+declare type StringToStringMap = {
+    [key: string]: string;
+};
 export interface CustomType {
     type: string;
     importPath: string;
     tsType?: string;
     tsImportPath?: string;
+    enumMap?: StringToStringMap;
+    inputType?: boolean;
     [x: string]: any;
 }
-declare type Type = GraphQLScalarType | ClassType | string | CustomType;
-export declare type GraphQLConnection<T> = {
+type Type = GraphQLScalarType | ClassType | string | CustomType;
+export type GraphQLConnection<T> = {
     node: T;
 };
 export interface gqlFieldOptions {
@@ -24,7 +29,7 @@ export interface gqlObjectOptions {
     name?: string;
     description?: string;
 }
-declare type gqlTopLevelOptions = Exclude<gqlFieldOptions, "nullable">;
+type gqlTopLevelOptions = Exclude<gqlFieldOptions, "nullable">;
 export declare enum CustomFieldType {
     Accessor = "ACCESSOR",
     Field = "FIELD",
@@ -42,6 +47,8 @@ interface CustomFieldImpl {
 export interface CustomField extends CustomFieldImpl {
     args: Field[];
     results: Field[];
+    extraImports?: any[];
+    functionContents?: string;
 }
 export interface CustomMutation extends CustomField {
 }
@@ -51,15 +58,15 @@ export interface ProcessedCustomField extends CustomFieldImpl {
     args: ProcessedField[];
     results: ProcessedField[];
 }
-export declare type ProcessCustomFieldMap = {
-    [key: string]: ProcessedCustomField;
+export type ProcessCustomFieldMap = {
+    [key: string]: ProcessedCustomField[];
 };
 export interface CustomObject {
     nodeName: string;
     className: string;
     description?: string;
 }
-declare type NullableListOptions = "contents" | "contentsAndList";
+type NullableListOptions = "contents" | "contentsAndList";
 interface FieldImpl {
     type: string;
     tsType?: string;
@@ -85,7 +92,7 @@ declare enum NullableResult {
 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 const addCustomType: (type: CustomType, gqlCapture: typeof GQLCapture) => void;
 export declare class GQLCapture {
     private static enabled;
     static enable(enabled: boolean): void;

package/graphql/graphql.js

@@ -61,13 +61,15 @@ exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
     return type.serialize !== undefined;
 };
-const addCustomType = (type) => {
+const addCustomType = (type, gqlCapture) => {
     // TODO these should return ReadOnly objects...
-    const customType = GQLCapture.getCustomTypes().get(type.type);
-    if (customType && customType !== type) {
-        throw new Error(`cannot add multiple custom types of name ${type.type}`);
+    const customTypes = gqlCapture.getCustomTypes();
+    const customType = customTypes.get(type.type);
+    if (customType && customType === type) {
+        return;
     }
-    if (customType) {
+    if (type.enumMap) {
+        customTypes.set(type.type, type);
         return;
     }
     try {
@@ -85,9 +87,21 @@ const addCustomType = (type) => {
         }
     }
     catch (e) {
+        if (type.secondaryImportPath) {
+            (0, exports.addCustomType)({
+                ...type,
+                importPath: type.secondaryImportPath,
+            }, gqlCapture);
+        }
+        return;
+    }
+    if (customType) {
+        if (JSON.stringify(customType) !== JSON.stringify(type)) {
+            throw new Error(`cannot add multiple custom types of name ${type.type}`);
+        }
         return;
     }
-    GQLCapture.getCustomTypes().set(type.type, type);
+    customTypes.set(type.type, type);
 };
 exports.addCustomType = addCustomType;
 const getType = (typ, result) => {
@@ -111,7 +125,8 @@ const getType = (typ, result) => {
     }
     if ((0, exports.isCustomType)(typ)) {
         result.type = typ.type;
-        (0, exports.addCustomType)(typ);
+        // TODO???
+        (0, exports.addCustomType)(typ, GQLCapture);
         return;
     }
     // GraphQLScalarType or ClassType
@@ -433,6 +448,7 @@ class GQLCapture {
         this.customInputObjects.forEach((_val, key) => baseArgs.set(key, true));
         baseArgs.set("Context", true);
         this.customTypes.forEach((_val, key) => baseArgs.set(key, true));
+        // TODO this should be aware of knownCustomTypes
         const resolveFields = (fields) => {
             fields.forEach((field) => {
                 // we have a check earlier that *should* make this path impossible

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/graphql/query/connection_type.d.ts

@@ -1,16 +1,16 @@
 import { GraphQLFieldConfigMap, GraphQLObjectType, GraphQLInterfaceType } from "graphql";
 import { RequestContext } from "../../core/context";
 import { GraphQLEdge } from "./edge_connection";
-import { Data } from "../../core/base";
-declare type nodeType = GraphQLObjectType | GraphQLInterfaceType;
-export declare class GraphQLEdgeType<TNode extends nodeType, TEdge extends Data> extends GraphQLObjectType {
-    constructor(name: string, nodeType: TNode, optionalFields?: () => GraphQLFieldConfigMap<GraphQLEdge<TEdge>, RequestContext>);
+import { Data, Viewer } from "../../core/base";
+type nodeType = GraphQLObjectType | GraphQLInterfaceType;
+export declare class GraphQLEdgeType<TNode extends nodeType, TEdge extends Data, TViewer extends Viewer> extends GraphQLObjectType {
+    constructor(name: string, nodeType: TNode, optionalFields?: () => GraphQLFieldConfigMap<GraphQLEdge<TEdge>, RequestContext<TViewer>>);
 }
-interface connectionOptions<T extends Data> {
-    fields?(): GraphQLFieldConfigMap<GraphQLEdge<T>, RequestContext>;
+interface connectionOptions<T extends Data, TViewer extends Viewer> {
+    fields?(): GraphQLFieldConfigMap<GraphQLEdge<T>, RequestContext<TViewer>>;
 }
-export declare class GraphQLConnectionType<TNode extends nodeType, TEdge extends Data> extends GraphQLObjectType {
-    edgeType: GraphQLEdgeType<TNode, TEdge>;
-    constructor(name: string, nodeType: TNode, options?: connectionOptions<TEdge>);
+export declare class GraphQLConnectionType<TNode extends nodeType, TEdge extends Data, TViewer extends Viewer> extends GraphQLObjectType {
+    edgeType: GraphQLEdgeType<TNode, TEdge, TViewer>;
+    constructor(name: string, nodeType: TNode, options?: connectionOptions<TEdge, TViewer>);
 }
 export {};

package/graphql/query/edge_connection.d.ts

@@ -1,30 +1,30 @@
 import { EdgeQuery, PaginationInfo } from "../../core/query/query";
-import { Data, Ent, Viewer } from "../../core/base";
+import { Data, Ent, ID, Viewer } from "../../core/base";
 export interface GraphQLEdge<T extends Data> {
     edge: T;
     node: Ent;
     cursor: string;
 }
-interface edgeQueryCtr<T extends Ent, TEdge extends Data> {
-    (v: Viewer, src: T): EdgeQuery<T, Ent, TEdge>;
+interface edgeQueryCtr<T extends Ent, TEdge extends Data, TViewer extends Viewer> {
+    (v: TViewer, src: T): EdgeQuery<T, Ent, TEdge>;
 }
-interface edgeQueryCtr2<T extends Ent, TEdge extends Data> {
-    (v: Viewer): EdgeQuery<T, Ent, TEdge>;
+interface edgeQueryCtr2<T extends Ent, TEdge extends Data, TViewer extends Viewer> {
+    (v: TViewer): EdgeQuery<T, Ent, TEdge>;
 }
-export declare class GraphQLEdgeConnection<TSource extends Ent, TEdge extends Data> {
+export declare class GraphQLEdgeConnection<TSource extends Ent, TEdge extends Data, TViewer extends Viewer = Viewer> {
     query: EdgeQuery<TSource, Ent, TEdge>;
     private results;
     private viewer;
     private source?;
     private args?;
-    constructor(viewer: Viewer, source: TSource, getQuery: edgeQueryCtr<TSource, TEdge>, args?: Data);
-    constructor(viewer: Viewer, getQuery: edgeQueryCtr2<TSource, TEdge>, args?: Data);
+    constructor(viewer: TViewer, source: TSource, getQuery: edgeQueryCtr<TSource, TEdge, TViewer>, args?: Data);
+    constructor(viewer: TViewer, getQuery: edgeQueryCtr2<TSource, TEdge, TViewer>, args?: Data);
     first(limit: number, cursor?: string): void;
     last(limit: number, cursor?: string): void;
     modifyQuery(fn: (query: EdgeQuery<TSource, Ent, TEdge>) => EdgeQuery<TSource, Ent, TEdge>): void;
     queryTotalCount(): Promise<number>;
     queryEdges(): Promise<GraphQLEdge<TEdge>[]>;
-    queryNodes(): Promise<Ent[]>;
+    queryNodes(): Promise<Ent<Viewer<Ent<any> | null, ID | null>>[]>;
     private defaultPageInfo;
     queryPageInfo(): Promise<PaginationInfo>;
     private queryData;

package/graphql/query/page_info.d.ts

@@ -1,4 +1,4 @@
 import { GraphQLObjectType } from "graphql";
 import { RequestContext } from "../../core/context";
 import { PaginationInfo } from "../../core/query/query";
-export declare const GraphQLPageInfo: GraphQLObjectType<PaginationInfo, RequestContext>;
+export declare const GraphQLPageInfo: GraphQLObjectType<PaginationInfo, RequestContext<import("../..").Viewer<import("../..").Ent<any> | null, import("../..").ID | null>>>;

package/graphql/query/shared_assoc_test.js

@@ -139,7 +139,7 @@ function sharedAssocTests() {
         const conn = new connection_type_1.GraphQLConnectionType("CustomEdge", eventType);
         const length = (m) => {
             let count = 0;
-            for (let k in m) {
+            for (let _ in m) {
                 count++;
             }
             return count;

package/graphql/query/shared_edge_connection.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonTests = void 0;
-const pg_1 = require("pg");
 const viewer_1 = require("../../core/viewer");
 const ent_1 = require("../../core/ent");
-const db_mock_1 = require("../../testutils/db_mock");
 const edge_connection_1 = require("./edge_connection");
 const test_helpers_1 = require("../../testutils/fake_data/test_helpers");
-jest.mock("pg");
-db_mock_1.QueryRecorder.mockPool(pg_1.Pool);
 class TestConnection {
     constructor(getQuery, ents, filter) {
         this.getQuery = getQuery;
@@ -48,23 +44,9 @@ class TestConnection {
 }
 const commonTests = (opts) => {
     function getCursorFrom(contacts, idx) {
-        // we depend on the fact that the same time is used for the edge and created_at
-        // based on getContactBuilder
-        // so regardless of if we're doing assoc or custom queries, we can get the time
-        // from the created_at field
         return (0, ent_1.getCursor)({
             row: contacts[idx],
-            col: "createdAt",
-            conv: (t) => {
-                //sqlite
-                if (typeof t === "string") {
-                    return Date.parse(t);
-                }
-                return t.getTime();
-            },
-            // we want the right column to be encoded in the cursor as opposed e.g. time for
-            // assoc queries, created_at for index/custom queries
-            cursorKey: opts.sortCol,
+            col: "id",
         });
     }
     describe("no filters", () => {

package/imports/index.d.ts

@@ -1,5 +1,6 @@
 export interface Options {
     filter?: (file: string, index: number, array: string[]) => boolean;
+    justCurrentDir?: boolean;
     ignore?: string | Readonly<string[]> | undefined;
 }
 export interface PathResult {
@@ -10,7 +11,11 @@ interface classResult {
     class: classInfo;
     file: file;
 }
-export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
+interface ParseInput {
+    root: string;
+    opts?: Options;
+}
+export declare function parseCustomImports(filePath: string, inputs: ParseInput[]): PathResult;
 export interface importInfo {
     name: string;
     importPath: string;

package/imports/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -34,7 +38,11 @@ function getFiles(filePath, opts) {
     }
     // graphql path should be passed to this
     // this is more agnostic about what it expect here
-    let files = glob_1.default.sync(`${filePath}/**/*.ts`, {
+    let pattern = `${filePath}/**/*.ts`;
+    if (opts?.justCurrentDir) {
+        pattern = `${filePath}/**.ts`;
+    }
+    let files = glob_1.default.sync(pattern, {
         ignore: opts?.ignore,
     });
     if (opts?.filter) {
@@ -42,8 +50,15 @@ function getFiles(filePath, opts) {
     }
     return files;
 }
-function parseCustomImports(filePath, opts) {
-    const files = getFiles(filePath, opts);
+function parseCustomImports(filePath, inputs) {
+    const files = [];
+    // simplifies tests and other simple callsites
+    if (inputs.length === 0) {
+        inputs.push({ root: filePath });
+    }
+    for (const input of inputs) {
+        files.push(...getFiles(input.root, input.opts));
+    }
     const options = (0, compilerOptions_1.readCompilerOptions)(filePath);
     let classMap = new Map();
     files.forEach((file) => {

package/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./core/base";
-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";
+export { loadEnt, loadCustomData, loadCustomEnts, loadCustomCount, loadEntX, loadEnts, CustomQuery, loadDerivedEnt, loadDerivedEntX, loadEntViaKey, loadEntXViaKey, performRawQuery, loadRowX, loadRow, loadRows, DataOperation, EditNodeOptions, EditNodeOperation, RawQueryOperation, EdgeOperation, DeleteNodeOperation, AssocEdge, AssocEdgeInputOptions, AssocEdgeInput, AssocEdgeData, loadEdgeData, loadEdgeDatas, loadEdges, loadUniqueEdge, loadUniqueNode, loadRawEdgeCountX, loadEdgeForID2, loadNodesByEdge, getEdgeTypeInGroup, setGlobalSchema, } from "./core/ent";
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };
@@ -7,12 +7,14 @@ export { EntPrivacyError, AlwaysAllowRule, AlwaysDenyRule, DenyIfLoggedInRule, D
 export * from "./core/query";
 export * from "./schema/";
 import * as q from "./core/clause";
+export { Clause } from "./core/clause";
 declare const query: {
     Eq: typeof q.Eq;
     NotEq: typeof q.NotEq;
     And: typeof q.And;
     AndOptional: typeof q.AndOptional;
     Or: typeof q.Or;
+    OrOptional: typeof q.OrOptional;
     In: typeof q.In;
     Greater: typeof q.Greater;
     Less: typeof q.Less;
@@ -20,10 +22,15 @@ declare const query: {
     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;
+    PostgresArrayContainsValue: typeof q.PostgresArrayContainsValue;
+    PostgresArrayContains: typeof q.PostgresArrayContains;
+    PostgresArrayNotContainsValue: typeof q.PostgresArrayNotContainsValue;
+    PostgresArrayNotContains: typeof q.PostgresArrayNotContains;
+    PostgresArrayOverlaps: typeof q.PostgresArrayOverlaps;
+    PostgresArrayNotOverlaps: typeof q.PostgresArrayNotOverlaps;
+    JSONPathValuePredicate: typeof q.JSONPathValuePredicate;
+    JSONObjectFieldKeyASJSON: typeof q.JSONObjectFieldKeyASJSON;
+    JSONObjectFieldKeyAsText: typeof q.JSONObjectFieldKeyAsText;
     TsQuery: typeof q.TsQuery;
     PlainToTsQuery: typeof q.PlainToTsQuery;
     PhraseToTsQuery: typeof q.PhraseToTsQuery;

package/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,13 +29,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.setGlobalSchema = 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.RawQueryOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomCount = 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 = exports.DenyIfViewerOutboundEdgeExistsRule = 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; } });
 Object.defineProperty(exports, "loadCustomData", { enumerable: true, get: function () { return ent_1.loadCustomData; } });
 Object.defineProperty(exports, "loadCustomEnts", { enumerable: true, get: function () { return ent_1.loadCustomEnts; } });
+Object.defineProperty(exports, "loadCustomCount", { enumerable: true, get: function () { return ent_1.loadCustomCount; } });
 Object.defineProperty(exports, "loadEntX", { enumerable: true, get: function () { return ent_1.loadEntX; } });
 Object.defineProperty(exports, "loadEnts", { enumerable: true, get: function () { return ent_1.loadEnts; } });
 Object.defineProperty(exports, "loadDerivedEnt", { enumerable: true, get: function () { return ent_1.loadDerivedEnt; } });
@@ -44,6 +49,7 @@ Object.defineProperty(exports, "loadRowX", { enumerable: true, get: function ()
 Object.defineProperty(exports, "loadRow", { enumerable: true, get: function () { return ent_1.loadRow; } });
 Object.defineProperty(exports, "loadRows", { enumerable: true, get: function () { return ent_1.loadRows; } });
 Object.defineProperty(exports, "EditNodeOperation", { enumerable: true, get: function () { return ent_1.EditNodeOperation; } });
+Object.defineProperty(exports, "RawQueryOperation", { enumerable: true, get: function () { return ent_1.RawQueryOperation; } });
 Object.defineProperty(exports, "EdgeOperation", { enumerable: true, get: function () { return ent_1.EdgeOperation; } });
 Object.defineProperty(exports, "DeleteNodeOperation", { enumerable: true, get: function () { return ent_1.DeleteNodeOperation; } });
 Object.defineProperty(exports, "AssocEdge", { enumerable: true, get: function () { return ent_1.AssocEdge; } });
@@ -57,6 +63,7 @@ Object.defineProperty(exports, "loadRawEdgeCountX", { enumerable: true, get: fun
 Object.defineProperty(exports, "loadEdgeForID2", { enumerable: true, get: function () { return ent_1.loadEdgeForID2; } });
 Object.defineProperty(exports, "loadNodesByEdge", { enumerable: true, get: function () { return ent_1.loadNodesByEdge; } });
 Object.defineProperty(exports, "getEdgeTypeInGroup", { enumerable: true, get: function () { return ent_1.getEdgeTypeInGroup; } });
+Object.defineProperty(exports, "setGlobalSchema", { enumerable: true, get: function () { return ent_1.setGlobalSchema; } });
 const db_1 = __importDefault(require("./core/db"));
 exports.DB = db_1.default;
 __exportStar(require("./core/loaders"), exports);
@@ -109,6 +116,7 @@ const query = {
     And: q.And,
     AndOptional: q.AndOptional,
     Or: q.Or,
+    OrOptional: q.OrOptional,
     In: q.In,
     Greater: q.Greater,
     Less: q.Less,
@@ -116,10 +124,15 @@ const query = {
     LessEq: q.LessEq,
     ArrayEq: q.ArrayEq,
     ArrayNotEq: q.ArrayNotEq,
-    ArrayGreater: q.ArrayGreater,
-    ArrayLess: q.ArrayLess,
-    ArrayGreaterEq: q.ArrayGreaterEq,
-    ArrayLessEq: q.ArrayLessEq,
+    PostgresArrayContainsValue: q.PostgresArrayContainsValue,
+    PostgresArrayContains: q.PostgresArrayContains,
+    PostgresArrayNotContainsValue: q.PostgresArrayNotContainsValue,
+    PostgresArrayNotContains: q.PostgresArrayNotContains,
+    PostgresArrayOverlaps: q.PostgresArrayOverlaps,
+    PostgresArrayNotOverlaps: q.PostgresArrayNotOverlaps,
+    JSONPathValuePredicate: q.JSONPathValuePredicate,
+    JSONObjectFieldKeyASJSON: q.JSONObjectFieldKeyASJSON,
+    JSONObjectFieldKeyAsText: q.JSONObjectFieldKeyAsText,
     TsQuery: q.TsQuery,
     PlainToTsQuery: q.PlainToTsQuery,
     PhraseToTsQuery: q.PhraseToTsQuery,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha10",
+  "version": "0.1.0-alpha101",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -8,26 +8,27 @@
     "example": "examples"
   },
   "dependencies": {
-    "@types/node": "^15.0.2",
+    "@types/node": "^18.11.18",
     "camel-case": "^4.1.2",
-    "dataloader": "^2.0.0",
-    "glob": "^7.1.6",
-    "graph-data-structure": "^1.12.0",
+    "cosmiconfig": "^8.0.0",
+    "dataloader": "^2.1.0",
+    "glob": "^8.0.3",
+    "graph-data-structure": "^2.0.0",
     "js-yaml": "^4.1.0",
-    "json5": "^2.1.3",
-    "luxon": "^1.25.0",
+    "json5": "^2.2.2",
+    "luxon": "^3.1.1",
     "memoizee": "^0.4.15",
-    "minimist": "^1.2.6",
+    "minimist": "^1.2.7",
     "pascal-case": "^3.1.2",
-    "pg": "^8.0.3",
-    "prettier": "^2.3.2",
+    "pg": "^8.8.0",
+    "prettier": "^2.8.1",
     "reflect-metadata": "^0.1.13",
-    "snake-case": "^3.0.3",
-    "ts-node": "^10.2.1",
-    "tsconfig-paths": "^3.11.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.4.2",
-    "uuid": "^8.3.2"
+    "snake-case": "^3.0.4",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.1.1",
+    "tslib": "^2.4.1",
+    "typescript": "^4.9.4",
+    "uuid": "^9.0.0"
   },
   "peerDependencies": {
     "better-sqlite3": "^7.4.1",

package/parse_schema/parse.d.ts

@@ -1,14 +1,14 @@
 import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
-import { ActionField, Type } from "../schema/schema";
+import { ActionField, Type, GlobalSchema } from "../schema/schema";
 declare enum NullableResult {
     CONTENTS = "contents",
     CONTENTS_AND_LIST = "contentsAndList",
     ITEM = "true"
 }
-declare type ProcessedActionField = Omit<ActionField, "nullable"> & {
+type ProcessedActionField = Omit<ActionField, "nullable"> & {
     nullable?: NullableResult;
 };
-declare type ProcessedAssocEdge = Omit<AssocEdge, "actionOnlyFields" | "edgeActions"> & {
+type ProcessedAssocEdge = Omit<AssocEdge, "actionOnlyFields" | "edgeActions"> & {
     patternName?: string;
     edgeActions?: OutputAction[];
 };
@@ -18,17 +18,18 @@ interface TransformFlags {
     transformsInsert?: boolean;
     transformsUpdate?: boolean;
 }
-declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields"> & TransformFlags & {
+type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" | "fields"> & TransformFlags & {
     actions: OutputAction[];
     assocEdges: ProcessedAssocEdge[];
     assocEdgeGroups: ProcessedAssocEdgeGroup[];
     fields: ProcessedField[];
     schemaPath?: string;
+    patternNames?: string[];
 };
-declare type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
+type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
     edgeAction?: OutputAction;
 };
-declare type OutputAction = Omit<Action, "actionOnlyFields"> & {
+type OutputAction = Omit<Action, "actionOnlyFields"> & {
     actionOnlyFields?: ProcessedActionField[];
 };
 interface schemasDict {
@@ -38,13 +39,14 @@ interface ProcessedPattern {
     name: string;
     assocEdges: ProcessedAssocEdge[];
     fields: ProcessedField[];
+    disableMixin?: boolean;
 }
-declare type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> & {
+type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> & {
     subFields?: ProcessedField[];
     listElemType?: ProcessedType;
     unionFields?: ProcessedField[];
 };
-declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type"> & {
+type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type" | "serverDefault"> & {
     name: string;
     hasDefaultValueOnCreate?: boolean;
     hasDefaultValueOnEdit?: boolean;
@@ -52,6 +54,7 @@ declare type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOn
     hasFieldPrivacy?: boolean;
     derivedFields?: ProcessedField[];
     type: ProcessedType;
+    serverDefault?: string;
 };
 interface patternsDict {
     [key: string]: ProcessedPattern;
@@ -59,9 +62,26 @@ interface patternsDict {
 interface Result {
     schemas: schemasDict;
     patterns: patternsDict;
+    globalSchema?: ProcessedGlobalSchema;
+    config?: {
+        rome?: RomeConfig;
+    };
 }
 declare type PotentialSchemas = {
     [key: string]: any;
 };
-export declare function parseSchema(potentialSchemas: PotentialSchemas): Result;
+export declare function parseSchema(potentialSchemas: PotentialSchemas, globalSchema?: GlobalSchema): Promise<Result>;
+interface RomeConfig {
+    indentStyle?: string;
+    lineWidth?: number;
+    indentSize?: number;
+    quoteStyle?: string;
+    quoteProperties?: string;
+    trailingComma?: string;
+}
+interface ProcessedGlobalSchema {
+    globalEdges: ProcessedAssocEdge[];
+    extraEdgeFields: ProcessedField[];
+    initForEdges?: boolean;
+}
 export {};