lemon-core 4.1.15 → 4.2.1

package/dist/cores/storage/storage-service.js

@@ -1,13 +1,4 @@
 "use strict";
-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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DummyStorageService = exports.DynamoStorageService = void 0;
 /**
@@ -39,16 +30,11 @@ const clearDuplicated = (arr) => arr.sort().reduce((L, val) => {
  * - service via DynamoDB with id + json data.
  */
 class DynamoStorageService {
+    _table; // target table-name
+    _idName; // target table-name
+    _fields; // fields set.
+    $dynamo;
     constructor(table, fields, idName = 'id', idType = 'string') {
-        /**
-         * say hello()
-         * @param name  (optional) given name
-         */
-        this.hello = () => `dynamo-storage-service:${this._table}/${this._idName}/${this._fields.length}`;
-        /**
-         * (extended) get copy of fields.
-         */
-        this.fields = () => [...this._fields];
         if (!table)
             throw new Error(`@table (table-name) is required!`);
         this._table = table;
@@ -56,52 +42,56 @@ class DynamoStorageService {
         this._fields = clearDuplicated(['id', 'type', 'stereo', 'meta', idName].concat(fields));
         this.$dynamo = new dynamo_1.DynamoService({ tableName: this._table, idName, idType });
     }
+    /**
+     * say hello()
+     * @param name  (optional) given name
+     */
+    hello = () => `dynamo-storage-service:${this._table}/${this._idName}/${this._fields.length}`;
+    /**
+     * (extended) get copy of fields.
+     */
+    fields = () => [...this._fields];
     /**
      * Read whole model via database.
      *
      * @param id        id
      */
-    read(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this.$dynamo.readItem(id);
-            const fields = this._fields || [];
-            const item = fields.reduce((N, key) => {
-                const val = data[key];
-                if (val !== undefined)
-                    N[key] = val;
-                return N;
-            }, {});
-            return item;
-        });
+    async read(id) {
+        const data = await this.$dynamo.readItem(id);
+        const fields = this._fields || [];
+        const item = fields.reduce((N, key) => {
+            const val = data[key];
+            if (val !== undefined)
+                N[key] = val;
+            return N;
+        }, {});
+        return item;
     }
     /**
      * Read multiple models via database.
      *
      * @param ids       ids
      */
-    mread(ids) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const total = (_a = ids === null || ids === void 0 ? void 0 : ids.length) !== null && _a !== void 0 ? _a : 0;
-            const result = { success: [], failed: [], total };
-            if (!ids || total === 0)
-                return result;
-            const list = ids.map(id => ({ id }));
-            const res = yield this.$dynamo.mreadItem(list);
-            const fields = this._fields || [];
-            const toModel = (data) => fields.reduce((N, key) => {
-                const val = data[key];
-                if (val !== undefined)
-                    N[key] = val;
-                return N;
-            }, {});
-            result.success = (res.success || []).map(toModel);
-            result.failed = (res.failed || []).map(item => {
-                const model = toModel(item);
-                return Object.assign(Object.assign({}, model), { error: item.error || 'Unknown error' });
-            });
+    async mread(ids) {
+        const total = ids?.length ?? 0;
+        const result = { success: [], failed: [], total };
+        if (!ids || total === 0)
             return result;
+        const list = ids.map(id => ({ id }));
+        const res = await this.$dynamo.mreadItem(list);
+        const fields = this._fields || [];
+        const toModel = (data) => fields.reduce((N, key) => {
+            const val = data[key];
+            if (val !== undefined)
+                N[key] = val;
+            return N;
+        }, {});
+        result.success = (res.success || []).map(toModel);
+        result.failed = (res.failed || []).map(item => {
+            const model = toModel(item);
+            return { ...model, error: item.error || 'Unknown error' };
         });
+        return result;
     }
     /**
      * auto-create if not found.
@@ -109,13 +99,11 @@ class DynamoStorageService {
      * @param id
      * @param model
      */
-    readOrCreate(id, model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.read(id).catch((e) => {
-                if (`${e.message}`.startsWith('404 NOT FOUND'))
-                    return this.update(id, model);
-                throw e;
-            });
+    async readOrCreate(id, model) {
+        return this.read(id).catch((e) => {
+            if (`${e.message}`.startsWith('404 NOT FOUND'))
+                return this.update(id, model);
+            throw e;
         });
     }
     /**
@@ -124,19 +112,17 @@ class DynamoStorageService {
      * @param id        id
      * @param model     whole object.
      */
-    save(id, model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fields = this._fields || [];
-            const data = fields.reduce((N, key) => {
-                const val = model[key];
-                if (val !== undefined)
-                    N[key] = val;
-                return N;
-            }, {});
-            yield this.$dynamo.saveItem(id, data); // must be `{}`
-            const item = Object.assign({ [this._idName]: id }, data);
-            return item;
-        });
+    async save(id, model) {
+        const fields = this._fields || [];
+        const data = fields.reduce((N, key) => {
+            const val = model[key];
+            if (val !== undefined)
+                N[key] = val;
+            return N;
+        }, {});
+        await this.$dynamo.saveItem(id, data); // must be `{}`
+        const item = Object.assign({ [this._idName]: id }, data);
+        return item;
     }
     /**
      * update some attributes
@@ -145,58 +131,53 @@ class DynamoStorageService {
      * @param model     attributes to update
      * @param incrementals (optional) attributes to increment
      */
-    update(id, model, incrementals) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fields = this._fields || [];
-            const $U = fields.reduce((N, key) => {
-                const val = model[key];
-                if (val !== undefined)
-                    N[key] = val;
-                return N;
-            }, {});
-            /* eslint-disable prettier/prettier */
-            const $I = !incrementals ? null : Object.keys(incrementals).reduce((M, key) => {
-                const val = incrementals[key];
-                if (typeof val !== 'number')
-                    throw new Error(`.${key} (${val}) should be number!`);
-                M[key] = val;
-                return M;
-            }, {});
-            /* eslint-enable prettier/prettier */
-            const ret = yield this.$dynamo.updateItem(id, undefined, $U, $I);
-            return ret;
-        });
+    async update(id, model, incrementals) {
+        const fields = this._fields || [];
+        const $U = fields.reduce((N, key) => {
+            const val = model[key];
+            if (val !== undefined)
+                N[key] = val;
+            return N;
+        }, {});
+        /* eslint-disable prettier/prettier */
+        const $I = !incrementals ? null : Object.keys(incrementals).reduce((M, key) => {
+            const val = incrementals[key];
+            if (typeof val !== 'number')
+                throw new Error(`.${key} (${val}) should be number!`);
+            M[key] = val;
+            return M;
+        }, {});
+        /* eslint-enable prettier/prettier */
+        const ret = await this.$dynamo.updateItem(id, undefined, $U, $I);
+        return ret;
     }
     /**
      * update multiple models
      *
      * @param list      list of models (should include id)
      */
-    mupdate(list) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const total = (_a = list === null || list === void 0 ? void 0 : list.length) !== null && _a !== void 0 ? _a : 0;
-            const result = { success: [], failed: [], total };
-            if (!list || total === 0)
-                return result;
-            const fields = this._fields || [];
-            const items = list.map((item) => {
-                const _id = item[this._idName] || item.id;
-                if (!_id)
-                    throw new Error('@id is required!');
-                const data = fields.reduce((N, key) => {
-                    const val = item[key];
-                    if (val !== undefined)
-                        N[key] = val;
-                    return N;
-                }, {});
-                return Object.assign({ id: `${_id}` }, data);
-            });
-            const res = yield this.$dynamo.mupdateItem(items);
-            result.success = res.success || [];
-            result.failed = res.failed || [];
+    async mupdate(list) {
+        const total = list?.length ?? 0;
+        const result = { success: [], failed: [], total };
+        if (!list || total === 0)
             return result;
+        const fields = this._fields || [];
+        const items = list.map((item) => {
+            const _id = item[this._idName] || item.id;
+            if (!_id)
+                throw new Error('@id is required!');
+            const data = fields.reduce((N, key) => {
+                const val = item[key];
+                if (val !== undefined)
+                    N[key] = val;
+                return N;
+            }, {});
+            return { id: `${_id}`, ...data };
         });
+        const res = await this.$dynamo.mupdateItem(items);
+        result.success = res.success || [];
+        result.failed = res.failed || [];
+        return result;
     }
     /**
      * increment number attribute (or overwrite string field)
@@ -206,42 +187,40 @@ class DynamoStorageService {
      * @param model     attributes of number.
      * @param $update   (optional) update-set.
      */
-    increment(id, model, $update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!model && !$update)
-                throw new Error('@item is required!');
-            const $org = yield this.read(id).catch(e => {
-                if (`${e.message || e}`.startsWith('404 NOT FOUND'))
-                    return { id };
-                throw e;
-            });
-            const fields = this._fields || [];
-            const $U = fields.reduce((N, key) => {
-                const val = $update ? $update[key] : undefined;
-                if (val !== undefined)
-                    N[key] = val;
-                return N;
-            }, {});
-            const $I = fields.reduce((N, key) => {
-                const val = model[key];
-                if (val !== undefined) {
-                    const org = $org[key];
-                    //* check type matched!
-                    if (org !== undefined && typeof org === 'number' && typeof val !== 'number')
-                        throw new Error(`.${key} (${val}) should be number!`);
-                    //* if not exists, update it.
-                    if (org === undefined && typeof val === 'number')
-                        N[key] = val;
-                    else if (typeof val !== 'number' && !Array.isArray(val))
-                        $U[key] = val;
-                    else
-                        N[key] = val;
-                }
-                return N;
-            }, {});
-            const ret = yield this.$dynamo.updateItem(id, undefined, $U, $I);
-            return ret;
+    async increment(id, model, $update) {
+        if (!model && !$update)
+            throw new Error('@item is required!');
+        const $org = await this.read(id).catch(e => {
+            if (`${e.message || e}`.startsWith('404 NOT FOUND'))
+                return { id };
+            throw e;
         });
+        const fields = this._fields || [];
+        const $U = fields.reduce((N, key) => {
+            const val = $update ? $update[key] : undefined;
+            if (val !== undefined)
+                N[key] = val;
+            return N;
+        }, {});
+        const $I = fields.reduce((N, key) => {
+            const val = model[key];
+            if (val !== undefined) {
+                const org = $org[key];
+                //* check type matched!
+                if (org !== undefined && typeof org === 'number' && typeof val !== 'number')
+                    throw new Error(`.${key} (${val}) should be number!`);
+                //* if not exists, update it.
+                if (org === undefined && typeof val === 'number')
+                    N[key] = val;
+                else if (typeof val !== 'number' && !Array.isArray(val))
+                    $U[key] = val;
+                else
+                    N[key] = val;
+            }
+            return N;
+        }, {});
+        const ret = await this.$dynamo.updateItem(id, undefined, $U, $I);
+        return ret;
     }
     /**
      * delete set.
@@ -249,12 +228,10 @@ class DynamoStorageService {
      *
      * @param id        id
      */
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const $org = yield this.read(id);
-            yield this.$dynamo.deleteItem(id);
-            return $org;
-        });
+    async delete(id) {
+        const $org = await this.read(id);
+        await this.$dynamo.deleteItem(id);
+        return $org;
     }
 }
 exports.DynamoStorageService = DynamoStorageService;
@@ -269,23 +246,23 @@ exports.DynamoStorageService = DynamoStorageService;
  * - this dummy service should be replaceable with real service `DynamoStorageService`
  */
 class DummyStorageService {
-    constructor(dataFile, name = 'memory', idName) {
-        this.buffer = {};
-        /**
-         * say hello()
-         * @param name  (optional) given name
-         */
-        this.hello = () => `dummy-storage-service:${this.name}/${this.idName}`;
-        this.$locks = {}; //* only for lock.
+    name;
+    idName;
+    _fields;
+    constructor(dataFile, name = 'memory', idName, fields) {
         (0, engine_1._log)(NS, `DummyStorageService(${dataFile || ''})...`);
         if (!dataFile)
             throw new Error('@dataFile(string) is required!');
         this.name = `${name || ''}`;
         this.idName = `${idName || 'id'}`;
+        //* `undefined` keeps legacy "no filter" mode; `[]` opts into Dynamo's default whitelist.
+        this._fields =
+            fields === undefined ? null : clearDuplicated(['id', 'type', 'stereo', 'meta', this.idName].concat(fields));
         // const loadDataYml = require('../express').loadDataYml;
         const dummy = (0, tools_1.loadDataYml)(dataFile);
         this.load(dummy.data);
     }
+    buffer = {};
     load(data) {
         if (!data || !Array.isArray(data))
             throw new Error('@data should be array!');
@@ -294,183 +271,241 @@ class DummyStorageService {
             this.buffer[id] = item;
         });
     }
-    read(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!id.trim())
+    /**
+     * apply Dynamo-style field whitelist when configured; otherwise return a shallow copy.
+     */
+    pick(obj) {
+        const source = dynamo_1.DynamoService.normalize(obj);
+        if (!this._fields)
+            return { ...source };
+        return this._fields.reduce((N, key) => {
+            const val = source[key];
+            if (val !== undefined)
+                N[key] = val;
+            return N;
+        }, {});
+    }
+    pickRaw(obj) {
+        if (!this._fields)
+            return { ...obj };
+        return this._fields.reduce((N, key) => {
+            const val = obj[key];
+            if (val !== undefined)
+                N[key] = val ?? '';
+            return N;
+        }, {});
+    }
+    applyDynamoAdd(key, org, val) {
+        if (Array.isArray(val)) {
+            if (org !== undefined && !Array.isArray(org))
+                throw new Error(`.${key} (${val}) cannot append to non-list existing value`);
+            return [...(Array.isArray(org) ? org : []), ...val];
+        }
+        if (typeof val === 'number') {
+            if (org !== undefined && typeof org !== 'number')
+                throw new Error(`.${key} (${val}) cannot ADD to non-number existing value`);
+            return engine_1.$U.N(org, 0) + val;
+        }
+        throw new Error(`.${key} (${val}) should be number!`);
+    }
+    /**
+     * say hello()
+     * @param name  (optional) given name
+     */
+    hello = () => this._fields
+        ? `dummy-storage-service:${this.name}/${this.idName}/${this._fields.length}`
+        : `dummy-storage-service:${this.name}/${this.idName}`;
+    async read(id) {
+        //* note: dummy-only validation; Dynamo's read does not short-circuit whitespace ids.
+        if (!id?.trim())
+            throw new Error('@id (string) is required!');
+        const item = this.buffer[id];
+        if (!item)
+            throw new Error(`404 NOT FOUND - ${this.idName}:${id}`);
+        return Object.assign(this.pick(item), { [this.idName]: id });
+    }
+    async mread(ids) {
+        const total = ids?.length ?? 0;
+        const result = { success: [], failed: [], total };
+        if (!ids || total === 0)
+            return result;
+        for (const id of ids) {
+            //* note: dummy-only validation; Dynamo's mread does not short-circuit whitespace ids.
+            if (!id || !`${id}`.trim())
                 throw new Error('@id (string) is required!');
             const item = this.buffer[id];
-            if (!item)
-                throw new Error(`404 NOT FOUND - ${this.idName}:${id}`);
-            return Object.assign(Object.assign({}, item), { [this.idName]: id });
-        });
+            if (!item) {
+                result.failed.push({
+                    [this.idName]: id,
+                    error: `404 NOT FOUND - ${this.idName}:${id}`,
+                });
+            }
+            else {
+                result.success.push(Object.assign(this.pick(item), { [this.idName]: id }));
+            }
+        }
+        return result;
     }
-    mread(ids) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const total = (_a = ids === null || ids === void 0 ? void 0 : ids.length) !== null && _a !== void 0 ? _a : 0;
-            const result = { success: [], failed: [], total };
-            if (!ids || total === 0)
-                return result;
-            for (const id of ids) {
-                if (!id || !`${id}`.trim())
-                    throw new Error('@id (string) is required!');
-                const item = this.buffer[id];
-                if (!item) {
-                    result.failed.push({ [this.idName]: id, error: '404 NOT FOUND' });
-                }
-                else {
-                    result.success.push(Object.assign(Object.assign({}, item), { [this.idName]: id }));
-                }
+    async readSafe(id) {
+        return this.read(id).catch(e => {
+            if (`${e.message || e}`.startsWith('404 NOT FOUND')) {
+                const $org = { [this.idName]: id };
+                return $org;
             }
-            return result;
+            throw e;
         });
     }
-    readSafe(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.read(id).catch(e => {
-                if (`${e.message || e}`.startsWith('404 NOT FOUND')) {
-                    const $org = { [this.idName]: id };
-                    return $org;
-                }
-                throw e;
-            });
+    async readOrCreate(id, model) {
+        return this.read(id).catch((e) => {
+            if (`${e.message}`.startsWith('404 NOT FOUND'))
+                return this.update(id, model);
+            throw e;
         });
     }
-    readOrCreate(id, model) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.read(id).catch((e) => {
-                if (`${e.message}`.startsWith('404 NOT FOUND'))
-                    return this.update(id, model);
-                throw e;
-            });
-        });
+    async save(id, item) {
+        if (!id)
+            throw new Error('@id is required!');
+        if (!id || !`${id}`.trim())
+            throw new Error('@id (string) is required!');
+        if (!item)
+            throw new Error('@item is required!');
+        if (typeof item.lock == 'number')
+            this.$locks[id] = item.lock;
+        const data = this.pick(item);
+        this.buffer[id] = data;
+        return Object.assign({ [this.idName]: id }, this.pickRaw(item));
     }
-    save(id, item) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!id)
-                throw new Error('@id is required!');
-            if (!item)
-                throw new Error('@item is required!');
+    $locks = {}; //* only for lock.
+    async update(id, item, $inc) {
+        if (!id)
+            throw new Error('@id is required!');
+        if (!id || !`${id}`.trim())
+            throw new Error('@id (string) is required!');
+        if (!item)
+            throw new Error('@item is required!');
+        //* atomic operation for `.lock` — dummy-only deviation; DynamoDB has no equivalent here.
+        const lock = (() => {
+            let lock = 0;
             if (item && typeof item.lock == 'number')
-                this.$locks[id] = item.lock;
-            this.buffer[id] = item;
-            return Object.assign({ [this.idName]: id }, item);
-        });
+                this.$locks[id] = lock = item.lock;
+            if ($inc && typeof $inc.lock == 'number')
+                this.$locks[id] = lock = $inc.lock + engine_1.$U.N(this.$locks[id], 0);
+            return lock;
+        })();
+        const $org = await this.readSafe(id);
+        //* whitelist `item` (matches Dynamo `update` $U); $inc is iterated by its own keys (matches Dynamo $I).
+        const filtered = this.pick(item);
+        const $new = Object.assign($org, filtered);
+        /* eslint-disable prettier/prettier */
+        const incremented = !$inc ? null : Object.keys($inc).reduce((M, key) => {
+            const val = $inc[key];
+            if (typeof val !== 'number')
+                throw new Error(`.${key} (${val}) should be number!`);
+            if (key == 'lock') {
+                M[key] = lock;
+            }
+            else {
+                M[key] = this.applyDynamoAdd(key, $new[key], val);
+            }
+            return M;
+        }, {});
+        if (incremented)
+            Object.assign($new, incremented);
+        /* eslint-enable prettier/prettier */
+        await this.save(id, $new);
+        const $set = { ...filtered, ...incremented };
+        if (typeof $set.lock == 'number')
+            $set.lock = lock;
+        return Object.assign({ [this.idName]: id }, $set);
     }
-    update(id, item, $inc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!id)
+    async mupdate(list) {
+        const total = list?.length ?? 0;
+        const result = { success: [], failed: [], total };
+        if (!list || total === 0)
+            return result;
+        //* Dynamo's mupdateItem is batch-PUT (overwrite, no merge). Mirror that here inline.
+        for (const item of list) {
+            const _id = item[this.idName] || item.id;
+            if (!_id)
                 throw new Error('@id is required!');
-            if (!item)
-                throw new Error('@item is required!');
-            //* atomic operation for `.lock`
-            const lock = (() => {
-                let lock = 0;
-                if (item && typeof item.lock == 'number')
-                    this.$locks[id] = lock = item.lock;
-                if ($inc && typeof $inc.lock == 'number')
-                    this.$locks[id] = lock = $inc.lock + engine_1.$U.N(this.$locks[id], 0);
-                return lock;
-            })();
-            const $org = yield this.readSafe(id);
-            const $new = Object.assign($org, item);
-            /* eslint-disable prettier/prettier */
-            const incremented = !$inc ? null : Object.keys($inc).reduce((M, key) => {
-                const val = $inc[key];
-                if (typeof val !== 'number')
-                    throw new Error(`.${key} (${val}) should be number!`);
-                if (key == 'lock') {
-                    M[key] = lock;
-                }
-                else {
-                    M[key] = engine_1.$U.N($new[key], 0) + val;
-                }
-                return M;
-            }, {});
-            if (incremented)
-                Object.assign($new, incremented);
-            /* eslint-enable prettier/prettier */
-            yield this.save(id, $new);
-            const $set = Object.assign(Object.assign({}, item), incremented);
-            if (typeof $set.lock == 'number')
-                $set.lock = lock;
-            return Object.assign({ [this.idName]: id }, $set);
-        });
+            if (!_id || !`${_id}`.trim())
+                throw new Error('@id (string) is required!');
+            if (typeof item.lock == 'number')
+                this.$locks[_id] = item.lock;
+            const cleaned = this.idName !== 'id' ? (({ id: _drop, ...rest }) => rest)(item) : item;
+            const data = this.pick(cleaned);
+            this.buffer[_id] = data;
+            result.success.push(Object.assign({ [this.idName]: _id }, data));
+        }
+        return result;
     }
-    mupdate(list) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const total = (_a = list === null || list === void 0 ? void 0 : list.length) !== null && _a !== void 0 ? _a : 0;
-            const result = { success: [], failed: [], total };
-            if (!list || total === 0)
-                return result;
-            for (const item of list) {
-                const _id = item[this.idName] || item.id;
-                if (!_id)
-                    throw new Error('@id is required!');
-                if (item && typeof item.lock == 'number')
-                    this.$locks[_id] = item.lock;
-                this.buffer[_id] = item;
-                result.success.push(Object.assign(Object.assign({}, item), { [this.idName]: _id }));
+    async increment(id, $inc, $upt) {
+        if (!id)
+            throw new Error('@id is required!');
+        if (!id || !`${id}`.trim())
+            throw new Error('@id (string) is required!');
+        if (!$inc && !$upt)
+            throw new Error('@item is required!');
+        if (!$inc)
+            throw new TypeError('Cannot convert undefined or null to object');
+        //* atomic operation for `.lock` — dummy-only deviation; DynamoDB has no equivalent here.
+        const lock = (() => {
+            let lock = 0;
+            if ($upt && typeof $upt.lock == 'number')
+                this.$locks[id] = lock = $upt.lock;
+            if ($inc && typeof $inc.lock == 'number')
+                this.$locks[id] = lock = $inc.lock + engine_1.$U.N(this.$locks[id], 0);
+            return lock;
+        })();
+        const $org = await this.readSafe(id);
+        //* null-guard: previously `Object.keys($inc)` threw when only $upt was provided.
+        const inc = $inc ? dynamo_1.DynamoService.normalize($inc) : {};
+        const upt = $upt ? dynamo_1.DynamoService.normalize($upt) : {};
+        //* iterate over the whitelist when configured (parity with Dynamo at storage-service.ts:283-301);
+        //* otherwise fall back to the union of provided keys (legacy unfiltered behavior).
+        const keys = this._fields
+            ? this._fields
+            : Array.from(new Set([...Object.keys(inc), ...Object.keys(upt)]));
+        const $set = {};
+        for (const key of keys) {
+            const uptVal = upt[key];
+            const incVal = inc[key];
+            const org = $org[key];
+            if (uptVal !== undefined) {
+                $set[key] = uptVal;
+                $org[key] = uptVal;
             }
-            return result;
-        });
-    }
-    increment(id, $inc, $upt) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!id)
-                throw new Error('@id is required!');
-            if (!$inc && !$upt)
-                throw new Error('@item is required!');
-            //* atomic operation for `.lock`
-            const lock = (() => {
-                let lock = 0;
-                if ($upt && typeof $upt.lock == 'number')
-                    this.$locks[id] = lock = $upt.lock;
-                if ($inc && typeof $inc.lock == 'number')
-                    this.$locks[id] = lock = $inc.lock + engine_1.$U.N(this.$locks[id], 0);
-                return lock;
-            })();
-            const $org = yield this.readSafe(id);
-            const $set = Object.keys($inc)
-                .concat(Object.keys($upt || {}))
-                .reduce((N, key) => {
-                const val = $inc ? $inc[key] : undefined;
-                const upt = $upt ? $upt[key] : undefined;
-                const org = $org[key];
-                if (upt !== undefined) {
-                    N[key] = upt;
+            else if (incVal !== undefined) {
+                if (org !== undefined && typeof org === 'number' && typeof incVal !== 'number')
+                    throw new Error(`.${key} (${incVal}) should be number!`);
+                if (key === 'lock') {
+                    $set[key] = lock;
+                    $org[key] = lock;
                 }
-                else if (val !== undefined) {
-                    if (org !== undefined && typeof org === 'number' && typeof val !== 'number')
-                        throw new Error(`.${key} (${val}) should be number!`);
-                    if (typeof val !== 'number') {
-                        N[key] = val;
-                    }
-                    else if (key == 'lock') {
-                        N[key] = lock;
-                        $org[key] = lock;
-                    }
-                    else {
-                        N[key] = (org === undefined ? 0 : org) + val;
-                        $org[key] = (org === undefined ? 0 : org) + val;
-                    }
+                else if (typeof incVal !== 'number' && !Array.isArray(incVal)) {
+                    //* non-number SET, matching DynamoStorage.increment's SET path.
+                    $set[key] = incVal;
+                    $org[key] = incVal;
                 }
-                return N;
-            }, {});
-            if (typeof $set.lock == 'number')
-                $set.lock = lock;
-            yield this.save(id, Object.assign($org, $set));
-            return Object.assign({ [this.idName]: id }, $set);
-        });
+                else {
+                    const newVal = this.applyDynamoAdd(key, org, incVal);
+                    $set[key] = newVal;
+                    $org[key] = newVal;
+                }
+            }
+        }
+        if (typeof $set.lock == 'number')
+            $set.lock = lock;
+        await this.save(id, $org);
+        return Object.assign({ [this.idName]: id }, $set);
     }
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const $org = yield this.read(id);
-            delete this.buffer[id];
-            delete this.$locks[id];
-            return $org;
-        });
+    async delete(id) {
+        if (!id || !`${id}`.trim())
+            throw new Error('@id (string) is required!');
+        const $org = await this.read(id);
+        delete this.buffer[id];
+        delete this.$locks[id];
+        return $org;
     }
 }
 exports.DummyStorageService = DummyStorageService;