proto.io 0.0.205 → 0.0.206

package/dist/adapters/storage/progres.mjs

@@ -1,13 +1,13 @@
 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 _isTypeof, f as isVector, g as _encodeValue, h as _decodeValue, j as dimensionOf, k as _typeof } from '../../internals/index-al1N-qi7.mjs';
+import { a as isRelation, i as isPointer, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, f as defaultObjectKeys, T as TObject, _ as _isTypeof, g as isVector, h as _encodeValue, j as _decodeValue, k as dimensionOf, l as _typeof } from '../../internals/index-DpN9tcbY.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 { 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-Blw7vAq5.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-iRVgw566.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType$1, g as generateId, Q as QueryValidator } from '../../internals/random-6nHcBOxn.mjs';
+import { r as resolveColumn, a as resolveDataType$1, g as generateId, Q as QueryValidator } from '../../internals/random-BnGB_bVS.mjs';
 import { P as PVK } from '../../internals/private-CNw40LZ7.mjs';
 
 //
@@ -96,7 +96,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());
             }
@@ -465,7 +465,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(defaultObjectKeys, k => sql `${{ identifier: k }}`)}
     `;
     }
     updateOne(query, update) {
@@ -488,7 +488,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(defaultObjectKeys, k => sql `${{ identifier: k }}`)}
         `;
         });
     }
@@ -537,14 +537,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(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(defaultObjectKeys, k => sql `${{ identifier: k }}`)}
           )
           SELECT * FROM ${{ identifier: updateName }}
           UNION
@@ -578,7 +578,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(defaultObjectKeys, k => sql `${{ identifier: k }}`)}
       `);
     }
 }
@@ -769,7 +769,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);
@@ -779,7 +779,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);
@@ -789,11 +789,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);
@@ -803,7 +799,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));
     }
 }