proto.io 0.0.204 → 0.0.206

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

@@ -1,7 +1,7 @@
-import { P as ProtoService } from '../../internals/index-JdEs5VLY.js';
+import { P as ProtoService } from '../../internals/index-DnbbpIaO.js';
 import OSS from 'ali-oss';
-import { a as FileStorageOptions } from '../../internals/base-Cf7WkDhO.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-ONaLyXL0.js';
+import { a as FileStorageOptions } from '../../internals/base-Be7PFKEC.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-CEQtSsWb.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/aliyun-oss.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
-require('../../internals/base-NsJYo2MG.js');
-var chunk = require('../../internals/chunk-CdEGTub2.js');
+require('../../internals/base-BFKQpiws.js');
+var chunk = require('../../internals/chunk-BuMQw4dz.js');
 require('util');
 require('zlib');
 require('@o2ter/utils-js');

package/dist/adapters/file/aliyun-oss.mjs

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-import '../../internals/base-DYc1_peK.mjs';
-import { F as FileChunkStorageBase } from '../../internals/chunk-3nNdftWC.mjs';
+import '../../internals/base-CfQi0T0I.mjs';
+import { F as FileChunkStorageBase } from '../../internals/chunk-DxYhYVky.mjs';
 import 'util';
 import 'zlib';
 import '@o2ter/utils-js';

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

@@ -1,5 +1,5 @@
-import { T as TSchema, P as ProtoService } from '../../internals/index-JdEs5VLY.js';
-import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-Cf7WkDhO.js';
+import { T as TSchema, P as ProtoService } from '../../internals/index-DnbbpIaO.js';
+import { F as FileStorageBase, a as FileStorageOptions } from '../../internals/base-Be7PFKEC.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/database.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
-var base = require('../../internals/base-NsJYo2MG.js');
-var index = require('../../internals/index-C4vwSN74.js');
+var base = require('../../internals/base-BFKQpiws.js');
+var index = require('../../internals/index-CyPxh5dl.js');
 var utilsJs = require('@o2ter/utils-js');
 require('util');
 require('zlib');
 require('../../internals/private-Ciddhure.js');
-require('../../internals/index-B8TESzd9.js');
+require('../../internals/index-CsmAYB_t.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 { Q as QuerySelector } from '../../internals/index-Blw7vAq5.mjs';
+import { F as FileStorageBase } from '../../internals/base-CfQi0T0I.mjs';
+import { Q as QuerySelector } from '../../internals/index-iRVgw566.mjs';
 import { bufferToBase64, base64ToBuffer } from '@o2ter/utils-js';
 import 'util';
 import 'zlib';
 import '../../internals/private-CNw40LZ7.mjs';
-import '../../internals/index-al1N-qi7.mjs';
+import '../../internals/index-DpN9tcbY.mjs';
 import 'decimal.js';
 
 //

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

@@ -1,6 +1,6 @@
-import { P as ProtoService } from '../../internals/index-JdEs5VLY.js';
-import { a as FileStorageOptions } from '../../internals/base-Cf7WkDhO.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-ONaLyXL0.js';
+import { P as ProtoService } from '../../internals/index-DnbbpIaO.js';
+import { a as FileStorageOptions } from '../../internals/base-Be7PFKEC.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-CEQtSsWb.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/filesystem.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _ = require('lodash');
 var path = require('path');
 var fs = require('fs/promises');
-var chunk = require('../../internals/chunk-CdEGTub2.js');
-require('../../internals/base-NsJYo2MG.js');
+var chunk = require('../../internals/chunk-BuMQw4dz.js');
+require('../../internals/base-BFKQpiws.js');
 require('util');
 require('zlib');
 require('@o2ter/utils-js');

package/dist/adapters/file/filesystem.mjs

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import path from 'path';
 import fs from 'fs/promises';
-import { F as FileChunkStorageBase } from '../../internals/chunk-3nNdftWC.mjs';
-import '../../internals/base-DYc1_peK.mjs';
+import { F as FileChunkStorageBase } from '../../internals/chunk-DxYhYVky.mjs';
+import '../../internals/base-CfQi0T0I.mjs';
 import 'util';
 import 'zlib';
 import '@o2ter/utils-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-JdEs5VLY.js';
-import { a as FileStorageOptions } from '../../internals/base-Cf7WkDhO.js';
-import { F as FileChunkStorageBase } from '../../internals/chunk-ONaLyXL0.js';
+import { P as ProtoService } from '../../internals/index-DnbbpIaO.js';
+import { a as FileStorageOptions } from '../../internals/base-Be7PFKEC.js';
+import { F as FileChunkStorageBase } from '../../internals/chunk-CEQtSsWb.js';
 import '@o2ter/utils-js';
 import 'jsonwebtoken';
 import '@o2ter/server-js';

package/dist/adapters/file/google-cloud-storage.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
-var chunk = require('../../internals/chunk-CdEGTub2.js');
-require('../../internals/base-NsJYo2MG.js');
+var chunk = require('../../internals/chunk-BuMQw4dz.js');
+require('../../internals/base-BFKQpiws.js');
 require('util');
 require('zlib');
 require('@o2ter/utils-js');

package/dist/adapters/file/google-cloud-storage.mjs

@@ -1,6 +1,6 @@
 import _ from 'lodash';
-import { F as FileChunkStorageBase } from '../../internals/chunk-3nNdftWC.mjs';
-import '../../internals/base-DYc1_peK.mjs';
+import { F as FileChunkStorageBase } from '../../internals/chunk-DxYhYVky.mjs';
+import '../../internals/base-CfQi0T0I.mjs';
 import 'util';
 import 'zlib';
 import '@o2ter/utils-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, r as TValueWithUndefined, t as TValue, u as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, v as QuerySelector, w as DecodedSortOption, x as DecodedQuery, y as FindOptions, I as InsertOptions, z as FindOneOptions, A as TStorage, B as TransactionOptions, i as TObject, C as TQueryRandomOptions, G as TPubSub } from '../../internals/index-JdEs5VLY.js';
+import { a as TValueWithoutObject, T as TSchema, u as TValueWithUndefined, v as TValue, w as TUpdateOp, F as FieldSelectorExpression, Q as QueryExpression, R as RelationOptions, x as QuerySelector, y as DecodedSortOption, z as DecodedQuery, A as FindOptions, I as InsertOptions, B as FindOneOptions, C as TStorage, G as TransactionOptions, j as TObject, H as TQueryRandomOptions, J as TPubSub } from '../../internals/index-DnbbpIaO.js';
 import * as _o2ter_utils_js from '@o2ter/utils-js';
 import { asyncStream } from '@o2ter/utils-js';
 import 'jsonwebtoken';
@@ -191,16 +191,13 @@ declare abstract class SqlStorage implements TStorage {
     refs(object: TObject, classNames: string[], roles?: string[]): AsyncGenerator<TObject, void, unknown>;
     nonrefs(query: DecodedQuery<FindOptions>): AsyncGenerator<TObject, void, unknown>;
     insert(options: InsertOptions, attrs: Record<string, TValueWithUndefined>): Promise<TObject | undefined>;
-    insertMany(options: InsertOptions, values: Record<string, TValueWithUndefined>[]): Promise<number>;
+    insertMany(options: InsertOptions, values: Record<string, TValueWithUndefined>[]): Promise<TObject[]>;
     updateOne(query: DecodedQuery<FindOneOptions>, update: Record<string, TUpdateOp>): Promise<TObject | undefined>;
-    updateMany(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>): Promise<number>;
+    updateMany(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>): Promise<TObject[]>;
     upsertOne(query: DecodedQuery<FindOneOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): Promise<TObject | undefined>;
-    upsertMany(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): Promise<{
-        updated: number;
-        inserted: number;
-    }>;
+    upsertMany(query: DecodedQuery<FindOptions>, update: Record<string, TUpdateOp>, setOnInsert: Record<string, TValueWithUndefined>): Promise<TObject[]>;
     deleteOne(query: DecodedQuery<FindOneOptions>): Promise<TObject | undefined>;
-    deleteMany(query: DecodedQuery<FindOptions>): Promise<number>;
+    deleteMany(query: DecodedQuery<FindOptions>): Promise<TObject[]>;
 }
 
 declare class PostgresStorageClient<Driver extends PostgresClientDriver> extends SqlStorage implements TPubSub {

package/dist/adapters/storage/progres.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _ = require('lodash');
-var index = require('../../internals/index-B8TESzd9.js');
+var index = require('../../internals/index-CsmAYB_t.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 index$1 = require('../../internals/index-C4vwSN74.js');
+var index$1 = require('../../internals/index-CyPxh5dl.js');
 require('@o2ter/crypto-js');
-var random$1 = require('../../internals/random-Dk3OhDNU.js');
+var random$1 = require('../../internals/random-D7S1XD7F.js');
 var _private = require('../../internals/private-Ciddhure.js');
 
 //
@@ -100,7 +100,7 @@ class SQL {
                 query += `${dialect.placeholder(nextIdx())}::DOUBLE PRECISION`;
                 values.push(value.value);
             }
-            else if (Decimal.isDecimal(value.value)) {
+            else if (value.value instanceof Decimal) {
                 query += `${dialect.placeholder(nextIdx())}::DECIMAL`;
                 values.push(value.value.toString());
             }
@@ -469,7 +469,7 @@ class QueryCompiler {
       INSERT INTO ${{ identifier: options.className }}
       (${_.map(keys, x => sql `${{ identifier: x }}`)})
       VALUES ${_.map(_values, v => sql `(${_.map(keys, k => sql `${v[k]}`)})`)}
-      RETURNING _id
+      RETURNING ${_.map(index.defaultObjectKeys, k => sql `${{ identifier: k }}`)}
     `;
     }
     updateOne(query, update) {
@@ -492,7 +492,7 @@ class QueryCompiler {
           UPDATE ${{ identifier: query.className }}
           SET ${this._encodeUpdateAttrs(query.className, update)}
           WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
-          RETURNING _id
+          RETURNING ${_.map(index.defaultObjectKeys, k => sql `${{ identifier: k }}`)}
         `;
         });
     }
@@ -541,14 +541,14 @@ class QueryCompiler {
             UPDATE ${{ identifier: query.className }}
             SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
-            RETURNING _id, __v
+            RETURNING ${_.map(index.defaultObjectKeys, k => sql `${{ identifier: k }}`)}
           )
           , ${{ identifier: insertName }} AS (
             INSERT INTO ${{ identifier: query.className }}
             (${_.map(_insert, x => sql `${{ identifier: x[0] }}`)})
             SELECT ${_.map(_insert, x => sql `${x[1]} AS ${{ identifier: x[0] }}`)}
             WHERE NOT EXISTS(SELECT * FROM ${{ identifier: updateName }})
-            RETURNING _id, __v
+            RETURNING ${_.map(index.defaultObjectKeys, k => sql `${{ identifier: k }}`)}
           )
           SELECT * FROM ${{ identifier: updateName }}
           UNION
@@ -582,7 +582,7 @@ class QueryCompiler {
         return this._modifyQuery(query, (fetchName) => sql `
         DELETE FROM ${{ identifier: query.className }}
         WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
-        RETURNING _id
+        RETURNING ${_.map(index.defaultObjectKeys, k => sql `${{ identifier: k }}`)}
       `);
     }
 }
@@ -773,7 +773,7 @@ class SqlStorage {
     async insertMany(options, values) {
         const compiler = this._makeCompiler(true);
         const result = await this.query(compiler.insertMany(options, values));
-        return result.length;
+        return _.map(result, x => this._decodeObject(options.className, x));
     }
     async updateOne(query, update) {
         const compiler = this._makeCompiler(true, query.extraFilter);
@@ -783,7 +783,7 @@ class SqlStorage {
     async updateMany(query, update) {
         const compiler = this._makeCompiler(true, query.extraFilter);
         const updated = await this.query(compiler.updateMany(query, update));
-        return updated.length;
+        return _.map(updated, x => this._decodeObject(query.className, x));
     }
     async upsertOne(query, update, setOnInsert) {
         const compiler = this._makeCompiler(true, query.extraFilter);
@@ -793,11 +793,7 @@ class SqlStorage {
     async upsertMany(query, update, setOnInsert) {
         const compiler = this._makeCompiler(true, query.extraFilter);
         const upserted = await this.query(compiler.upsertMany(query, update, setOnInsert));
-        const inserted = _.filter(upserted, x => x.__v === 0).length;
-        return {
-            updated: upserted.length - inserted,
-            inserted: inserted,
-        };
+        return _.map(upserted, x => this._decodeObject(query.className, x));
     }
     async deleteOne(query) {
         const compiler = this._makeCompiler(true, query.extraFilter);
@@ -807,7 +803,7 @@ class SqlStorage {
     async deleteMany(query) {
         const compiler = this._makeCompiler(true, query.extraFilter);
         const deleted = await this.query(compiler.deleteMany(query));
-        return deleted.length;
+        return _.map(deleted, x => this._decodeObject(query.className, x));
     }
 }