@proteinjs/db 1.54.1 → 1.54.3

package/dist/test/SyncRowHydration.test.js

@@ -0,0 +1,344 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var crypto_1 = require("crypto");
+var reflection_1 = require("@proteinjs/reflection");
+var Db_1 = require("../src/Db");
+var TableWatcherRunner_1 = require("../src/TableWatcherRunner");
+var Table_1 = require("../src/Table");
+var Record_1 = require("../src/Record");
+var Columns_1 = require("../src/Columns");
+var DataKeyStore_1 = require("../src/encryption/DataKeyStore");
+var EncryptionEnvelope_1 = require("../src/encryption/EncryptionEnvelope");
+/** Where the loop stood when each cell was read: the row, and whether the sentinel had fired by then. */
+var cellsRead = [];
+var sentinelFired = false;
+/**
+ * A column that notes, at each read, whether a microtask armed by the FIRST cell read has fired yet:
+ * a hydration that yields the loop between rows lets it fire mid-way; a synchronous one never does.
+ */
+var ObservingColumn = /** @class */ (function () {
+    function ObservingColumn(name) {
+        this.name = name;
+    }
+    ObservingColumn.prototype.deserialize = function (storedValue) {
+        if (cellsRead.length === 0) {
+            queueMicrotask(function () {
+                sentinelFired = true;
+            });
+        }
+        cellsRead.push({ column: this.name, row: storedValue, sentinelFired: sentinelFired });
+        return storedValue;
+    };
+    return ObservingColumn;
+}());
+var DocTable = /** @class */ (function (_super) {
+    __extends(DocTable, _super);
+    function DocTable() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.name = 'hydration_doc';
+        _this.columns = (0, Record_1.withRecordColumns)({
+            title: new Columns_1.StringColumn('title'),
+            first: new ObservingColumn('first'),
+            second: new ObservingColumn('second'),
+        });
+        return _this;
+    }
+    return DocTable;
+}(Table_1.Table));
+var docTable = new DocTable();
+var TestTransactionContextFactory = /** @class */ (function () {
+    function TestTransactionContextFactory() {
+        this.context = {};
+    }
+    TestTransactionContextFactory.prototype.getTransactionContext = function () {
+        return this.context;
+    };
+    TestTransactionContextFactory.prototype.runInContext = function (context, fn) {
+        return __awaiter(this, void 0, void 0, function () {
+            var previous;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        previous = this.context;
+                        this.context = context;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, , 3, 4]);
+                        return [4 /*yield*/, fn()];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        this.context = previous;
+                        return [7 /*endfinally*/];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return TestTransactionContextFactory;
+}());
+/** A driver that answers every query with the rows it was handed. */
+var RowsDriver = /** @class */ (function () {
+    function RowsDriver(rows) {
+        this.rows = rows;
+    }
+    RowsDriver.prototype.getDbName = function () {
+        return 'test';
+    };
+    RowsDriver.prototype.createDbIfNotExists = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    RowsDriver.prototype.createDb = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    RowsDriver.prototype.dropDb = function () {
+        return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
+            return [2 /*return*/];
+        }); });
+    };
+    RowsDriver.prototype.getTableManager = function () {
+        throw new Error('not used by these tests');
+    };
+    RowsDriver.prototype.runQuery = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.rows];
+            });
+        });
+    };
+    RowsDriver.prototype.runDml = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, 0];
+            });
+        });
+    };
+    RowsDriver.prototype.runTransaction = function (fn) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, fn({ id: 'transaction' })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    RowsDriver.prototype.getOperationDeadlineMs = function () {
+        return 1000;
+    };
+    return RowsDriver;
+}());
+var dbOver = function (rows) {
+    return new Db_1.Db(new RowsDriver(rows), function () { return docTable; }, new TestTransactionContextFactory(), true);
+};
+var storedRows = function (count) {
+    return Array.from({ length: count }, function (_, i) { return ({
+        id: "row-".concat(i),
+        created: new Date(1700000000000 + i),
+        updated: new Date(1700000000000 + i),
+        title: "title ".concat(i),
+        first: i,
+        second: i,
+    }); });
+};
+var objectCache = function () { return reflection_1.SourceRepository.get().objectCache; };
+var originalWatchers;
+// No reflection graph in a unit test: the watcher registry is empty by declaration.
+beforeAll(function () {
+    originalWatchers = objectCache()['@proteinjs/db/TableWatcher'];
+    objectCache()['@proteinjs/db/TableWatcher'] = [];
+    TableWatcherRunner_1.TableWatcherRunner.tableWatcherMap = undefined;
+});
+afterAll(function () {
+    if (originalWatchers) {
+        objectCache()['@proteinjs/db/TableWatcher'] = originalWatchers;
+    }
+    else {
+        delete objectCache()['@proteinjs/db/TableWatcher'];
+    }
+    TableWatcherRunner_1.TableWatcherRunner.tableWatcherMap = undefined;
+});
+var keyFor = function (owner, version) { return ({
+    owner: owner,
+    version: version,
+    cipherKey: (0, crypto_1.randomBytes)(32),
+    indexKey: (0, crypto_1.randomBytes)(32),
+}); };
+describe('a result set hydrates in one synchronous pass when no row needs an await', function () {
+    beforeEach(function () {
+        cellsRead.length = 0;
+        sentinelFired = false;
+    });
+    it('a query over plain rows never yields the event loop between rows', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var rows, records;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    rows = storedRows(200);
+                    return [4 /*yield*/, dbOver(rows).query(docTable, {})];
+                case 1:
+                    records = _a.sent();
+                    expect(records).toHaveLength(200);
+                    expect(records[199]).toMatchObject({ id: 'row-199', title: 'title 199', first: 199, second: 199 });
+                    // Every cell of every row was read before the microtask armed by the first cell could fire.
+                    expect(cellsRead).toHaveLength(400);
+                    expect(cellsRead.filter(function (cell) { return cell.sentinelFired; }).map(function (cell) { return "".concat(cell.column, ":").concat(cell.row); })).toEqual([]);
+                    expect(sentinelFired).toBe(true);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('the serializer answers a plain result set with the array itself, not a promise', function () {
+        var rows = storedRows(3);
+        var records = new Record_1.RecordSerializer(docTable).deserializeAll(rows);
+        expect(Array.isArray(records)).toBe(true);
+        expect(records.map(function (record) { return record.title; })).toEqual(['title 0', 'title 1', 'title 2']);
+    });
+    it('a column whose deserialize answers with a promise still settles, in column order', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var LaterColumn, LaterTable, laterTable, rows, settling, records;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    LaterColumn = /** @class */ (function () {
+                        function LaterColumn(name) {
+                            this.name = name;
+                        }
+                        LaterColumn.prototype.deserialize = function (storedValue) {
+                            return Promise.resolve(storedValue === null ? null : storedValue * 2);
+                        };
+                        return LaterColumn;
+                    }());
+                    LaterTable = /** @class */ (function (_super) {
+                        __extends(LaterTable, _super);
+                        function LaterTable() {
+                            var _this = _super !== null && _super.apply(this, arguments) || this;
+                            _this.name = 'hydration_later';
+                            _this.columns = (0, Record_1.withRecordColumns)({
+                                title: new Columns_1.StringColumn('title'),
+                                later: new LaterColumn('later'),
+                                after: new Columns_1.StringColumn('after'),
+                            });
+                            return _this;
+                        }
+                        return LaterTable;
+                    }(Table_1.Table));
+                    laterTable = new LaterTable();
+                    rows = [
+                        { id: 'a', created: new Date(), updated: new Date(), title: 'one', later: 21, after: 'x' },
+                        { id: 'b', created: new Date(), updated: new Date(), title: 'two', later: null, after: 'y' },
+                    ];
+                    settling = new Record_1.RecordSerializer(laterTable).deserializeAll(rows);
+                    expect(Array.isArray(settling)).toBe(false);
+                    return [4 /*yield*/, settling];
+                case 1:
+                    records = _a.sent();
+                    expect(records.map(function (record) { return record.later; })).toEqual([42, null]);
+                    expect(Object.keys(records[0])).toEqual(['id', 'created', 'updated', 'title', 'later', 'after']);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('a row holding a ciphertext envelope takes the async road and decrypts; its plain neighbors ride along', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var key, envelope, keyRead, rows, settling, records;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    key = keyFor('owner-1', 4);
+                    envelope = new EncryptionEnvelope_1.EncryptionEnvelope();
+                    keyRead = jest.spyOn(DataKeyStore_1.DataKeyStore.prototype, 'getKeyByVersion').mockResolvedValue(key);
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, , 3, 4]);
+                    rows = storedRows(3);
+                    rows[1].title = envelope.encrypt('the plaintext', key);
+                    settling = new Record_1.RecordSerializer(docTable).deserializeAll(rows);
+                    expect(Array.isArray(settling)).toBe(false);
+                    return [4 /*yield*/, settling];
+                case 2:
+                    records = _a.sent();
+                    expect(records.map(function (record) { return record.title; })).toEqual(['title 0', 'the plaintext', 'title 2']);
+                    expect(keyRead).toHaveBeenCalledTimes(1);
+                    expect(keyRead).toHaveBeenCalledWith('owner-1', 4);
+                    // The plain rows were hydrated in the one pass; the envelope row landed when its key read settled.
+                    expect(cellsRead.map(function (cell) { return cell.row; })).toEqual([0, 0, 2, 2, 1, 1]);
+                    return [3 /*break*/, 4];
+                case 3:
+                    keyRead.mockRestore();
+                    return [7 /*endfinally*/];
+                case 4: return [2 /*return*/];
+            }
+        });
+    }); });
+    it('a stored column the table no longer declares is omitted; a column without deserialize passes its value through', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var rows, record;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    rows = [
+                        { id: 'a', created: new Date(), updated: new Date(), title: 'one', first: 1, second: 1, retired: 'gone' },
+                    ];
+                    return [4 /*yield*/, new Record_1.RecordSerializer(docTable).deserializeAll(rows)];
+                case 1:
+                    record = (_a.sent())[0];
+                    expect(record).toMatchObject({ id: 'a', title: 'one', first: 1, second: 1 });
+                    expect('retired' in record).toBe(false);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
+//# sourceMappingURL=SyncRowHydration.test.js.map

package/dist/test/SyncRowHydration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SyncRowHydration.test.js","sourceRoot":"","sources":["../../test/SyncRowHydration.test.ts"],"names":[],"mappings":"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"}

package/dist/test/reusable/ColumnTypesTests.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnTypesTests.d.ts","sourceRoot":"","sources":["../../../test/reusable/ColumnTypesTests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,QAAQ,EAAU,KAAK,EAAE,gCAAgC,EAAE,MAAM,eAAe,CAAC;AAI9F,eAAO,MAAM,eAAe,WAClB,QAAQ,6BACW,gCAAgC,qBACxC,MAAM,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,eA0EhD,CAAC"}
+{"version":3,"file":"ColumnTypesTests.d.ts","sourceRoot":"","sources":["../../../test/reusable/ColumnTypesTests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,QAAQ,EAAU,KAAK,EAAE,gCAAgC,EAAuB,MAAM,eAAe,CAAC;AAMnH,eAAO,MAAM,eAAe,WAClB,QAAQ,6BACW,gCAAgC,qBACxC,MAAM,GAAG,CAAC,KAAK,QAAQ,IAAI,CAAC,eAsHhD,CAAC"}

package/dist/test/reusable/ColumnTypesTests.js

@@ -38,6 +38,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.columnTypeTests = void 0;
 var db_1 = require("@proteinjs/db");
+var db_query_1 = require("@proteinjs/db-query");
+var StatementConfigFactory_1 = require("../../src/StatementConfigFactory");
 var DbTestEnvironment_1 = require("../util/DbTestEnvironment");
 var columnTypesTestTables_1 = require("../util/tables/columnTypesTestTables");
 var columnTypeTests = function (driver, transactionContextFactory, dropTable) {
@@ -137,6 +139,59 @@ var columnTypeTests = function (driver, transactionContextFactory, dropTable) {
                 }
             });
         }); });
+        test('A legacy cell the column cannot deserialize never takes the row with it', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var testTable, legacy, intact, statementConfigFactory, legacyRow, fetched, all, other;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        testTable = columnTypesTestTables_1.columnTypesTestTables.Test;
+                        return [4 /*yield*/, db.insert(testTable, {
+                                stringColumn: 'legacy',
+                                objectColumn: { theme: 'dark' },
+                                arrayColumn: ['a', 'b'],
+                            })];
+                    case 1:
+                        legacy = _a.sent();
+                        return [4 /*yield*/, db.insert(testTable, {
+                                stringColumn: 'intact',
+                                objectColumn: { theme: 'light' },
+                                arrayColumn: ['c'],
+                            })];
+                    case 2:
+                        intact = _a.sent();
+                        statementConfigFactory = new StatementConfigFactory_1.StatementConfigFactory(driver.getDbName());
+                        legacyRow = new db_1.QueryBuilderFactory()
+                            .getQueryBuilder(testTable)
+                            .condition({ field: 'id', operator: '=', value: legacy.id });
+                        return [4 /*yield*/, driver.runDml(function (config) {
+                                return new db_query_1.StatementFactory().update(testTable.name, { object_column: 'legacyword', array_column: 'legacyword' }, legacyRow, statementConfigFactory.getStatementConfig(config));
+                            })];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, db.get(testTable, { id: legacy.id })];
+                    case 4:
+                        fetched = _a.sent();
+                        expect(fetched).toMatchObject({ id: legacy.id, stringColumn: 'legacy' });
+                        expect(fetched).not.toHaveProperty('objectColumn');
+                        expect(fetched).not.toHaveProperty('arrayColumn');
+                        return [4 /*yield*/, db.query(testTable, {})];
+                    case 5:
+                        all = _a.sent();
+                        expect(all.map(function (record) { return record.id; }).sort()).toEqual([legacy.id, intact.id].sort());
+                        other = all.find(function (record) { return record.id === intact.id; });
+                        expect(other).toMatchObject({ stringColumn: 'intact', objectColumn: { theme: 'light' }, arrayColumn: ['c'] });
+                        // Clean up
+                        return [4 /*yield*/, db.delete(testTable, { id: legacy.id })];
+                    case 6:
+                        // Clean up
+                        _a.sent();
+                        return [4 /*yield*/, db.delete(testTable, { id: intact.id })];
+                    case 7:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
     };
 };
 exports.columnTypeTests = columnTypeTests;

package/dist/test/reusable/ColumnTypesTests.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnTypesTests.js","sourceRoot":"","sources":["../../../test/reusable/ColumnTypesTests.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ColumnTypesTests.js","sourceRoot":"","sources":["../../../test/reusable/ColumnTypesTests.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proteinjs/db",
-  "version": "1.54.1",
+  "version": "1.54.3",
   "main": "./dist/generated/index.js",
   "types": "./dist/generated/index.d.ts",
   "exports": {
@@ -66,5 +66,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.2.2"
   },
-  "gitHead": "9c87e1ee2e65c4b2ffcf5308cbab21b88d53365c"
+  "gitHead": "351cc984b09d074bf0306a82750efd99ec00654a"
 }

package/src/Columns.ts

@@ -74,7 +74,7 @@ export class BooleanColumn implements Column<boolean | null, boolean | null> {
     return null;
   }
 
-  async deserialize(serializedFieldValue: boolean | null): Promise<boolean | null> {
+  deserialize(serializedFieldValue: boolean | null): boolean | null {
     if (serializedFieldValue) {
       return true;
     }
@@ -95,6 +95,13 @@ export class DateColumn implements Column<Date, Date> {
 }
 
 export class DateTimeColumn implements Column<moment.Moment | null, Date | null> {
+  /**
+   * The moment is built on the field's first read, not at hydration (`Column.deserializeOnFirstRead`):
+   * a row carries several of these and most are never read, and a moment costs more to build than
+   * the stored Date it is built from.
+   */
+  readonly deserializeOnFirstRead = true;
+
   constructor(
     public name: string,
     public options?: ColumnOptions
@@ -112,7 +119,7 @@ export class DateTimeColumn implements Column<moment.Moment | null, Date | null>
     return fieldValue.toDate();
   }
 
-  async deserialize(serializedFieldValue: Date | null): Promise<moment.Moment | null> {
+  deserialize(serializedFieldValue: Date | null): moment.Moment | null {
     if (serializedFieldValue === undefined || serializedFieldValue === null) {
       return null;
     }
@@ -186,7 +193,7 @@ export class ObjectColumn<T> extends StringColumn<T> {
     return Serializer.serialize(fieldValue);
   }
 
-  async deserialize(serializedFieldValue: string): Promise<T | null> {
+  deserialize(serializedFieldValue: string): T | null {
     if (serializedFieldValue === undefined || serializedFieldValue == null) {
       return null;
     }
@@ -247,8 +254,8 @@ export class ReferenceArrayColumn<T extends Record> extends ObjectColumn<Referen
     return await super.serialize(returnIds as any);
   }
 
-  async deserialize(serializedFieldValue: string): Promise<ReferenceArray<T> | null> {
-    let ids = (await super.deserialize(serializedFieldValue)) as string[] | null;
+  deserialize(serializedFieldValue: string): ReferenceArray<T> | null {
+    let ids = super.deserialize(serializedFieldValue) as string[] | null;
     if (ids === null) {
       ids = [];
     }
@@ -315,7 +322,7 @@ export class ReferenceColumn<T extends Record> extends StringColumn<Reference<T>
     return fieldValue._id;
   }
 
-  async deserialize(serializedFieldValue: string): Promise<Reference<T> | null> {
+  deserialize(serializedFieldValue: string): Reference<T> | null {
     const reference = new Reference(this.referenceTable, serializedFieldValue);
     if (reference._id === null) {
       return null;
@@ -487,7 +494,7 @@ export class DynamicReferenceColumn<T extends Record> extends StringColumn<Refer
     return fieldValue._id;
   }
 
-  async deserialize(serializedFieldValue: string, serializedRecord: any): Promise<Reference<T> | null> {
+  deserialize(serializedFieldValue: string, serializedRecord: any): Reference<T> | null {
     const reference = new Reference('', serializedFieldValue);
     if (reference._id === null) {
       return null;

package/src/Db.ts

@@ -750,10 +750,9 @@ export class Db<R extends Record = Record> implements DbService<R> {
     const generateQuery = (config: DbDriverQueryStatementConfig) =>
       qb.toSql(this.statementConfigFactory.getStatementConfig(config));
     const serializedRecords = await this.dbDriver.runQuery(generateQuery, this.transactionForDriver());
-    const recordSerializer = new RecordSerializer(table);
-    const records = await Promise.all(
-      serializedRecords.map(async (serializedRecord) => recordSerializer.deserialize(serializedRecord))
-    );
+    // One pass over the result set — synchronous when no row needs an await (see
+    // `RecordSerializer.deserializeAll`): no promise per row, no yield of the loop between rows.
+    const records = await new RecordSerializer<T>(table).deserializeAll(serializedRecords);
     await this.preloadReferences(records, options);
     return records;
   }