@snowtop/ent 0.1.9 → 0.1.10

package/action/operations.js

@@ -29,6 +29,7 @@ const action_1 = require("../action");
 const schema_1 = require("../schema/schema");
 const global_schema_1 = require("../core/global_schema");
 const ent_1 = require("../core/ent");
+const query_impl_1 = require("../core/query_impl");
 class DeleteNodeOperation {
     constructor(id, builder, options) {
         this.id = id;
@@ -203,7 +204,7 @@ class EditNodeOperation {
                 cls = clause.And(cls, optionClause);
             }
         }
-        const query = (0, ent_1.buildQuery)({
+        const query = (0, query_impl_1.buildQuery)({
             fields: opts.fields.length ? opts.fields : ["*"],
             tableName: options.tableName,
             clause: cls,

package/core/clause.d.ts

@@ -116,6 +116,8 @@ export declare function JSONObjectFieldKeyAsText<T extends Data, K = keyof T>(co
 type predicate = "==" | ">" | "<" | "!=" | ">=" | "<=";
 export declare function JSONPathValuePredicate<T extends Data, K = keyof T>(dbCol: K, path: string, val: any, pred: predicate): Clause<T, K>;
 export declare function JSONKeyExists<T extends Data, K = keyof T>(dbCol: K, val: any): Clause<T, K>;
+export declare function JSONBKeyInList<T extends Data, K = keyof T>(dbCol: K, jsonCol: string, val: any): Clause<T, K>;
+export declare function JSONKeyInList<T extends Data, K = keyof T>(dbCol: K, jsonCol: string, val: any): Clause<T, K>;
 export declare function PaginationMultipleColsSubQuery<T extends Data, K = keyof T>(col: K, op: string, tableName: string, uniqueCol: K, val: any): Clause<T, K>;
 export declare function Add<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Subtract<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;

package/core/clause.js

@@ -23,8 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCombinedClause = exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONKeyExists = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.notInClause = exports.inClause = void 0;
+exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONKeyInList = exports.JSONBKeyInList = exports.JSONKeyExists = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.notInClause = exports.inClause = void 0;
+exports.getCombinedClause = void 0;
 const db_1 = __importStar(require("./db"));
+const query_impl_1 = require("./query_impl");
 function isSensitive(val) {
     return (val !== null &&
         typeof val === "object" &&
@@ -90,6 +92,28 @@ class simpleClause {
         return `${this.col}${this.op}${rawValue(this.value)}`;
     }
 }
+class queryClause {
+    constructor(dependentQueryOptions) {
+        this.dependentQueryOptions = dependentQueryOptions;
+    }
+    clause(idx) {
+        const q = (0, query_impl_1.buildQuery)(this.dependentQueryOptions);
+        return `EXISTS (${q})`;
+    }
+    columns() {
+        // @ts-ignore
+        return this.dependentQueryOptions.clause.columns();
+    }
+    values() {
+        return this.dependentQueryOptions.clause.values();
+    }
+    logValues() {
+        return this.dependentQueryOptions.clause.logValues();
+    }
+    instanceKey() {
+        return `exists:${this.dependentQueryOptions.tableName}:${this.dependentQueryOptions.clause.instanceKey()}`;
+    }
+}
 class isNullClause {
     constructor(col) {
         this.col = col;
@@ -729,6 +753,30 @@ function JSONKeyExists(dbCol, val) {
     return new simpleClause(dbCol, val, "?", new isNullClause(dbCol));
 }
 exports.JSONKeyExists = JSONKeyExists;
+function JSONBKeyInList(dbCol, jsonCol, val) {
+    const opts = {
+        fields: ["1"],
+        tableName: `jsonb_array_elements(${dbCol}) AS json_element`,
+        // @ts-ignore
+        clause: And(JSONKeyExists("json_element", jsonCol), 
+        // @ts-ignore
+        Eq(JSONObjectFieldKeyAsText("json_element", jsonCol), val)),
+    };
+    return new queryClause(opts);
+}
+exports.JSONBKeyInList = JSONBKeyInList;
+function JSONKeyInList(dbCol, jsonCol, val) {
+    const opts = {
+        fields: ["1"],
+        tableName: `json_array_elements(${dbCol}) AS json_element`,
+        // @ts-ignore
+        clause: And(JSONKeyExists("json_element", jsonCol), 
+        // @ts-ignore
+        Eq(JSONObjectFieldKeyAsText("json_element", jsonCol), val)),
+    };
+    return new queryClause(opts);
+}
+exports.JSONKeyInList = JSONKeyInList;
 // TODO need a better name for this lol
 // this assumes we're doing the same direction twice which isn't necessarily accurate in the future...
 class paginationMultipleColumnsSubQueryClause {

package/core/config.d.ts

@@ -45,6 +45,7 @@ interface CodegenConfig {
     customAssocEdgePath?: importedObject;
     globalImportPath?: string;
     userOveriddenFiles?: string[];
+    transformDeleteMethod?: string;
 }
 interface PrettierConfig {
     custom?: boolean;

package/core/ent.d.ts

@@ -1,5 +1,5 @@
 import { Queryer, SyncQueryer } from "./db";
-import { Viewer, Ent, ID, LoadRowsOptions, LoadRowOptions, Data, DataOptions, QueryableDataOptions, EditRowOptions, LoadEntOptions, LoadCustomEntOptions, EdgeQueryableDataOptions, Context, CreateRowOptions, QueryDataOptions, SelectCustomDataOptions, LoaderWithLoadMany } from "./base";
+import { Viewer, Ent, ID, LoadRowsOptions, LoadRowOptions, Data, DataOptions, EditRowOptions, LoadEntOptions, LoadCustomEntOptions, EdgeQueryableDataOptions, Context, CreateRowOptions, QueryDataOptions, SelectCustomDataOptions, LoaderWithLoadMany } from "./base";
 import * as clause from "./clause";
 import DataLoader from "dataloader";
 import { OrderBy } from "./query_impl";
@@ -99,7 +99,6 @@ export declare function loadRow(options: LoadRowOptions): Promise<Data | null>;
 export declare function ___setLogQueryErrorWithError(val: boolean | undefined): void;
 export declare function performRawQuery(query: string, values: any[], logValues?: any[]): Promise<Data[]>;
 export declare function loadRows(options: LoadRowsOptions): Promise<Data[]>;
-export declare function buildQuery(options: QueryableDataOptions): string;
 interface GroupQueryOptions<T extends Data, K = keyof T> {
     tableName: string;
     clause?: clause.Clause<T, K>;

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.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.getDefaultLimit = exports.setDefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = 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 = exports.getEntLoader = exports.rowIsError = void 0;
-exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = void 0;
+exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.getEdgeClauseAndFields = exports.loadEdges = exports.getDefaultLimit = exports.setDefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.buildGroupQuery = exports.loadRows = exports.performRawQuery = exports.___setLogQueryErrorWithError = exports.loadRow = exports.loadRowX = exports.logQuery = 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 = exports.getEntLoader = exports.rowIsError = void 0;
+exports.getEdgeTypeInGroup = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -558,7 +558,7 @@ async function loadRow(options) {
             return row;
         }
     }
-    const query = buildQuery(options);
+    const query = (0, query_impl_1.buildQuery)(options);
     logQuery(query, options.clause.logValues());
     const pool = db_1.default.getInstance().getPool();
     const res = await pool.query(query, options.clause.values());
@@ -606,7 +606,7 @@ async function loadRows(options) {
             return rows;
         }
     }
-    const query = buildQuery(options);
+    const query = (0, query_impl_1.buildQuery)(options);
     const r = await performRawQuery(query, options.clause.values(), options.clause.logValues());
     if (cache) {
         // put the rows in the cache...
@@ -615,25 +615,6 @@ async function loadRows(options) {
     return r;
 }
 exports.loadRows = loadRows;
-// private to ent
-function buildQuery(options) {
-    const fields = options.fields.join(", ");
-    // always start at 1
-    const whereClause = options.clause.clause(1);
-    const parts = [];
-    parts.push(`SELECT ${fields} FROM ${options.tableName} WHERE ${whereClause}`);
-    if (options.groupby) {
-        parts.push(`GROUP BY ${options.groupby}`);
-    }
-    if (options.orderby) {
-        parts.push(`ORDER BY ${(0, query_impl_1.getOrderByPhrase)(options.orderby)}`);
-    }
-    if (options.limit) {
-        parts.push(`LIMIT ${options.limit}`);
-    }
-    return parts.join(" ");
-}
-exports.buildQuery = buildQuery;
 // this is used for queries when we select multiple ids at once
 function buildGroupQuery(options) {
     const fields = [...options.fields, "row_number()"];

package/core/logger.js

@@ -28,6 +28,7 @@ function log(level, msg) {
             console.error(msg.message);
             return;
         }
+        // console[m[level]](inspect(msg, false, 10));
         console[m[level]](msg);
     }
 }

package/core/query_impl.d.ts

@@ -1,3 +1,4 @@
+import { QueryableDataOptions } from "./base";
 export interface OrderByOption {
     column: string;
     direction: "ASC" | "DESC";
@@ -6,3 +7,4 @@ export interface OrderByOption {
 export type OrderBy = OrderByOption[];
 export declare function getOrderByPhrase(orderby: OrderBy): string;
 export declare function reverseOrderBy(orderby: OrderBy): OrderBy;
+export declare function buildQuery(options: QueryableDataOptions): string;

package/core/query_impl.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reverseOrderBy = exports.getOrderByPhrase = void 0;
+exports.buildQuery = exports.reverseOrderBy = exports.getOrderByPhrase = void 0;
 function getOrderByPhrase(orderby) {
     return orderby
         .map((v) => {
@@ -26,3 +26,21 @@ function reverseOrderBy(orderby) {
     });
 }
 exports.reverseOrderBy = reverseOrderBy;
+function buildQuery(options) {
+    const fields = options.fields.join(", ");
+    // always start at 1
+    const whereClause = options.clause.clause(1);
+    const parts = [];
+    parts.push(`SELECT ${fields} FROM ${options.tableName} WHERE ${whereClause}`);
+    if (options.groupby) {
+        parts.push(`GROUP BY ${options.groupby}`);
+    }
+    if (options.orderby) {
+        parts.push(`ORDER BY ${getOrderByPhrase(options.orderby)}`);
+    }
+    if (options.limit) {
+        parts.push(`LIMIT ${options.limit}`);
+    }
+    return parts.join(" ");
+}
+exports.buildQuery = buildQuery;

package/package.json

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