@relq/orm 0.1.3 → 0.1.5

package/dist/cjs/pg/condition/json-path-proxy.cjs

@@ -0,0 +1,480 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createJsonColumnProxy = createJsonColumnProxy;
+exports.buildPgJsonProxySQL = buildPgJsonProxySQL;
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
+const TERMINAL_METHODS = new Set([
+    'equal', 'notEqual',
+    'greaterThan', 'greaterThanOrEqual',
+    'lessThan', 'lessThanOrEqual',
+    'between',
+    'in', 'notIn',
+    'like', 'ilike',
+    'startsWith', 'endsWith',
+    'contains',
+    'regex', 'iregex',
+    'before', 'after',
+    'isNull', 'isNotNull',
+    'containedBy',
+    'hasKey', 'hasAnyKeys', 'hasAllKeys',
+    'typeOf',
+]);
+const ARRAY_TERMINAL_METHODS = new Set([
+    'length', 'isEmpty', 'isNotEmpty',
+    'contains', 'containsAll', 'containsAny',
+    'some', 'every',
+]);
+const ELEMENT_TERMINALS = new Set([
+    'equal', 'notEqual',
+    'isNull', 'isNotNull',
+    'in', 'notIn',
+    'greaterThan', 'greaterThanOrEqual',
+    'lessThan', 'lessThanOrEqual',
+    'between',
+    'like', 'ilike', 'startsWith', 'endsWith',
+    'contains',
+    'regex', 'iregex',
+    'before', 'after',
+    'containedBy',
+    'hasKey', 'hasAnyKeys', 'hasAllKeys',
+    'typeOf',
+]);
+const PROXY_TRAP_IGNORE = new Set([
+    'then', 'toJSON', 'valueOf', 'toString',
+    'constructor', 'prototype', '__proto__',
+    'inspect', 'nodeType',
+    'asymmetricMatch',
+    '$$typeof',
+]);
+function createJsonColumnProxy(parent) {
+    return new Proxy(Object.create(null), {
+        get(_target, prop) {
+            if (typeof prop === 'symbol' || PROXY_TRAP_IGNORE.has(prop)) {
+                return undefined;
+            }
+            return createJsonPathProxy(prop, [], parent);
+        }
+    });
+}
+function createJsonPathProxy(column, path, parent) {
+    return new Proxy(Object.create(null), {
+        get(_target, prop) {
+            if (typeof prop === 'symbol' || PROXY_TRAP_IGNORE.has(prop)) {
+                return undefined;
+            }
+            const propName = prop;
+            if (TERMINAL_METHODS.has(propName)) {
+                return (...args) => {
+                    parent.conditions.push({
+                        method: 'json_proxy',
+                        column,
+                        values: { path: [...path], op: propName, args }
+                    });
+                    return parent;
+                };
+            }
+            if (propName === 'array') {
+                return createJsonArrayProxy(column, path, parent);
+            }
+            return createJsonPathProxy(column, [...path, propName], parent);
+        }
+    });
+}
+function createJsonArrayProxy(column, path, parent) {
+    return new Proxy(Object.create(null), {
+        get(_target, prop) {
+            if (typeof prop === 'symbol' || PROXY_TRAP_IGNORE.has(prop)) {
+                return undefined;
+            }
+            const propName = prop;
+            if (propName === 'some') {
+                return (callback) => {
+                    const subConditions = [];
+                    const elementProxy = createJsonArrayElementProxy(subConditions);
+                    callback(elementProxy);
+                    parent.conditions.push({
+                        method: 'json_proxy',
+                        column,
+                        values: { path: [...path], op: 'array_some', args: [{ conditions: subConditions }] }
+                    });
+                    return parent;
+                };
+            }
+            if (propName === 'every') {
+                return (callback) => {
+                    const subConditions = [];
+                    const elementProxy = createJsonArrayElementProxy(subConditions);
+                    callback(elementProxy);
+                    parent.conditions.push({
+                        method: 'json_proxy',
+                        column,
+                        values: { path: [...path], op: 'array_every', args: [{ conditions: subConditions }] }
+                    });
+                    return parent;
+                };
+            }
+            if (ARRAY_TERMINAL_METHODS.has(propName)) {
+                return (...args) => {
+                    parent.conditions.push({
+                        method: 'json_proxy',
+                        column,
+                        values: { path: [...path], op: `array_${propName}`, args }
+                    });
+                    return parent;
+                };
+            }
+            return undefined;
+        }
+    });
+}
+function createJsonArrayElementProxy(conditions, path = []) {
+    return new Proxy(Object.create(null), {
+        get(_target, prop) {
+            if (typeof prop === 'symbol' || PROXY_TRAP_IGNORE.has(prop)) {
+                return undefined;
+            }
+            const name = prop;
+            if (ELEMENT_TERMINALS.has(name)) {
+                return (...args) => {
+                    conditions.push({ path: [...path], op: name, args });
+                };
+            }
+            return createJsonArrayElementProxy(conditions, [...path, name]);
+        }
+    });
+}
+function buildPgJsonProxySQL(condition) {
+    const { column, values } = condition;
+    const { path, op, args } = values;
+    if (!column)
+        return '';
+    if (op.startsWith('array_')) {
+        return buildPgArrayOpSQL(column, path, op, args);
+    }
+    if (path.length === 0) {
+        return buildPgColumnLevelSQL(column, op, args);
+    }
+    return buildPgPathLevelSQL(column, path, op, args);
+}
+function buildPgColumnLevelSQL(column, op, args) {
+    switch (op) {
+        case 'contains':
+            return (0, pg_format_1.default)('%I @> %L', column, JSON.stringify(args[0]));
+        case 'containedBy':
+            return (0, pg_format_1.default)('%I <@ %L', column, JSON.stringify(args[0]));
+        case 'hasKey':
+            return (0, pg_format_1.default)('%I ? %L', column, args[0]);
+        case 'hasAnyKeys':
+            return (0, pg_format_1.default)('%I ?| ARRAY[%s]', column, args[0].map(k => (0, pg_format_1.default)('%L', k)).join(','));
+        case 'hasAllKeys':
+            return (0, pg_format_1.default)('%I ?& ARRAY[%s]', column, args[0].map(k => (0, pg_format_1.default)('%L', k)).join(','));
+        case 'isNull':
+            return (0, pg_format_1.default)('%I IS NULL', column);
+        case 'isNotNull':
+            return (0, pg_format_1.default)('%I IS NOT NULL', column);
+        case 'equal':
+            return (0, pg_format_1.default)('%I = %L::jsonb', column, JSON.stringify(args[0]));
+        case 'notEqual':
+            return (0, pg_format_1.default)('%I != %L::jsonb', column, JSON.stringify(args[0]));
+        case 'typeOf':
+            return (0, pg_format_1.default)('jsonb_typeof(%I) = %L', column, args[0]);
+        default:
+            return '';
+    }
+}
+function buildPgPathLevelSQL(column, path, op, args) {
+    const pathStr = `{${path.join(',')}}`;
+    switch (op) {
+        case 'equal':
+            return (0, pg_format_1.default)('%I#>>%L = %L', column, pathStr, String(args[0]));
+        case 'notEqual':
+            return (0, pg_format_1.default)('%I#>>%L != %L', column, pathStr, String(args[0]));
+        case 'greaterThan':
+            return typeof args[0] === 'number'
+                ? (0, pg_format_1.default)('(%I#>>%L)::numeric > %L', column, pathStr, args[0])
+                : (0, pg_format_1.default)('%I#>>%L > %L', column, pathStr, args[0]);
+        case 'greaterThanOrEqual':
+            return typeof args[0] === 'number'
+                ? (0, pg_format_1.default)('(%I#>>%L)::numeric >= %L', column, pathStr, args[0])
+                : (0, pg_format_1.default)('%I#>>%L >= %L', column, pathStr, args[0]);
+        case 'lessThan':
+            return typeof args[0] === 'number'
+                ? (0, pg_format_1.default)('(%I#>>%L)::numeric < %L', column, pathStr, args[0])
+                : (0, pg_format_1.default)('%I#>>%L < %L', column, pathStr, args[0]);
+        case 'lessThanOrEqual':
+            return typeof args[0] === 'number'
+                ? (0, pg_format_1.default)('(%I#>>%L)::numeric <= %L', column, pathStr, args[0])
+                : (0, pg_format_1.default)('%I#>>%L <= %L', column, pathStr, args[0]);
+        case 'between':
+            return typeof args[0] === 'number'
+                ? (0, pg_format_1.default)('(%I#>>%L)::numeric BETWEEN %L AND %L', column, pathStr, args[0], args[1])
+                : (0, pg_format_1.default)('%I#>>%L BETWEEN %L AND %L', column, pathStr, args[0], args[1]);
+        case 'in': {
+            const inList = args[0].map(v => (0, pg_format_1.default)('%L', v)).join(', ');
+            return (0, pg_format_1.default)('%I#>>%L IN (%s)', column, pathStr, inList);
+        }
+        case 'notIn': {
+            const notInList = args[0].map(v => (0, pg_format_1.default)('%L', v)).join(', ');
+            return (0, pg_format_1.default)('%I#>>%L NOT IN (%s)', column, pathStr, notInList);
+        }
+        case 'like':
+            return (0, pg_format_1.default)('%I#>>%L LIKE %L', column, pathStr, args[0]);
+        case 'ilike':
+            return (0, pg_format_1.default)('%I#>>%L ILIKE %L', column, pathStr, args[0]);
+        case 'startsWith':
+            return (0, pg_format_1.default)('%I#>>%L LIKE %L', column, pathStr, `${args[0]}%`);
+        case 'endsWith':
+            return (0, pg_format_1.default)('%I#>>%L LIKE %L', column, pathStr, `%${args[0]}`);
+        case 'contains':
+            if (typeof args[0] === 'string') {
+                return (0, pg_format_1.default)('%I#>>%L LIKE %L', column, pathStr, `%${args[0]}%`);
+            }
+            return (0, pg_format_1.default)('%I#>%L @> %L', column, pathStr, JSON.stringify(args[0]));
+        case 'regex':
+            return (0, pg_format_1.default)('%I#>>%L ~ %L', column, pathStr, args[0]);
+        case 'iregex':
+            return (0, pg_format_1.default)('%I#>>%L ~* %L', column, pathStr, args[0]);
+        case 'before':
+            return (0, pg_format_1.default)('%I#>>%L < %L', column, pathStr, args[0] instanceof Date ? args[0].toISOString() : args[0]);
+        case 'after':
+            return (0, pg_format_1.default)('%I#>>%L > %L', column, pathStr, args[0] instanceof Date ? args[0].toISOString() : args[0]);
+        case 'isNull':
+            return (0, pg_format_1.default)('(%I#>%L IS NULL OR %I#>%L = \'null\'::jsonb)', column, pathStr, column, pathStr);
+        case 'isNotNull':
+            return (0, pg_format_1.default)('(%I#>%L IS NOT NULL AND %I#>%L != \'null\'::jsonb)', column, pathStr, column, pathStr);
+        case 'containedBy':
+            return (0, pg_format_1.default)('%I#>%L <@ %L', column, pathStr, JSON.stringify(args[0]));
+        case 'hasKey':
+            return (0, pg_format_1.default)('%I#>%L ? %L', column, pathStr, args[0]);
+        case 'hasAnyKeys':
+            return (0, pg_format_1.default)('%I#>%L ?| ARRAY[%s]', column, pathStr, args[0].map(k => (0, pg_format_1.default)('%L', k)).join(','));
+        case 'hasAllKeys':
+            return (0, pg_format_1.default)('%I#>%L ?& ARRAY[%s]', column, pathStr, args[0].map(k => (0, pg_format_1.default)('%L', k)).join(','));
+        case 'typeOf':
+            return (0, pg_format_1.default)('jsonb_typeof(%I#>%L) = %L', column, pathStr, args[0]);
+        default:
+            return '';
+    }
+}
+function buildPgArrayOpSQL(column, path, op, args) {
+    const source = path.length === 0
+        ? (0, pg_format_1.default)('COALESCE(%I, \'[]\'::jsonb)', column)
+        : (0, pg_format_1.default)('COALESCE(%I#>%L, \'[]\'::jsonb)', column, `{${path.join(',')}}`);
+    switch (op) {
+        case 'array_length': {
+            const [operator, value] = args;
+            return `jsonb_array_length(${source}) ${operator} ${value}`;
+        }
+        case 'array_isEmpty':
+            return `jsonb_array_length(${source}) = 0`;
+        case 'array_isNotEmpty':
+            return `jsonb_array_length(${source}) > 0`;
+        case 'array_contains': {
+            const colExpr = path.length === 0
+                ? pg_format_1.default.ident(column)
+                : (0, pg_format_1.default)('%I#>%L', column, `{${path.join(',')}}`);
+            return `${colExpr} @> ${(0, pg_format_1.default)('%L', JSON.stringify([args[0]]))}`;
+        }
+        case 'array_containsAll': {
+            const colExpr = path.length === 0
+                ? pg_format_1.default.ident(column)
+                : (0, pg_format_1.default)('%I#>%L', column, `{${path.join(',')}}`);
+            return `${colExpr} @> ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}`;
+        }
+        case 'array_containsAny': {
+            const colExpr = path.length === 0
+                ? pg_format_1.default.ident(column)
+                : (0, pg_format_1.default)('%I#>%L', column, `{${path.join(',')}}`);
+            const elements = args[0];
+            const conditions = elements.map(el => `${colExpr} @> ${(0, pg_format_1.default)('%L', JSON.stringify([el]))}`);
+            return `(${conditions.join(' OR ')})`;
+        }
+        case 'array_some': {
+            const { conditions } = args[0];
+            return buildJsonArrayQuantifiedSQL(source, conditions, 'some');
+        }
+        case 'array_every': {
+            const { conditions } = args[0];
+            return buildJsonArrayQuantifiedSQL(source, conditions, 'every');
+        }
+        default:
+            return '';
+    }
+}
+function buildJsonArrayQuantifiedSQL(source, conditions, quantifier) {
+    if (conditions.length === 0)
+        return '';
+    const whereClauses = conditions.map(cond => buildJsonElementSQL(cond));
+    const validClauses = whereClauses.filter(Boolean);
+    if (validClauses.length === 0)
+        return '';
+    const whereClause = validClauses.join(' AND ');
+    if (quantifier === 'some') {
+        return `EXISTS (SELECT 1 FROM jsonb_array_elements(${source}) elem WHERE ${whereClause})`;
+    }
+    return `NOT EXISTS (SELECT 1 FROM jsonb_array_elements(${source}) elem WHERE NOT (${whereClause}))`;
+}
+function buildJsonElementSQL(cond) {
+    const { path, op, args } = cond;
+    if (path.length === 0) {
+        return buildJsonScalarElementSQL(op, args);
+    }
+    return buildJsonNestedElementSQL(path, op, args);
+}
+function buildJsonScalarElementSQL(op, args) {
+    const elemText = "elem #>> '{}'";
+    const elemJsonb = 'elem';
+    switch (op) {
+        case 'equal':
+            return typeof args[0] === 'boolean'
+                ? `${elemText} = ${(0, pg_format_1.default)('%L', String(args[0]))}`
+                : typeof args[0] === 'number'
+                    ? `(${elemText})::numeric = ${(0, pg_format_1.default)('%L', args[0])}`
+                    : `${elemText} = ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'notEqual':
+            return typeof args[0] === 'number'
+                ? `(${elemText})::numeric != ${(0, pg_format_1.default)('%L', args[0])}`
+                : `${elemText} != ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'greaterThan':
+            return `(${elemText})::numeric > ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'greaterThanOrEqual':
+            return `(${elemText})::numeric >= ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'lessThan':
+            return `(${elemText})::numeric < ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'lessThanOrEqual':
+            return `(${elemText})::numeric <= ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'between':
+            return typeof args[0] === 'number'
+                ? `(${elemText})::numeric BETWEEN ${(0, pg_format_1.default)('%L', args[0])} AND ${(0, pg_format_1.default)('%L', args[1])}`
+                : `${elemText} BETWEEN ${(0, pg_format_1.default)('%L', args[0])} AND ${(0, pg_format_1.default)('%L', args[1])}`;
+        case 'in': {
+            const vals = args[0].map(v => (0, pg_format_1.default)('%L', v)).join(', ');
+            return `${elemText} IN (${vals})`;
+        }
+        case 'notIn': {
+            const vals = args[0].map(v => (0, pg_format_1.default)('%L', v)).join(', ');
+            return `${elemText} NOT IN (${vals})`;
+        }
+        case 'like':
+            return `${elemText} LIKE ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'ilike':
+            return `${elemText} ILIKE ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'startsWith':
+            return `${elemText} LIKE ${(0, pg_format_1.default)('%L', `${args[0]}%`)}`;
+        case 'endsWith':
+            return `${elemText} LIKE ${(0, pg_format_1.default)('%L', `%${args[0]}`)}`;
+        case 'contains':
+            if (typeof args[0] === 'string') {
+                return `${elemText} LIKE ${(0, pg_format_1.default)('%L', `%${args[0]}%`)}`;
+            }
+            return `${elemJsonb} @> ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}`;
+        case 'regex':
+            return `${elemText} ~ ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'iregex':
+            return `${elemText} ~* ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'before':
+            return `${elemText} < ${(0, pg_format_1.default)('%L', args[0] instanceof Date ? args[0].toISOString() : args[0])}`;
+        case 'after':
+            return `${elemText} > ${(0, pg_format_1.default)('%L', args[0] instanceof Date ? args[0].toISOString() : args[0])}`;
+        case 'isNull':
+            return `(${elemJsonb} IS NULL OR ${elemJsonb} = 'null'::jsonb)`;
+        case 'isNotNull':
+            return `(${elemJsonb} IS NOT NULL AND ${elemJsonb} != 'null'::jsonb)`;
+        case 'containedBy':
+            return `${elemJsonb} <@ ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}`;
+        case 'hasKey':
+            return `${elemJsonb} ? ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'hasAnyKeys':
+            return `${elemJsonb} ?| ARRAY[${args[0].map(k => (0, pg_format_1.default)('%L', k)).join(',')}]`;
+        case 'hasAllKeys':
+            return `${elemJsonb} ?& ARRAY[${args[0].map(k => (0, pg_format_1.default)('%L', k)).join(',')}]`;
+        case 'typeOf':
+            return `jsonb_typeof(${elemJsonb}) = ${(0, pg_format_1.default)('%L', args[0])}`;
+        default:
+            return '';
+    }
+}
+function buildJsonNestedElementSQL(path, op, args) {
+    const elemText = path.length === 1
+        ? `elem->>${(0, pg_format_1.default)('%L', path[0])}`
+        : `elem#>>'{${path.join(',')}}'`;
+    const elemJsonb = path.length === 1
+        ? `elem->${(0, pg_format_1.default)('%L', path[0])}`
+        : `elem#>'{${path.join(',')}}'`;
+    switch (op) {
+        case 'equal':
+            return typeof args[0] === 'boolean'
+                ? `${elemText} = ${(0, pg_format_1.default)('%L', String(args[0]))}`
+                : typeof args[0] === 'number'
+                    ? `(${elemText})::numeric = ${(0, pg_format_1.default)('%L', args[0])}`
+                    : typeof args[0] === 'object' && args[0] !== null
+                        ? `${elemJsonb} = ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}::jsonb`
+                        : `${elemText} = ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'notEqual':
+            return typeof args[0] === 'number'
+                ? `(${elemText})::numeric != ${(0, pg_format_1.default)('%L', args[0])}`
+                : typeof args[0] === 'object' && args[0] !== null
+                    ? `${elemJsonb} != ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}::jsonb`
+                    : `${elemText} != ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'greaterThan':
+            return `(${elemText})::numeric > ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'greaterThanOrEqual':
+            return `(${elemText})::numeric >= ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'lessThan':
+            return `(${elemText})::numeric < ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'lessThanOrEqual':
+            return `(${elemText})::numeric <= ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'between':
+            return typeof args[0] === 'number'
+                ? `(${elemText})::numeric BETWEEN ${(0, pg_format_1.default)('%L', args[0])} AND ${(0, pg_format_1.default)('%L', args[1])}`
+                : `${elemText} BETWEEN ${(0, pg_format_1.default)('%L', args[0])} AND ${(0, pg_format_1.default)('%L', args[1])}`;
+        case 'in': {
+            const vals = args[0].map(v => (0, pg_format_1.default)('%L', v)).join(', ');
+            return `${elemText} IN (${vals})`;
+        }
+        case 'notIn': {
+            const vals = args[0].map(v => (0, pg_format_1.default)('%L', v)).join(', ');
+            return `${elemText} NOT IN (${vals})`;
+        }
+        case 'like':
+            return `${elemText} LIKE ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'ilike':
+            return `${elemText} ILIKE ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'startsWith':
+            return `${elemText} LIKE ${(0, pg_format_1.default)('%L', `${args[0]}%`)}`;
+        case 'endsWith':
+            return `${elemText} LIKE ${(0, pg_format_1.default)('%L', `%${args[0]}`)}`;
+        case 'contains':
+            if (typeof args[0] === 'string') {
+                return `${elemText} LIKE ${(0, pg_format_1.default)('%L', `%${args[0]}%`)}`;
+            }
+            return `${elemJsonb} @> ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}`;
+        case 'regex':
+            return `${elemText} ~ ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'iregex':
+            return `${elemText} ~* ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'before':
+            return `${elemText} < ${(0, pg_format_1.default)('%L', args[0] instanceof Date ? args[0].toISOString() : args[0])}`;
+        case 'after':
+            return `${elemText} > ${(0, pg_format_1.default)('%L', args[0] instanceof Date ? args[0].toISOString() : args[0])}`;
+        case 'isNull':
+            return `(${elemJsonb} IS NULL OR ${elemJsonb} = 'null'::jsonb)`;
+        case 'isNotNull':
+            return `(${elemJsonb} IS NOT NULL AND ${elemJsonb} != 'null'::jsonb)`;
+        case 'containedBy':
+            return `${elemJsonb} <@ ${(0, pg_format_1.default)('%L', JSON.stringify(args[0]))}`;
+        case 'hasKey':
+            return `${elemJsonb} ? ${(0, pg_format_1.default)('%L', args[0])}`;
+        case 'hasAnyKeys':
+            return `${elemJsonb} ?| ARRAY[${args[0].map(k => (0, pg_format_1.default)('%L', k)).join(',')}]`;
+        case 'hasAllKeys':
+            return `${elemJsonb} ?& ARRAY[${args[0].map(k => (0, pg_format_1.default)('%L', k)).join(',')}]`;
+        case 'typeOf':
+            return `jsonb_typeof(${elemJsonb}) = ${(0, pg_format_1.default)('%L', args[0])}`;
+        default:
+            return '';
+    }
+}

package/dist/cjs/{condition → pg/condition}/jsonb-condition-builder.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonbConditionCollector = exports.JsonbArrayConditionBuilder = void 0;
 exports.buildJsonbConditionSQL = buildJsonbConditionSQL;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 class JsonbArrayConditionBuilder {
     parent;
     constructor(parent) {

package/dist/cjs/{condition → pg/condition}/network-condition-builder.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkConditionCollector = void 0;
 exports.buildNetworkConditionSQL = buildNetworkConditionSQL;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 function networkToSQL(address) {
     if (typeof address === 'string')
         return address;

package/dist/cjs/{condition → pg/condition}/postgis-condition-builder.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PostgisConditionCollector = void 0;
 exports.buildPostgisConditionSQL = buildPostgisConditionSQL;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 function isGeoJson(input) {
     return typeof input === 'object' && input !== null && 'type' in input && 'coordinates' in input;
 }

package/dist/cjs/{condition → pg/condition}/range-condition-builder.cjs

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RangeConditionCollector = void 0;
 exports.buildRangeConditionSQL = buildRangeConditionSQL;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 function rangeToSQL(range) {
     if (typeof range === 'string')
         return range;

package/dist/cjs/{count → pg/count}/count-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CountBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const condition_collector_1 = require("../condition/condition-collector.cjs");
 class CountBuilder {
     tableName;
@@ -48,10 +48,15 @@ class CountBuilder {
         });
         return this;
     }
-    where(callback) {
-        const conditionBuilder = new condition_collector_1.ConditionCollector();
-        callback(conditionBuilder);
-        this.whereConditions.push(...conditionBuilder.getConditions());
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof condition_collector_1.ConditionCollector) {
+            this.whereConditions.push(...callbackOrCondition.getConditions());
+        }
+        else {
+            const conditionBuilder = new condition_collector_1.ConditionCollector();
+            callbackOrCondition(conditionBuilder);
+            this.whereConditions.push(...conditionBuilder.getConditions());
+        }
         return this;
     }
     toString() {

package/dist/cjs/{delete → pg/delete}/delete-builder.cjs

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteBuilder = void 0;
-const pg_format_1 = __importDefault(require("../shared/pg-format.cjs"));
+const pg_format_1 = __importDefault(require("../../shared/pg-format.cjs"));
 const condition_collector_1 = require("../condition/condition-collector.cjs");
 const select_builder_1 = require("../select/select-builder.cjs");
 const count_builder_1 = require("../count/count-builder.cjs");
@@ -53,10 +53,15 @@ class DeleteBuilder {
             };
         });
     }
-    where(callback) {
-        const conditionBuilder = new condition_collector_1.ConditionCollector();
-        callback(conditionBuilder);
-        this.whereConditions.push(...conditionBuilder.getConditions());
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof condition_collector_1.ConditionCollector) {
+            this.whereConditions.push(...callbackOrCondition.getConditions());
+        }
+        else {
+            const conditionBuilder = new condition_collector_1.ConditionCollector();
+            callbackOrCondition(conditionBuilder);
+            this.whereConditions.push(...conditionBuilder.getConditions());
+        }
         return this;
     }
     returning(columns) {

package/dist/cjs/{core → pg}/helpers/ConnectedAggregateBuilder.cjs

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectedAggregateBuilder = void 0;
-const methods_1 = require("./methods.cjs");
-const table_accessor_1 = require("../shared/table-accessor.cjs");
+const condition_collector_1 = require("../condition/condition-collector.cjs");
+const methods_1 = require("../../core/helpers/methods.cjs");
+const table_accessor_1 = require("../../core/shared/table-accessor.cjs");
+const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
 class ConnectedAggregateBuilder {
     builder;
     relq;
@@ -12,6 +14,7 @@ class ConnectedAggregateBuilder {
         this.relq = relq;
         this.tableName = tableName;
     }
+    get _sourceTableKey() { return this.tableName; }
     mapColumn(column) {
         const transformed = this.relq[methods_1.INTERNAL].transformToDbColumns(this.tableName, { [column]: true });
         return Object.keys(transformed)[0] || column;
@@ -73,7 +76,17 @@ class ConnectedAggregateBuilder {
         this.builder.boolOr(this.mapColumn(column), alias);
         return this;
     }
-    where(callback) {
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof condition_collector_1.ConditionCollector) {
+            const conditionTable = callbackOrCondition._tableName;
+            if (conditionTable && conditionTable !== this.tableName) {
+                throw new relq_errors_1.RelqBuilderError(`Condition was created for table '${conditionTable}' but is being used on '${this.tableName}'. ` +
+                    `Create the condition with db.where('${this.tableName}') instead.`);
+            }
+            this.builder.where(callbackOrCondition);
+            return this;
+        }
+        const callback = callbackOrCondition;
         this.builder.where((q) => {
             q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
             return callback(q);

package/dist/cjs/{core → pg}/helpers/ConnectedCountBuilder.cjs

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectedCountBuilder = void 0;
-const methods_1 = require("./methods.cjs");
-const table_accessor_1 = require("../shared/table-accessor.cjs");
+const condition_collector_1 = require("../condition/condition-collector.cjs");
+const methods_1 = require("../../core/helpers/methods.cjs");
+const table_accessor_1 = require("../../core/shared/table-accessor.cjs");
+const relq_errors_1 = require("../../shared/errors/relq-errors.cjs");
 class ConnectedCountBuilder {
     builder;
     relq;
@@ -13,6 +15,7 @@ class ConnectedCountBuilder {
         this.relq = relq;
         this.tableName = tableName;
     }
+    get _sourceTableKey() { return this.tableName; }
     group(name, callback, options) {
         this.groupNames.push(name);
         this.builder.group(name, (q) => {
@@ -21,7 +24,17 @@ class ConnectedCountBuilder {
         }, options);
         return this;
     }
-    where(callback) {
+    where(callbackOrCondition) {
+        if (callbackOrCondition instanceof condition_collector_1.ConditionCollector) {
+            const conditionTable = callbackOrCondition._tableName;
+            if (conditionTable && conditionTable !== this.tableName) {
+                throw new relq_errors_1.RelqBuilderError(`Condition was created for table '${conditionTable}' but is being used on '${this.tableName}'. ` +
+                    `Create the condition with db.where('${this.tableName}') instead.`);
+            }
+            this.builder.where(callbackOrCondition);
+            return this;
+        }
+        const callback = callbackOrCondition;
         this.builder.where((q) => {
             q._tables = (0, table_accessor_1.createTableAccessor)(this.relq, this.relq.schema);
             const wrapped = this.wrapConditionBuilder(q);