nicot 1.2.9 → 1.2.11

package/dist/index.cjs

@@ -800,6 +800,7 @@ var createQueryArrayify = (newWrapper, singleFallbackWrapper) => createQueryWrap
   if (items.length === 1 && singleFallbackWrapper) {
     const singleRes = singleFallbackWrapper(entityExpr, varExpr, info);
     if (singleRes) {
+      info.mutateValue(items[0]);
       return singleRes;
     }
   }
@@ -1477,7 +1478,6 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
 
 // src/crud-base.ts
 var import_p_queue = __toESM(require("p-queue"));
-var import_nfkit = require("nfkit");
 var Relation = (name, options = {}) => {
   return { name, inner: false, ...options };
 };
@@ -2106,52 +2106,119 @@ var CrudBase = class {
     if (!await this.repo.exists({ where })) {
       throw404();
     }
+    const isPlainObject = (v) => {
+      if (!v || typeof v !== "object") return false;
+      const proto = Object.getPrototypeOf(v);
+      return proto === Object.prototype || proto === null;
+    };
+    const cloneAtomicOrJson = (v) => {
+      if (v == null) return v;
+      if (typeof v !== "object") return v;
+      if (v instanceof Date) return new Date(v.getTime());
+      if (typeof Buffer !== "undefined" && Buffer.isBuffer(v)) {
+        return Buffer.from(v);
+      }
+      if (ArrayBuffer.isView(v)) {
+        const ctor = v.constructor;
+        return new ctor(v.slice?.() ?? v);
+      }
+      if (v instanceof ArrayBuffer) return v.slice(0);
+      if (Array.isArray(v) || isPlainObject(v)) {
+        const sc = globalThis.structuredClone;
+        if (typeof sc === "function") return sc(v);
+        return JSON.parse(JSON.stringify(v));
+      }
+      return v;
+    };
+    const deepEqual = (a, b) => {
+      if (a === b) return true;
+      if (a == null || b == null) return a === b;
+      if (a instanceof Date && b instanceof Date)
+        return a.getTime() === b.getTime();
+      if (typeof Buffer !== "undefined" && Buffer.isBuffer(a) && Buffer.isBuffer(b)) {
+        return a.equals(b);
+      }
+      if (ArrayBuffer.isView(a) && ArrayBuffer.isView(b)) {
+        if (a.byteLength !== b.byteLength) return false;
+        const ua = new Uint8Array(a.buffer, a.byteOffset, a.byteLength);
+        const ub = new Uint8Array(b.buffer, b.byteOffset, b.byteLength);
+        for (let i = 0; i < ua.length; i++) if (ua[i] !== ub[i]) return false;
+        return true;
+      }
+      if (a instanceof ArrayBuffer && b instanceof ArrayBuffer) {
+        if (a.byteLength !== b.byteLength) return false;
+        const ua = new Uint8Array(a);
+        const ub = new Uint8Array(b);
+        for (let i = 0; i < ua.length; i++) if (ua[i] !== ub[i]) return false;
+        return true;
+      }
+      if (Array.isArray(a) || Array.isArray(b)) {
+        if (!Array.isArray(a) || !Array.isArray(b)) return false;
+        if (a.length !== b.length) return false;
+        for (let i = 0; i < a.length; i++)
+          if (!deepEqual(a[i], b[i])) return false;
+        return true;
+      }
+      if (typeof a === "object" && typeof b === "object") {
+        const keys = /* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(b)]);
+        for (const k of keys) {
+          if (!deepEqual(a[k], b[k])) return false;
+        }
+        return true;
+      }
+      return false;
+    };
     const op = async (repo) => {
       const ent = await repo.findOne({
         lock: { mode: "pessimistic_write", tables: [repo.metadata.tableName] },
         ...options.find || {},
         where
       });
-      if (!ent) {
-        throw404();
+      if (!ent) throw404();
+      const columns = repo.metadata.columns.map(
+        (c) => c.propertyName
+      );
+      const snapshot = {};
+      const snapshotHasKey = {};
+      for (const key of columns) {
+        snapshotHasKey[key] = Object.prototype.hasOwnProperty.call(
+          ent,
+          key
+        );
+        snapshot[key] = cloneAtomicOrJson(ent[key]);
       }
-      const initial = { ...ent };
-      let changes = {};
-      const entProxy = (0, import_nfkit.observeDiff)(ent, (change) => {
-        if (change.type === "delete") {
-          if (initial[change.key] === null) {
-            delete changes[change.key];
-          } else {
-            changes[change.key] = null;
+      const flush = async () => {
+        const patch = {};
+        for (const key of columns) {
+          const hasNow = Object.prototype.hasOwnProperty.call(ent, key);
+          if (!hasNow) {
+            if (snapshotHasKey[key]) {
+              patch[key] = null;
+              snapshotHasKey[key] = true;
+              snapshot[key] = null;
+            }
+            continue;
           }
-        } else {
-          if (change.newValue !== initial[change.key]) {
-            changes[change.key] = change.newValue;
-          } else {
-            delete changes[change.key];
+          const current = ent[key];
+          const before = snapshot[key];
+          if (!deepEqual(before, current)) {
+            patch[key] = current;
+            snapshotHasKey[key] = true;
+            snapshot[key] = cloneAtomicOrJson(current);
           }
         }
-      });
-      const flush = async () => {
-        if (Object.keys(changes).length) {
-          const currentChanges = { ...changes };
-          Object.assign(initial, changes);
-          changes = {};
-          await repo.update({ id }, currentChanges);
+        if (Object.keys(patch).length) {
+          await repo.update({ id }, patch);
         }
       };
-      const result = await cb(entProxy, { repo, flush });
+      const result = await cb(ent, { repo, flush });
       await flush();
       return result;
     };
     const res = await (options.repo ? op(options.repo) : this.repo.manager.transaction(
       (tdb) => op(tdb.getRepository(this.entityClass))
     ));
-    if (res == null) {
-      return new import_nesties8.BlankReturnMessageDto(200, "success");
-    } else {
-      return new import_nesties8.GenericReturnMessageDto(200, "success", res);
-    }
+    return res == null ? new import_nesties8.BlankReturnMessageDto(200, "success") : new import_nesties8.GenericReturnMessageDto(200, "success", res);
   }
   async _loadFullTextIndex() {
     const fields = reflector.getArray(
@@ -2348,7 +2415,7 @@ var MutatorPipe = class {
 };
 
 // src/restful.ts
-var import_nfkit2 = require("nfkit");
+var import_nfkit = require("nfkit");
 var getCurrentLevelRelations = (relations) => relations.filter((r) => !r.includes("."));
 var getNextLevelRelations = (relations, enteringField) => relations.filter((r) => r.includes(".") && r.startsWith(`${enteringField}.`)).map((r) => r.split(".").slice(1).join("."));
 var _RestfulFactory = class _RestfulFactory {
@@ -2965,58 +3032,58 @@ var _RestfulFactory = class _RestfulFactory {
   }
 };
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "fieldsToOmit", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "fieldsInCreateToOmit", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "createDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "fieldsInUpdateToOmit", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "updateDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "importDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "fieldsInGetToOmit", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "queryableFields", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "findAllDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "findAllCursorPaginatedDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityResultDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityCreateResultDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityReturnMessageDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityCreateReturnMessageDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityArrayReturnMessageDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityCursorPaginationReturnMessageDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "importReturnMessageDto", 1);
 __decorateClass([
-  (0, import_nfkit2.Memorize)()
+  (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "idType", 1);
 var RestfulFactory = _RestfulFactory;