json-fs-query 2.1.0 → 2.2.0

package/dist/data/queries/sortBy.d.ts

@@ -1,2 +1,8 @@
+/**
+ * Sort by each clause in turn: missing, then null, then the values, compared by the field's declared type when the
+ * clause has one (see compareAs), so a string field sorts as text ('10' before '9') and an int field as numbers.
+ * @param dataSet
+ * @param sortClauses
+ */
 export declare const sortBy: (dataSet?: any[], sortClauses?: any[]) => any[];
 //# sourceMappingURL=sortBy.d.ts.map

package/dist/data/queries/sortBy.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sortBy = void 0;
+var _compareAs = require("../utilities/compareAs");
 // Where a value sorts before any other, ascending: missing first, then null, then the values (MySQL's null placement,
 // with missing below null). Descending reverses it.
 const presence = (data, property) => {
@@ -12,6 +13,12 @@ const presence = (data, property) => {
   }
   return data[property] === null ? 1 : 2;
 };
+/**
+ * Sort by each clause in turn: missing, then null, then the values, compared by the field's declared type when the
+ * clause has one (see compareAs), so a string field sorts as text ('10' before '9') and an int field as numbers.
+ * @param dataSet
+ * @param sortClauses
+ */
 const sortBy = (dataSet = [], sortClauses = []) => {
   if (!sortClauses.length) {
     return dataSet;
@@ -25,13 +32,15 @@ const sortBy = (dataSet = [], sortClauses = []) => {
       if (rankA !== rankB) {
         return direction === 'asc' ? rankA - rankB : rankB - rankA;
       }
-      // Ordering compares the raw stored values, not by declared type (that's only for equality, see where), so
-      // numeric ids in a string field still sort numerically. Loose so '3' and 3 still tie, as do two nulls or two missing.
+      // Values compare by the declared type, so numeric ids in a string field sort as text ('10' before '9'). Loose so
+      // '3' and 3 still tie in an untyped field, as do two nulls or two missing.
+      const valueA = (0, _compareAs.compareAs)(sortClause.type, a[property]);
+      const valueB = (0, _compareAs.compareAs)(sortClause.type, b[property]);
       // eslint-disable-next-line eqeqeq
-      if (a[property] == b[property]) {
+      if (valueA == valueB) {
         continue;
       }
-      const result = a[property] < b[property] ? -1 : 1;
+      const result = valueA < valueB ? -1 : 1;
       return direction === 'asc' ? result : result * -1;
     }
     return 0;

package/dist/data/queries/sortBy.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.sortBy=void 0;const presence=(e,r)=>Object.prototype.hasOwnProperty.call(e,r)?null===e[r]?1:2:0,sortBy=(e=[],r=[])=>r.length?(e.sort(((e,t)=>{for(const o of r){const r=o.property,s=o.direction,n=presence(e,r),c=presence(t,r);if(n!==c)return"asc"===s?n-c:c-n;if(e[r]==t[r])continue;const p=e[r]<t[r]?-1:1;return"asc"===s?p:-1*p}return 0})),e):e;exports.sortBy=sortBy;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.sortBy=void 0;var _compareAs=require("../utilities/compareAs");const presence=(e,r)=>Object.prototype.hasOwnProperty.call(e,r)?null===e[r]?1:2:0,sortBy=(e=[],r=[])=>r.length?(e.sort(((e,t)=>{for(const o of r){const r=o.property,s=o.direction,c=presence(e,r),p=presence(t,r);if(c!==p)return"asc"===s?c-p:p-c;const n=(0,_compareAs.compareAs)(o.type,e[r]),a=(0,_compareAs.compareAs)(o.type,t[r]);if(n==a)continue;const i=n<a?-1:1;return"asc"===s?i:-1*i}return 0})),e):e;exports.sortBy=sortBy;

package/dist/data/queries/where.js

@@ -18,7 +18,8 @@ const likeMatch = (dataValue, pattern) => {
 };
 /**
  * Equality (=, !=, <>, in) compares by the field's declared type when given one (see sameValue), so
- * '3' and 3 match in a string or int field. Ordering (>, <, between, like) compares the raw values.
+ * '3' and 3 match in a string or int field. Ordering (>, >=, <, <=, between) compares by it too (see compareAs): a
+ * string field orders as text ('10' < '9'), an int field as numbers. like compares the raw values.
  *
  * Null and missing are their own cases, as in SQL: a field that is null or missing matches no comparison (not even
  * `!=`), and a null never equals anything, not even another null. Only these test for them:
@@ -47,6 +48,7 @@ const makeCondition = (data, property, comparator, value, type = undefined) => {
     return false;
   }
   const dataValue = data[property];
+  const typedValue = (0, _compareAs.compareAs)(type, dataValue);
   switch (comparator) {
     case '=':
       return (0, _compareAs.sameValue)(type, dataValue, value);
@@ -54,18 +56,18 @@ const makeCondition = (data, property, comparator, value, type = undefined) => {
     case '<>':
       return !(0, _compareAs.sameValue)(type, dataValue, value);
     case '>':
-      return dataValue > value;
+      return typedValue > (0, _compareAs.compareAs)(type, value);
     case '>=':
-      return dataValue >= value;
+      return typedValue >= (0, _compareAs.compareAs)(type, value);
     case '<':
-      return dataValue < value;
+      return typedValue < (0, _compareAs.compareAs)(type, value);
     case '<=':
-      return dataValue <= value;
+      return typedValue <= (0, _compareAs.compareAs)(type, value);
     case 'in':
       return Array.isArray(value) && (type ? value.some(item => (0, _compareAs.sameValue)(type, dataValue, item)) : value.includes(dataValue));
     case 'between':
       // A null bound would act as 0 in >= / <=: it bounds nothing, so nothing matches (the parser refuses it)
-      return Array.isArray(value) && value.length === 2 && !value.includes(null) && dataValue >= value[0] && dataValue <= value[1];
+      return Array.isArray(value) && value.length === 2 && !value.includes(null) && typedValue >= (0, _compareAs.compareAs)(type, value[0]) && typedValue <= (0, _compareAs.compareAs)(type, value[1]);
     case 'like':
       return likeMatch(dataValue, value);
   }

package/dist/data/queries/where.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.where=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.some.js");var _compareAs=require("../utilities/compareAs");const likeMatch=(e,r)=>{if("string"!=typeof e||"string"!=typeof r)return!1;const t=r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/%/g,".*").replace(/_/g,".");return new RegExp(`^${t}$`,"i").test(e)},makeCondition=(e,r,t,s,n=void 0)=>{const a=Object.prototype.hasOwnProperty.call(e,r);switch(t){case"exists":return a;case"does not exist":return!a;case"is null":return a&&null===e[r];case"is not null":return a&&null!==e[r]}if(!a||null===e[r]||null===s)return!1;const o=e[r];switch(t){case"=":return(0,_compareAs.sameValue)(n,o,s);case"!=":case"<>":return!(0,_compareAs.sameValue)(n,o,s);case">":return o>s;case">=":return o>=s;case"<":return o<s;case"<=":return o<=s;case"in":return Array.isArray(s)&&(n?s.some((e=>(0,_compareAs.sameValue)(n,o,e))):s.includes(o));case"between":return Array.isArray(s)&&2===s.length&&!s.includes(null)&&o>=s[0]&&o<=s[1];case"like":return likeMatch(o,s)}return!1},where=(e=[],{property:r="",joinEntity:t,comparator:s="=",value:n=null,type:a}={})=>e.filter((e=>makeCondition(e,t?`${t}.${r}`:r,s,n,a)));exports.where=where;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.where=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.some.js");var _compareAs=require("../utilities/compareAs");const likeMatch=(e,r)=>{if("string"!=typeof e||"string"!=typeof r)return!1;const s=r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/%/g,".*").replace(/_/g,".");return new RegExp(`^${s}$`,"i").test(e)},makeCondition=(e,r,s,t,a=void 0)=>{const o=Object.prototype.hasOwnProperty.call(e,r);switch(s){case"exists":return o;case"does not exist":return!o;case"is null":return o&&null===e[r];case"is not null":return o&&null!==e[r]}if(!o||null===e[r]||null===t)return!1;const c=e[r],n=(0,_compareAs.compareAs)(a,c);switch(s){case"=":return(0,_compareAs.sameValue)(a,c,t);case"!=":case"<>":return!(0,_compareAs.sameValue)(a,c,t);case">":return n>(0,_compareAs.compareAs)(a,t);case">=":return n>=(0,_compareAs.compareAs)(a,t);case"<":return n<(0,_compareAs.compareAs)(a,t);case"<=":return n<=(0,_compareAs.compareAs)(a,t);case"in":return Array.isArray(t)&&(a?t.some((e=>(0,_compareAs.sameValue)(a,c,e))):t.includes(c));case"between":return Array.isArray(t)&&2===t.length&&!t.includes(null)&&n>=(0,_compareAs.compareAs)(a,t[0])&&n<=(0,_compareAs.compareAs)(a,t[1]);case"like":return likeMatch(c,t)}return!1},where=(e=[],{property:r="",joinEntity:s,comparator:t="=",value:a=null,type:o}={})=>e.filter((e=>makeCondition(e,s?`${s}.${r}`:r,t,a,o)));exports.where=where;

package/dist/data/utilities/getConditionIndexedList.d.ts

@@ -1,3 +1,15 @@
 import { ParsedQuery } from './parsers/parseQuery';
-export declare const getConditionIndexedList: (parsed: ParsedQuery, recordData: any, dataSet: any) => Promise<ParsedQuery>;
+/**
+ * Load only the rows the indexed conditions match, and leave the other conditions for where() to apply later.
+ * Conditions are joined by `and`, so a row is loaded only when every indexed condition on its entity matched it: each
+ * condition narrows the files the ones before it matched. (Each indexed condition used to replace the rows of the one
+ * before, so `where date = 'x' and where exercise_id = 1` returned every row with exercise_id 1, whatever its date.)
+ * @param parsed
+ * @param recordData
+ * @param dataSet
+ * @param resolved - Filled with each entity whose rows were loaded here: its rows in dataSet are final (possibly none)
+ * and must not be reloaded, even when other conditions are left for where() (an empty list otherwise reads as "not
+ * loaded yet", see readEntity).
+ */
+export declare const getConditionIndexedList: (parsed: ParsedQuery, recordData: any, dataSet: any, resolved?: Set<string>) => Promise<ParsedQuery>;
 //# sourceMappingURL=getConditionIndexedList.d.ts.map

package/dist/data/utilities/getConditionIndexedList.js

@@ -4,14 +4,47 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getConditionIndexedList = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.flat-map.js");
+require("core-js/modules/esnext.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.js");
 var _isEntityProperty = require("./parsers/isEntityProperty");
 var _splitEntityProperty = require("./parsers/splitEntityProperty");
 var _retrieveRecord = require("./retrieveRecord");
 var _where = require("../queries/where");
 var _retrieveFile = require("./retrieveFile");
 var _getMatchingIndexes = require("./getMatchingIndexes");
-const getConditionIndexedList = async (parsed, recordData, dataSet) => {
+/**
+ * Load only the rows the indexed conditions match, and leave the other conditions for where() to apply later.
+ * Conditions are joined by `and`, so a row is loaded only when every indexed condition on its entity matched it: each
+ * condition narrows the files the ones before it matched. (Each indexed condition used to replace the rows of the one
+ * before, so `where date = 'x' and where exercise_id = 1` returned every row with exercise_id 1, whatever its date.)
+ * @param parsed
+ * @param recordData
+ * @param dataSet
+ * @param resolved - Filled with each entity whose rows were loaded here: its rows in dataSet are final (possibly none)
+ * and must not be reloaded, even when other conditions are left for where() (an empty list otherwise reads as "not
+ * loaded yet", see readEntity).
+ */
+const getConditionIndexedList = async (parsed, recordData, dataSet, resolved = new Set()) => {
   const reducedConditions = [];
+  const matchedFiles = {};
+  const indexed = {};
   for (const condition of parsed.conditions) {
     let entity = parsed.entity;
     let property = condition.property;
@@ -23,25 +56,27 @@ const getConditionIndexedList = async (parsed, recordData, dataSet) => {
     if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
       recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
     }
-    const indexed = {};
-    const retrieveMatchedFiles = async (entity, property, recordData, condition, dataSet, indexed) => {
-      const matchedRecords = (0, _where.where)(indexed[entity][property], {
+    const narrowMatchedFiles = async (entity, property, recordData, condition, dataSet, indexed) => {
+      const files = new Set((0, _where.where)(indexed[entity][property], {
         property: 'value',
         comparator: condition.comparator,
         value: condition.value,
         type: condition.type
-      });
-      for (const matchedRecord of matchedRecords) {
-        for (const file of matchedRecord.record) {
-          dataSet[entity].push(await (0, _retrieveFile.retrieveFile)(`${entity}/${file}`));
-        }
-      }
+      }).flatMap(matchedRecord => matchedRecord.record));
+      matchedFiles[entity] = Object.prototype.hasOwnProperty.call(matchedFiles, entity) ? matchedFiles[entity].filter(file => files.has(file)) : [...files];
     };
-    const isIndexed = await (0, _getMatchingIndexes.getMatchingIndexes)(entity, property, recordData, condition, dataSet, indexed, retrieveMatchedFiles);
+    const isIndexed = await (0, _getMatchingIndexes.getMatchingIndexes)(entity, property, recordData, condition, dataSet, indexed, narrowMatchedFiles);
     if (!isIndexed) {
       reducedConditions.push(condition);
     }
   }
+  for (const entity of Object.keys(matchedFiles)) {
+    resolved.add(entity);
+    dataSet[entity] = [];
+    for (const file of matchedFiles[entity]) {
+      dataSet[entity].push(await (0, _retrieveFile.retrieveFile)(`${entity}/${file}`));
+    }
+  }
   parsed.conditions = reducedConditions;
   return parsed;
 };

package/dist/data/utilities/getConditionIndexedList.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getConditionIndexedList=void 0;var _isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_retrieveRecord=require("./retrieveRecord"),_where=require("../queries/where"),_retrieveFile=require("./retrieveFile"),_getMatchingIndexes=require("./getMatchingIndexes");const getConditionIndexedList=async(e,t,r)=>{const i=[];for(const o of e.conditions){let n=e.entity,s=o.property;if((0,_isEntityProperty.isEntityProperty)(s)){const e=(0,_splitEntityProperty.splitEntityProperty)(s);n=e.entity,s=e.property}Object.prototype.hasOwnProperty.call(t,n)||(t[n]=await(0,_retrieveRecord.retrieveRecord)(n));const p={},y=async(e,t,r,i,o,n)=>{const s=(0,_where.where)(n[e][t],{property:"value",comparator:i.comparator,value:i.value,type:i.type});for(const t of s)for(const r of t.record)o[e].push(await(0,_retrieveFile.retrieveFile)(`${e}/${r}`))};await(0,_getMatchingIndexes.getMatchingIndexes)(n,s,t,o,r,p,y)||i.push(o)}return e.conditions=i,e};exports.getConditionIndexedList=getConditionIndexedList;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getConditionIndexedList=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.flat-map.js"),require("core-js/modules/esnext.set.add-all.js"),require("core-js/modules/esnext.set.delete-all.js"),require("core-js/modules/esnext.set.difference.js"),require("core-js/modules/esnext.set.every.js"),require("core-js/modules/esnext.set.filter.js"),require("core-js/modules/esnext.set.find.js"),require("core-js/modules/esnext.set.intersection.js"),require("core-js/modules/esnext.set.is-disjoint-from.js"),require("core-js/modules/esnext.set.is-subset-of.js"),require("core-js/modules/esnext.set.is-superset-of.js"),require("core-js/modules/esnext.set.join.js"),require("core-js/modules/esnext.set.map.js"),require("core-js/modules/esnext.set.reduce.js"),require("core-js/modules/esnext.set.some.js"),require("core-js/modules/esnext.set.symmetric-difference.js"),require("core-js/modules/esnext.set.union.js");var _isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_retrieveRecord=require("./retrieveRecord"),_where=require("../queries/where"),_retrieveFile=require("./retrieveFile"),_getMatchingIndexes=require("./getMatchingIndexes");const getConditionIndexedList=async(e,r,t,s=new Set)=>{const o=[],i={},n={};for(const s of e.conditions){let u=e.entity,c=s.property;if((0,_isEntityProperty.isEntityProperty)(c)){const e=(0,_splitEntityProperty.splitEntityProperty)(c);u=e.entity,c=e.property}Object.prototype.hasOwnProperty.call(r,u)||(r[u]=await(0,_retrieveRecord.retrieveRecord)(u));const d=async(e,r,t,s,o,n)=>{const u=new Set((0,_where.where)(n[e][r],{property:"value",comparator:s.comparator,value:s.value,type:s.type}).flatMap((e=>e.record)));i[e]=Object.prototype.hasOwnProperty.call(i,e)?i[e].filter((e=>u.has(e))):[...u]};await(0,_getMatchingIndexes.getMatchingIndexes)(u,c,r,s,t,n,d)||o.push(s)}for(const e of Object.keys(i)){s.add(e),t[e]=[];for(const r of i[e])t[e].push(await(0,_retrieveFile.retrieveFile)(`${e}/${r}`))}return e.conditions=o,e};exports.getConditionIndexedList=getConditionIndexedList;

package/dist/data/utilities/getMatchingIndexes.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getMatchingIndexes = void 0;
-require("core-js/modules/es.array.includes.js");
 var _retrieveIndexes = require("./retrieveIndexes");
+var _isSingleFieldKey = require("./isSingleFieldKey");
 const getMatchingIndexes = async (entity, property, recordData, clause, dataSet, indexed, cb = null) => {
   let isIndexed = false;
   for (const key of recordData[entity].keys) {
-    if (key.fields.includes(property)) {
+    if ((0, _isSingleFieldKey.isSingleFieldKey)(key, property)) {
       dataSet[entity] = [];
       if (!Object.prototype.hasOwnProperty.call(indexed, entity)) {
         indexed[entity] = {};

package/dist/data/utilities/getMatchingIndexes.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getMatchingIndexes=void 0,require("core-js/modules/es.array.includes.js");var _retrieveIndexes=require("./retrieveIndexes");const getMatchingIndexes=async(e,t,r,s,n,o,i=null)=>{let a=!1;for(const c of r[e].keys)c.fields.includes(t)&&(n[e]=[],Object.prototype.hasOwnProperty.call(o,e)||(o[e]={}),Object.prototype.hasOwnProperty.call(o[e],t)||(o[e][t]=(await(0,_retrieveIndexes.retrieveIndexes)(e,[t],r))[t]),"function"==typeof i&&await i(e,t,r,s,n,o),a=!0);return a};exports.getMatchingIndexes=getMatchingIndexes;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getMatchingIndexes=void 0;var _retrieveIndexes=require("./retrieveIndexes"),_isSingleFieldKey=require("./isSingleFieldKey");const getMatchingIndexes=async(e,t,i,r,n,s,o=null)=>{let l=!1;for(const a of i[e].keys)(0,_isSingleFieldKey.isSingleFieldKey)(a,t)&&(n[e]=[],Object.prototype.hasOwnProperty.call(s,e)||(s[e]={}),Object.prototype.hasOwnProperty.call(s[e],t)||(s[e][t]=(await(0,_retrieveIndexes.retrieveIndexes)(e,[t],i))[t]),"function"==typeof o&&await o(e,t,i,r,n,s),l=!0);return l};exports.getMatchingIndexes=getMatchingIndexes;

package/dist/data/utilities/isSingleFieldKey.d.ts

@@ -0,0 +1,10 @@
+import { keyDefinition } from '../introspect/definitions/key';
+/**
+ * Whether a key indexes exactly this one field, so its index file can answer a condition or join on that field. A
+ * composite key's index holds combined values (`["a",1]`, see computeKeyValue), which never equal one field's value:
+ * using it for that field matched nothing. (Using a composite index for its leftmost field is a planned improvement.)
+ * @param key
+ * @param property
+ */
+export declare const isSingleFieldKey: (key: keyDefinition, property: string) => boolean;
+//# sourceMappingURL=isSingleFieldKey.d.ts.map

package/dist/data/utilities/isSingleFieldKey.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isSingleFieldKey = void 0;
+/**
+ * Whether a key indexes exactly this one field, so its index file can answer a condition or join on that field. A
+ * composite key's index holds combined values (`["a",1]`, see computeKeyValue), which never equal one field's value:
+ * using it for that field matched nothing. (Using a composite index for its leftmost field is a planned improvement.)
+ * @param key
+ * @param property
+ */
+const isSingleFieldKey = (key, property) => key.fields.length === 1 && key.fields[0] === property;
+exports.isSingleFieldKey = isSingleFieldKey;

package/dist/data/utilities/isSingleFieldKey.min.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.isSingleFieldKey=void 0;const isSingleFieldKey=(e,i)=>1===e.fields.length&&e.fields[0]===i;exports.isSingleFieldKey=isSingleFieldKey;

package/dist/data/utilities/parsers/findSortClauses.d.ts

@@ -2,6 +2,7 @@ import { ParsedQuery } from './parseQuery';
 export type ParsedSortClause = {
     property: string;
     direction: string | 'asc' | 'desc';
+    type?: string;
 };
 /**
  * Extract sort clauses from the query.

package/dist/data/utilities/retrieveIndexes.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.retrieveIndexes = void 0;
-require("core-js/modules/es.array.includes.js");
 var _retrieveFile = require("./retrieveFile");
 var _retrieveRecord = require("./retrieveRecord");
+var _isSingleFieldKey = require("./isSingleFieldKey");
 const retrieveIndexes = async (entity = '', properties = [], recordData = {}) => {
   if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
     recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
@@ -14,7 +14,7 @@ const retrieveIndexes = async (entity = '', properties = [], recordData = {}) =>
   const indexSet = {};
   for (const property of properties) {
     for (const key of recordData[entity].keys) {
-      if (key.fields.includes(property)) {
+      if ((0, _isSingleFieldKey.isSingleFieldKey)(key, property)) {
         indexSet[property] = await (0, _retrieveFile.retrieveFile)(`__indexes/${entity}/${key.lookup}`);
       }
     }

package/dist/data/utilities/retrieveIndexes.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.retrieveIndexes=void 0,require("core-js/modules/es.array.includes.js");var _retrieveFile=require("./retrieveFile"),_retrieveRecord=require("./retrieveRecord");const retrieveIndexes=async(e="",r=[],t={})=>{Object.prototype.hasOwnProperty.call(t,e)||(t[e]=await(0,_retrieveRecord.retrieveRecord)(e));const i={};for(const o of r)for(const r of t[e].keys)r.fields.includes(o)&&(i[o]=await(0,_retrieveFile.retrieveFile)(`__indexes/${e}/${r.lookup}`));return i};exports.retrieveIndexes=retrieveIndexes;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.retrieveIndexes=void 0;var _retrieveFile=require("./retrieveFile"),_retrieveRecord=require("./retrieveRecord"),_isSingleFieldKey=require("./isSingleFieldKey");const retrieveIndexes=async(e="",r=[],i={})=>{Object.prototype.hasOwnProperty.call(i,e)||(i[e]=await(0,_retrieveRecord.retrieveRecord)(e));const t={};for(const o of r)for(const r of i[e].keys)(0,_isSingleFieldKey.isSingleFieldKey)(r,o)&&(t[o]=await(0,_retrieveFile.retrieveFile)(`__indexes/${e}/${r.lookup}`));return t};exports.retrieveIndexes=retrieveIndexes;

package/dist/data/utilities/runQuery.js

@@ -6,6 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.runQuery = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.reduce.js");
+require("core-js/modules/esnext.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.js");
 var _deleteEntity = require("../queries/deleteEntity");
 var _insertEntity = require("../queries/insertEntity");
 var _readEntity = require("../queries/readEntity");
@@ -28,15 +44,15 @@ var _isEntityProperty = require("./parsers/isEntityProperty");
 var _splitEntityProperty = require("./parsers/splitEntityProperty");
 var _fieldType = require("./fieldType");
 /**
- * Give each condition its field's declared type, so where compares by it (a joined entity's field
- * is looked up on that entity's record).
+ * Give each condition and sort clause its field's declared type, so where and sortBy compare by it
+ * (a joined entity's field is looked up on that entity's record).
  * @param parsed
  * @param recordData
  */
-const typeConditions = async (parsed, recordData) => {
-  for (const condition of parsed.conditions) {
+const typeClauses = async (parsed, recordData) => {
+  for (const clause of [...parsed.conditions, ...parsed.sortClauses]) {
     let entity = parsed.entity;
-    let property = condition.property;
+    let property = clause.property;
     if ((0, _isEntityProperty.isEntityProperty)(property)) {
       ({
         entity,
@@ -46,7 +62,7 @@ const typeConditions = async (parsed, recordData) => {
     if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
       recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
     }
-    condition.type = (0, _fieldType.fieldType)(recordData[entity], property);
+    clause.type = (0, _fieldType.fieldType)(recordData[entity], property);
   }
 };
 const runQuery = async parsed => {
@@ -75,25 +91,26 @@ const runQuery = async parsed => {
   if (typeof parsed.joinEntity !== 'undefined') {
     recordData[parsed.joinEntity] = await (0, _retrieveRecord.retrieveRecord)(parsed.joinEntity);
   }
-  await typeConditions(parsed, recordData);
+  await typeClauses(parsed, recordData);
   let dataSet = {
     [parsed.entity]: []
   };
-  // A condition that's indexed but genuinely matches nothing leaves dataSet[entity] at [] - the
-  // same state it starts in before anything has looked at it at all. readEntity() (below) can't
-  // tell those two states apart on its own (it reloads whenever the array is empty, regardless of
-  // why), so capture here, before that ambiguity can happen, whether every condition actually got
-  // resolved this way - if so, dataSet[entity] is already correct and must not be reloaded.
-  const hadConditions = parsed.conditions.length > 0;
-  parsed = await (0, _getConditionIndexedList.getConditionIndexedList)(parsed, recordData, dataSet);
-  const conditionsFullyIndexed = hadConditions && parsed.conditions.length === 0;
+  // An indexed condition that matches nothing leaves dataSet[entity] at [] - the same state it starts in before
+  // anything has looked at it at all. readEntity() (below) can't tell those two states apart on its own (it reloads
+  // whenever the array is empty), so getConditionIndexedList reports which entities it resolved: once any indexed
+  // condition has narrowed entity's rows, they are final (the conditions left over are applied to them below) and
+  // must not be reloaded. This used to ask whether EVERY condition was indexed, so `where date = 'none' and where
+  // reps = 10` reloaded every row and returned, updated or deleted all rows with reps 10.
+  const resolved = new Set();
+  parsed = await (0, _getConditionIndexedList.getConditionIndexedList)(parsed, recordData, dataSet, resolved);
+  const entityResolved = resolved.has(parsed.entity);
   parsed = await (0, _getJoinIndexedList.getJoinIndexedList)(parsed, recordData, dataSet);
   // delete/update act on whatever is already in dataSet[entity] - unlike read, which loads
   // everything and lets the where-reduce below narrow it down afterward, they never get a second
   // pass. So the matching rows have to be fully resolved (indexed conditions already are, via
   // getConditionIndexedList above; anything left in parsed.conditions is not) before either runs.
   if (parsed.command === 'delete' || parsed.command === 'update') {
-    if (!conditionsFullyIndexed) {
+    if (!entityResolved) {
       dataSet = await (0, _readEntity.readEntity)(parsed.entity, dataSet);
     }
     dataSet[parsed.entity] = parsed.conditions.reduce((remainingData, condition) => (0, _where.where)(remainingData, condition), dataSet[parsed.entity]);
@@ -106,7 +123,7 @@ const runQuery = async parsed => {
       dataSet = await (0, _insertEntity.insertEntity)(parsed.entity, parsed.insertValues, dataSet);
       break;
     case 'read':
-      if (!conditionsFullyIndexed) {
+      if (!entityResolved) {
         dataSet = await (0, _readEntity.readEntity)(parsed.entity, dataSet);
       }
       break;
@@ -116,7 +133,7 @@ const runQuery = async parsed => {
     default:
       throw new Error(`Unknown command: ${parsed.command}`);
   }
-  dataSet = await (0, _joinEntity.joinEntity)(parsed.entity, parsed.joinEntity, dataSet, parsed.joinClauses, conditionsFullyIndexed);
+  dataSet = await (0, _joinEntity.joinEntity)(parsed.entity, parsed.joinEntity, dataSet, parsed.joinClauses, entityResolved);
   dataSet = await (0, _mergeJoins.mergeJoins)(dataSet, parsed.mergeJoins);
   // delete/update already had parsed.conditions applied above, before they ran. Re-applying the
   // same conditions here would be wrong, not just redundant, for update specifically: if the

package/dist/data/utilities/runQuery.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _deleteEntity=require("../queries/deleteEntity"),_insertEntity=require("../queries/insertEntity"),_readEntity=require("../queries/readEntity"),_updateEntity=require("../queries/updateEntity"),_createRecord=require("../queries/createRecord"),_dropRecord=require("../queries/dropRecord"),_describeRecord=require("../queries/describeRecord"),_showRecords=require("../queries/showRecords"),_joinEntity=require("../queries/joinEntity"),_mergeJoins=require("../queries/mergeJoins"),_where=require("../queries/where"),_sortBy=require("../queries/sortBy"),_groupBy=require("../queries/groupBy"),_limitOffset=require("../queries/limitOffset"),_selectFields=require("../queries/selectFields"),_retrieveRecord=require("./retrieveRecord"),_getConditionIndexedList=require("./getConditionIndexedList"),_getJoinIndexedList=require("./getJoinIndexedList"),_isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType");const typeConditions=async(e,t)=>{for(const r of e.conditions){let i=e.entity,n=r.property;(0,_isEntityProperty.isEntityProperty)(n)&&({entity:i,property:n}=(0,_splitEntityProperty.splitEntityProperty)(n)),Object.prototype.hasOwnProperty.call(t,i)||(t[i]=await(0,_retrieveRecord.retrieveRecord)(i)),r.type=(0,_fieldType.fieldType)(t[i],n)}},runQuery=async e=>{switch(e.command){case"create":return{[e.entity]:await(0,_createRecord.createRecord)(e.entity,e.create)};case"drop":return{[e.entity]:await(0,_dropRecord.dropRecord)(e.entity,e.ifExists)};case"describe":return{[e.entity]:await(0,_describeRecord.describeRecord)(e.entity)};case"show":return{[e.entity]:await(0,_showRecords.showRecords)()}}const t={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(t[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity)),await typeConditions(e,t);let r={[e.entity]:[]};const i=e.conditions.length>0;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,t,r);const n=i&&0===e.conditions.length;switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,t,r)).command&&"update"!==e.command||(n||(r=await(0,_readEntity.readEntity)(e.entity,r)),r[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),r[e.entity])),e.command){case"delete":r=await(0,_deleteEntity.deleteEntity)(e.entity,r);break;case"insert":r=await(0,_insertEntity.insertEntity)(e.entity,e.insertValues,r);break;case"read":n||(r=await(0,_readEntity.readEntity)(e.entity,r));break;case"update":r=await(0,_updateEntity.updateEntity)(e.entity,e.updateValues,r);break;default:throw new Error(`Unknown command: ${e.command}`)}return r=await(0,_joinEntity.joinEntity)(e.entity,e.joinEntity,r,e.joinClauses,n),r=await(0,_mergeJoins.mergeJoins)(r,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(r[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),r[e.entity])),r[e.entity]=(0,_sortBy.sortBy)(r[e.entity],e.sortClauses),r[e.entity]=(0,_limitOffset.limitOffset)(r[e.entity],e.offset,e.limit),r[e.entity]=(0,_groupBy.groupBy)(r[e.entity],e.groupBy),r[e.entity]=(0,_selectFields.selectFields)(r[e.entity],e.selectClauses),r};exports.runQuery=runQuery;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js"),require("core-js/modules/esnext.set.add-all.js"),require("core-js/modules/esnext.set.delete-all.js"),require("core-js/modules/esnext.set.difference.js"),require("core-js/modules/esnext.set.every.js"),require("core-js/modules/esnext.set.filter.js"),require("core-js/modules/esnext.set.find.js"),require("core-js/modules/esnext.set.intersection.js"),require("core-js/modules/esnext.set.is-disjoint-from.js"),require("core-js/modules/esnext.set.is-subset-of.js"),require("core-js/modules/esnext.set.is-superset-of.js"),require("core-js/modules/esnext.set.join.js"),require("core-js/modules/esnext.set.map.js"),require("core-js/modules/esnext.set.reduce.js"),require("core-js/modules/esnext.set.some.js"),require("core-js/modules/esnext.set.symmetric-difference.js"),require("core-js/modules/esnext.set.union.js");var _deleteEntity=require("../queries/deleteEntity"),_insertEntity=require("../queries/insertEntity"),_readEntity=require("../queries/readEntity"),_updateEntity=require("../queries/updateEntity"),_createRecord=require("../queries/createRecord"),_dropRecord=require("../queries/dropRecord"),_describeRecord=require("../queries/describeRecord"),_showRecords=require("../queries/showRecords"),_joinEntity=require("../queries/joinEntity"),_mergeJoins=require("../queries/mergeJoins"),_where=require("../queries/where"),_sortBy=require("../queries/sortBy"),_groupBy=require("../queries/groupBy"),_limitOffset=require("../queries/limitOffset"),_selectFields=require("../queries/selectFields"),_retrieveRecord=require("./retrieveRecord"),_getConditionIndexedList=require("./getConditionIndexedList"),_getJoinIndexedList=require("./getJoinIndexedList"),_isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType");const typeClauses=async(e,t)=>{for(const r of[...e.conditions,...e.sortClauses]){let i=e.entity,s=r.property;(0,_isEntityProperty.isEntityProperty)(s)&&({entity:i,property:s}=(0,_splitEntityProperty.splitEntityProperty)(s)),Object.prototype.hasOwnProperty.call(t,i)||(t[i]=await(0,_retrieveRecord.retrieveRecord)(i)),r.type=(0,_fieldType.fieldType)(t[i],s)}},runQuery=async e=>{switch(e.command){case"create":return{[e.entity]:await(0,_createRecord.createRecord)(e.entity,e.create)};case"drop":return{[e.entity]:await(0,_dropRecord.dropRecord)(e.entity,e.ifExists)};case"describe":return{[e.entity]:await(0,_describeRecord.describeRecord)(e.entity)};case"show":return{[e.entity]:await(0,_showRecords.showRecords)()}}const t={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(t[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity)),await typeClauses(e,t);let r={[e.entity]:[]};const i=new Set;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,t,r,i);const s=i.has(e.entity);switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,t,r)).command&&"update"!==e.command||(s||(r=await(0,_readEntity.readEntity)(e.entity,r)),r[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),r[e.entity])),e.command){case"delete":r=await(0,_deleteEntity.deleteEntity)(e.entity,r);break;case"insert":r=await(0,_insertEntity.insertEntity)(e.entity,e.insertValues,r);break;case"read":s||(r=await(0,_readEntity.readEntity)(e.entity,r));break;case"update":r=await(0,_updateEntity.updateEntity)(e.entity,e.updateValues,r);break;default:throw new Error(`Unknown command: ${e.command}`)}return r=await(0,_joinEntity.joinEntity)(e.entity,e.joinEntity,r,e.joinClauses,s),r=await(0,_mergeJoins.mergeJoins)(r,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(r[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),r[e.entity])),r[e.entity]=(0,_sortBy.sortBy)(r[e.entity],e.sortClauses),r[e.entity]=(0,_limitOffset.limitOffset)(r[e.entity],e.offset,e.limit),r[e.entity]=(0,_groupBy.groupBy)(r[e.entity],e.groupBy),r[e.entity]=(0,_selectFields.selectFields)(r[e.entity],e.selectClauses),r};exports.runQuery=runQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-fs-query",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Use json files to manage and read data.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",