proto.io 0.0.168 → 0.0.170

package/dist/adapters/storage/progres.mjs

@@ -5,9 +5,9 @@ import QueryStream from 'pg-query-stream';
 import { asyncStream } from '@o2ter/utils-js';
 import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
-import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-BejQNqvC.mjs';
+import { a as QueryCoditionalSelector, b as QueryFieldSelector, c as QueryExpressionSelector, d as QueryDistanceExpression, e as QueryCoditionalExpression, f as QueryComparisonExpression, g as QueryNotExpression, h as QueryArrayExpression, i as QueryValueExpression, j as QueryKeyExpression, Q as QuerySelector, F as FieldSelectorExpression } from '../../internals/index-B1wqSio6.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-DrURPPxr.mjs';
+import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-BCpwYpyw.mjs';
 import { P as PVK } from '../../internals/private-BUpLAMZi.mjs';
 
 //
@@ -885,9 +885,6 @@ const fetchElement = (compiler, parent, field) => {
             relation: {
                 target: dataType.target,
                 populate,
-                mapElem: (callback) => sql `SELECT
-          ${callback(sql `${json ? sql `VALUE` : sql `UNNEST`}`)}
-        FROM ${json ? sql `jsonb_array_elements(${element})` : sql `UNNEST(${element})`}`,
             },
         };
     }
@@ -2128,12 +2125,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
         case '$lt':
         case '$lte':
             {
-                const operatorMap = {
+                const op = {
                     '$gt': '>',
                     '$gte': '>=',
                     '$lt': '<',
                     '$lte': '<=',
-                };
+                }[expr.type];
                 if (_.isRegExp(expr.value) || expr.value instanceof QuerySelector || expr.value instanceof FieldSelectorExpression)
                     break;
                 if (dataType && isPrimitive(dataType)) {
@@ -2141,46 +2138,47 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         case 'boolean':
                             if (!_.isBoolean(expr.value))
                                 break;
-                            return sql `${element} ${{ literal: operatorMap[expr.type] }} ${encodeValue(expr.value)}`;
+                            return sql `${element} ${{ literal: op }} ${encodeValue(expr.value)}`;
                         case 'number':
                         case 'decimal':
                             if (!(expr.value instanceof Decimal) && !_.isNumber(expr.value))
                                 break;
-                            return sql `${element} ${{ literal: operatorMap[expr.type] }} ${encodeValue(expr.value)}`;
+                            return sql `${element} ${{ literal: op }} ${encodeValue(expr.value)}`;
                         case 'string':
                             if (!_.isString(expr.value))
                                 break;
-                            return sql `${element} ${{ literal: operatorMap[expr.type] }} ${encodeValue(expr.value)}`;
+                            return sql `${element} ${{ literal: op }} ${encodeValue(expr.value)}`;
                         case 'date':
                             if (!_.isDate(expr.value))
                                 break;
-                            return sql `${element} ${{ literal: operatorMap[expr.type] }} ${encodeValue(expr.value)}`;
+                            return sql `${element} ${{ literal: op }} ${encodeValue(expr.value)}`;
                     }
                 }
                 else if (!_.isString(dataType) && dataType?.type === 'pointer' && expr.value instanceof TObject && expr.value.objectId) {
-                    return sql `${element} ${{ literal: operatorMap[expr.type] }} ${{ value: expr.value.objectId }}`;
+                    return sql `${element} ${{ literal: op }} ${{ value: expr.value.objectId }}`;
                 }
                 else if (!dataType) {
                     if (expr.value instanceof Decimal || _.isNumber(expr.value)) {
                         return sql `(
               jsonb_typeof(${element}) ${nullSafeEqual()} 'number'
-              AND ${element}::NUMERIC ${{ literal: operatorMap[expr.type] }} ${{ value: expr.value instanceof Decimal ? expr.value.toNumber() : expr.value }}
+              AND ${element}::NUMERIC ${{ literal: op }} ${{ value: expr.value instanceof Decimal ? expr.value.toNumber() : expr.value }}
             ) OR (
               jsonb_typeof(${element} -> '$decimal') ${nullSafeEqual()} 'string'
-              AND (${element} ->> '$decimal')::DECIMAL ${{ literal: operatorMap[expr.type] }} ${{ value: expr.value instanceof Decimal ? expr.value.toString() : expr.value }}::DECIMAL
+              AND (${element} ->> '$decimal')::DECIMAL ${{ literal: op }} ${{ value: expr.value instanceof Decimal ? expr.value.toString() : expr.value }}::DECIMAL
             )`;
                     }
                     else if (_.isDate(expr.value)) {
                         return sql `(
               jsonb_typeof(${element} -> '$date') ${nullSafeEqual()} 'string'
-              AND ${element} ${{ literal: operatorMap[expr.type] }} ${encodeValue(expr.value)}
+              AND ${element} ${{ literal: op }} ${encodeValue(expr.value)}
             )`;
                     }
                     else {
-                        return sql `${element} ${{ literal: operatorMap[expr.type] }} ${encodeValue(expr.value)}`;
+                        return sql `${element} ${{ literal: op }} ${encodeValue(expr.value)}`;
                     }
                 }
             }
+            break;
         case '$in':
             {
                 if (!_.isArray(expr.value))
@@ -2216,6 +2214,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         return sql `${element} IN (${_.map(values, x => encodeValue(x))})`;
                 }
             }
+            break;
         case '$nin':
             {
                 if (!_.isArray(expr.value))
@@ -2251,76 +2250,38 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         return sql `${element} NOT IN (${_.map(values, x => encodeValue(x))})`;
                 }
             }
+            break;
         case '$subset':
-            {
-                if (!_.isArray(expr.value))
-                    break;
-                if (dataType === 'array' || (!_.isString(dataType) && dataType?.type === 'array')) {
-                    return sql `${element} <@ ${{ value: _encodeValue(expr.value) }}`;
-                }
-                if (relation) {
-                    if (!_.every(expr.value, x => x instanceof TObject && x.objectId))
-                        break;
-                    return sql `ARRAY(${relation.mapElem((v) => sql `${v} ->> '_id'`)}) <@ ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
-                }
-                if (!dataType) {
-                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} <@ ${_encodeJsonValue(_encodeValue(expr.value))}`;
-                }
-            }
         case '$superset':
-            {
-                if (!_.isArray(expr.value))
-                    break;
-                if (_.isEmpty(expr.value))
-                    return sql `true`;
-                if (dataType === 'array' || (!_.isString(dataType) && dataType?.type === 'array')) {
-                    return sql `${element} @> ${{ value: _encodeValue(expr.value) }}`;
-                }
-                if (relation) {
-                    if (!_.every(expr.value, x => x instanceof TObject && x.objectId))
-                        break;
-                    return sql `ARRAY(${relation.mapElem((v) => sql `${v} ->> '_id'`)}) @> ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
-                }
-                if (!dataType) {
-                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} @> ${_encodeJsonValue(_encodeValue(expr.value))}`;
-                }
-            }
-        case '$disjoint':
-            {
-                if (!_.isArray(expr.value))
-                    break;
-                if (_.isEmpty(expr.value))
-                    return sql `true`;
-                if (dataType === 'array' || (!_.isString(dataType) && dataType?.type === 'array')) {
-                    return sql `NOT ${element} && ${{ value: _encodeValue(expr.value) }}`;
-                }
-                if (relation) {
-                    if (!_.every(expr.value, x => x instanceof TObject && x.objectId))
-                        break;
-                    return sql `NOT ARRAY(${relation.mapElem((v) => sql `${v} ->> '_id'`)}) && ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
-                }
-                if (!dataType) {
-                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND NOT ${element} && ${_encodeJsonValue(_encodeValue(expr.value))}`;
-                }
-            }
         case '$intersect':
             {
+                const op = {
+                    '$subset': '<@',
+                    '$superset': '@>',
+                    '$intersect': '&&',
+                }[expr.type];
                 if (!_.isArray(expr.value))
                     break;
                 if (_.isEmpty(expr.value))
-                    return sql `false`;
+                    return sql `true`;
                 if (dataType === 'array' || (!_.isString(dataType) && dataType?.type === 'array')) {
-                    return sql `${element} && ${{ value: _encodeValue(expr.value) }}`;
+                    return sql `${element} ${{ literal: op }} ${{ value: _encodeValue(expr.value) }}`;
                 }
-                if (relation) {
+                if (relation && parent.className) {
                     if (!_.every(expr.value, x => x instanceof TObject && x.objectId))
                         break;
-                    return sql `ARRAY(${relation.mapElem((v) => sql `${v} ->> '_id'`)}) && ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
+                    const tempName = `_populate_expr_$${compiler.nextIdx()}`;
+                    const populate = _selectRelationPopulate(compiler, { className: parent.className, name: parent.name }, relation.populate, `$${field}`, false);
+                    return sql `ARRAY(
+            SELECT ${{ identifier: '_id' }}
+            FROM (${populate}) AS ${{ identifier: tempName }}
+          ) ${{ literal: op }} ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
                 }
                 if (!dataType) {
-                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} && ${_encodeJsonValue(_encodeValue(expr.value))}`;
+                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} ${{ literal: op }} ${_encodeJsonValue(_encodeValue(expr.value))}`;
                 }
             }
+            break;
         case '$not':
             {
                 if (!(expr.value instanceof FieldSelectorExpression))
@@ -2350,6 +2311,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     }
                 }
             }
+            break;
         case '$starts':
             {
                 if (!_.isString(expr.value))
@@ -2361,6 +2323,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'string' AND (${element} #>> '{}') LIKE ${{ value: `${expr.value.replace(/([\\_%])/g, '\\$1')}%` }}`;
                 }
             }
+            break;
         case '$ends':
             {
                 if (!_.isString(expr.value))
@@ -2372,6 +2335,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'string' AND (${element} #>> '{}') LIKE ${{ value: `%${expr.value.replace(/([\\_%])/g, '\\$1')}` }}`;
                 }
             }
+            break;
         case '$size':
             {
                 if (!_.isNumber(expr.value) || !_.isSafeInteger(expr.value))
@@ -2392,6 +2356,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
         case '$empty':
             {
                 if (!_.isBoolean(expr.value))
@@ -2412,11 +2377,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
         case '$every':
             {
                 if (!(expr.value instanceof QuerySelector))
                     break;
-                if (relation?.populate && parent.className) {
+                if (relation && parent.className) {
                     const tempName = `_populate_expr_$${compiler.nextIdx()}`;
                     const filter = compiler._encodeFilter({
                         name: tempName,
@@ -2425,11 +2391,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     }, expr.value);
                     if (!filter)
                         break;
+                    const populate = _selectRelationPopulate(compiler, { className: parent.className, name: parent.name }, relation.populate, `$${field}`, false);
                     return sql `NOT EXISTS(
-            SELECT * FROM (${_selectRelationPopulate(compiler, {
-                        className: parent.className,
-                        name: parent.name,
-                    }, relation.populate, `$${field}`, false)}) AS ${{ identifier: tempName }}
+            SELECT * FROM (${populate}) AS ${{ identifier: tempName }}
             WHERE NOT (${filter})
           )`;
                 }
@@ -2450,11 +2414,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
         case '$some':
             {
                 if (!(expr.value instanceof QuerySelector))
                     break;
-                if (relation?.populate && parent.className) {
+                if (relation && parent.className) {
                     const tempName = `_populate_expr_$${compiler.nextIdx()}`;
                     const filter = compiler._encodeFilter({
                         name: tempName,
@@ -2463,11 +2428,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     }, expr.value);
                     if (!filter)
                         break;
+                    const populate = _selectRelationPopulate(compiler, { className: parent.className, name: parent.name }, relation.populate, `$${field}`, false);
                     return sql `EXISTS(
-            SELECT * FROM (${_selectRelationPopulate(compiler, {
-                        className: parent.className,
-                        name: parent.name,
-                    }, relation.populate, `$${field}`, false)}) AS ${{ identifier: tempName }}
+            SELECT * FROM (${populate}) AS ${{ identifier: tempName }}
             WHERE ${filter}
           )`;
                 }
@@ -2488,6 +2451,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
     }
     throw Error('Invalid expression');
 };