graphddb 0.2.0 → 0.2.2

package/dist/index.js

@@ -28,7 +28,7 @@ import {
   compileFragment,
   compileMutationPlan,
   compileSingleFragmentPlan,
-  cond,
+  conditionParamName,
   contractOfMethodSpec,
   decodeCursor,
   definePlan,
@@ -68,7 +68,6 @@ import {
   isLifecycleContract,
   isMutationFragment,
   isMutationInputRef,
-  isParam,
   isPlannedCommandMethod,
   isQueryModelContract,
   isSelectBuilder,
@@ -78,7 +77,6 @@ import {
   mintContractKeyFieldRef,
   mintContractParamRef,
   mutation,
-  param,
   plan,
   publicCommandModel,
   publicQueryModel,
@@ -88,11 +86,11 @@ import {
   validateDepth,
   when,
   wholeKeysSentinel
-} from "./chunk-F27INYI2.js";
+} from "./chunk-CXIAECRS.js";
 import {
   CdcEmulator,
   createCdcEmulator
-} from "./chunk-UNRQ5YJT.js";
+} from "./chunk-27XBTYVK.js";
 import {
   BATCH_GET_MAX_KEYS,
   BATCH_WRITE_MAX_ITEMS,
@@ -110,7 +108,9 @@ import {
   buildUpdateExpression,
   buildUpdateInput,
   collapseSameKeyItems,
+  collectRawConditionParams,
   commitTransaction,
+  cond,
   createDefaultLinter,
   execItemKeySignature,
   executeDelete,
@@ -121,16 +121,20 @@ import {
   gsiAmbiguityRule,
   isColumn,
   isKeySegment,
+  isParam,
+  isRawCondition,
   k,
   key,
   missingGsiRule,
   noScanRule,
+  param,
   relationDepthRule,
   requireLimitRule,
+  resolveConditionTree,
   resolveKey,
   resolveModelClass,
   serializeFieldValue
-} from "./chunk-347U24SB.js";
+} from "./chunk-3MI43FHU.js";
 
 // src/metadata/prefix.ts
 function derivePrefix(customPrefix, className) {
@@ -413,6 +417,12 @@ function whenHolds(when2, params, element) {
   const right = resolveTemplate(when2.right, params, element);
   return when2.op === "eq" ? left === right : left !== right;
 }
+function resolveRawConditionValue(val, params, element) {
+  if (val !== null && typeof val === "object" && typeof val.$param === "string") {
+    return resolveValue(`{${val.$param}}`, params, element);
+  }
+  return val;
+}
 function applyCondition(condition, target, params, element) {
   if (!condition) return;
   const names = target.ExpressionAttributeNames ??= {};
@@ -428,6 +438,25 @@ function applyCondition(condition, target, params, element) {
     return;
   }
   const values = target.ExpressionAttributeValues ??= {};
+  if (condition.kind === "raw") {
+    Object.assign(names, condition.names);
+    for (const [alias, val] of Object.entries(condition.values)) {
+      values[alias] = resolveRawConditionValue(val, params, element);
+    }
+    target.ConditionExpression = condition.expression;
+    return;
+  }
+  if (condition.kind === "expr") {
+    const concrete = resolveConditionTree(
+      condition.declarative,
+      (name) => resolveValue(`{${name}}`, params, element)
+    );
+    const compiled = buildConditionExpression(concrete);
+    Object.assign(names, compiled.names);
+    Object.assign(values, compiled.values);
+    target.ConditionExpression = compiled.expression;
+    return;
+  }
   const clauses = [];
   let i = 0;
   for (const [field2, tmpl] of Object.entries(condition.fields)) {
@@ -832,11 +861,88 @@ function entityRef(model2) {
 }
 function collectConditionParams(condition, out) {
   if (condition === void 0) return;
+  if (isRawCondition(condition)) {
+    for (const { name, param: param2 } of collectRawConditionParams(condition)) {
+      out[name] = descriptorFromParam(name, param2, out[name]);
+    }
+    return;
+  }
   const obj = condition;
   if (obj.notExists === true) return;
   if (typeof obj.attributeExists === "string") return;
   if (typeof obj.attributeNotExists === "string") return;
-  collectParams(condition, out);
+  collectConditionTreeParams(obj, out);
+}
+var SINGLE_OPERAND_OPS = /* @__PURE__ */ new Set([
+  "eq",
+  "ne",
+  "gt",
+  "ge",
+  "lt",
+  "le",
+  "beginsWith",
+  "contains",
+  "notContains",
+  "attributeType",
+  "size"
+]);
+function collectConditionTreeParams(obj, out) {
+  for (const [key2, value] of Object.entries(obj)) {
+    if (value === void 0) continue;
+    if (key2 === "and" || key2 === "or") {
+      for (const sub of value) {
+        if (isRawCondition(sub)) {
+          for (const { name, param: param2 } of collectRawConditionParams(sub)) {
+            out[name] = descriptorFromParam(name, param2, out[name]);
+          }
+          continue;
+        }
+        collectConditionTreeParams(sub, out);
+      }
+      continue;
+    }
+    if (key2 === "not") {
+      if (isRawCondition(value)) {
+        for (const { name, param: param2 } of collectRawConditionParams(value)) {
+          out[name] = descriptorFromParam(name, param2, out[name]);
+        }
+        continue;
+      }
+      collectConditionTreeParams(value, out);
+      continue;
+    }
+    if (isParam(value)) {
+      out[key2] = descriptorFromParam(key2, value, out[key2]);
+      continue;
+    }
+    if (value === null || typeof value !== "object" || value instanceof Date) {
+      continue;
+    }
+    const ops = value;
+    for (const [op, opVal] of Object.entries(ops)) {
+      if (op === "between") {
+        const [lo, hi] = opVal;
+        if (isParam(lo)) {
+          const n = conditionParamName(key2, op, 0);
+          out[n] = descriptorFromParam(n, lo, out[n]);
+        }
+        if (isParam(hi)) {
+          const n = conditionParamName(key2, op, 1);
+          out[n] = descriptorFromParam(n, hi, out[n]);
+        }
+      } else if (op === "in") {
+        opVal.forEach((v, i) => {
+          if (isParam(v)) {
+            const n = conditionParamName(key2, op, i);
+            out[n] = descriptorFromParam(n, v, out[n]);
+          }
+        });
+      } else if (SINGLE_OPERAND_OPS.has(op) && isParam(opVal)) {
+        const n = conditionParamName(key2, op);
+        out[n] = descriptorFromParam(n, opVal, out[n]);
+      }
+    }
+  }
 }
 function makeDefinition(model2, operation, key2, select, changes, condition) {
   const params = collectParams(key2);

package/dist/testing/index.d.ts

@@ -1,4 +1,4 @@
-import { E as Executor, D as DynamoDBOperation, a as ExecutorResult, B as BatchGetExecInput, P as PutInput, W as WriteExecOptions, b as WriteResult, U as UpdateInput, c as DeleteInput, d as BatchWriteExecItem, T as TransactWriteExecItem, M as ModelStatic, e as DDBModel, C as ChangeEvent } from '../types-D6qLpw2M.js';
+import { E as Executor, D as DynamoDBOperation, a as ExecutorResult, B as BatchGetExecInput, P as PutInput, W as WriteExecOptions, b as WriteResult, U as UpdateInput, c as DeleteInput, d as BatchWriteExecItem, T as TransactWriteExecItem, M as ModelStatic, e as DDBModel, C as ChangeEvent } from '../types-SKxZQbQO.js';
 import '@aws-sdk/client-dynamodb';
 
 /**

package/dist/testing/index.js

@@ -1,12 +1,12 @@
 import {
   createCdcEmulator
-} from "../chunk-UNRQ5YJT.js";
+} from "../chunk-27XBTYVK.js";
 import {
   ClientManager,
   MetadataRegistry,
   TableMapping,
   resolveModelClass
-} from "../chunk-347U24SB.js";
+} from "../chunk-3MI43FHU.js";
 
 // src/memory/memory-store.ts
 function deepClone(value) {