proto.io 0.0.217 → 0.0.219

package/dist/adapters/file/aliyun-oss.d.ts

@@ -1,7 +1,7 @@
-import { P as ProtoService } from '../../internals/index-Bs8n7Q8f.js';
+import { P as ProtoService } from '../../internals/index-82GLvDiN.js';
 import OSS from 'ali-oss';
-import { a as FileStorageOptions } from '../../internals/base-CWnOBKD5.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-CNNSQpRF.js';
+import { a as FileStorageOptions } from '../../internals/base-C1uAg1dD.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-CpgqvFNO.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-Bs8n7Q8f.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-CWnOBKD5.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-82GLvDiN.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-C1uAg1dD.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _ = require('lodash');
 var base = require('../../internals/base-NsJYo2MG.js');
 var utilsJs = require('@o2ter/utils-js');
-var validator = require('../../internals/validator-mcBCJP4P.js');
+var validator = require('../../internals/validator-B5yHpyvb.js');
 require('util');
 require('zlib');
 require('../../internals/private-Ciddhure.js');
-require('../../internals/index-B8TESzd9.js');
+require('../../internals/index-CLKTEIj0.js');
 require('decimal.js');
 
 //

package/dist/adapters/file/database.mjs

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import { F as FileStorageBase } from '../../internals/base-DYc1_peK.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
-import { c as QuerySelector } from '../../internals/validator-CEcBF4Cn.mjs';
+import { c as QuerySelector } from '../../internals/validator-DX2nXeQo.mjs';
 import 'util';
 import 'zlib';
 import '../../internals/private-CNw40LZ7.mjs';
-import '../../internals/index-BzDsTt4R.mjs';
+import '../../internals/index-gWcE22mf.mjs';
 import 'decimal.js';
 
 //

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

@@ -1,6 +1,6 @@
-import { P as ProtoService } from '../../internals/index-Bs8n7Q8f.js';
-import { a as FileStorageOptions } from '../../internals/base-CWnOBKD5.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-CNNSQpRF.js';
+import { P as ProtoService } from '../../internals/index-82GLvDiN.js';
+import { a as FileStorageOptions } from '../../internals/base-C1uAg1dD.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-CpgqvFNO.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

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

@@ -1,8 +1,8 @@
 import * as _google_cloud_storage from '@google-cloud/storage';
 import { File, Storage } from '@google-cloud/storage';
-import { P as ProtoService } from '../../internals/index-Bs8n7Q8f.js';
-import { a as FileStorageOptions } from '../../internals/base-CWnOBKD5.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-CNNSQpRF.js';
+import { P as ProtoService } from '../../internals/index-82GLvDiN.js';
+import { a as FileStorageOptions } from '../../internals/base-C1uAg1dD.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-CpgqvFNO.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 { a as TValueWithoutObject, T as TSchema, q as TValueWithUndefined, r as TValue, t as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, u as QueryAccumulator, v as QuerySelector, w as DecodedSortOption, x as DecodedQuery, y as FindOptions, I as InsertOptions, z as TStorage, A as TransactionOptions, k as TObject, B as QueryRandomOptions, C as TPubSub } from '../../internals/index-Bs8n7Q8f.js';
+import { a as TValueWithoutObject, T as TSchema, q as TValueWithUndefined, r as TValue, t as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, u as QueryAccumulator, v as QuerySelector, w as DecodedSortOption, x as DecodedQuery, y as FindOptions, I as InsertOptions, z as TStorage, A as TransactionOptions, k as TObject, B as QueryRandomOptions, C as TPubSub } from '../../internals/index-82GLvDiN.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';

package/dist/adapters/storage/progres.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
-var index = require('../../internals/index-B8TESzd9.js');
+var index = require('../../internals/index-CLKTEIj0.js');
 var pg = require('pg');
 var QueryStream = require('pg-query-stream');
 var utilsJs = require('@o2ter/utils-js');
 var Decimal = require('decimal.js');
 var utils = require('pg/lib/utils');
-var validator = require('../../internals/validator-mcBCJP4P.js');
+var validator = require('../../internals/validator-B5yHpyvb.js');
 require('@o2ter/crypto-js');
 var _const = require('../../internals/const-C3I6cfav.js');
 var random$1 = require('../../internals/random-nkOQ9U6S.js');
@@ -189,12 +189,12 @@ const _encodeSorting = (includes, populates, sort) => {
     return sorting;
 };
 const _defaultInsertOpts = (options) => {
-    const objectId = random$1.generateId(options.objectIdSize);
+    const id = random$1.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] }}`,
         } : {},
     };
 };
@@ -632,12 +632,12 @@ const encodeType = (colname, dataType, value) => {
                 break;
             return sql `ARRAY[${_.map(value, x => _encodeJsonValue(index._encodeValue(x)))}]::JSONB[]`;
         case 'pointer':
-            if (value instanceof index.TObject && value.objectId)
-                return sql `${{ value: `${value.className}$${value.objectId}` }}`;
+            if (value instanceof index.TObject && value.id)
+                return sql `${{ value: `${value.className}$${value.id}` }}`;
             break;
         case 'relation':
-            if (_.isArray(value) && _.every(value, x => x instanceof index.TObject && x.objectId)) {
-                return sql `${{ value: _.uniq(_.map(value, (x) => `${x.className}$${x.objectId}`)) }}`;
+            if (_.isArray(value) && _.every(value, x => x instanceof index.TObject && x.id)) {
+                return sql `${{ value: _.uniq(_.map(value, (x) => `${x.className}$${x.id}`)) }}`;
             }
             break;
     }
@@ -1317,7 +1317,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);
                 }
             }
@@ -1357,7 +1357,7 @@ class SqlStorage {
             else if (index.isPointer(dataType)) {
                 if (_.isPlainObject(value)) {
                     const decoded = this._decodeObject(dataType.target, value, matchType);
-                    if (decoded.objectId)
+                    if (decoded.id)
                         obj[_private.PVK].attributes[key] = decoded;
                 }
             }
@@ -1450,7 +1450,7 @@ class SqlStorage {
         const self = this;
         const query = sql `
       SELECT *
-      FROM (${this._refs(_.pick(this.schema, classNames), object.className, index.TObject.defaultKeys, sql `${{ value: `${object.className}$${object.objectId}` }}`)}) AS "$"
+      FROM (${this._refs(_.pick(this.schema, classNames), object.className, index.TObject.defaultKeys, sql `${{ value: `${object.className}$${object.id}` }}`)}) AS "$"
       ${_.isNil(roles) ? sql `` : sql `WHERE ${{ identifier: '$' }}.${{ identifier: '_rperm' }} && ${{ value: roles }}`}
     `;
         return (async function* () {
@@ -2041,25 +2041,25 @@ const updateOperation = (paths, dataType, operation) => {
                 case '$addToSet':
                 case '$push':
                     {
-                        if (!_.isArray(value) || !_.every(value, x => x instanceof index.TObject && x.objectId))
+                        if (!_.isArray(value) || !_.every(value, x => x instanceof index.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 index.TObject && x.objectId))
+                        if (!_.isArray(value) || !_.every(value, x => x instanceof index.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 }}`)})
             )`;
                     }
             }
@@ -2559,9 +2559,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 index.TObject) || dataType.target !== expr.value.className || !expr.value.objectId)
+                    if (!(expr.value instanceof index.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)}`;
             }
@@ -2572,9 +2572,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 index.TObject) || dataType.target !== expr.value.className || !expr.value.objectId)
+                    if (!(expr.value instanceof index.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)}`;
             }
@@ -2616,8 +2616,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 index.TObject && expr.value.objectId) {
-                    return sql `${element} ${{ literal: op }} ${{ value: expr.value.objectId }}`;
+                else if (!_.isString(dataType) && dataType?.type === 'pointer' && expr.value instanceof index.TObject && expr.value.id) {
+                    return sql `${element} ${{ literal: op }} ${{ value: expr.value.id }}`;
                 }
                 else if (!dataType) {
                     if (expr.value instanceof Decimal || _.isNumber(expr.value)) {
@@ -2653,9 +2653,9 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                             if (!_.isString(dataType) && dataType?.type === 'pointer') {
                                 if (_.isNil(value))
                                     return sql `${element} IS NULL`;
-                                if (!(value instanceof index.TObject) || dataType.target !== value.className || !value.objectId)
+                                if (!(value instanceof index.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)}`;
                         }
@@ -2663,12 +2663,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 index.TObject && dataType.target === x.className && x.objectId))
+                            if (!_.every(values, x => x instanceof index.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))})`;
@@ -2689,9 +2689,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 index.TObject) || dataType.target !== value.className || !value.objectId)
+                                if (!(value instanceof index.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)}`;
                         }
@@ -2699,12 +2699,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 index.TObject && dataType.target === x.className && x.objectId))
+                            if (!_.every(values, x => x instanceof index.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))})`;
@@ -2734,14 +2734,14 @@ const encodeFieldExpression = (compiler, parent, field, expr) => {
                     return sql `${element} ${{ literal: op }} ${{ value: index._encodeValue(expr.value) }}`;
                 }
                 if (relation && parent.className) {
-                    if (!_.every(expr.value, x => x instanceof index.TObject && relation.target === x.className && x.objectId))
+                    if (!_.every(expr.value, x => x instanceof index.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(index._encodeValue(expr.value))}`;
@@ -3027,7 +3027,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})
   )`;
 };