@onyx.dev/onyx-database 0.3.0 → 1.0.0

package/dist/index.cjs

@@ -833,6 +833,56 @@ var QueryResults = class extends Array {
   }
 };
 
+// src/helpers/condition-normalizer.ts
+function isQueryBuilderLike(value) {
+  return !!value && typeof value.toSerializableQueryObject === "function";
+}
+function normalizeCriteriaValue(value) {
+  if (Array.isArray(value)) {
+    let changed = false;
+    const normalized = value.map((item) => {
+      const result = normalizeCriteriaValue(item);
+      if (result.changed) changed = true;
+      return result.value;
+    });
+    if (!changed) {
+      for (let i = 0; i < normalized.length; i += 1) {
+        if (normalized[i] !== value[i]) {
+          changed = true;
+          break;
+        }
+      }
+    }
+    return { value: changed ? normalized : value, changed };
+  }
+  if (isQueryBuilderLike(value)) {
+    return { value: value.toSerializableQueryObject(), changed: true };
+  }
+  return { value, changed: false };
+}
+function normalizeConditionInternal(condition) {
+  if (condition.conditionType === "SingleCondition") {
+    const { value, changed: changed2 } = normalizeCriteriaValue(condition.criteria.value);
+    if (!changed2) return condition;
+    return {
+      ...condition,
+      criteria: { ...condition.criteria, value }
+    };
+  }
+  let changed = false;
+  const normalizedConditions = condition.conditions.map((child) => {
+    const normalized = normalizeConditionInternal(child);
+    if (normalized !== child) changed = true;
+    return normalized;
+  });
+  if (!changed) return condition;
+  return { ...condition, conditions: normalizedConditions };
+}
+function normalizeCondition(condition) {
+  if (!condition) return condition;
+  return normalizeConditionInternal(condition);
+}
+
 // src/builders/cascade-relationship-builder.ts
 var CascadeRelationshipBuilder = class {
   graphName;
@@ -960,6 +1010,10 @@ function serializeDates(value) {
   }
   return value;
 }
+function stripEntityText(input) {
+  const { entityText, ...rest } = input;
+  return rest;
+}
 function normalizeSecretMetadata(input) {
   return { ...input, updatedAt: new Date(input.updatedAt) };
 }
@@ -973,7 +1027,7 @@ function normalizeDate(value) {
   return Number.isNaN(ts.getTime()) ? void 0 : ts;
 }
 function normalizeSchemaRevision(input, fallbackDatabaseId) {
-  const { meta, createdAt, publishedAt, revisionId, ...rest } = input;
+  const { meta, createdAt, publishedAt, revisionId, entityText, ...rest } = input;
   const mergedMeta = {
     revisionId: meta?.revisionId ?? revisionId,
     createdAt: normalizeDate(meta?.createdAt ?? createdAt),
@@ -1144,15 +1198,23 @@ var OnyxDatabaseImpl = class {
     const params = new URLSearchParams();
     if (options?.publish) params.append("publish", "true");
     const path = `/schemas/${encodeURIComponent(databaseId)}${params.size ? `?${params.toString()}` : ""}`;
-    const body = { ...schema, databaseId: schema.databaseId ?? databaseId };
-    const res = await http.request("PUT", path, serializeDates(body));
+    const body = stripEntityText({ ...schema, databaseId: schema.databaseId ?? databaseId });
+    const res = await http.request(
+      "PUT",
+      path,
+      serializeDates(body)
+    );
     return normalizeSchemaRevision(res, databaseId);
   }
   async validateSchema(schema) {
     const { http, databaseId } = await this.ensureClient();
     const path = `/schemas/${encodeURIComponent(databaseId)}/validate`;
-    const body = { ...schema, databaseId: schema.databaseId ?? databaseId };
-    const res = await http.request("POST", path, serializeDates(body));
+    const body = stripEntityText({ ...schema, databaseId: schema.databaseId ?? databaseId });
+    const res = await http.request(
+      "POST",
+      path,
+      serializeDates(body)
+    );
     const normalizedSchema = res.schema ? normalizeSchemaRevision(res.schema, databaseId) : void 0;
     return {
       ...res,
@@ -1314,11 +1376,14 @@ var QueryBuilderImpl = class {
     if (!this.table) throw new Error("Table is not defined. Call from(<table>) first.");
     return this.table;
   }
+  serializableConditions() {
+    return normalizeCondition(this.conditions);
+  }
   toSelectQuery() {
     return {
       type: "SelectQuery",
       fields: this.fields,
-      conditions: this.conditions,
+      conditions: this.serializableConditions(),
       sort: this.sort,
       limit: this.limitValue,
       distinct: this.distinctValue,
@@ -1327,6 +1392,21 @@ var QueryBuilderImpl = class {
       resolvers: this.resolvers
     };
   }
+  toUpdateQuery() {
+    return {
+      type: "UpdateQuery",
+      conditions: this.serializableConditions(),
+      updates: this.updates ?? {},
+      sort: this.sort,
+      limit: this.limitValue,
+      partition: this.partitionValue ?? null
+    };
+  }
+  toSerializableQueryObject() {
+    const table = this.ensureTable();
+    const payload = this.mode === "update" ? this.toUpdateQuery() : this.toSelectQuery();
+    return { ...payload, table };
+  }
   from(table) {
     this.table = table;
     return this;
@@ -1462,14 +1542,7 @@ var QueryBuilderImpl = class {
   async update() {
     if (this.mode !== "update") throw new Error("Call setUpdates(...) before update().");
     const table = this.ensureTable();
-    const update = {
-      type: "UpdateQuery",
-      conditions: this.conditions,
-      updates: this.updates ?? {},
-      sort: this.sort,
-      limit: this.limitValue,
-      partition: this.partitionValue ?? null
-    };
+    const update = this.toUpdateQuery();
     return this.db._update(table, update, this.partitionValue);
   }
   onItemAdded(listener) {
@@ -1682,12 +1755,20 @@ var ConditionBuilderImpl = class {
 var c = (field, operator, value) => new ConditionBuilderImpl({ field, operator, value });
 var eq = (field, value) => c(field, "EQUAL", value);
 var neq = (field, value) => c(field, "NOT_EQUAL", value);
-var inOp = (field, values) => c(
-  field,
-  "IN",
-  typeof values === "string" ? values.split(",").map((v) => v.trim()).filter((v) => v.length) : values
-);
-var notIn = (field, values) => c(field, "NOT_IN", values);
+function inOp(field, values) {
+  const parsed = typeof values === "string" ? values.split(",").map((v) => v.trim()).filter((v) => v.length) : values;
+  return c(field, "IN", parsed);
+}
+function within(field, values) {
+  return inOp(field, values);
+}
+function notIn(field, values) {
+  const parsed = typeof values === "string" ? values.split(",").map((v) => v.trim()).filter((v) => v.length) : values;
+  return c(field, "NOT_IN", parsed);
+}
+function notWithin(field, values) {
+  return notIn(field, values);
+}
 var between = (field, lower2, upper2) => c(field, "BETWEEN", [lower2, upper2]);
 var gt = (field, value) => c(field, "GREATER_THAN", value);
 var gte = (field, value) => c(field, "GREATER_THAN_EQUAL", value);
@@ -1754,6 +1835,7 @@ exports.notLike = notLike;
 exports.notMatches = notMatches;
 exports.notNull = notNull;
 exports.notStartsWith = notStartsWith;
+exports.notWithin = notWithin;
 exports.onyx = onyx;
 exports.percentile = percentile;
 exports.replace = replace;
@@ -1765,5 +1847,6 @@ exports.substring = substring;
 exports.sum = sum;
 exports.upper = upper;
 exports.variance = variance;
+exports.within = within;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map