proto.io 0.0.205 → 0.0.207

package/dist/adapters/storage/progres.mjs

@@ -5,9 +5,9 @@ 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-DlY33lfO.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-ZgzzM5v_.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());
             }
@@ -427,11 +427,12 @@ class QueryCompiler {
     _selectPopulateMap(context) {
         return _.map(context.populates, (populate, field) => this.dialect.selectPopulate(this, context, populate, field, _.includes(context.countMatches, field)));
     }
-    insert(options, attrs) {
-        const _attrs = _.toPairs({
+    insert(options, values) {
+        const _values = _.map(values, attr => ({
             ..._defaultInsertOpts(options),
-            ...this._encodeObjectAttrs(options.className, attrs),
-        });
+            ...this._encodeObjectAttrs(options.className, attr),
+        }));
+        const keys = _.uniq(_.flatMap(_values, x => _.keys(x)));
         const name = `_insert_$${options.className.toLowerCase()}`;
         const context = { ...this._encodeIncludes(options), name };
         const populates = _.mapValues(context.populates, (populate) => this.dialect.encodePopulate(this, populate));
@@ -441,8 +442,8 @@ class QueryCompiler {
         return sql `
       WITH ${{ identifier: name }} AS (
         INSERT INTO ${{ identifier: options.className }}
-        (${_.map(_attrs, x => sql `${{ identifier: x[0] }}`)})
-        VALUES (${_.map(_attrs, x => sql `${x[1]}`)})
+        (${_.map(keys, x => sql `${{ identifier: x }}`)})
+        VALUES ${_.map(_values, v => sql `(${_.map(keys, k => sql `${v[k]}`)})`)}
         RETURNING *
       )${!_.isEmpty(stages) ? sql `, ${_.map(stages, (q, n) => sql `${{ identifier: n }} AS (${q})`)}` : sql ``}
       SELECT ${{
@@ -455,21 +456,8 @@ class QueryCompiler {
       ${!_.isEmpty(joins) ? { literal: joins, separator: '\n' } : sql ``}
     `;
     }
-    insertMany(options, values) {
-        const _values = _.map(values, attr => ({
-            ..._defaultInsertOpts(options),
-            ...this._encodeObjectAttrs(options.className, attr),
-        }));
-        const keys = _.uniq(_.flatMap(_values, x => _.keys(x)));
-        return sql `
-      INSERT INTO ${{ identifier: options.className }}
-      (${_.map(keys, x => sql `${{ identifier: x }}`)})
-      VALUES ${_.map(_values, v => sql `(${_.map(keys, k => sql `${v[k]}`)})`)}
-      RETURNING _id
-    `;
-    }
-    updateOne(query, update) {
-        return this._modifyQuery({ ...query, limit: 1 }, (fetchName) => {
+    update(query, update) {
+        return this._modifyQuery(query, (fetchName) => {
             const name = `_update_$${query.className.toLowerCase()}`;
             return sql `
           , ${{ identifier: name }} AS (
@@ -482,22 +470,12 @@ class QueryCompiler {
         `;
         });
     }
-    updateMany(query, update) {
-        return this._modifyQuery(query, (fetchName) => {
-            return sql `
-          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
-        `;
-        });
-    }
-    upsertOne(query, update, setOnInsert) {
+    upsert(query, update, setOnInsert) {
         const _insert = _.toPairs({
             ..._defaultInsertOpts(query),
             ...this._encodeObjectAttrs(query.className, setOnInsert),
         });
-        return this._modifyQuery({ ...query, limit: 1 }, (fetchName) => {
+        return this._modifyQuery(query, (fetchName) => {
             const updateName = `_update_$${query.className.toLowerCase()}`;
             const insertName = `_insert_$${query.className.toLowerCase()}`;
             const upsertName = `_upsert_$${query.className.toLowerCase()}`;
@@ -524,36 +502,8 @@ class QueryCompiler {
         `;
         });
     }
-    upsertMany(query, update, setOnInsert) {
-        const _insert = _.toPairs({
-            ..._defaultInsertOpts(query),
-            ...this._encodeObjectAttrs(query.className, setOnInsert),
-        });
-        return this._modifyQuery(query, (fetchName) => {
-            const updateName = `_update_$${query.className.toLowerCase()}`;
-            const insertName = `_insert_$${query.className.toLowerCase()}`;
-            return sql `
-          , ${{ identifier: updateName }} AS (
-            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
-          )
-          , ${{ 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
-          )
-          SELECT * FROM ${{ identifier: updateName }}
-          UNION
-          SELECT * FROM ${{ identifier: insertName }}
-        `;
-        });
-    }
-    deleteOne(query) {
-        return this._modifyQuery({ ...query, limit: 1 }, (fetchName, context) => {
+    delete(query) {
+        return this._modifyQuery(query, (fetchName, context) => {
             const name = `_delete_$${query.className.toLowerCase()}`;
             const populates = this._selectPopulateMap({ ...context, name });
             const joins = _.compact(_.map(populates, ({ join }) => join));
@@ -574,13 +524,6 @@ class QueryCompiler {
         `;
         });
     }
-    deleteMany(query) {
-        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
-      `);
-    }
 }
 
 //
@@ -761,49 +704,25 @@ class SqlStorage {
             }
         })();
     }
-    async insert(options, attrs) {
+    async insert(options, values) {
         const compiler = this._makeCompiler(true);
-        const result = _.first(await this.query(compiler.insert(options, attrs)));
-        return _.isNil(result) ? undefined : this._decodeObject(options.className, result);
-    }
-    async insertMany(options, values) {
-        const compiler = this._makeCompiler(true);
-        const result = await this.query(compiler.insertMany(options, values));
-        return result.length;
-    }
-    async updateOne(query, update) {
-        const compiler = this._makeCompiler(true, query.extraFilter);
-        const updated = _.first(await this.query(compiler.updateOne(query, update)));
-        return _.isNil(updated) ? undefined : this._decodeObject(query.className, updated);
+        const result = await this.query(compiler.insert(options, values));
+        return _.map(result, x => this._decodeObject(options.className, x));
     }
-    async updateMany(query, update) {
+    async update(query, update) {
         const compiler = this._makeCompiler(true, query.extraFilter);
-        const updated = await this.query(compiler.updateMany(query, update));
-        return updated.length;
-    }
-    async upsertOne(query, update, setOnInsert) {
-        const compiler = this._makeCompiler(true, query.extraFilter);
-        const upserted = _.first(await this.query(compiler.upsertOne(query, update, setOnInsert)));
-        return _.isNil(upserted) ? undefined : this._decodeObject(query.className, upserted);
-    }
-    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,
-        };
+        const updated = await this.query(compiler.update(query, update));
+        return _.map(updated, x => this._decodeObject(query.className, x));
     }
-    async deleteOne(query) {
+    async upsert(query, update, setOnInsert) {
         const compiler = this._makeCompiler(true, query.extraFilter);
-        const deleted = _.first(await this.query(compiler.deleteOne(query)));
-        return _.isNil(deleted) ? undefined : this._decodeObject(query.className, deleted);
+        const upserted = await this.query(compiler.upsert(query, update, setOnInsert));
+        return _.map(upserted, x => this._decodeObject(query.className, x));
     }
-    async deleteMany(query) {
+    async delete(query) {
         const compiler = this._makeCompiler(true, query.extraFilter);
-        const deleted = await this.query(compiler.deleteMany(query));
-        return deleted.length;
+        const deleted = await this.query(compiler.delete(query));
+        return _.map(deleted, x => this._decodeObject(query.className, x));
     }
 }