@exabugs/dynamodb-client 1.6.2 → 1.8.0

package/dist/server/media-handler.cjs

@@ -1,5 +1,5 @@
-// @exabugs/dynamodb-client v1.6.2
-// Built: 2026-10-11T14:15:49.129Z
+// @exabugs/dynamodb-client v1.8.0
+// Built: 2026-10-11T23:03:45.636Z
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;

package/dist/server/media-process-handler-dlq.cjs

@@ -1,5 +1,5 @@
-// @exabugs/dynamodb-client v1.6.2
-// Built: 2026-10-11T14:15:49.129Z
+// @exabugs/dynamodb-client v1.8.0
+// Built: 2026-10-11T23:03:45.636Z
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -37714,7 +37714,7 @@ var init_types2 = __esm({
 });
 
 // src/shared/errors/index.ts
-var AppError, ConfigError, InvalidTokenError;
+var AppError, ConfigError, InvalidFilterError, InvalidTokenError;
 var init_errors4 = __esm({
   "src/shared/errors/index.ts"() {
     "use strict";
@@ -37750,6 +37750,14 @@ var init_errors4 = __esm({
         super("CONFIG_ERROR" /* CONFIG_ERROR */, message, 500, details);
       }
     };
+    InvalidFilterError = class extends AppError {
+      static {
+        __name(this, "InvalidFilterError");
+      }
+      constructor(message, details) {
+        super("INVALID_FILTER" /* INVALID_FILTER */, message, 400, details);
+      }
+    };
     InvalidTokenError = class extends AppError {
       static {
         __name(this, "InvalidTokenError");
@@ -46087,7 +46095,7 @@ function parseFilters(filter) {
         fieldKey,
         error: error2 instanceof Error ? error2.message : String(error2)
       });
-      throw new ConfigError(`Invalid filter field syntax: ${fieldKey}`, {
+      throw new InvalidFilterError(`Invalid filter field syntax: ${fieldKey}`, {
         field: fieldKey,
         error: error2 instanceof Error ? error2.message : String(error2)
       });
@@ -46279,7 +46287,14 @@ async function executeInQuery(resource, targetIds, sort, requestId) {
 }
 async function executeAllRecordsQuery(resource, sort, perPage, nextToken, parsedFilters, requestId) {
   if (parsedFilters.length > 0) {
-    return executeAllRecordsQueryFullScan(resource, sort, perPage, nextToken, parsedFilters, requestId);
+    return executeAllRecordsQueryFullScan(
+      resource,
+      sort,
+      perPage,
+      nextToken,
+      parsedFilters,
+      requestId
+    );
   }
   const dbClient2 = getDBClient();
   const tableName = getTableName();
@@ -46351,19 +46366,20 @@ async function executeAllRecordsQueryFullScan(resource, sort, perPage, nextToken
   const dbClient2 = getDBClient();
   const tableName = getTableName();
   const costTracker = new CostTracker();
-  const offset = nextToken ? decodeOffsetToken(nextToken) ?? 0 : 0;
-  logger4.debug("Executing full scan query (ID sort)", {
-    requestId,
-    resource,
-    offset
-  });
-  const allRecords = [];
   let exclusiveStartKey;
-  let previousKeySignature;
-  const MAX_ITERATIONS = 1e4;
+  if (nextToken) {
+    const decoded = decodeNextToken(nextToken);
+    exclusiveStartKey = { PK: decoded.PK, SK: decoded.SK };
+  }
+  const page = [];
+  let lastReturned;
+  let hasNextPage = false;
+  let scanned = 0;
   let iterations = 0;
-  do {
-    if (++iterations > MAX_ITERATIONS) {
+  let previousKeySignature;
+  let chunkSize = SCAN_CHUNK_INITIAL;
+  scan: while (true) {
+    if (++iterations > SCAN_MAX_ITERATIONS) {
       logger4.error("executeAllRecordsQueryFullScan: \u6700\u5927\u53CD\u5FA9\u56DE\u6570\u3092\u8D85\u904E\u3057\u305F\u305F\u3081\u4E2D\u65AD", {
         requestId,
         resource,
@@ -46381,8 +46397,7 @@ async function executeAllRecordsQueryFullScan(resource, sort, perPage, nextToken
             ":skPrefix": "id#"
           },
           ScanIndexForward: sort.order === "ASC",
-          Limit: 1e3,
-          // 大きめの Limit でループ回数を最小化
+          Limit: chunkSize,
           ExclusiveStartKey: exclusiveStartKey,
           ConsistentRead: true,
           ReturnConsumedCapacity: "TOTAL"
@@ -46391,10 +46406,24 @@ async function executeAllRecordsQueryFullScan(resource, sort, perPage, nextToken
       "Query"
     );
     costTracker.add(queryResult.ConsumedCapacity);
-    allRecords.push(...queryResult.Items || []);
+    for (const row of queryResult.Items || []) {
+      scanned++;
+      if (!matchesAllFilters(extractCleanRecord(row), parsedFilters)) {
+        continue;
+      }
+      if (page.length >= perPage) {
+        hasNextPage = true;
+        break scan;
+      }
+      page.push(extractCleanRecord(row));
+      lastReturned = { PK: row.PK, SK: row.SK };
+    }
     const nextKey = queryResult.LastEvaluatedKey;
-    const nextKeySignature = nextKey ? `${nextKey.PK}#${nextKey.SK}` : void 0;
-    if (nextKeySignature && nextKeySignature === previousKeySignature) {
+    if (!nextKey) {
+      break;
+    }
+    const nextKeySignature = `${nextKey.PK}#${nextKey.SK}`;
+    if (nextKeySignature === previousKeySignature) {
       logger4.error("executeAllRecordsQueryFullScan: \u540C\u4E00\u306ELastEvaluatedKey\u304C\u8FD4\u5374\u3055\u308C\u305F\u305F\u3081\u4E2D\u65AD", {
         requestId,
         resource,
@@ -46404,28 +46433,24 @@ async function executeAllRecordsQueryFullScan(resource, sort, perPage, nextToken
     }
     previousKeySignature = nextKeySignature;
     exclusiveStartKey = nextKey;
-  } while (exclusiveStartKey);
-  let items = allRecords.map((item) => extractCleanRecord(item));
-  items = items.filter((record) => matchesAllFilters(record, parsedFilters));
-  const page = items.slice(offset, offset + perPage);
-  const hasNextPage = offset + perPage < items.length;
-  const nextTokenValue = hasNextPage ? encodeOffsetToken(offset + perPage) : void 0;
-  logger4.info("ID full scan query succeeded", {
+    chunkSize = Math.min(chunkSize * 2, SCAN_CHUNK_MAX);
+  }
+  const nextTokenValue = hasNextPage && lastReturned ? encodeNextToken(lastReturned.PK, lastReturned.SK) : void 0;
+  logger4.info("ID filtered scan query succeeded", {
     requestId,
     resource,
-    totalMatched: items.length,
-    offset,
+    scanned,
     returned: page.length,
     hasNextPage
   });
   return {
     items: page,
-    pageInfo: { hasNextPage, hasPreviousPage: offset > 0 },
+    pageInfo: { hasNextPage, hasPreviousPage: !!nextToken },
     ...nextTokenValue && { nextToken: nextTokenValue },
     consumedCapacity: costTracker.getAggregated()
   };
 }
-var import_lib_dynamodb2, logger4;
+var import_lib_dynamodb2, logger4, SCAN_CHUNK_INITIAL, SCAN_CHUNK_MAX, SCAN_MAX_ITERATIONS;
 var init_idQuery = __esm({
   "src/server/operations/find/idQuery.ts"() {
     "use strict";
@@ -46443,6 +46468,9 @@ var init_idQuery = __esm({
     __name(executeSpecificIdQuery, "executeSpecificIdQuery");
     __name(executeInQuery, "executeInQuery");
     __name(executeAllRecordsQuery, "executeAllRecordsQuery");
+    SCAN_CHUNK_INITIAL = 100;
+    SCAN_CHUNK_MAX = 1e3;
+    SCAN_MAX_ITERATIONS = 1e4;
     __name(executeAllRecordsQueryFullScan, "executeAllRecordsQueryFullScan");
   }
 });
@@ -47347,6 +47375,113 @@ var init_chunking = __esm({
   }
 });
 
+// src/server/utils/mergePatch.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function invalidPath(path, reason) {
+  return new AppError("VALIDATION_ERROR" /* VALIDATION_ERROR */, `Invalid patch path "${path}": ${reason}`, 400, {
+    path
+  });
+}
+function mergeInto(target, patch) {
+  for (const [key, value] of Object.entries(patch)) {
+    if (key.includes(".")) {
+      setByPath(target, key, value);
+    } else {
+      setKey(target, key, value, key);
+    }
+  }
+}
+function setKey(target, key, value, path) {
+  if (key === "__proto__") {
+    throw invalidPath(path, "forbidden segment");
+  }
+  if (value === null) {
+    delete target[key];
+  } else if (isPlainObject(value) && isPlainObject(target[key])) {
+    mergeInto(target[key], value);
+  } else {
+    target[key] = value;
+  }
+}
+function setByPath(target, path, value) {
+  const keys = path.split(".");
+  if (keys.some((k4) => k4 === "")) {
+    throw invalidPath(path, "empty segment");
+  }
+  let current = target;
+  for (let i4 = 0; i4 < keys.length; i4++) {
+    const key = keys[i4];
+    const isLast = i4 === keys.length - 1;
+    if (Array.isArray(current)) {
+      if (!/^(0|[1-9]\d*)$/.test(key) || Number(key) >= current.length) {
+        throw invalidPath(path, `"${key}" is not a valid index (length ${current.length})`);
+      }
+      const index = Number(key);
+      if (isLast) {
+        if (value === null) {
+          throw invalidPath(path, "array elements cannot be deleted by path");
+        }
+        const existing = current[index];
+        if (isPlainObject(value) && isPlainObject(existing)) {
+          mergeInto(existing, value);
+        } else {
+          current[index] = value;
+        }
+        return;
+      }
+      const next2 = current[index];
+      if (isPlainObject(next2) || Array.isArray(next2)) {
+        current = next2;
+      } else {
+        if (value === null) {
+          return;
+        }
+        const created = {};
+        current[index] = created;
+        current = created;
+      }
+      continue;
+    }
+    if (isLast) {
+      setKey(current, key, value, path);
+      return;
+    }
+    if (key === "__proto__") {
+      throw invalidPath(path, "forbidden segment");
+    }
+    const next = current[key];
+    if (isPlainObject(next) || Array.isArray(next)) {
+      current = next;
+    } else {
+      if (value === null) {
+        return;
+      }
+      const created = {};
+      current[key] = created;
+      current = created;
+    }
+  }
+}
+function applyJsonMergePatch(target, patch) {
+  const result = structuredClone(target);
+  mergeInto(result, structuredClone(patch));
+  return result;
+}
+var init_mergePatch = __esm({
+  "src/server/utils/mergePatch.ts"() {
+    "use strict";
+    init_shared();
+    __name(isPlainObject, "isPlainObject");
+    __name(invalidPath, "invalidPath");
+    __name(mergeInto, "mergeInto");
+    __name(setKey, "setKey");
+    __name(setByPath, "setByPath");
+    __name(applyJsonMergePatch, "applyJsonMergePatch");
+  }
+});
+
 // src/server/utils/timestamps.ts
 var timestamps_exports = {};
 __export(timestamps_exports, {
@@ -47380,8 +47515,8 @@ function addUpdateTimestamp(data) {
   }
   const now = (/* @__PURE__ */ new Date()).toISOString();
   return {
-    [timestampFields.updatedAt]: now,
-    ...data
+    ...data,
+    [timestampFields.updatedAt]: data[timestampFields.updatedAt] ?? now
   };
 }
 var init_timestamps = __esm({
@@ -47399,46 +47534,6 @@ var updateMany_exports = {};
 __export(updateMany_exports, {
   handleUpdateMany: () => handleUpdateMany
 });
-function expandDotNotation(patch) {
-  const result = {};
-  for (const [key, value] of Object.entries(patch)) {
-    if (key.includes(".")) {
-      const keys = key.split(".");
-      let current = result;
-      for (let i4 = 0; i4 < keys.length - 1; i4++) {
-        const k4 = keys[i4];
-        if (!(k4 in current)) {
-          current[k4] = {};
-        } else if (typeof current[k4] !== "object" || Array.isArray(current[k4])) {
-          current[k4] = {};
-        }
-        current = current[k4];
-      }
-      const lastKey = keys[keys.length - 1];
-      current[lastKey] = value;
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-function applyJsonMergePatch(target, patch) {
-  const expandedPatch = expandDotNotation(patch);
-  const result = { ...target };
-  for (const [key, value] of Object.entries(expandedPatch)) {
-    if (value === null) {
-      delete result[key];
-    } else if (typeof value === "object" && !Array.isArray(value) && value !== null && typeof result[key] === "object" && !Array.isArray(result[key]) && result[key] !== null) {
-      result[key] = applyJsonMergePatch(
-        result[key],
-        value
-      );
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
 async function handleUpdateMany(resource, params, requestId) {
   const { data: patchData, options } = params;
   const upsert = options?.upsert ?? false;
@@ -47566,11 +47661,9 @@ async function handleUpdateMany(resource, params, requestId) {
       const id = existingData.id;
       const oldShadowKeys = item.__shadowKeys ?? existingData.__shadowKeys ?? [];
       const actualPatchData2 = patchData.$set ? patchData.$set : patchData;
-      const mergedData = applyJsonMergePatch(removeShadowKeys(existingData), actualPatchData2);
-      const updatedData = addUpdateTimestamp({
-        ...mergedData,
-        id
-      });
+      const timestampedPatch = addUpdateTimestamp(actualPatchData2);
+      const mergedData = applyJsonMergePatch(removeShadowKeys(existingData), timestampedPatch);
+      const updatedData = { ...mergedData, id };
       const newShadowRecords = generateShadowRecords(updatedData, resource, shadowConfig);
       const newShadowKeys = newShadowRecords.map((shadow) => shadow.SK);
       const mainSK = generateMainRecordSK2(id);
@@ -47851,10 +47944,9 @@ var init_updateMany = __esm({
     init_chunking();
     init_cost_tracker();
     init_dynamodb3();
+    init_mergePatch();
     init_timestamps();
     logger11 = createLogger({ service: "records-lambda" });
-    __name(expandDotNotation, "expandDotNotation");
-    __name(applyJsonMergePatch, "applyJsonMergePatch");
     __name(handleUpdateMany, "handleUpdateMany");
     __name(getPreparationErrorCode, "getPreparationErrorCode");
   }
@@ -47990,6 +48082,9 @@ async function handleUpdateOne(resource, params, requestId) {
     if (updateManyResult.count === 0) {
       const error2 = Object.values(updateManyResult.errors || {})[0];
       if (error2) {
+        if (error2.code === "VALIDATION_ERROR" /* VALIDATION_ERROR */) {
+          throw new AppError("VALIDATION_ERROR" /* VALIDATION_ERROR */, error2.message ?? "Invalid patch", 400);
+        }
         throw new Error(`Failed to update record: ${error2.message}`);
       } else {
         throw new Error(`Failed to update record: ${targetId}`);
@@ -48029,6 +48124,9 @@ async function handleUpdateOne(resource, params, requestId) {
     if (updateManyResult.count === 0) {
       const error2 = Object.values(updateManyResult.errors || {})[0];
       if (error2) {
+        if (error2.code === "VALIDATION_ERROR" /* VALIDATION_ERROR */) {
+          throw new AppError("VALIDATION_ERROR" /* VALIDATION_ERROR */, error2.message ?? "Invalid patch", 400);
+        }
         throw new Error(`Failed to update record: ${error2.message}`);
       } else {
         throw new Error(`No records found matching filter`);