proto.io 0.0.138 → 0.0.139

package/dist/adapters/storage/progres.js

@@ -140,267 +140,6 @@ class SQL {
 }
 const sql = (templates, ...values) => new SQL(templates, values);
 
-//
-//  basic.ts
-//
-//  The MIT License
-//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-const stringArrayAttrs = ['_rperm', '_wperm'];
-const nullSafeEqual = () => sql `IS NOT DISTINCT FROM`;
-const nullSafeNotEqual = () => sql `IS DISTINCT FROM`;
-const quote = (str) => utils.escapeLiteral(str);
-const identifier = (name) => utils.escapeIdentifier(name);
-const placeholder = (idx) => `$${idx}`;
-const boolean = (value) => value ? 'true' : 'false';
-const encodeSortKey = (className, key) => {
-    const [colname, ...subpath] = _.toPath(key);
-    if (_.isEmpty(subpath))
-        return sql `${{ identifier: className }}.${{ identifier: colname }}`;
-    return sql `jsonb_extract_path(
-    ${{ identifier: className }}.${{ identifier: colname }},
-    ${_.map(subpath, x => sql `${{ quote: x }}`)}
-  )`;
-};
-const random = (opts) => {
-    return opts.weight ? sql `-ln(random()) / ${{ identifier: opts.weight }}` : sql `random()`;
-};
-
-//
-//  index.ts
-//
-//  The MIT License
-//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-const typeParser = (oid, format) => {
-    format = format ?? 'text';
-    if (format === 'text') {
-        switch (oid) {
-            case pg.types.builtins.MONEY:
-                return (value) => new Decimal(value);
-        }
-    }
-    return pg.types.getTypeParser(oid, format);
-};
-class PostgresClientDriver {
-    db;
-    constructor(db) {
-        this.db = db;
-    }
-    query(text, values = [], batchSize) {
-        const db = this.db;
-        return utilsJs.asyncStream(async function* () {
-            const client = db instanceof pg.Pool ? await db.connect() : db;
-            const stream = new QueryStream(text, values, { batchSize });
-            client.query(stream);
-            try {
-                yield* stream;
-            }
-            finally {
-                stream.destroy();
-                if (db instanceof pg.Pool)
-                    client.release();
-            }
-        });
-    }
-    async version() {
-        const [{ version }] = await this.query('SELECT version()');
-        return version;
-    }
-    async databases() {
-        return _.compact(_.map(await this.query('SELECT datname FROM pg_catalog.pg_database'), x => x.datname));
-    }
-    async tables() {
-        return _.compact(_.map(await this.query(`
-        SELECT tablename FROM pg_catalog.pg_tables
-        WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'
-      `), x => x.tablename));
-    }
-    async views() {
-        return _.compact(_.map(await this.query(`
-        SELECT viewname FROM pg_catalog.pg_views
-        WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'
-      `), x => x.viewname));
-    }
-    async materializedViews() {
-        return _.compact(_.map(await this.query(`
-        SELECT matviewname FROM pg_catalog.pg_matviews
-        WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'
-      `), x => x.matviewname));
-    }
-    async columns(table, namespace) {
-        const columns = await this.query(`
-      SELECT
-          a.attname AS column_name,
-          format_type(a.atttypid, a.atttypmod) AS data_type,
-          a.attnum ,
-          a.attnotnull
-      FROM
-          pg_namespace n,
-          pg_class t,
-          pg_attribute a
-      WHERE
-          a.attnum > 0
-          AND n.oid = t.relnamespace
-          AND a.attrelid = t.oid
-          AND NOT a.attisdropped
-          AND t.relname = '${table}'
-          ${namespace ? `AND n.nspname = '${namespace}'` : ''}
-    `);
-        return _.map(columns, ({ column_name, data_type, attnotnull }) => ({
-            name: column_name,
-            type: data_type,
-            required: !!attnotnull,
-        }));
-    }
-    async indices(table, namespace) {
-        const indices = await this.query(`
-      SELECT
-          n.nspname AS schema_name,
-          t.relname AS table_name,
-          i.relname AS index_name,
-          ix.indisprimary AS is_primary,
-          ix.indisunique AS is_unique,
-          a.attname AS column_name,
-          k.indseq AS seq
-      FROM
-          pg_namespace n,
-          pg_class t,
-          pg_class i,
-          pg_index ix,
-          UNNEST(ix.indkey) WITH ORDINALITY k(attnum, indseq),
-          pg_attribute a
-      WHERE
-          t.oid = ix.indrelid
-          AND n.oid = t.relnamespace
-          AND i.oid = ix.indexrelid
-          AND a.attrelid = t.oid
-          AND a.attnum = k.attnum
-          AND t.relkind = 'r'
-          AND t.relname = '${table}'
-          ${namespace ? `AND n.nspname = '${namespace}'` : ''}
-    `);
-        return _.mapValues(_.groupBy(indices, 'index_name'), v => ({
-            keys: _.map(_.sortBy(v, ({ seq }) => parseInt(seq)), 'column_name'),
-            ..._.pick(_.first(v), [
-                'schema_name',
-                'table_name',
-                'index_name',
-                'is_primary',
-                'is_unique',
-            ])
-        }));
-    }
-    async withClient(callback) {
-        const client = this.db instanceof pg.Pool ? await this.db.connect() : this.db;
-        try {
-            return await callback(new PostgresClientDriver(client));
-        }
-        finally {
-            if (this.db instanceof pg.Pool)
-                client.release();
-        }
-    }
-    async publish(payload) {
-        await this.withClient(async (db) => {
-            await db.query(`NOTIFY ${PROTO_POSTGRES_MSG}, ${quote(JSON.stringify(index._encodeValue(payload)))}`);
-        });
-    }
-}
-class PostgresDriver extends PostgresClientDriver {
-    database;
-    pubsub;
-    subscribers = [];
-    constructor(config) {
-        if (_.isEmpty(config))
-            throw Error('Invalid postgre config.');
-        const _types = { getTypeParser: typeParser };
-        const database = new pg.Pool(_.isString(config) ? { connectionString: config, types: _types } : { ...config, types: _types });
-        super(database);
-        this.database = database;
-    }
-    async shutdown() {
-        await this._release_pubsub();
-        await this.database.end();
-    }
-    async _init_pubsub() {
-        if (this.pubsub)
-            return;
-        try {
-            this.pubsub = this.database.connect();
-            const pubsub = await this.pubsub;
-            pubsub.on('notification', ({ channel, payload }) => {
-                if (_.toUpper(channel) !== PROTO_POSTGRES_MSG || !payload)
-                    return;
-                try {
-                    const _payload = index._decodeValue(JSON.parse(payload));
-                    for (const subscriber of this.subscribers) {
-                        subscriber(_payload);
-                    }
-                }
-                catch (e) {
-                    console.error(`Unknown payload: ${e}`);
-                }
-            });
-            await pubsub.query(`LISTEN ${PROTO_POSTGRES_MSG}`);
-        }
-        catch (e) {
-            console.error(e);
-        }
-    }
-    async _release_pubsub() {
-        const pubsub = this.pubsub;
-        this.pubsub = undefined;
-        await (await pubsub)?.release();
-    }
-    subscribe(callback) {
-        this._init_pubsub();
-        this.subscribers.push(callback);
-        return () => {
-            this.subscribers = this.subscribers.filter(x => x !== callback);
-            if (_.isEmpty(this.subscribers)) {
-                this._release_pubsub();
-            }
-        };
-    }
-}
-
 //
 //  compiler.ts
 //
@@ -696,7 +435,7 @@ class QueryCompiler {
             })}`;
         }
         return sql `${_.map(sort, (order, key) => sql `
-      ${this.dialect.encodeSortKey(parent.name, key)} ${{ literal: order === 1 ? 'ASC' : 'DESC' }}
+      ${this.dialect.encodeSortKey(this, parent, key)} ${{ literal: order === 1 ? 'ASC' : 'DESC' }}
     `)}`;
     }
     _selectPopulateMap(context, className, name) {
@@ -1023,7 +762,7 @@ class SqlStorage {
 }
 
 //
-//  encode.ts
+//  utils.ts
 //
 //  The MIT License
 //  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
@@ -1046,7 +785,363 @@ class SqlStorage {
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 //
-const _encodeJsonValue = (value) => {
+const _fetchElement = (parent, colname, subpath, dataType) => {
+    const element = sql `${{ identifier: parent.name }}.${{ identifier: parent.name.startsWith('_expr_$') ? '$' : colname }}`;
+    if (!parent.className) {
+        if (colname !== '$') {
+            return {
+                element: sql `jsonb_extract_path(${element}, ${_.map([colname, ...subpath], x => sql `${{ quote: x.startsWith('$') ? `$${x}` : x }}`)})`,
+                json: true,
+            };
+        }
+        else if (!_.isEmpty(subpath)) {
+            return {
+                element: sql `jsonb_extract_path(${element}, ${_.map(subpath, x => sql `${{ quote: x.startsWith('$') ? `$${x}` : x }}`)})`,
+                json: true,
+            };
+        }
+    }
+    else if (!_.isEmpty(subpath)) {
+        const _subpath = sql `${_.map(subpath, x => sql `${{ quote: x.startsWith('$') ? `$${x}` : x }}`)}`;
+        if (dataType === 'array' || (!_.isString(dataType) && (dataType?.type === 'array' || dataType?.type === 'relation'))) {
+            return {
+                element: sql `jsonb_extract_path(to_jsonb(${element}), ${_subpath})`,
+                json: true,
+            };
+        }
+        else {
+            return {
+                element: sql `jsonb_extract_path(${element}, ${_subpath})`,
+                json: true,
+            };
+        }
+    }
+    if (parent.name.startsWith('_expr_$') && colname !== '$') {
+        return {
+            element: sql `jsonb_extract_path(${element}, ${{ quote: colname.startsWith('$') ? `$${colname}` : colname }})`,
+            json: true,
+        };
+    }
+    return { element, json: false };
+};
+const resolvePaths = (compiler, className, paths) => {
+    const { paths: [colname, ...subpath], dataType } = random$1._resolveColumn(compiler.schema, className, paths.join('.'));
+    if (!_.isEmpty(subpath) && index.isVector(dataType)) {
+        if (subpath.length !== 1)
+            throw Error(`Invalid key: ${paths.join('.')}`);
+        const idx = parseInt(subpath[0]);
+        if (_.isSafeInteger(idx) && idx >= 0 && idx < dataType.dimension) {
+            return { dataType: 'number', colname: `${colname}[${idx}]`, subpath: [] };
+        }
+        else {
+            throw Error(`Invalid key: ${paths.join('.')}`);
+        }
+    }
+    if (!_.isEmpty(subpath) && index.isPointer(dataType)) {
+        const resolved = resolvePaths(compiler, dataType.target, subpath);
+        return { ...resolved, colname: `${colname}.${resolved.colname}` };
+    }
+    const digit = _.first(subpath);
+    if (!_.isEmpty(subpath) && index.isRelation(dataType) && digit?.match(random$1.QueryValidator.patterns.digits)) {
+        const resolved = resolvePaths(compiler, dataType.target, _.slice(subpath, 1));
+        return { dataType, colname, subpath: [digit, resolved.colname, ...resolved.subpath] };
+    }
+    return { dataType, colname, subpath };
+};
+const fetchElement = (compiler, parent, field) => {
+    if (parent.className) {
+        const { dataType, colname, subpath } = resolvePaths(compiler, parent.className, _.toPath(field));
+        if (index.isPointer(dataType))
+            return { element: sql `${{ identifier: parent.name }}.${{ identifier: `${colname}._id` }}`, dataType };
+        const { element, json } = _fetchElement(parent, colname, subpath, dataType);
+        return { element, json, dataType: json ? null : dataType, relation: index.isRelation(dataType) ? dataType : null };
+    }
+    const [colname, ...subpath] = _.toPath(field);
+    const { element, json } = _fetchElement(parent, colname, subpath);
+    return { element, json, dataType: null, relation: null };
+};
+
+//
+//  basic.ts
+//
+//  The MIT License
+//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+const stringArrayAttrs = ['_rperm', '_wperm'];
+const nullSafeEqual = () => sql `IS NOT DISTINCT FROM`;
+const nullSafeNotEqual = () => sql `IS DISTINCT FROM`;
+const quote = (str) => utils.escapeLiteral(str);
+const identifier = (name) => utils.escapeIdentifier(name);
+const placeholder = (idx) => `$${idx}`;
+const boolean = (value) => value ? 'true' : 'false';
+const encodeSortKey = (compiler, parent, key) => {
+    const { element } = fetchElement(compiler, parent, key);
+    return element;
+};
+const random = (opts) => {
+    return opts.weight ? sql `-ln(random()) / ${{ identifier: opts.weight }}` : sql `random()`;
+};
+
+//
+//  index.ts
+//
+//  The MIT License
+//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+const typeParser = (oid, format) => {
+    format = format ?? 'text';
+    if (format === 'text') {
+        switch (oid) {
+            case pg.types.builtins.MONEY:
+                return (value) => new Decimal(value);
+        }
+    }
+    return pg.types.getTypeParser(oid, format);
+};
+class PostgresClientDriver {
+    db;
+    constructor(db) {
+        this.db = db;
+    }
+    query(text, values = [], batchSize) {
+        const db = this.db;
+        return utilsJs.asyncStream(async function* () {
+            const client = db instanceof pg.Pool ? await db.connect() : db;
+            const stream = new QueryStream(text, values, { batchSize });
+            client.query(stream);
+            try {
+                yield* stream;
+            }
+            finally {
+                stream.destroy();
+                if (db instanceof pg.Pool)
+                    client.release();
+            }
+        });
+    }
+    async version() {
+        const [{ version }] = await this.query('SELECT version()');
+        return version;
+    }
+    async databases() {
+        return _.compact(_.map(await this.query('SELECT datname FROM pg_catalog.pg_database'), x => x.datname));
+    }
+    async tables() {
+        return _.compact(_.map(await this.query(`
+        SELECT tablename FROM pg_catalog.pg_tables
+        WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'
+      `), x => x.tablename));
+    }
+    async views() {
+        return _.compact(_.map(await this.query(`
+        SELECT viewname FROM pg_catalog.pg_views
+        WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'
+      `), x => x.viewname));
+    }
+    async materializedViews() {
+        return _.compact(_.map(await this.query(`
+        SELECT matviewname FROM pg_catalog.pg_matviews
+        WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'
+      `), x => x.matviewname));
+    }
+    async columns(table, namespace) {
+        const columns = await this.query(`
+      SELECT
+          a.attname AS column_name,
+          format_type(a.atttypid, a.atttypmod) AS data_type,
+          a.attnum ,
+          a.attnotnull
+      FROM
+          pg_namespace n,
+          pg_class t,
+          pg_attribute a
+      WHERE
+          a.attnum > 0
+          AND n.oid = t.relnamespace
+          AND a.attrelid = t.oid
+          AND NOT a.attisdropped
+          AND t.relname = '${table}'
+          ${namespace ? `AND n.nspname = '${namespace}'` : ''}
+    `);
+        return _.map(columns, ({ column_name, data_type, attnotnull }) => ({
+            name: column_name,
+            type: data_type,
+            required: !!attnotnull,
+        }));
+    }
+    async indices(table, namespace) {
+        const indices = await this.query(`
+      SELECT
+          n.nspname AS schema_name,
+          t.relname AS table_name,
+          i.relname AS index_name,
+          ix.indisprimary AS is_primary,
+          ix.indisunique AS is_unique,
+          a.attname AS column_name,
+          k.indseq AS seq
+      FROM
+          pg_namespace n,
+          pg_class t,
+          pg_class i,
+          pg_index ix,
+          UNNEST(ix.indkey) WITH ORDINALITY k(attnum, indseq),
+          pg_attribute a
+      WHERE
+          t.oid = ix.indrelid
+          AND n.oid = t.relnamespace
+          AND i.oid = ix.indexrelid
+          AND a.attrelid = t.oid
+          AND a.attnum = k.attnum
+          AND t.relkind = 'r'
+          AND t.relname = '${table}'
+          ${namespace ? `AND n.nspname = '${namespace}'` : ''}
+    `);
+        return _.mapValues(_.groupBy(indices, 'index_name'), v => ({
+            keys: _.map(_.sortBy(v, ({ seq }) => parseInt(seq)), 'column_name'),
+            ..._.pick(_.first(v), [
+                'schema_name',
+                'table_name',
+                'index_name',
+                'is_primary',
+                'is_unique',
+            ])
+        }));
+    }
+    async withClient(callback) {
+        const client = this.db instanceof pg.Pool ? await this.db.connect() : this.db;
+        try {
+            return await callback(new PostgresClientDriver(client));
+        }
+        finally {
+            if (this.db instanceof pg.Pool)
+                client.release();
+        }
+    }
+    async publish(payload) {
+        await this.withClient(async (db) => {
+            await db.query(`NOTIFY ${PROTO_POSTGRES_MSG}, ${quote(JSON.stringify(index._encodeValue(payload)))}`);
+        });
+    }
+}
+class PostgresDriver extends PostgresClientDriver {
+    database;
+    pubsub;
+    subscribers = [];
+    constructor(config) {
+        if (_.isEmpty(config))
+            throw Error('Invalid postgre config.');
+        const _types = { getTypeParser: typeParser };
+        const database = new pg.Pool(_.isString(config) ? { connectionString: config, types: _types } : { ...config, types: _types });
+        super(database);
+        this.database = database;
+    }
+    async shutdown() {
+        await this._release_pubsub();
+        await this.database.end();
+    }
+    async _init_pubsub() {
+        if (this.pubsub)
+            return;
+        try {
+            this.pubsub = this.database.connect();
+            const pubsub = await this.pubsub;
+            pubsub.on('notification', ({ channel, payload }) => {
+                if (_.toUpper(channel) !== PROTO_POSTGRES_MSG || !payload)
+                    return;
+                try {
+                    const _payload = index._decodeValue(JSON.parse(payload));
+                    for (const subscriber of this.subscribers) {
+                        subscriber(_payload);
+                    }
+                }
+                catch (e) {
+                    console.error(`Unknown payload: ${e}`);
+                }
+            });
+            await pubsub.query(`LISTEN ${PROTO_POSTGRES_MSG}`);
+        }
+        catch (e) {
+            console.error(e);
+        }
+    }
+    async _release_pubsub() {
+        const pubsub = this.pubsub;
+        this.pubsub = undefined;
+        await (await pubsub)?.release();
+    }
+    subscribe(callback) {
+        this._init_pubsub();
+        this.subscribers.push(callback);
+        return () => {
+            this.subscribers = this.subscribers.filter(x => x !== callback);
+            if (_.isEmpty(this.subscribers)) {
+                this._release_pubsub();
+            }
+        };
+    }
+}
+
+//
+//  encode.ts
+//
+//  The MIT License
+//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+//
+const _encodeJsonValue = (value) => {
     if (_.isArray(value))
         return sql `jsonb_build_array(${_.map(value, x => _encodeJsonValue(x))})`;
     if (_.isPlainObject(value))
@@ -1470,106 +1565,6 @@ const updateOperation = (paths, dataType, operation) => {
     throw Error('Invalid update operation');
 };
 
-//
-//  utils.ts
-//
-//  The MIT License
-//  Copyright (c) 2021 - 2024 O2ter Limited. All rights reserved.
-//
-//  Permission is hereby granted, free of charge, to any person obtaining a copy
-//  of this software and associated documentation files (the "Software"), to deal
-//  in the Software without restriction, including without limitation the rights
-//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-//  copies of the Software, and to permit persons to whom the Software is
-//  furnished to do so, subject to the following conditions:
-//
-//  The above copyright notice and this permission notice shall be included in
-//  all copies or substantial portions of the Software.
-//
-//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-//  THE SOFTWARE.
-//
-const _fetchElement = (parent, colname, subpath, dataType) => {
-    const element = sql `${{ identifier: parent.name }}.${{ identifier: parent.name.startsWith('_expr_$') ? '$' : colname }}`;
-    if (!parent.className) {
-        if (colname !== '$') {
-            return {
-                element: sql `jsonb_extract_path(${element}, ${_.map([colname, ...subpath], x => sql `${{ quote: x.startsWith('$') ? `$${x}` : x }}`)})`,
-                json: true,
-            };
-        }
-        else if (!_.isEmpty(subpath)) {
-            return {
-                element: sql `jsonb_extract_path(${element}, ${_.map(subpath, x => sql `${{ quote: x.startsWith('$') ? `$${x}` : x }}`)})`,
-                json: true,
-            };
-        }
-    }
-    else if (!_.isEmpty(subpath)) {
-        const _subpath = sql `${_.map(subpath, x => sql `${{ quote: x.startsWith('$') ? `$${x}` : x }}`)}`;
-        if (dataType === 'array' || (!_.isString(dataType) && (dataType?.type === 'array' || dataType?.type === 'relation'))) {
-            return {
-                element: sql `jsonb_extract_path(to_jsonb(${element}), ${_subpath})`,
-                json: true,
-            };
-        }
-        else {
-            return {
-                element: sql `jsonb_extract_path(${element}, ${_subpath})`,
-                json: true,
-            };
-        }
-    }
-    if (parent.name.startsWith('_expr_$') && colname !== '$') {
-        return {
-            element: sql `jsonb_extract_path(${element}, ${{ quote: colname.startsWith('$') ? `$${colname}` : colname }})`,
-            json: true,
-        };
-    }
-    return { element, json: false };
-};
-const resolvePaths = (compiler, className, paths) => {
-    const { paths: [colname, ...subpath], dataType } = random$1._resolveColumn(compiler.schema, className, paths.join('.'));
-    if (!_.isEmpty(subpath) && index.isVector(dataType)) {
-        if (subpath.length !== 1)
-            throw Error(`Invalid key: ${paths.join('.')}`);
-        const idx = parseInt(subpath[0]);
-        if (_.isSafeInteger(idx) && idx >= 0 && idx < dataType.dimension) {
-            return { dataType: 'number', colname: `${colname}[${idx}]`, subpath: [] };
-        }
-        else {
-            throw Error(`Invalid key: ${paths.join('.')}`);
-        }
-    }
-    if (!_.isEmpty(subpath) && index.isPointer(dataType)) {
-        const resolved = resolvePaths(compiler, dataType.target, subpath);
-        return { ...resolved, colname: `${colname}.${resolved.colname}` };
-    }
-    const digit = _.first(subpath);
-    if (!_.isEmpty(subpath) && index.isRelation(dataType) && digit?.match(random$1.QueryValidator.patterns.digits)) {
-        const resolved = resolvePaths(compiler, dataType.target, _.slice(subpath, 1));
-        return { dataType, colname, subpath: [digit, resolved.colname, ...resolved.subpath] };
-    }
-    return { dataType, colname, subpath };
-};
-const fetchElement = (compiler, parent, field) => {
-    if (parent.className) {
-        const { dataType, colname, subpath } = resolvePaths(compiler, parent.className, _.toPath(field));
-        if (index.isPointer(dataType))
-            return { element: sql `${{ identifier: parent.name }}.${{ identifier: `${colname}._id` }}`, dataType };
-        const { element, json } = _fetchElement(parent, colname, subpath, dataType);
-        return { element, json, dataType: json ? null : dataType, relation: index.isRelation(dataType) ? dataType : null };
-    }
-    const [colname, ...subpath] = _.toPath(field);
-    const { element, json } = _fetchElement(parent, colname, subpath);
-    return { element, json, dataType: null, relation: null };
-};
-
 //
 //  expressions.ts
 //
@@ -2260,7 +2255,7 @@ const selectPopulate = (compiler, parent, populate, field) => {
         SELECT to_jsonb(${{ identifier: populate.name }}) FROM (
           SELECT ${_.map(subpaths, ({ path, type }) => _encodePopulateInclude(populate.name, path, type))}
           FROM ${{ identifier: populate.name }} WHERE ${cond}
-          ${!_.isEmpty(populate.sort) ? sql `ORDER BY ${compiler._encodeSort(populate.sort, { className: populate.name, name: populate.name })}` : sql ``}
+          ${!_.isEmpty(populate.sort) ? sql `ORDER BY ${compiler._encodeSort(populate.sort, { className: populate.className, name: populate.name })}` : sql ``}
           ${populate.limit ? sql `LIMIT ${{ literal: `${populate.limit}` }}` : sql ``}
           ${populate.skip ? sql `OFFSET ${{ literal: `${populate.skip}` }}` : sql ``}
           ${compiler.selectLock ? compiler.isUpdate ? sql `FOR UPDATE NOWAIT` : sql `FOR SHARE NOWAIT` : sql ``}