@peerbit/indexer-sqlite3 3.0.2 → 3.0.4

package/dist/index.min.js

@@ -20296,6 +20296,37 @@ var SQLConversionMap = {
 var WRAPPED_SIMPLE_VALUE_VARIANT = "wrapped";
 var JSON_GROUP_ARRAY = "json_group_array";
 var JSON_OBJECT = "distinct json_object";
+var coerceLocalQuery = (query) => {
+  if (query instanceof Query) {
+    return query;
+  }
+  return deserialize(serialize(query), Query);
+};
+var coerceLocalQueries = (query) => {
+  if (!query) {
+    return [];
+  }
+  if (Array.isArray(query)) {
+    return query.map((entry) => coerceLocalQuery(entry));
+  }
+  if (query instanceof Query) {
+    return [query];
+  }
+  try {
+    return [coerceLocalQuery(query)];
+  } catch {
+    return toQuery(query).map((entry) => coerceLocalQuery(entry));
+  }
+};
+var coerceLocalSorts = (sort) => {
+  if (!sort) {
+    return void 0;
+  }
+  if (Array.isArray(sort)) {
+    return sort.map((entry) => entry instanceof Sort ? entry : deserialize(serialize(entry), Sort));
+  }
+  return sort instanceof Sort ? sort : deserialize(serialize(sort), Sort);
+};
 var u64ToI64 = (u64) => {
   return (typeof u64 === "number" ? BigInt(u64) : u64) - 9223372036854775808n;
 };
@@ -21187,14 +21218,14 @@ var resolveInstanceFromValue = async (fromTablePrefixedValues, tables, table, re
   return Object.assign(Object.create(table.ctor.prototype), obj);
 };
 var convertDeleteRequestToQuery = (request, tables, table) => {
-  const { query, bindable } = convertRequestToQuery("delete", { query: toQuery(request.query) }, tables, table);
+  const { query, bindable } = convertRequestToQuery("delete", { query: coerceLocalQueries(request.query) }, tables, table);
   return {
     sql: `DELETE FROM ${table.name} WHERE ${table.name}.${table.primary} IN (SELECT ${table.primary} from ${table.name} ${query}) returning ${table.primary}`,
     bindable
   };
 };
 var convertSumRequestToQuery = (request, tables, table) => {
-  const { query, bindable } = convertRequestToQuery("sum", { query: toQuery(request.query), key: request.key }, tables, table);
+  const { query, bindable } = convertRequestToQuery("sum", { query: coerceLocalQueries(request.query), key: request.key }, tables, table);
   const inlineName = getInlineTableFieldName(request.key);
   const field2 = table.fields.find((x) => x.name === inlineName);
   if (unwrapNestedType(field2.from.type) === "u64") {
@@ -21207,7 +21238,7 @@ var convertSumRequestToQuery = (request, tables, table) => {
   };
 };
 var convertCountRequestToQuery = (request, tables, table) => {
-  const { query, bindable } = convertRequestToQuery("count", { query: request?.query ? toQuery(request.query) : void 0 }, tables, table);
+  const { query, bindable } = convertRequestToQuery("count", { query: coerceLocalQueries(request?.query) }, tables, table);
   return {
     sql: `SELECT count(DISTINCT ${table.name}.${table.primary}) as count FROM ${table.name} ${query}`,
     bindable
@@ -21243,6 +21274,10 @@ var buildOrderBy = (sort, tables, table, joinBuilder, resolverBuilder, path = []
   return { orderByBuilder };
 };
 var convertSearchRequestToQuery = (request, tables, rootTables, options) => {
+  const normalizedRequest = request ? {
+    query: coerceLocalQueries(request.query),
+    sort: coerceLocalSorts(request.sort)
+  } : void 0;
   let unionBuilder = "";
   let orderByClause = "";
   let matchedOnce = false;
@@ -21252,7 +21287,7 @@ var convertSearchRequestToQuery = (request, tables, rootTables, options) => {
   for (const [i, table] of rootTables.entries()) {
     const { selects, joins, groupBy } = selectsPerTable[i];
     try {
-      const { orderByBuilder } = buildOrderBy(request?.sort, tables, table, joins, selects, [], options);
+      const { orderByBuilder } = buildOrderBy(normalizedRequest?.sort, tables, table, joins, selects, [], options);
       if (!orderByClause && orderByBuilder) {
         orderByClause = orderByBuilder.length > 0 ? orderByClause.length > 0 ? orderByClause + ", " + orderByBuilder : orderByBuilder : orderByClause;
       }
@@ -21264,7 +21299,7 @@ var convertSearchRequestToQuery = (request, tables, rootTables, options) => {
       throw error2;
     }
     const selectQuery = generateSelectQuery(table, selects);
-    for (const flattenRequest of flattenQuery(request)) {
+    for (const flattenRequest of flattenQuery(normalizedRequest)) {
       try {
         const { query, bindable } = convertRequestToQuery(
           "iterate",
@@ -21318,7 +21353,7 @@ var convertRequestToQuery = (type, request, tables, table, extraJoin, path = [],
   let bindableBuilder = [];
   let joinBuilder = extraJoin || /* @__PURE__ */ new Map();
   getOrSetRootTable(joinBuilder, table);
-  const coercedQuery = toQuery(request?.query);
+  const coercedQuery = coerceLocalQueries(request?.query);
   if (coercedQuery.length === 1) {
     const { where: where2, bindable } = convertQueryToSQLQuery(coercedQuery[0], tables, table, joinBuilder, path, void 0, 0);
     whereBuilder += where2;
@@ -22256,8 +22291,8 @@ var SQLiteIndex = class {
     let bindable = [];
     let sqlFetch = void 0;
     const normalizedQuery = new PlannableQuery({
-      query: toQuery(request?.query),
-      sort: request?.sort
+      query: coerceLocalQueries(request?.query),
+      sort: coerceLocalSorts(request?.sort)
     });
     let planningScope;
     const fetch2 = async (amount) => {