@anfenn/dync 1.0.8 → 1.0.10

package/README.md

@@ -37,9 +37,9 @@ And see how Dync compares to the alternatives [below](#hasnt-this-already-been-d
         ```js
         db.query(async (ctx) => {
             if (ctx instanceof DexieQueryContext) {
-                return await ctx.table('items').where('value').equals('dexie-test');
+                return await ctx.table('items').where('value').startsWithIgnoreCase('dexie').toArray();
             } else if (ctx instanceof SqliteQueryContext) {
-                return await ctx.queryRows('SELECT * FROM items WHERE value = ?', ['sqlite-test']);
+                return await ctx.queryRows('SELECT * FROM items WHERE value LIKE ?', ['sqlite%']);
             }
         });
         ```

package/dist/{chunk-PCA4XM2N.js → chunk-MOYMEJP5.js}

@@ -1860,11 +1860,11 @@ var MemoryCollection = class _MemoryCollection {
 // src/storage/memory/MemoryWhereClause.ts
 var MemoryWhereClause = class {
   table;
-  index;
+  column;
   baseCollection;
-  constructor(table, index, baseCollection) {
+  constructor(table, column, baseCollection) {
     this.table = table;
-    this.index = index;
+    this.column = column;
     this.baseCollection = baseCollection;
   }
   equals(value) {
@@ -1943,9 +1943,9 @@ var MemoryWhereClause = class {
     return this.createCollection((current) => this.table.compareValues(current, value) !== 0);
   }
   createCollection(predicate) {
-    const condition = (record, _key) => predicate(this.table.getIndexValue(record, this.index));
+    const condition = (record, _key) => predicate(this.table.getIndexValue(record, this.column));
     if (this.baseCollection) {
-      const combined = (record, key) => this.baseCollection.matches(record, key) || predicate(this.table.getIndexValue(record, this.index));
+      const combined = (record, key) => this.baseCollection.matches(record, key) || predicate(this.table.getIndexValue(record, this.column));
       return this.table.createCollectionFromPredicate(combined, this.baseCollection);
     }
     return this.table.createCollectionFromPredicate(condition);
@@ -1963,7 +1963,6 @@ var MemoryTable = class {
   name;
   schema = void 0;
   primaryKey = LOCAL_PK;
-  hook = Object.freeze({});
   raw;
   records = /* @__PURE__ */ new Map();
   constructor(name) {
@@ -2072,9 +2071,6 @@ var MemoryTable = class {
   limit(count) {
     return this.createCollection({ limit: count });
   }
-  mapToClass(_ctor) {
-    return this;
-  }
   async each(callback) {
     for (const [, record] of this.entries()) {
       await callback(this.cloneRecord(record));
@@ -2099,8 +2095,8 @@ var MemoryTable = class {
       predicate
     });
   }
-  createWhereClause(index, baseCollection) {
-    return new MemoryWhereClause(this, index, baseCollection);
+  createWhereClause(column, baseCollection) {
+    return new MemoryWhereClause(this, column, baseCollection);
   }
   entries() {
     return Array.from(this.records.entries());
@@ -2314,10 +2310,6 @@ var buildCondition = (condition) => {
     }
     return { clause: `(${subClauses.join(" OR ")})`, parameters: subParams };
   }
-  if (condition.type === "compoundEquals") {
-    const clauses = condition.columns.map((col2) => `${quoteIdentifier(col2)} = ?`);
-    return { clause: `(${clauses.join(" AND ")})`, parameters: condition.values };
-  }
   const col = quoteIdentifier(condition.column);
   switch (condition.type) {
     case "equals": {
@@ -2891,42 +2883,17 @@ var SQLiteAdapter2 = class {
 // src/storage/sqlite/SQLiteWhereClause.ts
 var SQLiteWhereClause = class {
   table;
-  index;
+  column;
   baseCollection;
-  constructor(table, index, baseCollection) {
+  constructor(table, column, baseCollection) {
     this.table = table;
-    this.index = index;
+    this.column = column;
     this.baseCollection = baseCollection;
   }
-  getColumn() {
-    if (Array.isArray(this.index)) {
-      return this.index[0];
-    }
-    return this.index;
-  }
-  isCompoundIndex() {
-    return Array.isArray(this.index) && this.index.length > 1;
-  }
-  getCompoundColumns() {
-    return Array.isArray(this.index) ? this.index : [this.index];
-  }
-  getCompoundValues(value) {
-    if (Array.isArray(value)) {
-      return value;
-    }
-    return [value];
-  }
   createCollectionWithCondition(condition) {
     const base = this.baseCollection ?? this.table.createCollection();
     return base.addSqlCondition(condition);
   }
-  createCollectionWithJsPredicate(predicate) {
-    const base = this.baseCollection ?? this.table.createCollection();
-    return base.jsFilter(predicate);
-  }
-  getIndexValue(record) {
-    return this.table.getIndexValue(record, this.index);
-  }
   flattenArgs(args) {
     if (args.length === 1 && Array.isArray(args[0])) {
       return args[0];
@@ -2934,79 +2901,48 @@ var SQLiteWhereClause = class {
     return args;
   }
   equals(value) {
-    if (this.isCompoundIndex()) {
-      const columns = this.getCompoundColumns();
-      const values = this.getCompoundValues(value);
-      return this.createCollectionWithCondition({
-        type: "compoundEquals",
-        columns,
-        values
-      });
-    }
     return this.createCollectionWithCondition({
       type: "equals",
-      column: this.getColumn(),
+      column: this.column,
       value
     });
   }
   above(value) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => this.table.compareValues(this.getIndexValue(record), value) > 0);
-    }
     return this.createCollectionWithCondition({
       type: "comparison",
-      column: this.getColumn(),
+      column: this.column,
       op: ">",
       value
     });
   }
   aboveOrEqual(value) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => this.table.compareValues(this.getIndexValue(record), value) >= 0);
-    }
     return this.createCollectionWithCondition({
       type: "comparison",
-      column: this.getColumn(),
+      column: this.column,
       op: ">=",
       value
     });
   }
   below(value) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => this.table.compareValues(this.getIndexValue(record), value) < 0);
-    }
     return this.createCollectionWithCondition({
       type: "comparison",
-      column: this.getColumn(),
+      column: this.column,
       op: "<",
       value
     });
   }
   belowOrEqual(value) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => this.table.compareValues(this.getIndexValue(record), value) <= 0);
-    }
     return this.createCollectionWithCondition({
       type: "comparison",
-      column: this.getColumn(),
+      column: this.column,
       op: "<=",
       value
     });
   }
   between(lower, upper, includeLower = true, includeUpper = false) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => {
-        const value = this.getIndexValue(record);
-        const lowerCmp = this.table.compareValues(value, lower);
-        const upperCmp = this.table.compareValues(value, upper);
-        const lowerPass = includeLower ? lowerCmp >= 0 : lowerCmp > 0;
-        const upperPass = includeUpper ? upperCmp <= 0 : upperCmp < 0;
-        return lowerPass && upperPass;
-      });
-    }
     return this.createCollectionWithCondition({
       type: "between",
-      column: this.getColumn(),
+      column: this.column,
       lower,
       upper,
       includeLower,
@@ -3014,22 +2950,17 @@ var SQLiteWhereClause = class {
     });
   }
   inAnyRange(ranges, options) {
-    if (this.isCompoundIndex() || ranges.length === 0) {
-      return this.createCollectionWithJsPredicate((record) => {
-        const value = this.getIndexValue(record);
-        return ranges.some(([lower, upper]) => {
-          const lowerCmp = this.table.compareValues(value, lower);
-          const upperCmp = this.table.compareValues(value, upper);
-          const lowerPass = options?.includeLower !== false ? lowerCmp >= 0 : lowerCmp > 0;
-          const upperPass = options?.includeUpper ? upperCmp <= 0 : upperCmp < 0;
-          return lowerPass && upperPass;
-        });
-      });
+    if (ranges.length === 0) {
+      return this.createCollectionWithCondition({
+        type: "comparison",
+        column: this.column,
+        op: "=",
+        value: null
+      }).jsFilter(() => false);
     }
-    const column = this.getColumn();
     const orConditions = ranges.map(([lower, upper]) => ({
       type: "between",
-      column,
+      column: this.column,
       lower,
       upper,
       includeLower: options?.includeLower !== false,
@@ -3041,44 +2972,37 @@ var SQLiteWhereClause = class {
     });
   }
   startsWith(prefix) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => String(this.getIndexValue(record) ?? "").startsWith(prefix));
-    }
     const escapedPrefix = prefix.replace(/[%_\\]/g, "\\$&");
     return this.createCollectionWithCondition({
       type: "like",
-      column: this.getColumn(),
+      column: this.column,
       pattern: `${escapedPrefix}%`
     });
   }
   startsWithIgnoreCase(prefix) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate(
-        (record) => String(this.getIndexValue(record) ?? "").toLowerCase().startsWith(prefix.toLowerCase())
-      );
-    }
     const escapedPrefix = prefix.replace(/[%_\\]/g, "\\$&");
     return this.createCollectionWithCondition({
       type: "like",
-      column: this.getColumn(),
+      column: this.column,
       pattern: `${escapedPrefix}%`,
       caseInsensitive: true
     });
   }
   startsWithAnyOf(...args) {
     const prefixes = this.flattenArgs(args);
-    if (this.isCompoundIndex() || prefixes.length === 0) {
-      return this.createCollectionWithJsPredicate((record) => {
-        const value = String(this.getIndexValue(record) ?? "");
-        return prefixes.some((prefix) => value.startsWith(prefix));
-      });
+    if (prefixes.length === 0) {
+      return this.createCollectionWithCondition({
+        type: "comparison",
+        column: this.column,
+        op: "=",
+        value: null
+      }).jsFilter(() => false);
     }
-    const column = this.getColumn();
     const orConditions = prefixes.map((prefix) => {
       const escapedPrefix = prefix.replace(/[%_\\]/g, "\\$&");
       return {
         type: "like",
-        column,
+        column: this.column,
         pattern: `${escapedPrefix}%`
       };
     });
@@ -3089,19 +3013,19 @@ var SQLiteWhereClause = class {
   }
   startsWithAnyOfIgnoreCase(...args) {
     const prefixes = this.flattenArgs(args);
-    if (this.isCompoundIndex() || prefixes.length === 0) {
-      const lowerPrefixes = prefixes.map((p) => p.toLowerCase());
-      return this.createCollectionWithJsPredicate((record) => {
-        const value = String(this.getIndexValue(record) ?? "").toLowerCase();
-        return lowerPrefixes.some((prefix) => value.startsWith(prefix));
-      });
+    if (prefixes.length === 0) {
+      return this.createCollectionWithCondition({
+        type: "comparison",
+        column: this.column,
+        op: "=",
+        value: null
+      }).jsFilter(() => false);
     }
-    const column = this.getColumn();
     const orConditions = prefixes.map((prefix) => {
       const escapedPrefix = prefix.replace(/[%_\\]/g, "\\$&");
       return {
         type: "like",
-        column,
+        column: this.column,
         pattern: `${escapedPrefix}%`,
         caseInsensitive: true
       };
@@ -3112,72 +3036,42 @@ var SQLiteWhereClause = class {
     });
   }
   equalsIgnoreCase(value) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => String(this.getIndexValue(record) ?? "").toLowerCase() === value.toLowerCase());
-    }
     return this.createCollectionWithCondition({
       type: "equals",
-      column: this.getColumn(),
+      column: this.column,
       value,
       caseInsensitive: true
     });
   }
   anyOf(...args) {
     const values = this.flattenArgs(args);
-    if (this.isCompoundIndex()) {
-      const columns = this.getCompoundColumns();
-      const orConditions = values.map((value) => ({
-        type: "compoundEquals",
-        columns,
-        values: this.getCompoundValues(value)
-      }));
-      return this.createCollectionWithCondition({
-        type: "or",
-        conditions: orConditions
-      });
-    }
     return this.createCollectionWithCondition({
       type: "in",
-      column: this.getColumn(),
+      column: this.column,
       values
     });
   }
   anyOfIgnoreCase(...args) {
     const values = this.flattenArgs(args);
-    if (this.isCompoundIndex()) {
-      const lowerValues = values.map((v) => v.toLowerCase());
-      return this.createCollectionWithJsPredicate((record) => {
-        const value = String(this.getIndexValue(record) ?? "").toLowerCase();
-        return lowerValues.includes(value);
-      });
-    }
     return this.createCollectionWithCondition({
       type: "in",
-      column: this.getColumn(),
+      column: this.column,
       values,
       caseInsensitive: true
     });
   }
   noneOf(...args) {
     const values = this.flattenArgs(args);
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate(
-        (record) => values.every((candidate) => this.table.compareValues(this.getIndexValue(record), candidate) !== 0)
-      );
-    }
     return this.createCollectionWithCondition({
       type: "notIn",
-      column: this.getColumn(),
+      column: this.column,
       values
     });
   }
   notEqual(value) {
-    if (this.isCompoundIndex()) {
-      return this.createCollectionWithJsPredicate((record) => this.table.compareValues(this.getIndexValue(record), value) !== 0);
-    }
     return this.createCollectionWithCondition({
       type: "comparison",
-      column: this.getColumn(),
+      column: this.column,
       op: "!=",
       value
     });
@@ -3188,7 +3082,6 @@ var SQLiteWhereClause = class {
 var SQLiteTable = class {
   name;
   schema;
-  hook = Object.freeze({});
   raw;
   adapter;
   columnNames;
@@ -3357,9 +3250,6 @@ var SQLiteTable = class {
   limit(count) {
     return this.createCollection({ limit: count });
   }
-  mapToClass(_ctor) {
-    return this;
-  }
   async each(callback) {
     const entries = await this.getEntries();
     for (const entry of entries) {
@@ -3381,8 +3271,8 @@ var SQLiteTable = class {
       jsPredicate: combinedPredicate
     });
   }
-  createWhereClause(index, baseCollection) {
-    return new SQLiteWhereClause(this, index, baseCollection);
+  createWhereClause(column, baseCollection) {
+    return new SQLiteWhereClause(this, column, baseCollection);
   }
   async *iterateEntries(options) {
     const selectClause = this.buildSelectClause();
@@ -3881,4 +3771,4 @@ export {
   SqliteQueryContext,
   SQLiteAdapter2 as SQLiteAdapter
 };
-//# sourceMappingURL=chunk-PCA4XM2N.js.map
+//# sourceMappingURL=chunk-MOYMEJP5.js.map