@exabugs/dynamodb-client 1.25.0 → 1.26.0

package/dist/server/handler.cjs

@@ -1,5 +1,5 @@
-// @exabugs/dynamodb-client v1.25.0
-// Built: 2026-11-13T10:52:43.271Z
+// @exabugs/dynamodb-client v1.26.0
+// Built: 2026-11-14T13:53:42.297Z
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -39750,6 +39750,253 @@ var init_cost_tracker = __esm({
   }
 });
 
+// src/server/utils/filter.ts
+function parseFilterField(fieldKey) {
+  const parts = fieldKey.split(":");
+  if (parts.length === 1) {
+    return { field: parts[0], operator: "$eq", type: "string" };
+  }
+  if (parts.length === 2) {
+    const operator = parts[1];
+    if (!isValidOperator(operator)) {
+      throw new Error(`Invalid filter operator: ${parts[1]}`);
+    }
+    return { field: parts[0], operator, type: "string" };
+  }
+  if (parts.length === 3) {
+    const operator = parts[1];
+    const type = parts[2];
+    if (!isValidOperator(operator)) {
+      throw new Error(`Invalid filter operator: ${parts[1]}`);
+    }
+    if (!isValidType(type)) {
+      throw new Error(`Invalid filter type: ${parts[2]}`);
+    }
+    return { field: parts[0], operator, type };
+  }
+  throw new Error(`Invalid filter field syntax: ${fieldKey}`);
+}
+function isValidOperator(operator) {
+  return [
+    "$eq",
+    "$ne",
+    "$lt",
+    "$lte",
+    "$gt",
+    "$gte",
+    "$in",
+    "$nin",
+    "$starts",
+    "$ends",
+    "$contains",
+    "$regex",
+    "$exists",
+    "$near"
+  ].includes(operator);
+}
+function isValidType(type) {
+  return ["string", "number", "date", "boolean"].includes(type);
+}
+var init_filter = __esm({
+  "src/server/utils/filter.ts"() {
+    "use strict";
+    __name(parseFilterField, "parseFilterField");
+    __name(isValidOperator, "isValidOperator");
+    __name(isValidType, "isValidType");
+  }
+});
+
+// src/server/utils/validation.ts
+function validateSortField(_config, _resource, _sort) {
+  return;
+}
+function normalizePagination(pagination) {
+  const perPage = Math.min(pagination?.perPage || 50, 50);
+  const nextToken = pagination?.nextToken;
+  return { perPage, nextToken };
+}
+function normalizeSort(config, _resource, sort) {
+  if (sort) {
+    return sort;
+  }
+  return {
+    field: config.updatedAtField,
+    order: "DESC"
+  };
+}
+var init_validation2 = __esm({
+  "src/server/utils/validation.ts"() {
+    "use strict";
+    __name(validateSortField, "validateSortField");
+    __name(normalizePagination, "normalizePagination");
+    __name(normalizeSort, "normalizeSort");
+  }
+});
+
+// src/server/operations/find/utils.ts
+function initializeFindConfig() {
+  return getShadowConfig();
+}
+function normalizeFindParams(config, resource, params) {
+  const sort = normalizeSort(config, resource, params.sort);
+  const pagination = normalizePagination(params.pagination);
+  const parsedFilters = parseFilters(params.filter);
+  return {
+    sort,
+    pagination,
+    parsedFilters,
+    schema: params.schema
+  };
+}
+function withInferredType(parsed, fieldKey, value) {
+  if (fieldKey.split(":").length >= 3) return parsed;
+  if (typeof value === "number") return { ...parsed, type: "number" };
+  if (typeof value === "boolean") return { ...parsed, type: "boolean" };
+  return parsed;
+}
+function parseFilters(filter) {
+  const parsedFilters = [];
+  if (!filter || Object.keys(filter).length === 0) {
+    return parsedFilters;
+  }
+  for (const [fieldKey, value] of Object.entries(filter)) {
+    try {
+      if (value && typeof value === "object" && !Array.isArray(value)) {
+        for (const [operator, operatorValue] of Object.entries(value)) {
+          const parsed = parseFilterField(`${fieldKey}:${operator}`);
+          parsedFilters.push({
+            parsed: withInferredType(parsed, fieldKey, operatorValue),
+            value: operatorValue
+          });
+        }
+      } else {
+        const parsed = parseFilterField(fieldKey);
+        parsedFilters.push({ parsed: withInferredType(parsed, fieldKey, value), value });
+      }
+    } catch (error2) {
+      logger6.error("Invalid filter field syntax", {
+        fieldKey,
+        error: error2 instanceof Error ? error2.message : String(error2)
+      });
+      throw new InvalidFilterError(`Invalid filter field syntax: ${fieldKey}`, {
+        field: fieldKey,
+        error: error2 instanceof Error ? error2.message : String(error2)
+      });
+    }
+  }
+  return parsedFilters;
+}
+function findOptimizableFilter(sortField, parsedFilters) {
+  return parsedFilters.find((filter) => filter.parsed.field === sortField);
+}
+function matchesAllFilters(record, parsedFilters) {
+  return parsedFilters.every((filter) => {
+    const { field, operator } = filter.parsed;
+    const recordValue = record[field];
+    const filterValue = filter.value;
+    switch (operator) {
+      case "$eq":
+        return recordValue === filterValue;
+      case "$ne":
+        return recordValue !== filterValue;
+      case "$gt":
+        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue > filterValue;
+      case "$gte":
+        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue >= filterValue;
+      case "$lt":
+        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue < filterValue;
+      case "$lte":
+        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue <= filterValue;
+      case "$in":
+        return Array.isArray(filterValue) && filterValue.includes(recordValue);
+      case "$nin":
+        return Array.isArray(filterValue) && !filterValue.includes(recordValue);
+      case "$starts":
+        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.startsWith(filterValue);
+      case "$ends":
+        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.endsWith(filterValue);
+      case "$contains":
+        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.includes(filterValue);
+      case "$regex":
+        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.includes(filterValue);
+      case "$exists":
+        return filterValue ? recordValue !== void 0 && recordValue !== null : recordValue === void 0 || recordValue === null;
+      default:
+        return true;
+    }
+  });
+}
+function detectNearQuery(filter) {
+  if (!filter || Object.keys(filter).length === 0) {
+    return null;
+  }
+  for (const [fieldName, value] of Object.entries(filter)) {
+    if (value && typeof value === "object" && !Array.isArray(value)) {
+      const nearValue = value.$near;
+      if (nearValue && typeof nearValue === "object") {
+        return {
+          fieldName,
+          nearQuery: nearValue
+        };
+      }
+    }
+  }
+  return null;
+}
+var logger6;
+var init_utils6 = __esm({
+  "src/server/operations/find/utils.ts"() {
+    "use strict";
+    init_errors();
+    init_shared();
+    init_shadow();
+    init_filter();
+    init_validation2();
+    logger6 = createLogger({
+      service: "find-utils",
+      level: process.env.LOG_LEVEL || "info"
+    });
+    __name(initializeFindConfig, "initializeFindConfig");
+    __name(normalizeFindParams, "normalizeFindParams");
+    __name(withInferredType, "withInferredType");
+    __name(parseFilters, "parseFilters");
+    __name(findOptimizableFilter, "findOptimizableFilter");
+    __name(matchesAllFilters, "matchesAllFilters");
+    __name(detectNearQuery, "detectNearQuery");
+  }
+});
+
+// src/server/utils/idFilter.ts
+function splitIdFilter(filter) {
+  const { id, ...rest } = filter ?? {};
+  if (typeof id === "string") {
+    return { id, rest };
+  }
+  if (typeof id === "object" && id !== null && "$in" in id) {
+    return { ids: (id.$in ?? []).slice(), rest };
+  }
+  return { rest: filter ?? {} };
+}
+function conditionOf(rest) {
+  return Object.keys(rest).length > 0 ? rest : void 0;
+}
+function conditionMatcher(condition) {
+  if (!condition || Object.keys(condition).length === 0) {
+    return () => true;
+  }
+  const parsed = parseFilters(condition);
+  return (record) => matchesAllFilters(record, parsed);
+}
+var init_idFilter = __esm({
+  "src/server/utils/idFilter.ts"() {
+    "use strict";
+    init_utils6();
+    __name(splitIdFilter, "splitIdFilter");
+    __name(conditionOf, "conditionOf");
+    __name(conditionMatcher, "conditionMatcher");
+  }
+});
+
 // src/server/utils/revision.ts
 function revisionOf(item) {
   const rev = item[REVISION_ATTRIBUTE];
@@ -39815,33 +40062,6 @@ var init_revision = __esm({
   }
 });
 
-// src/server/utils/validation.ts
-function validateSortField(_config, _resource, _sort) {
-  return;
-}
-function normalizePagination(pagination) {
-  const perPage = Math.min(pagination?.perPage || 50, 50);
-  const nextToken = pagination?.nextToken;
-  return { perPage, nextToken };
-}
-function normalizeSort(config, _resource, sort) {
-  if (sort) {
-    return sort;
-  }
-  return {
-    field: config.updatedAtField,
-    order: "DESC"
-  };
-}
-var init_validation2 = __esm({
-  "src/server/utils/validation.ts"() {
-    "use strict";
-    __name(validateSortField, "validateSortField");
-    __name(normalizePagination, "normalizePagination");
-    __name(normalizeSort, "normalizeSort");
-  }
-});
-
 // src/client/FindCursor.ts
 var init_FindCursor = __esm({
   "src/client/FindCursor.ts"() {
@@ -40141,12 +40361,12 @@ function getScanWarnThreshold() {
   const value = Number(raw);
   return Number.isInteger(value) && value >= 1 ? value : DEFAULT_SCAN_WARN_THRESHOLD;
 }
-var logger6, SPARSE_SCAN_EVENT, DEFAULT_SCAN_WARN_THRESHOLD, ScanWatcher;
+var logger7, SPARSE_SCAN_EVENT, DEFAULT_SCAN_WARN_THRESHOLD, ScanWatcher;
 var init_scanWarning = __esm({
   "src/server/utils/scanWarning.ts"() {
     "use strict";
     init_shared();
-    logger6 = createLogger({ service: "scan-warning", level: "warn" });
+    logger7 = createLogger({ service: "scan-warning", level: "warn" });
     SPARSE_SCAN_EVENT = "SPARSE_SCAN";
     DEFAULT_SCAN_WARN_THRESHOLD = 5e3;
     __name(getScanWarnThreshold, "getScanWarnThreshold");
@@ -40166,7 +40386,7 @@ var init_scanWarning = __esm({
         this.scanned += count;
         if (!this.warned && this.scanned >= this.threshold) {
           this.warned = true;
-          logger6.warn(
+          logger7.warn(
             `${SPARSE_SCAN_EVENT}: 1\u30EA\u30AF\u30A8\u30B9\u30C8\u3067 ${this.scanned} \u4EF6\u4EE5\u4E0A\u3092\u8AAD\u307F\u307E\u3057\u305F\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30FB\u30B9\u30AD\u30FC\u30DE\u30FB\u30ED\u30B8\u30C3\u30AF\u306E\u898B\u76F4\u3057\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\uFF08docs/SCAN_WARNING.md\uFF09`,
             {
               event: SPARSE_SCAN_EVENT,
@@ -40186,195 +40406,6 @@ var init_scanWarning = __esm({
   }
 });
 
-// src/server/utils/filter.ts
-function parseFilterField(fieldKey) {
-  const parts = fieldKey.split(":");
-  if (parts.length === 1) {
-    return { field: parts[0], operator: "$eq", type: "string" };
-  }
-  if (parts.length === 2) {
-    const operator = parts[1];
-    if (!isValidOperator(operator)) {
-      throw new Error(`Invalid filter operator: ${parts[1]}`);
-    }
-    return { field: parts[0], operator, type: "string" };
-  }
-  if (parts.length === 3) {
-    const operator = parts[1];
-    const type = parts[2];
-    if (!isValidOperator(operator)) {
-      throw new Error(`Invalid filter operator: ${parts[1]}`);
-    }
-    if (!isValidType(type)) {
-      throw new Error(`Invalid filter type: ${parts[2]}`);
-    }
-    return { field: parts[0], operator, type };
-  }
-  throw new Error(`Invalid filter field syntax: ${fieldKey}`);
-}
-function isValidOperator(operator) {
-  return [
-    "$eq",
-    "$ne",
-    "$lt",
-    "$lte",
-    "$gt",
-    "$gte",
-    "$in",
-    "$nin",
-    "$starts",
-    "$ends",
-    "$contains",
-    "$regex",
-    "$exists",
-    "$near"
-  ].includes(operator);
-}
-function isValidType(type) {
-  return ["string", "number", "date", "boolean"].includes(type);
-}
-var init_filter = __esm({
-  "src/server/utils/filter.ts"() {
-    "use strict";
-    __name(parseFilterField, "parseFilterField");
-    __name(isValidOperator, "isValidOperator");
-    __name(isValidType, "isValidType");
-  }
-});
-
-// src/server/operations/find/utils.ts
-function initializeFindConfig() {
-  return getShadowConfig();
-}
-function normalizeFindParams(config, resource, params) {
-  const sort = normalizeSort(config, resource, params.sort);
-  const pagination = normalizePagination(params.pagination);
-  const parsedFilters = parseFilters(params.filter);
-  return {
-    sort,
-    pagination,
-    parsedFilters,
-    schema: params.schema
-  };
-}
-function withInferredType(parsed, fieldKey, value) {
-  if (fieldKey.split(":").length >= 3) return parsed;
-  if (typeof value === "number") return { ...parsed, type: "number" };
-  if (typeof value === "boolean") return { ...parsed, type: "boolean" };
-  return parsed;
-}
-function parseFilters(filter) {
-  const parsedFilters = [];
-  if (!filter || Object.keys(filter).length === 0) {
-    return parsedFilters;
-  }
-  for (const [fieldKey, value] of Object.entries(filter)) {
-    try {
-      if (value && typeof value === "object" && !Array.isArray(value)) {
-        for (const [operator, operatorValue] of Object.entries(value)) {
-          const parsed = parseFilterField(`${fieldKey}:${operator}`);
-          parsedFilters.push({
-            parsed: withInferredType(parsed, fieldKey, operatorValue),
-            value: operatorValue
-          });
-        }
-      } else {
-        const parsed = parseFilterField(fieldKey);
-        parsedFilters.push({ parsed: withInferredType(parsed, fieldKey, value), value });
-      }
-    } catch (error2) {
-      logger7.error("Invalid filter field syntax", {
-        fieldKey,
-        error: error2 instanceof Error ? error2.message : String(error2)
-      });
-      throw new InvalidFilterError(`Invalid filter field syntax: ${fieldKey}`, {
-        field: fieldKey,
-        error: error2 instanceof Error ? error2.message : String(error2)
-      });
-    }
-  }
-  return parsedFilters;
-}
-function findOptimizableFilter(sortField, parsedFilters) {
-  return parsedFilters.find((filter) => filter.parsed.field === sortField);
-}
-function matchesAllFilters(record, parsedFilters) {
-  return parsedFilters.every((filter) => {
-    const { field, operator } = filter.parsed;
-    const recordValue = record[field];
-    const filterValue = filter.value;
-    switch (operator) {
-      case "$eq":
-        return recordValue === filterValue;
-      case "$ne":
-        return recordValue !== filterValue;
-      case "$gt":
-        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue > filterValue;
-      case "$gte":
-        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue >= filterValue;
-      case "$lt":
-        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue < filterValue;
-      case "$lte":
-        return recordValue != null && typeof recordValue === typeof filterValue && (typeof recordValue === "number" || typeof recordValue === "string") && recordValue <= filterValue;
-      case "$in":
-        return Array.isArray(filterValue) && filterValue.includes(recordValue);
-      case "$nin":
-        return Array.isArray(filterValue) && !filterValue.includes(recordValue);
-      case "$starts":
-        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.startsWith(filterValue);
-      case "$ends":
-        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.endsWith(filterValue);
-      case "$contains":
-        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.includes(filterValue);
-      case "$regex":
-        return typeof recordValue === "string" && typeof filterValue === "string" && recordValue.includes(filterValue);
-      case "$exists":
-        return filterValue ? recordValue !== void 0 && recordValue !== null : recordValue === void 0 || recordValue === null;
-      default:
-        return true;
-    }
-  });
-}
-function detectNearQuery(filter) {
-  if (!filter || Object.keys(filter).length === 0) {
-    return null;
-  }
-  for (const [fieldName, value] of Object.entries(filter)) {
-    if (value && typeof value === "object" && !Array.isArray(value)) {
-      const nearValue = value.$near;
-      if (nearValue && typeof nearValue === "object") {
-        return {
-          fieldName,
-          nearQuery: nearValue
-        };
-      }
-    }
-  }
-  return null;
-}
-var logger7;
-var init_utils6 = __esm({
-  "src/server/operations/find/utils.ts"() {
-    "use strict";
-    init_errors();
-    init_shared();
-    init_shadow();
-    init_filter();
-    init_validation2();
-    logger7 = createLogger({
-      service: "find-utils",
-      level: process.env.LOG_LEVEL || "info"
-    });
-    __name(initializeFindConfig, "initializeFindConfig");
-    __name(normalizeFindParams, "normalizeFindParams");
-    __name(withInferredType, "withInferredType");
-    __name(parseFilters, "parseFilters");
-    __name(findOptimizableFilter, "findOptimizableFilter");
-    __name(matchesAllFilters, "matchesAllFilters");
-    __name(detectNearQuery, "detectNearQuery");
-  }
-});
-
 // src/server/operations/find/idQuery.ts
 async function executeIdQuery(resource, normalizedParams, requestId) {
   const { sort, pagination, parsedFilters } = normalizedParams;
@@ -40386,14 +40417,30 @@ async function executeIdQuery(resource, normalizedParams, requestId) {
     hasFilters: parsedFilters.length > 0
   });
   const idFilter = parsedFilters.find((f5) => f5.parsed.field === "id");
+  const otherFilters = parsedFilters.filter((f5) => f5 !== idFilter);
   if (idFilter && idFilter.parsed.operator === "$eq") {
-    return await executeSpecificIdQuery(resource, String(idFilter.value), requestId);
+    return withOtherFilters(
+      await executeSpecificIdQuery(resource, String(idFilter.value), requestId),
+      otherFilters
+    );
   }
   if (idFilter && idFilter.parsed.operator === "$in" && Array.isArray(idFilter.value)) {
-    return await executeInQuery(resource, idFilter.value.map(String), sort, requestId);
+    return withOtherFilters(
+      await executeInQuery(resource, idFilter.value.map(String), sort, requestId),
+      otherFilters
+    );
   }
   return await executeAllRecordsQuery(resource, sort, perPage, nextToken, parsedFilters, requestId);
 }
+function withOtherFilters(result, otherFilters) {
+  if (otherFilters.length === 0) {
+    return result;
+  }
+  return {
+    ...result,
+    items: result.items.filter((item) => matchesAllFilters(item, otherFilters))
+  };
+}
 async function executeSpecificIdQuery(resource, targetId, requestId) {
   const dbClient2 = getDBClient();
   const tableName = getTableName();
@@ -40432,36 +40479,21 @@ async function executeSpecificIdQuery(resource, targetId, requestId) {
   };
 }
 async function executeInQuery(resource, targetIds, sort, requestId) {
-  const dbClient2 = getDBClient();
-  const tableName = getTableName();
   const costTracker = new CostTracker();
-  const results = await Promise.all(
-    targetIds.map(
-      (id) => executeDynamoDBOperation(
-        () => dbClient2.send(
-          new import_lib_dynamodb3.QueryCommand({
-            TableName: tableName,
-            KeyConditionExpression: "PK = :pk AND SK = :sk",
-            ExpressionAttributeValues: {
-              ":pk": resource,
-              ":sk": `id#${id}`
-            },
-            ConsistentRead: true,
-            ReturnConsumedCapacity: "TOTAL"
-          })
-        ),
-        "Query"
-      ).then((result) => {
-        costTracker.add(result.ConsumedCapacity);
-        return result.Items || [];
-      })
-    )
+  const found = await batchGetAll(
+    targetIds.map((id) => ({ PK: resource, SK: `id#${id}` })),
+    { consistentRead: true, costTracker, requestId }
   );
-  let items = results.flat().map((item) => extractCleanRecord(item));
+  const items = found.map((item) => extractCleanRecord(item));
+  const direction = sort.order === "ASC" ? 1 : -1;
   items.sort((a5, b5) => {
-    const aVal = String(a5.id ?? "");
-    const bVal = String(b5.id ?? "");
-    return sort.order === "ASC" ? aVal.localeCompare(bVal) : bVal.localeCompare(aVal);
+    const aVal = a5[sort.field];
+    const bVal = b5[sort.field];
+    if (aVal === bVal) return 0;
+    if (aVal === void 0 || aVal === null) return 1;
+    if (bVal === void 0 || bVal === null) return -1;
+    if (typeof aVal === "number" && typeof bVal === "number") return (aVal - bVal) * direction;
+    return String(aVal).localeCompare(String(bVal)) * direction;
   });
   logger8.info("ID $in query succeeded", {
     requestId,
@@ -40665,6 +40697,7 @@ var init_idQuery = __esm({
     "use strict";
     import_lib_dynamodb3 = __toESM(require_dist_cjs22(), 1);
     init_shared();
+    init_batchGet();
     init_cost_tracker();
     init_dynamodb3();
     init_pagination();
@@ -40675,6 +40708,7 @@ var init_idQuery = __esm({
       level: process.env.LOG_LEVEL || "info"
     });
     __name(executeIdQuery, "executeIdQuery");
+    __name(withOtherFilters, "withOtherFilters");
     __name(executeSpecificIdQuery, "executeSpecificIdQuery");
     __name(executeInQuery, "executeInQuery");
     __name(executeAllRecordsQuery, "executeAllRecordsQuery");
@@ -41430,8 +41464,10 @@ async function handleDeleteMany(resource, params, requestId) {
   const startTime = Date.now();
   const costTracker = new CostTracker();
   let ids;
+  let condition;
   if ("ids" in params) {
     ids = params.ids;
+    condition = params.condition;
     logger12.debug("Executing deleteMany with ids", {
       requestId,
       resource,
@@ -41456,6 +41492,7 @@ async function handleDeleteMany(resource, params, requestId) {
       requestId
     );
     ids = matched.map((item) => item.id);
+    condition = params.filter;
     logger12.debug("Found records with filter", {
       requestId,
       resource,
@@ -41480,9 +41517,13 @@ async function handleDeleteMany(resource, params, requestId) {
   );
   const existingIds = /* @__PURE__ */ new Set();
   const preparedRecords = [];
+  const matches = conditionMatcher(condition);
   for (const item of existingItems) {
     const existingData = item.data;
     const id = existingData.id;
+    if (!matches(existingData)) {
+      continue;
+    }
     const shadowKeys = item.__shadowKeys ?? existingData.__shadowKeys ?? [];
     existingIds.add(id);
     preparedRecords.push({
@@ -41691,6 +41732,7 @@ var init_deleteMany = __esm({
     init_chunking();
     init_cost_tracker();
     init_dynamodb3();
+    init_idFilter();
     init_revision();
     init_findAll();
     logger12 = createLogger({ service: "records-lambda" });
@@ -41714,7 +41756,8 @@ async function handleFindMany(resource, params, requestId) {
       ids.map((id) => ({ PK: resource, SK: generateMainRecordSK2(id) })),
       { consistentRead: true, requestId }
     );
-    const records = items.map((item) => extractCleanRecord(item));
+    const matches = conditionMatcher(params.condition);
+    const records = items.map((item) => extractCleanRecord(item)).filter(matches);
     logger14.info("findMany by ids succeeded", {
       requestId,
       resource,
@@ -41749,6 +41792,7 @@ var init_findMany = __esm({
     init_shadow();
     init_batchGet();
     init_dynamodb3();
+    init_idFilter();
     init_findAll();
     logger14 = createLogger({ service: "records-lambda" });
     __name(handleFindMany, "handleFindMany");
@@ -41768,7 +41812,11 @@ async function handleFindOne(resource, params, requestId) {
       resource,
       id
     });
-    const results = await handleFindMany(resource, { ids: [id] }, requestId);
+    const results = await handleFindMany(
+      resource,
+      { ids: [id], condition: params.condition },
+      requestId
+    );
     if (results.length === 0) {
       throw new ItemNotFoundError(`Record not found: ${id}`, { resource, id });
     }
@@ -42364,8 +42412,10 @@ async function handleUpdateMany(resource, params, requestId) {
     upsert
   });
   let ids;
+  let condition;
   if ("ids" in params) {
     ids = params.ids;
+    condition = params.condition;
     logger20.debug("Executing updateMany with ids", {
       requestId,
       resource,
@@ -42390,6 +42440,7 @@ async function handleUpdateMany(resource, params, requestId) {
       requestId
     );
     ids = matched.map((item) => item.id);
+    condition = params.filter;
     logger20.debug("Found records with filter", {
       requestId,
       resource,
@@ -42428,6 +42479,8 @@ async function handleUpdateMany(resource, params, requestId) {
       targetIds.map((id) => ({ PK: resource, SK: generateMainRecordSK2(id) })),
       { consistentRead: true, costTracker, requestId }
     );
+    const matches = conditionMatcher(condition);
+    const mismatchedIds2 = /* @__PURE__ */ new Set();
     const existingIds = new Set(
       existingItems.map((item) => {
         const data = item.data;
@@ -42461,6 +42514,10 @@ async function handleUpdateMany(resource, params, requestId) {
       try {
         const existingData = item.data;
         const id = existingData.id;
+        if (!matches(existingData)) {
+          mismatchedIds2.add(id);
+          continue;
+        }
         const oldShadowKeys = item.__shadowKeys ?? existingData.__shadowKeys ?? [];
         const timestampedPatch = addUpdateTimestamp(update.patch);
         const mergedData = applyJsonMergePatch(removeShadowKeys(existingData), timestampedPatch);
@@ -42535,9 +42592,15 @@ async function handleUpdateMany(resource, params, requestId) {
         }
       }
     }
-    return { preparedRecords: preparedRecords2, notFoundIds: notFoundIds2, preparationFailedIds: preparationFailedIds2, preparationErrors: preparationErrors2 };
+    return {
+      preparedRecords: preparedRecords2,
+      notFoundIds: notFoundIds2,
+      mismatchedIds: mismatchedIds2,
+      preparationFailedIds: preparationFailedIds2,
+      preparationErrors: preparationErrors2
+    };
   }, "prepare");
-  const { preparedRecords, notFoundIds, preparationFailedIds, preparationErrors } = await prepare(ids);
+  const { preparedRecords, notFoundIds, mismatchedIds, preparationFailedIds, preparationErrors } = await prepare(ids);
   const getItemCount = /* @__PURE__ */ __name((record) => {
     const shadowDiff = calculateShadowDiff(record.oldShadowKeys, record.newShadowKeys);
     return 1 + shadowDiff.toDelete.length + shadowDiff.toAdd.length;
@@ -42651,17 +42714,15 @@ async function handleUpdateMany(resource, params, requestId) {
       }
     }
   }
-  if (!upsert) {
-    for (let i5 = 0; i5 < ids.length; i5++) {
-      const id = ids[i5];
-      if (notFoundIds.includes(id)) {
-        failedIdsMap[i5] = id;
-        errorsMap[i5] = {
-          id,
-          code: "ITEM_NOT_FOUND",
-          message: `Record not found: ${id}`
-        };
-      }
+  for (let i5 = 0; i5 < ids.length; i5++) {
+    const id = ids[i5];
+    if (!upsert && notFoundIds.includes(id) || mismatchedIds.has(id)) {
+      failedIdsMap[i5] = id;
+      errorsMap[i5] = {
+        id,
+        code: "ITEM_NOT_FOUND",
+        message: `Record not found: ${id}`
+      };
     }
   }
   for (let i5 = 0; i5 < ids.length; i5++) {
@@ -42760,6 +42821,7 @@ var init_updateMany = __esm({
     init_chunking();
     init_cost_tracker();
     init_dynamodb3();
+    init_idFilter();
     init_mergePatch();
     init_revision();
     init_timestamps();
@@ -42801,7 +42863,8 @@ async function handleDeleteOne(resource, params, requestId) {
     const deleteManyResult = await handleDeleteMany2(
       resource,
       {
-        ids: [targetId]
+        ids: [targetId],
+        condition: params.condition
       },
       requestId
     );
@@ -42830,7 +42893,12 @@ async function handleDeleteOne(resource, params, requestId) {
       params.filter,
       requestId
     );
-    const deleteManyResult = target ? await handleDeleteMany2(resource, { ids: [target.id] }, requestId) : await handleDeleteMany2(resource, { ids: [] }, requestId);
+    const deleteManyResult = target ? await handleDeleteMany2(
+      resource,
+      // 選んでから消すまでの間に条件から外れたレコードを消さない
+      { ids: [target.id], condition: params.filter },
+      requestId
+    ) : await handleDeleteMany2(resource, { ids: [] }, requestId);
     if (deleteManyResult.count === 0) {
       const error2 = Object.values(deleteManyResult.errors || {})[0];
       if (error2) {
@@ -43019,6 +43087,7 @@ async function handleInsertOne(resource, params, requestId) {
 __name(handleInsertOne, "handleInsertOne");
 
 // src/server/operations/parameterConverter.ts
+init_idFilter();
 function convertFindParams(mongoParams) {
   const { filter = {}, options = {} } = mongoParams;
   const { sort, limit, nextToken, schema } = options;
@@ -43045,9 +43114,10 @@ function convertFindOneParams(mongoParams) {
   if (!mongoParams.filter) {
     throw new Error("findOne requires filter");
   }
-  const id = typeof mongoParams.filter.id === "string" ? mongoParams.filter.id : void 0;
+  const { id, rest } = splitIdFilter(mongoParams.filter);
   if (id) {
-    return { id };
+    const condition = conditionOf(rest);
+    return { id, ...condition && { condition } };
   }
   return { filter: mongoParams.filter };
 }
@@ -43059,10 +43129,10 @@ function convertFindManyParams(mongoParams) {
   if (!mongoParams.filter) {
     throw new Error("findMany requires either ids or filter");
   }
-  const idFilter = mongoParams.filter.id;
-  if (typeof idFilter === "object" && idFilter !== null && "$in" in idFilter) {
-    const ids = idFilter.$in || [];
-    return { ids };
+  const { ids, rest } = splitIdFilter(mongoParams.filter);
+  if (ids) {
+    const condition = conditionOf(rest);
+    return { ids, ...condition && { condition } };
   }
   return { filter: mongoParams.filter };
 }
@@ -43077,16 +43147,7 @@ function convertInsertOneParams(mongoParams) {
 }
 __name(convertInsertOneParams, "convertInsertOneParams");
 function convertUpdateOneParams(mongoParams) {
-  let updateData;
-  if (mongoParams.update && typeof mongoParams.update === "object") {
-    if ("$set" in mongoParams.update || "$setOnInsert" in mongoParams.update) {
-      updateData = mongoParams.update;
-    } else {
-      updateData = mongoParams.update;
-    }
-  } else {
-    updateData = {};
-  }
+  const updateData = mongoParams.update && typeof mongoParams.update === "object" ? mongoParams.update : {};
   const directId = "id" in mongoParams && typeof mongoParams.id === "string" ? mongoParams.id : void 0;
   if (directId) {
     return {
@@ -43100,10 +43161,12 @@ function convertUpdateOneParams(mongoParams) {
   if (!mongoParams.filter) {
     throw new Error("updateOne requires filter");
   }
-  const id = typeof mongoParams.filter.id === "string" ? mongoParams.filter.id : void 0;
+  const { id, rest } = splitIdFilter(mongoParams.filter);
+  const condition = conditionOf(rest);
   if (id) {
     return {
       id,
+      ...condition && { condition },
       data: updateData,
       ...mongoParams.options?.upsert !== void 0 && {
         options: { upsert: mongoParams.options.upsert }
@@ -43120,10 +43183,10 @@ function convertUpdateOneParams(mongoParams) {
 }
 __name(convertUpdateOneParams, "convertUpdateOneParams");
 function convertUpdateManyParams(mongoParams) {
-  const idFilter = mongoParams.filter?.id;
-  const hasIdIn = typeof idFilter === "object" && idFilter !== null && "$in" in idFilter;
-  const target = hasIdIn ? { ids: idFilter.$in || [] } : mongoParams.filter ? { filter: mongoParams.filter } : { ids: [] };
-  const updateData = mongoParams.update && typeof mongoParams.update === "object" ? "$set" in mongoParams.update ? mongoParams.update.$set || {} : mongoParams.update : {};
+  const { ids, rest } = splitIdFilter(mongoParams.filter);
+  const condition = conditionOf(rest);
+  const target = ids ? { ids, ...condition && { condition } } : mongoParams.filter ? { filter: mongoParams.filter } : { ids: [] };
+  const updateData = mongoParams.update && typeof mongoParams.update === "object" ? mongoParams.update : {};
   return {
     ...target,
     data: updateData,
@@ -43138,17 +43201,19 @@ function convertDeleteOneParams(mongoParams) {
   if (directId) {
     return { id: directId };
   }
-  const id = typeof mongoParams.filter?.id === "string" ? mongoParams.filter.id : void 0;
+  const { id, rest } = splitIdFilter(mongoParams.filter);
   if (!id) {
     throw new Error("deleteOne requires filter.id");
   }
-  return { id };
+  const condition = conditionOf(rest);
+  return { id, ...condition && { condition } };
 }
 __name(convertDeleteOneParams, "convertDeleteOneParams");
 function convertDeleteManyParams(mongoParams) {
-  const idFilter = mongoParams.filter?.id;
-  if (typeof idFilter === "object" && idFilter !== null && "$in" in idFilter) {
-    return { ids: idFilter.$in || [] };
+  const { ids, rest } = splitIdFilter(mongoParams.filter);
+  if (ids) {
+    const condition = conditionOf(rest);
+    return { ids, ...condition && { condition } };
   }
   if (mongoParams.filter) {
     return { filter: mongoParams.filter };
@@ -43188,6 +43253,7 @@ async function handleUpdateOne(resource, params, requestId) {
       resource,
       {
         ids: [targetId],
+        condition: params.condition,
         data: patchData,
         options
       },
@@ -43233,7 +43299,13 @@ async function handleUpdateOne(resource, params, requestId) {
     );
     const updateManyResult = await handleUpdateMany2(
       resource,
-      target ? { ids: [target.id], data: patchData, options } : { filter: params.filter, data: patchData, options },
+      target ? {
+        ids: [target.id],
+        // 選んでから書くまでの間に条件から外れたレコードを書かない
+        condition: params.filter,
+        data: patchData,
+        options
+      } : { filter: params.filter, data: patchData, options },
       requestId
     );
     if (updateManyResult.count === 0) {
@@ -44817,7 +44889,7 @@ async function handler(event) {
       return createCorsResponse(HTTP_STATUS.OK);
     }
     if (event.requestContext.http.method === "GET" && event.requestContext.http.path === "/version") {
-      const version = "1.25.0";
+      const version = "1.26.0";
       return createSuccessResponse({ version, timestamp: (/* @__PURE__ */ new Date()).toISOString() }, requestId);
     }
     if (event.requestContext.http.method !== "POST") {