proto.io 0.0.175 → 0.0.176

package/dist/adapters/storage/progres.mjs

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { i as isPointer, a as isRelation, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, T as TObject, f as isVector, _ as _encodeValue, g as _decodeValue, h as dimensionOf, j as _typeof } from '../../internals/index-CTsc042s.mjs';
+import { a as isRelation, i as isPointer, b as isShape, e as decodeUpdateOp, s as shapePaths, c as isPrimitive, T as TObject, f as isVector, _ as _encodeValue, g as _decodeValue, h as dimensionOf, j as _typeof } from '../../internals/index-CTsc042s.mjs';
 import { Pool, types } from 'pg';
 import QueryStream from 'pg-query-stream';
 import { asyncStream } from '@o2ter/utils-js';
@@ -7,7 +7,7 @@ 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-DHQhYGsJ.mjs';
 import '@o2ter/crypto-js';
-import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-BMQpRlGH.mjs';
+import { r as resolveColumn, a as resolveDataType, g as generateId, Q as QueryValidator } from '../../internals/random-DGiu1IIq.mjs';
 import { P as PVK } from '../../internals/private-BUpLAMZi.mjs';
 
 //
@@ -233,22 +233,25 @@ class QueryCompiler {
         return this.idx++;
     }
     _makeContext(query) {
-        const context = this._encodeIncludes(query.className, query.includes, query.matches);
+        const context = this._encodeIncludes(query);
         return {
             ...context,
             sorting: _encodeSorting(context.includes, context.populates, query.sort),
         };
     }
-    _encodeIncludes(className, includes, matches) {
+    _encodeIncludes(query) {
         const names = {};
         const populates = {};
-        for (const include of includes) {
-            const { paths: [colname, ...subpath], dataType } = resolveColumn(this.schema, className, include);
+        const countMatches = [];
+        for (const include of query.includes) {
+            const { paths: [colname, ...subpath], dataType } = resolveColumn(this.schema, query.className, include);
             names[colname] = dataType;
+            if (isRelation(dataType) && _.includes(query.countMatches, colname))
+                countMatches.push(colname);
             if (isPointer(dataType) || isRelation(dataType)) {
                 if (_.isEmpty(subpath))
                     throw Error(`Invalid path: ${include}`);
-                const _matches = matches[colname];
+                const _matches = query.matches[colname];
                 populates[colname] = populates[colname] ?? {
                     name: `t${this.nextIdx()}`,
                     className: dataType.target,
@@ -274,13 +277,22 @@ class QueryCompiler {
             }
         }
         for (const [colname, populate] of _.toPairs(populates)) {
-            const _matches = matches[colname];
-            const { includes, populates } = this._encodeIncludes(populate.className, populate.subpaths, _matches.matches);
+            const _matches = query.matches[colname];
+            const { includes, populates, countMatches } = this._encodeIncludes({
+                className: populate.className,
+                includes: populate.subpaths,
+                matches: _matches.matches,
+                countMatches: [
+                    ..._.filter(query.countMatches, x => _.startsWith(x, `${colname}.`)).map(x => x.slice(colname.length + 1)),
+                    ..._matches.countMatches ?? [],
+                ],
+            });
             populate.sort = _encodeSorting(includes, populates, _matches.sort);
             populate.includes = includes;
             populate.populates = populates;
+            populate.countMatches = countMatches;
         }
-        return { includes: names, populates };
+        return { includes: names, populates, countMatches };
     }
     _baseSelectQuery(query, options) {
         const context = this._makeContext(query);
@@ -324,7 +336,7 @@ class QueryCompiler {
         };
     }
     _refetch(name, query) {
-        const _context = this._encodeIncludes(query.className, query.includes, query.matches);
+        const _context = this._encodeIncludes(query);
         const populates = _.mapValues(_context.populates, (populate) => this.dialect.encodePopulate(this, populate, { className: query.className, name }));
         const stages = _.fromPairs(_.flatMap(_.values(populates), (p) => _.toPairs(p)));
         const _populates = this._selectPopulateMap(_context, query.className, name);
@@ -358,7 +370,10 @@ class QueryCompiler {
     `;
     }
     _encodeUpdateAttrs(className, attrs) {
-        const updates = [];
+        const updates = [
+            sql `__v = __v + 1`,
+            sql `_updated_at = NOW()`,
+        ];
         for (const [path, op] of _.toPairs(attrs)) {
             const { paths: [column, ...subpath], dataType } = resolveColumn(this.schema, className, path);
             if (isShape(dataType)) {
@@ -443,7 +458,7 @@ class QueryCompiler {
         return _.map(context.populates, (populate, field) => this.dialect.selectPopulate(this, {
             className,
             name,
-        }, populate, field));
+        }, populate, field, _.includes(context.countMatches, field)));
     }
     insert(options, attrs) {
         const _attrs = _.toPairs({
@@ -492,8 +507,7 @@ class QueryCompiler {
             return sql `
           , ${{ identifier: name }} AS (
             UPDATE ${{ identifier: query.className }}
-            SET __v = __v + 1, _updated_at = NOW()
-            ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+            SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
             RETURNING *
           )
@@ -505,8 +519,7 @@ class QueryCompiler {
         return this._modifyQuery(query, (fetchName) => {
             return sql `
           UPDATE ${{ identifier: query.className }}
-          SET __v = __v + 1, _updated_at = NOW()
-          ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+          SET ${this._encodeUpdateAttrs(query.className, update)}
           WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
           RETURNING _id
         `;
@@ -524,8 +537,7 @@ class QueryCompiler {
             return sql `
           , ${{ identifier: updateName }} AS (
             UPDATE ${{ identifier: query.className }}
-            SET __v = __v + 1, _updated_at = NOW()
-            ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+            SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
             RETURNING *
           )
@@ -556,17 +568,16 @@ class QueryCompiler {
             return sql `
           , ${{ identifier: updateName }} AS (
             UPDATE ${{ identifier: query.className }}
-            SET __v = __v + 1, _updated_at = NOW()
-            ${!_.isEmpty(update) ? sql `, ${this._encodeUpdateAttrs(query.className, update)}` : sql ``}
+            SET ${this._encodeUpdateAttrs(query.className, update)}
             WHERE ${{ identifier: query.className }}._id IN (SELECT ${{ identifier: fetchName }}._id FROM ${{ identifier: fetchName }})
-            RETURNING _id, 0 AS ${{ identifier: 'result' }}
+            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, 1 AS ${{ identifier: 'result' }}
+            RETURNING _id, __v
           )
           SELECT * FROM ${{ identifier: updateName }}
           UNION
@@ -660,7 +671,9 @@ class SqlStorage {
             }
             else if (isRelation(type)) {
                 const _value = _.get(value, path);
-                if (_.isArray(_value))
+                if (_.isString(_value) && _value.match(/^\d+$/g))
+                    _.set(result, path, parseInt(_value));
+                else if (_.isArray(_value))
                     _.set(result, path, _value.map(x => this._decodeObject(type.target, x)));
             }
             else {
@@ -696,7 +709,9 @@ class SqlStorage {
                 }
             }
             else if (isRelation(dataType)) {
-                if (_.isArray(value))
+                if (_.isString(value) && value.match(/^\d+$/g))
+                    obj[PVK].attributes[key] = parseInt(value);
+                else if (_.isArray(value))
                     obj[PVK].attributes[key] = value.map(x => this._decodeObject(dataType.target, x));
             }
             else {
@@ -807,9 +822,10 @@ 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: _.filter(upserted, x => x.result === 0).length,
-            inserted: _.filter(upserted, x => x.result === 1).length,
+            updated: upserted.length - inserted,
+            inserted: inserted,
         };
     }
     async deleteOne(query) {
@@ -1988,11 +2004,17 @@ const _selectRelationPopulate = (compiler, parent, populate, field, encode) => {
     ${compiler.selectLock ? compiler.isUpdate ? sql `FOR UPDATE NOWAIT` : sql `FOR SHARE NOWAIT` : sql ``}
   `;
 };
-const selectPopulate = (compiler, parent, populate, field) => {
+const selectPopulate = (compiler, parent, populate, field, countMatches) => {
     if (populate.type === 'relation') {
         return {
             columns: [
-                sql `
+                countMatches ? sql `
+          (
+            SELECT COUNT(*) FROM (
+              ${_selectRelationPopulate(compiler, parent, populate, field, false)}
+            ) ${{ identifier: populate.name }}
+          ) AS ${{ identifier: field }}
+        ` : sql `
           ARRAY(
             SELECT to_jsonb(${{ identifier: populate.name }}) FROM (
               ${_selectRelationPopulate(compiler, parent, populate, field, true)}
@@ -2093,7 +2115,7 @@ const encodePopulate = (compiler, parent, remix) => {
         parent.filter && compiler._encodeFilter(parent, parent.filter),
         compiler.extraFilter && compiler._encodeFilter(parent, compiler.extraFilter(parent.className)),
     ]);
-    const _populates = _.map(parent.populates, (populate, field) => selectPopulate(compiler, parent, populate, field));
+    const _populates = _.map(parent.populates, (populate, field) => selectPopulate(compiler, parent, populate, field, _.includes(parent.countMatches, field)));
     const _joins = _.compact(_.map(_populates, ({ join }) => join));
     const _includes = _.pickBy(parent.includes, v => isPrimitive(v));
     const { joins: _joins2 = [], field: _foreignField = undefined, rows = false, } = parent.foreignField ? encodeForeignField(compiler, {