proto.io 0.0.217 → 0.0.219

package/dist/adapters/storage/progres.mjs

@@ -1,11 +1,11 @@
 import _ from 'lodash';
-import { a as isRelation, i as isPointer, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, T as TObject, _ as _encodeValue, f as dimensionOf, g as _decodeValue, h as _typeof, j as isVector, k as _isTypeof } from '../../internals/index-BzDsTt4R.mjs';
+import { a as isRelation, i as isPointer, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, T as TObject, _ as _encodeValue, f as dimensionOf, g as _decodeValue, h as _typeof, j as isVector, k as _isTypeof } from '../../internals/index-gWcE22mf.mjs';
 import { Pool, types } from 'pg';
 import QueryStream from 'pg-query-stream';
 import { asyncStream, IteratorPool } from '@o2ter/utils-js';
 import Decimal from 'decimal.js';
 import { escapeLiteral, escapeIdentifier } from 'pg/lib/utils';
-import { r as resolveColumn, b as resolveDataType$1, d as QueryCoditionalSelector, e as QueryFieldSelector, f as QueryExpressionSelector, g as QueryArrayExpression, h as QueryValueExpression, i as QueryKeyExpression, j as QueryCoditionalExpression, k as QueryComparisonExpression, l as QueryNotExpression, m as QueryDistanceExpression, n as QueryZeroParamExpression, o as QueryUnaryExpression, p as QueryBinaryExpression, q as QueryListExpression, s as QueryTernaryExpression, t as QueryCondExpression, Q as QueryValidator, u as QueryZeroParamAccumulator, v as QueryUnaryAccumulator, w as QueryPercentileAccumulator, c as QuerySelector, F as FieldSelectorExpression } from '../../internals/validator-CEcBF4Cn.mjs';
+import { r as resolveColumn, b as resolveDataType$1, d as QueryCoditionalSelector, e as QueryFieldSelector, f as QueryExpressionSelector, g as QueryArrayExpression, h as QueryValueExpression, i as QueryKeyExpression, j as QueryCoditionalExpression, k as QueryComparisonExpression, l as QueryNotExpression, m as QueryDistanceExpression, n as QueryZeroParamExpression, o as QueryUnaryExpression, p as QueryBinaryExpression, q as QueryListExpression, s as QueryTernaryExpression, t as QueryCondExpression, Q as QueryValidator, u as QueryZeroParamAccumulator, v as QueryUnaryAccumulator, w as QueryPercentileAccumulator, c as QuerySelector, F as FieldSelectorExpression } from '../../internals/validator-DX2nXeQo.mjs';
 import '@o2ter/crypto-js';
 import { c as PROTO_EVENT } from '../../internals/const-Dkp7Nsv5.mjs';
 import { g as generateId } from '../../internals/random-CYjWDvex.mjs';
@@ -185,12 +185,12 @@ const _encodeSorting = (includes, populates, sort) => {
     return sorting;
 };
 const _defaultInsertOpts = (options) => {
-    const objectId = generateId(options.objectIdSize);
+    const id = generateId(options.objectIdSize);
     return {
-        _id: sql `${{ value: objectId }}`,
+        _id: sql `${{ value: id }}`,
         ...options.className === 'User' ? {
-            _rperm: sql `${{ value: [objectId] }}`,
-            _wperm: sql `${{ value: [objectId] }}`,
+            _rperm: sql `${{ value: [id] }}`,
+            _wperm: sql `${{ value: [id] }}`,
         } : {},
     };
 };
@@ -628,12 +628,12 @@ const encodeType = (colname, dataType, value) => {
                 break;
             return sql `ARRAY[${_.map(value, x => _encodeJsonValue(_encodeValue(x)))}]::JSONB[]`;
         case 'pointer':
-            if (value instanceof TObject && value.objectId)
-                return sql `${{ value: `${value.className}$${value.objectId}` }}`;
+            if (value instanceof TObject && value.id)
+                return sql `${{ value: `${value.className}$${value.id}` }}`;
             break;
         case 'relation':
-            if (_.isArray(value) && _.every(value, x => x instanceof TObject && x.objectId)) {
-                return sql `${{ value: _.uniq(_.map(value, (x) => `${x.className}$${x.objectId}`)) }}`;
+            if (_.isArray(value) && _.every(value, x => x instanceof TObject && x.id)) {
+                return sql `${{ value: _.uniq(_.map(value, (x) => `${x.className}$${x.id}`)) }}`;
             }
             break;
     }
@@ -1313,7 +1313,7 @@ class SqlStorage {
                 const _value = _.get(value, path);
                 if (_.isPlainObject(_value)) {
                     const decoded = this._decodeObject(type.target, _value, matchType);
-                    if (decoded.objectId)
+                    if (decoded.id)
                         _.set(result, path, decoded);
                 }
             }
@@ -1353,7 +1353,7 @@ class SqlStorage {
             else if (isPointer(dataType)) {
                 if (_.isPlainObject(value)) {
                     const decoded = this._decodeObject(dataType.target, value, matchType);
-                    if (decoded.objectId)
+                    if (decoded.id)
                         obj[PVK].attributes[key] = decoded;
                 }
             }
@@ -1446,7 +1446,7 @@ class SqlStorage {
         const self = this;
         const query = sql `
       SELECT *
-      FROM (${this._refs(_.pick(this.schema, classNames), object.className, TObject.defaultKeys, sql `${{ value: `${object.className}$${object.objectId}` }}`)}) AS "$"
+      FROM (${this._refs(_.pick(this.schema, classNames), object.className, TObject.defaultKeys, sql `${{ value: `${object.className}$${object.id}` }}`)}) AS "$"
       ${_.isNil(roles) ? sql `` : sql `WHERE ${{ identifier: '$' }}.${{ identifier: '_rperm' }} && ${{ value: roles }}`}
     `;
         return (async function* () {
@@ -2037,25 +2037,25 @@ const updateOperation = (paths, dataType, operation) => {
                 case '$addToSet':
                 case '$push':
                     {
-                        if (!_.isArray(value) || !_.every(value, x => x instanceof TObject && x.objectId))
+                        if (!_.isArray(value) || !_.every(value, x => x instanceof TObject && x.id))
                             break;
-                        const objectIds = _.uniq(_.map(value, (x) => `${x.className}$${x.objectId}`));
+                        const ids = _.uniq(_.map(value, (x) => `${x.className}$${x.id}`));
                         return sql `ARRAY(
               SELECT DISTINCT "$"
-              FROM UNNEST(${{ identifier: column }} || ARRAY[${_.map(objectIds, (x) => sql `${{ value: x }}`)}]) "$"
+              FROM UNNEST(${{ identifier: column }} || ARRAY[${_.map(ids, (x) => sql `${{ value: x }}`)}]) "$"
               RIGHT JOIN ${{ identifier: dataType.target }} ON "$" = (${{ quote: dataType.target + '$' }} || ${{ identifier: dataType.target }}._id)
             )`;
                     }
                 case '$removeAll':
                     {
-                        if (!_.isArray(value) || !_.every(value, x => x instanceof TObject && x.objectId))
+                        if (!_.isArray(value) || !_.every(value, x => x instanceof TObject && x.id))
                             break;
-                        const objectIds = _.uniq(_.map(value, (x) => `${x.className}$${x.objectId}`));
+                        const ids = _.uniq(_.map(value, (x) => `${x.className}$${x.id}`));
                         return sql `ARRAY(
               SELECT "$"
               FROM UNNEST(${{ identifier: column }}) "$"
               RIGHT JOIN ${{ identifier: dataType.target }} ON "$" = (${{ quote: dataType.target + '$' }} || ${{ identifier: dataType.target }}._id)
-              WHERE "$" NOT IN (${_.map(objectIds, (x) => sql `${{ value: x }}`)})
+              WHERE "$" NOT IN (${_.map(ids, (x) => sql `${{ value: x }}`)})
             )`;
                     }
             }
@@ -2555,9 +2555,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 if (_.isNil(expr.value))
                     return sql `${element} IS NULL`;
                 if (!_.isString(dataType) && dataType?.type === 'pointer') {
-                    if (!(expr.value instanceof TObject) || dataType.target !== expr.value.className || !expr.value.objectId)
+                    if (!(expr.value instanceof TObject) || dataType.target !== expr.value.className || !expr.value.id)
                         break;
-                    return sql `${element} ${nullSafeEqual()} ${{ value: expr.value.objectId }}`;
+                    return sql `${element} ${nullSafeEqual()} ${{ value: expr.value.id }}`;
                 }
                 return sql `${element} ${nullSafeEqual()} ${encodeValue(expr.value)}`;
             }
@@ -2568,9 +2568,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                 if (_.isNil(expr.value))
                     return sql `${element} IS NOT NULL`;
                 if (!_.isString(dataType) && dataType?.type === 'pointer') {
-                    if (!(expr.value instanceof TObject) || dataType.target !== expr.value.className || !expr.value.objectId)
+                    if (!(expr.value instanceof TObject) || dataType.target !== expr.value.className || !expr.value.id)
                         break;
-                    return sql `${element} ${nullSafeNotEqual()} ${{ value: expr.value.objectId }}`;
+                    return sql `${element} ${nullSafeNotEqual()} ${{ value: expr.value.id }}`;
                 }
                 return sql `${element} ${nullSafeNotEqual()} ${encodeValue(expr.value)}`;
             }
@@ -2612,8 +2612,8 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                             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: op }} ${{ value: expr.value.objectId }}`;
+                else if (!_.isString(dataType) && dataType?.type === 'pointer' && expr.value instanceof TObject && expr.value.id) {
+                    return sql `${element} ${{ literal: op }} ${{ value: expr.value.id }}`;
                 }
                 else if (!dataType) {
                     if (expr.value instanceof Decimal || _.isNumber(expr.value)) {
@@ -2649,9 +2649,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                             if (!_.isString(dataType) && dataType?.type === 'pointer') {
                                 if (_.isNil(value))
                                     return sql `${element} IS NULL`;
-                                if (!(value instanceof TObject) || dataType.target !== value.className || !value.objectId)
+                                if (!(value instanceof TObject) || dataType.target !== value.className || !value.id)
                                     break;
-                                return sql `${element} ${nullSafeEqual()} ${{ value: value.objectId }}`;
+                                return sql `${element} ${nullSafeEqual()} ${{ value: value.id }}`;
                             }
                             return sql `${element} ${nullSafeEqual()} ${encodeValue(value)}`;
                         }
@@ -2659,12 +2659,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         const containsNil = _.some(expr.value, x => _.isNil(x));
                         const values = _.filter(expr.value, x => !_.isNil(x));
                         if (!_.isString(dataType) && dataType?.type === 'pointer') {
-                            if (!_.every(values, x => x instanceof TObject && dataType.target === x.className && x.objectId))
+                            if (!_.every(values, x => x instanceof TObject && dataType.target === x.className && x.id))
                                 break;
                             if (containsNil) {
-                                return sql `${element} IS NULL OR ${element} IN (${_.map(values, (x) => sql `${{ value: x.objectId }}`)})`;
+                                return sql `${element} IS NULL OR ${element} IN (${_.map(values, (x) => sql `${{ value: x.id }}`)})`;
                             }
-                            return sql `${element} IN (${_.map(values, (x) => sql `${{ value: x.objectId }}`)})`;
+                            return sql `${element} IN (${_.map(values, (x) => sql `${{ value: x.id }}`)})`;
                         }
                         if (containsNil) {
                             return sql `${element} IS NULL OR ${element} IN (${_.map(values, x => encodeValue(x))})`;
@@ -2685,9 +2685,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                             if (!_.isString(dataType) && dataType?.type === 'pointer') {
                                 if (_.isNil(value))
                                     return sql `${element} IS NOT NULL`;
-                                if (!(value instanceof TObject) || dataType.target !== value.className || !value.objectId)
+                                if (!(value instanceof TObject) || dataType.target !== value.className || !value.id)
                                     break;
-                                return sql `${element} ${nullSafeNotEqual()} ${{ value: value.objectId }}`;
+                                return sql `${element} ${nullSafeNotEqual()} ${{ value: value.id }}`;
                             }
                             return sql `${element} ${nullSafeNotEqual()} ${encodeValue(value)}`;
                         }
@@ -2695,12 +2695,12 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                         const containsNil = _.some(expr.value, x => _.isNil(x));
                         const values = _.filter(expr.value, x => !_.isNil(x));
                         if (!_.isString(dataType) && dataType?.type === 'pointer') {
-                            if (!_.every(values, x => x instanceof TObject && dataType.target === x.className && x.objectId))
+                            if (!_.every(values, x => x instanceof TObject && dataType.target === x.className && x.id))
                                 break;
                             if (containsNil) {
-                                return sql `${element} IS NOT NULL AND ${element} NOT IN (${_.map(values, (x) => sql `${{ value: x.objectId }}`)})`;
+                                return sql `${element} IS NOT NULL AND ${element} NOT IN (${_.map(values, (x) => sql `${{ value: x.id }}`)})`;
                             }
-                            return sql `${element} NOT IN (${_.map(values, (x) => sql `${{ value: x.objectId }}`)})`;
+                            return sql `${element} NOT IN (${_.map(values, (x) => sql `${{ value: x.id }}`)})`;
                         }
                         if (containsNil) {
                             return sql `${element} IS NOT NULL AND ${element} NOT IN (${_.map(values, x => encodeValue(x))})`;
@@ -2730,14 +2730,14 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     return sql `${element} ${{ literal: op }} ${{ value: _encodeValue(expr.value) }}`;
                 }
                 if (relation && parent.className) {
-                    if (!_.every(expr.value, x => x instanceof TObject && relation.target === x.className && x.objectId))
+                    if (!_.every(expr.value, x => x instanceof TObject && relation.target === x.className && x.id))
                         break;
                     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 }}`)}]::TEXT[]`;
+          ) ${{ literal: op }} ARRAY[${_.map(expr.value, (x) => sql `${{ value: x.id }}`)}]::TEXT[]`;
                 }
                 if (!dataType) {
                     return sql `jsonb_typeof(${element}) ${nullSafeEqual()} 'array' AND ${element} ${{ literal: op }} ${_encodeJsonValue(_encodeValue(expr.value))}`;
@@ -3023,7 +3023,7 @@ const encodeRelation = (compiler, parent, relatedBy) => {
     SELECT 1
     FROM ${{ identifier: relatedBy.className }} AS ${{ identifier: name }}
     ${!_.isEmpty(joins) ? { literal: joins, separator: '\n' } : sql ``}
-    WHERE ${_foreign('_id')} = ${{ value: relatedBy.objectId }} AND ${sql `(${{ quote: parent.className + '$' }} || ${_local('_id')})`} = ANY(${field})
+    WHERE ${_foreign('_id')} = ${{ value: relatedBy.id }} AND ${sql `(${{ quote: parent.className + '$' }} || ${_local('_id')})`} = ANY(${field})
   )`;
 };