proto.io 0.0.168 → 0.0.169

package/dist/adapters/file/database.d.ts

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-y8EePsDY.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rkqvel7o.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-BB2vDnq0.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B5u7VXjz.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
 var index = require('../../internals/index-BqFdBhFc.js');
-var index$1 = require('../../internals/index-CSNRyhjB.js');
+var index$1 = require('../../internals/index-CzfsyXvb.js');
 var utilsJs = require('@o2ter/utils-js');
 require('util');
 require('zlib');

package/dist/adapters/file/database.mjs

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { F as FileStorageBase } from '../../internals/index-be1VYBY2.mjs';
-import { Q as QuerySelector } from '../../internals/index-BejQNqvC.mjs';
+import { Q as QuerySelector } from '../../internals/index-B1wqSio6.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
 import 'util';
 import 'zlib';

package/dist/adapters/file/filesystem.d.ts

@@ -1,5 +1,5 @@
-import { P as ProtoService } from '../../internals/index-y8EePsDY.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rkqvel7o.js';
+import { P as ProtoService } from '../../internals/index-BB2vDnq0.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B5u7VXjz.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.d.ts

@@ -1,7 +1,7 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-y8EePsDY.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-rkqvel7o.js';
+import { P as ProtoService } from '../../internals/index-BB2vDnq0.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/index-B5u7VXjz.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/storage/progres.d.ts

@@ -1,5 +1,5 @@
 import { Pool, PoolClient, PoolConfig } from 'pg';
-import { _ as _TValue, o as EventData, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-y8EePsDY.js';
+import { _ as _TValue, o as EventData, T as TSchema, Q as QuerySelector, p as DecodedQuery, F as FindOptions, R as RelationOptions, q as DecodedSortOption, I as InsertOptions, r as TValue, t as FindOneOptions, u as TUpdateOp, v as FieldSelectorExpression, w as QueryExpression, x as TStorage, y as TransactionOptions, h as TObject, z as TQueryRandomOptions, A as TPubSub } from '../../internals/index-BB2vDnq0.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.js

@@ -9,9 +9,9 @@ var QueryStream = require('pg-query-stream');
 var utilsJs = require('@o2ter/utils-js');
 var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
-var index$1 = require('../../internals/index-CSNRyhjB.js');
+var index$1 = require('../../internals/index-CzfsyXvb.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-q0PeamQE.js');
+var random$1 = require('../../internals/random-Dytum6Nh.js');
 var _private = require('../../internals/private-CSB1Ep4g.js');
 
 //
@@ -889,9 +889,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})`}`,
             },
         };
     }
@@ -2132,12 +2129,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 index$1.QuerySelector || expr.value instanceof index$1.FieldSelectorExpression)
                     break;
                 if (dataType && index.isPrimitive(dataType)) {
@@ -2145,46 +2142,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 index.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))
@@ -2220,6 +2218,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         return sql `${element} IN (${_.map(values, x => encodeValue(x))})`;
                 }
             }
+            break;
         case '$nin':
             {
                 if (!_.isArray(expr.value))
@@ -2255,76 +2254,34 @@ 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: index._encodeValue(expr.value) }}`;
-                }
-                if (relation) {
-                    if (!_.every(expr.value, x => x instanceof index.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(index._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: index._encodeValue(expr.value) }}`;
-                }
-                if (relation) {
-                    if (!_.every(expr.value, x => x instanceof index.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(index._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: index._encodeValue(expr.value) }}`;
-                }
-                if (relation) {
-                    if (!_.every(expr.value, x => x instanceof index.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(index._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: index._encodeValue(expr.value) }}`;
+                    return sql `${element} ${{ literal: op }} ${{ value: index._encodeValue(expr.value) }}`;
                 }
-                if (relation) {
+                if (relation && parent.className) {
                     if (!_.every(expr.value, x => x instanceof index.TObject && x.objectId))
                         break;
-                    return sql `ARRAY(${relation.mapElem((v) => sql `${v} ->> '_id'`)}) && ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
+                    const populate = _selectRelationPopulate(compiler, { className: parent.className, name: parent.name }, relation.populate, `$${field}`, false);
+                    return sql `ARRAY(SELECT ${{ identifier: '_id' }} FROM (${populate})) ${{ literal: op }} ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.objectId }}`)}]`;
                 }
                 if (!dataType) {
-                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} && ${_encodeJsonValue(index._encodeValue(expr.value))}`;
+                    return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} ${{ literal: op }} ${_encodeJsonValue(index._encodeValue(expr.value))}`;
                 }
             }
+            break;
         case '$not':
             {
                 if (!(expr.value instanceof index$1.FieldSelectorExpression))
@@ -2354,6 +2311,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     }
                 }
             }
+            break;
         case '$starts':
             {
                 if (!_.isString(expr.value))
@@ -2365,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))
@@ -2376,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))
@@ -2396,6 +2356,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
         case '$empty':
             {
                 if (!_.isBoolean(expr.value))
@@ -2416,11 +2377,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
         case '$every':
             {
                 if (!(expr.value instanceof index$1.QuerySelector))
                     break;
-                if (relation?.populate && parent.className) {
+                if (relation && parent.className) {
                     const tempName = `_populate_expr_$${compiler.nextIdx()}`;
                     const filter = compiler._encodeFilter({
                         name: tempName,
@@ -2429,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})
           )`;
                 }
@@ -2454,11 +2414,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
         case '$some':
             {
                 if (!(expr.value instanceof index$1.QuerySelector))
                     break;
-                if (relation?.populate && parent.className) {
+                if (relation && parent.className) {
                     const tempName = `_populate_expr_$${compiler.nextIdx()}`;
                     const filter = compiler._encodeFilter({
                         name: tempName,
@@ -2467,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}
           )`;
                 }
@@ -2492,6 +2451,7 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
           )`;
                 }
             }
+            break;
     }
     throw Error('Invalid expression');
 };