@exabugs/dynamodb-client 1.4.17 → 1.5.1

package/dist/server/handler.cjs

@@ -1,5 +1,5 @@
-// @exabugs/dynamodb-client v1.4.17
-// Built: 2026-04-25T05:17:24.229Z
+// @exabugs/dynamodb-client v1.5.1
+// Built: 2026-09-27T04:40:22.568Z
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -30657,6 +30657,9 @@ 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);
+  }
   const dbClient2 = getDBClient();
   const tableName = getTableName();
   const costTracker = new CostTracker();
@@ -30723,6 +30726,84 @@ async function executeAllRecordsQuery(resource, sort, perPage, nextToken, parsed
     consumedCapacity: costTracker.getAggregated()
   };
 }
+async function executeAllRecordsQueryFullScan(resource, sort, perPage, nextToken, parsedFilters, requestId) {
+  const dbClient2 = getDBClient();
+  const tableName = getTableName();
+  const costTracker = new CostTracker();
+  const offset = nextToken ? decodeOffsetToken(nextToken) ?? 0 : 0;
+  logger6.debug("Executing full scan query (ID sort)", {
+    requestId,
+    resource,
+    offset
+  });
+  const allRecords = [];
+  let exclusiveStartKey;
+  let previousKeySignature;
+  const MAX_ITERATIONS = 1e4;
+  let iterations = 0;
+  do {
+    if (++iterations > MAX_ITERATIONS) {
+      logger6.error("executeAllRecordsQueryFullScan: \u6700\u5927\u53CD\u5FA9\u56DE\u6570\u3092\u8D85\u904E\u3057\u305F\u305F\u3081\u4E2D\u65AD", {
+        requestId,
+        resource,
+        iterations
+      });
+      break;
+    }
+    const queryResult = await executeDynamoDBOperation(
+      () => dbClient2.send(
+        new import_lib_dynamodb2.QueryCommand({
+          TableName: tableName,
+          KeyConditionExpression: "PK = :pk AND begins_with(SK, :skPrefix)",
+          ExpressionAttributeValues: {
+            ":pk": resource,
+            ":skPrefix": "id#"
+          },
+          ScanIndexForward: sort.order === "ASC",
+          Limit: 1e3,
+          // 大きめの Limit でループ回数を最小化
+          ExclusiveStartKey: exclusiveStartKey,
+          ConsistentRead: true,
+          ReturnConsumedCapacity: "TOTAL"
+        })
+      ),
+      "Query"
+    );
+    costTracker.add(queryResult.ConsumedCapacity);
+    allRecords.push(...queryResult.Items || []);
+    const nextKey = queryResult.LastEvaluatedKey;
+    const nextKeySignature = nextKey ? `${nextKey.PK}#${nextKey.SK}` : void 0;
+    if (nextKeySignature && nextKeySignature === previousKeySignature) {
+      logger6.error("executeAllRecordsQueryFullScan: \u540C\u4E00\u306ELastEvaluatedKey\u304C\u8FD4\u5374\u3055\u308C\u305F\u305F\u3081\u4E2D\u65AD", {
+        requestId,
+        resource,
+        iterations
+      });
+      break;
+    }
+    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;
+  logger6.info("ID full scan query succeeded", {
+    requestId,
+    resource,
+    totalMatched: items.length,
+    offset,
+    returned: page.length,
+    hasNextPage
+  });
+  return {
+    items: page,
+    pageInfo: { hasNextPage, hasPreviousPage: offset > 0 },
+    ...nextTokenValue && { nextToken: nextTokenValue },
+    consumedCapacity: costTracker.getAggregated()
+  };
+}
 var import_lib_dynamodb2, logger6;
 var init_idQuery = __esm({
   "src/server/operations/find/idQuery.ts"() {
@@ -30741,6 +30822,7 @@ var init_idQuery = __esm({
     __name(executeSpecificIdQuery, "executeSpecificIdQuery");
     __name(executeInQuery, "executeInQuery");
     __name(executeAllRecordsQuery, "executeAllRecordsQuery");
+    __name(executeAllRecordsQueryFullScan, "executeAllRecordsQueryFullScan");
   }
 });
 
@@ -30906,6 +30988,19 @@ async function executeShadowQuery(resource, normalizedParams, requestId) {
     );
   }
   const optimizableFilter = findOptimizableFilter(sort.field, parsedFilters);
+  const isKeyConditionOptimized = optimizableFilter !== void 0 && KEY_CONDITION_OPERATORS.has(optimizableFilter.parsed.operator);
+  const residualFilters = parsedFilters.filter(
+    (f4) => !(isKeyConditionOptimized && f4 === optimizableFilter)
+  );
+  if (residualFilters.length > 0) {
+    logger8.debug("Residual filters detected, falling back to full scan", {
+      requestId,
+      resource,
+      sortField: sort.field,
+      residualFilterFields: residualFilters.map((f4) => f4.parsed.field)
+    });
+    return executeFullScanQuery(resource, normalizedParams, costTracker, requestId);
+  }
   logger8.debug("Executing shadow query", {
     requestId,
     resource,
@@ -30918,7 +31013,7 @@ async function executeShadowQuery(resource, normalizedParams, requestId) {
     sort,
     perPage,
     nextToken,
-    optimizableFilter,
+    isKeyConditionOptimized ? optimizableFilter : void 0,
     costTracker,
     requestId
   );
@@ -30986,38 +31081,13 @@ async function executeFilterFirstQuery(resource, normalizedParams, filterCandida
     sortField: sort.field,
     offset
   });
-  const allShadowItems = [];
-  let lastKey;
-  do {
-    const result = await executeShadowRecordQuery(
-      resource,
-      filterSort,
-      1e3,
-      // 大きめの Limit でループ回数を最小化
-      lastKey ? encodeNextToken(lastKey.PK, lastKey.SK) : void 0,
-      filterCandidate,
-      costTracker,
-      requestId
-    );
-    allShadowItems.push(...result.Items || []);
-    lastKey = result.LastEvaluatedKey;
-  } while (lastKey);
-  const allIds = Array.from(new Set(extractRecordIds(allShadowItems)));
-  if (allIds.length === 0) {
-    return {
-      items: [],
-      pageInfo: { hasNextPage: false, hasPreviousPage: offset > 0 },
-      consumedCapacity: costTracker.getAggregated()
-    };
-  }
-  const mainRecords = await fetchMainRecords(resource, allIds, costTracker, requestId);
-  const recordMap = new Map(
-    mainRecords.map((item) => {
-      const data2 = item.data;
-      return [data2.id, extractCleanRecord(item)];
-    })
+  let items = await fetchAllRecordsViaShadowIndex(
+    resource,
+    filterSort,
+    filterCandidate,
+    costTracker,
+    requestId
   );
-  let items = allIds.map((id) => recordMap.get(id)).filter((r4) => r4 !== void 0);
   if (remainingFilters.length > 0) {
     items = items.filter((r4) => matchesAllFilters(r4, remainingFilters));
   }
@@ -31042,6 +31112,91 @@ async function executeFilterFirstQuery(resource, normalizedParams, filterCandida
     consumedCapacity: costTracker.getAggregated()
   };
 }
+async function executeFullScanQuery(resource, normalizedParams, costTracker, requestId) {
+  const { sort, pagination, parsedFilters } = normalizedParams;
+  const { perPage, nextToken } = pagination;
+  const offset = nextToken ? decodeOffsetToken(nextToken) ?? 0 : 0;
+  logger8.debug("Executing full scan query", {
+    requestId,
+    resource,
+    sortField: sort.field,
+    offset
+  });
+  let items = await fetchAllRecordsViaShadowIndex(resource, sort, void 0, costTracker, requestId);
+  if (parsedFilters.length > 0) {
+    items = items.filter((r4) => matchesAllFilters(r4, parsedFilters));
+  }
+  const page = items.slice(offset, offset + perPage);
+  const hasNextPage = offset + perPage < items.length;
+  const nextTokenValue = hasNextPage ? encodeOffsetToken(offset + perPage) : void 0;
+  logger8.info("Full scan query succeeded", {
+    requestId,
+    resource,
+    sortField: sort.field,
+    totalMatched: items.length,
+    offset,
+    returned: page.length,
+    hasNextPage
+  });
+  return {
+    items: page,
+    pageInfo: { hasNextPage, hasPreviousPage: offset > 0 },
+    ...nextTokenValue && { nextToken: nextTokenValue },
+    consumedCapacity: costTracker.getAggregated()
+  };
+}
+async function fetchAllRecordsViaShadowIndex(resource, indexSort, indexFilter, costTracker, requestId) {
+  const allShadowItems = [];
+  let lastKey;
+  let previousKeySignature;
+  const MAX_ITERATIONS = 1e4;
+  let iterations = 0;
+  do {
+    if (++iterations > MAX_ITERATIONS) {
+      logger8.error("fetchAllRecordsViaShadowIndex: \u6700\u5927\u53CD\u5FA9\u56DE\u6570\u3092\u8D85\u904E\u3057\u305F\u305F\u3081\u4E2D\u65AD", {
+        requestId,
+        resource,
+        iterations
+      });
+      break;
+    }
+    const result = await executeShadowRecordQuery(
+      resource,
+      indexSort,
+      1e3,
+      // 大きめの Limit でループ回数を最小化
+      lastKey ? encodeNextToken(lastKey.PK, lastKey.SK) : void 0,
+      indexFilter,
+      costTracker,
+      requestId
+    );
+    allShadowItems.push(...result.Items || []);
+    const nextKey = result.LastEvaluatedKey;
+    const nextKeySignature = nextKey ? `${nextKey.PK}#${nextKey.SK}` : void 0;
+    if (nextKeySignature && nextKeySignature === previousKeySignature) {
+      logger8.error("fetchAllRecordsViaShadowIndex: \u540C\u4E00\u306ELastEvaluatedKey\u304C\u8FD4\u5374\u3055\u308C\u305F\u305F\u3081\u4E2D\u65AD", {
+        requestId,
+        resource,
+        iterations
+      });
+      break;
+    }
+    previousKeySignature = nextKeySignature;
+    lastKey = nextKey;
+  } while (lastKey);
+  const allIds = Array.from(new Set(extractRecordIds(allShadowItems)));
+  if (allIds.length === 0) {
+    return [];
+  }
+  const mainRecords = await fetchMainRecords(resource, allIds, costTracker, requestId);
+  const recordMap = new Map(
+    mainRecords.map((item) => {
+      const data2 = item.data;
+      return [data2.id, extractCleanRecord(item)];
+    })
+  );
+  return allIds.map((id) => recordMap.get(id)).filter((r4) => r4 !== void 0);
+}
 function selectFilterFirstCandidate(parsedFilters, sortField, schema, perPage) {
   const eqFilters = parsedFilters.filter(
     (f4) => f4.parsed.operator === "$eq" && f4.parsed.field !== sortField
@@ -31238,7 +31393,7 @@ async function fetchMainRecords(resource, recordIds, costTracker, requestId) {
   });
   return allRecords;
 }
-var import_lib_dynamodb4, logger8;
+var import_lib_dynamodb4, logger8, KEY_CONDITION_OPERATORS;
 var init_shadowQuery = __esm({
   "src/server/operations/find/shadowQuery.ts"() {
     "use strict";
@@ -31253,8 +31408,11 @@ var init_shadowQuery = __esm({
       service: "shadow-query",
       level: process.env.LOG_LEVEL || "info"
     });
+    KEY_CONDITION_OPERATORS = /* @__PURE__ */ new Set(["$eq", "$gt", "$gte", "$lt", "$lte", "$starts"]);
     __name(executeShadowQuery, "executeShadowQuery");
     __name(executeFilterFirstQuery, "executeFilterFirstQuery");
+    __name(executeFullScanQuery, "executeFullScanQuery");
+    __name(fetchAllRecordsViaShadowIndex, "fetchAllRecordsViaShadowIndex");
     __name(selectFilterFirstCandidate, "selectFilterFirstCandidate");
     __name(sortInMemory, "sortInMemory");
     __name(executeShadowRecordQuery, "executeShadowRecordQuery");
@@ -34559,7 +34717,7 @@ async function handler(event) {
       return createCorsResponse(HTTP_STATUS.OK);
     }
     if (event.requestContext.http.method === "GET" && event.requestContext.http.path === "/version") {
-      const version = "1.4.17";
+      const version = "1.5.1";
       return createSuccessResponse({ version, timestamp: (/* @__PURE__ */ new Date()).toISOString() }, requestId);
     }
     if (event.requestContext.http.method !== "POST") {