json-fs-query 3.1.3 → 3.2.0

package/dist/data/utilities/retrieveFile.js

@@ -1,26 +1,17 @@
 "use strict";
 
-require("core-js/modules/esnext.weak-map.delete-all.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.retrieveFile = void 0;
-var jsEnv = _interopRequireWildcard(require("browser-or-node"));
-var _config = require("./config");
-var e;
-function _interopRequireWildcard(t, r) { if (!r && t && t.__esModule) return t; var n, a, o = Object.defineProperty, f = { __proto__: null, default: t }; if (Object(t) !== t) return f; if (e || "function" != typeof WeakMap || (e = new WeakMap()), e) { if (e.has(t)) return e.get(t); e.set(t, f); } for (a in t) "default" !== a && {}.hasOwnProperty.call(t, a) && ((n = o && Object.getOwnPropertyDescriptor(t, a)) && (n.get || n.set) ? o(f, a, n) : f[a] = t[a]); return f; }
+var _storage = require("../storage");
+/**
+ * Read one JSON file of the database (see readJson), logging the underlying error and throwing one that names the file.
+ * @param path - A path inside the database, such as `users.json`.
+ * @throws {Error} `Could not read <path>` when the file can't be read.
+ */
 const retrieveFile = async path => {
-  let retrieveFn = url => fetch(url).then(res => res.json());
-  const relativePath = jsEnv.isBrowser ? (0, _config.getSetting)('relativePath', '') : '';
-  if (jsEnv.isNode) {
-    const {
-      readFile
-    } = require('fs/promises');
-    retrieveFn = url => readFile(url).then(res => JSON.parse(res));
-  }
-  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
-  const fetchUrl = `${relativePath}${databasePath}${path}`;
-  const recordInfo = await retrieveFn(fetchUrl).catch(err => console.error(err));
+  const recordInfo = await (0, _storage.readJson)(path).catch(err => console.error(err));
   if (!recordInfo) {
     throw new Error(`Could not read ${path}`);
   }

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

@@ -1 +1 @@
-"use strict";require("core-js/modules/esnext.weak-map.delete-all.js"),Object.defineProperty(exports,"__esModule",{value:!0}),exports.retrieveFile=void 0;var e,jsEnv=_interopRequireWildcard(require("browser-or-node")),_config=require("./config");function _interopRequireWildcard(r,t){if(!t&&r&&r.__esModule)return r;var i,o,n=Object.defineProperty,s={__proto__:null,default:r};if(Object(r)!==r)return s;if(e||"function"!=typeof WeakMap||(e=new WeakMap),e){if(e.has(r))return e.get(r);e.set(r,s)}for(o in r)"default"!==o&&{}.hasOwnProperty.call(r,o)&&((i=n&&Object.getOwnPropertyDescriptor(r,o))&&(i.get||i.set)?n(s,o,i):s[o]=r[o]);return s}const retrieveFile=async e=>{let r=e=>fetch(e).then((e=>e.json()));const t=jsEnv.isBrowser?(0,_config.getSetting)("relativePath",""):"";if(jsEnv.isNode){const{readFile:e}=require("fs/promises");r=r=>e(r).then((e=>JSON.parse(e)))}const i=`${t}${(0,_config.getSetting)("databasePath","database/")}${e}`,o=await r(i).catch((e=>console.error(e)));if(!o)throw new Error(`Could not read ${e}`);return o};exports.retrieveFile=retrieveFile;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.retrieveFile=void 0;var _storage=require("../storage");const retrieveFile=async e=>{const r=await(0,_storage.readJson)(e).catch((e=>console.error(e)));if(!r)throw new Error(`Could not read ${e}`);return r};exports.retrieveFile=retrieveFile;

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

@@ -0,0 +1,38 @@
+/**
+ * Rows grouped by their join key on one field (see joinKey), each group in the rows' order. Rows whose field is null or
+ * missing are left out: they equal nothing.
+ * @param rows
+ * @param property
+ * @param type - The declared type the field is compared by.
+ */
+export declare const groupRows: (rows: any[], property: string, type: string | undefined) => Map<any, any[]>;
+/**
+ * The position of the first row with each join key on one field (see groupRows).
+ * @param rows
+ * @param property
+ * @param type - The declared type the field is compared by.
+ */
+export declare const firstPositions: (rows: any[], property: string, type: string | undefined) => Map<any, number>;
+/**
+ * Lookups over one list of rows, built once and kept for as long as the list (a join's rows of a record), so a join
+ * builds each lookup once rather than once per row joined.
+ */
+export declare class RowLookups {
+    readonly rows: any[];
+    private groups;
+    private positions;
+    constructor(rows: any[]);
+    /**
+     * See groupRows.
+     * @param property
+     * @param type
+     */
+    groupsBy(property: string, type: string | undefined): Map<any, any[]>;
+    /**
+     * See firstPositions.
+     * @param property
+     * @param type
+     */
+    positionsBy(property: string, type: string | undefined): Map<any, number>;
+}
+//# sourceMappingURL=rowLookup.d.ts.map

package/dist/data/utilities/rowLookup.js

@@ -0,0 +1,99 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupRows = exports.firstPositions = exports.RowLookups = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.map.delete-all.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+require("core-js/modules/esnext.map.merge.js");
+require("core-js/modules/esnext.map.reduce.js");
+require("core-js/modules/esnext.map.some.js");
+require("core-js/modules/esnext.map.update.js");
+var _joinKey = require("./joinKey");
+/**
+ * Rows grouped by their join key on one field (see joinKey), each group in the rows' order. Rows whose field is null or
+ * missing are left out: they equal nothing.
+ * @param rows
+ * @param property
+ * @param type - The declared type the field is compared by.
+ */
+const groupRows = (rows, property, type) => {
+  const groups = new Map();
+  for (const row of rows) {
+    const key = (0, _joinKey.joinKey)(type, row[property]);
+    if (typeof key === 'undefined') {
+      continue;
+    }
+    const group = groups.get(key);
+    if (group) {
+      group.push(row);
+    } else {
+      groups.set(key, [row]);
+    }
+  }
+  return groups;
+};
+/**
+ * The position of the first row with each join key on one field (see groupRows).
+ * @param rows
+ * @param property
+ * @param type - The declared type the field is compared by.
+ */
+exports.groupRows = groupRows;
+const firstPositions = (rows, property, type) => {
+  const positions = new Map();
+  rows.forEach((row, position) => {
+    const key = (0, _joinKey.joinKey)(type, row[property]);
+    if (typeof key !== 'undefined' && !positions.has(key)) {
+      positions.set(key, position);
+    }
+  });
+  return positions;
+};
+/**
+ * Lookups over one list of rows, built once and kept for as long as the list (a join's rows of a record), so a join
+ * builds each lookup once rather than once per row joined.
+ */
+exports.firstPositions = firstPositions;
+class RowLookups {
+  constructor(rows) {
+    this.rows = rows;
+    this.groups = new Map();
+    this.positions = new Map();
+  }
+  /**
+   * See groupRows.
+   * @param property
+   * @param type
+   */
+  groupsBy(property, type) {
+    const name = `${property}\u0000${type}`;
+    if (!this.groups.has(name)) {
+      this.groups.set(name, groupRows(this.rows, property, type));
+    }
+    return this.groups.get(name);
+  }
+  /**
+   * See firstPositions.
+   * @param property
+   * @param type
+   */
+  positionsBy(property, type) {
+    const name = `${property}\u0000${type}`;
+    if (!this.positions.has(name)) {
+      this.positions.set(name, firstPositions(this.rows, property, type));
+    }
+    return this.positions.get(name);
+  }
+}
+exports.RowLookups = RowLookups;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.groupRows=exports.firstPositions=exports.RowLookups=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.for-each.js"),require("core-js/modules/esnext.map.delete-all.js"),require("core-js/modules/esnext.map.every.js"),require("core-js/modules/esnext.map.filter.js"),require("core-js/modules/esnext.map.find.js"),require("core-js/modules/esnext.map.find-key.js"),require("core-js/modules/esnext.map.includes.js"),require("core-js/modules/esnext.map.key-of.js"),require("core-js/modules/esnext.map.map-keys.js"),require("core-js/modules/esnext.map.map-values.js"),require("core-js/modules/esnext.map.merge.js"),require("core-js/modules/esnext.map.reduce.js"),require("core-js/modules/esnext.map.some.js"),require("core-js/modules/esnext.map.update.js");var _joinKey=require("./joinKey");const groupRows=(e,s,o)=>{const r=new Map;for(const t of e){const e=(0,_joinKey.joinKey)(o,t[s]);if(void 0===e)continue;const i=r.get(e);i?i.push(t):r.set(e,[t])}return r};exports.groupRows=groupRows;const firstPositions=(e,s,o)=>{const r=new Map;return e.forEach(((e,t)=>{const i=(0,_joinKey.joinKey)(o,e[s]);void 0===i||r.has(i)||r.set(i,t)})),r};exports.firstPositions=firstPositions;class RowLookups{constructor(e){this.rows=e,this.groups=new Map,this.positions=new Map}groupsBy(e,s){const o=`${e}\0${s}`;return this.groups.has(o)||this.groups.set(o,groupRows(this.rows,e,s)),this.groups.get(o)}positionsBy(e,s){const o=`${e}\0${s}`;return this.positions.has(o)||this.positions.set(o,firstPositions(this.rows,e,s)),this.positions.get(o)}}exports.RowLookups=RowLookups;

package/dist/data/utilities/runQuery.js

@@ -38,7 +38,6 @@ var _limitOffset = require("../queries/limitOffset");
 var _selectFields = require("../queries/selectFields");
 var _retrieveRecord = require("./retrieveRecord");
 var _getConditionIndexedList = require("./getConditionIndexedList");
-var _getJoinIndexedList = require("./getJoinIndexedList");
 var _isEntityProperty = require("./parsers/isEntityProperty");
 var _splitEntityProperty = require("./parsers/splitEntityProperty");
 var _fieldType = require("./fieldType");
@@ -112,7 +111,7 @@ const runQuery = async parsed => {
   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);
+  // The join is joinEntity's (below), for rows an index narrowed too
   // 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 every condition is applied to the candidates (all rows, or the ones the indexes picked)

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/es.array.includes.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"),_conditionTree=require("./conditionTree"),_conditionEntities=require("./conditionEntities"),_requireNode=require("./requireNode");const typeClauses=async(e,t)=>{for(const r of[...(0,_conditionTree.conditionsOf)(e.where),...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=>{const t=void 0!==e.where&&(0,_conditionEntities.conditionEntities)(e);switch(["insert","update","delete","create","drop"].includes(e.command)&&(0,_requireNode.requireNode)(`"${e.command}"`),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 r={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(r[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity)),await typeClauses(e,r);let i={[e.entity]:[]};const s=new Set;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,r,i,s);const n=s.has(e.entity);switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,r,i)).command&&"update"!==e.command||(n||(i=await(0,_readEntity.readEntity)(e.entity,i)),i[e.entity]=(0,_where.whereTree)(i[e.entity],e.where)),e.command){case"delete":i=await(0,_deleteEntity.deleteEntity)(e.entity,i);break;case"insert":i=await(0,_insertEntity.insertEntity)(e.entity,e.insertValues,i);break;case"read":n||(i=await(0,_readEntity.readEntity)(e.entity,i));break;case"update":i=await(0,_updateEntity.updateEntity)(e.entity,e.updateValues,i);break;default:throw new Error(`Unknown command: ${e.command}`)}return i=await(0,_joinEntity.joinEntity)(e.entity,e.joinEntity,i,e.joinClauses,n,s.has(e.joinEntity)),i=await(0,_mergeJoins.mergeJoins)(i,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(i[e.entity]=(0,_where.whereTree)(i[e.entity],e.where,t?e.joinEntity:void 0)),i[e.entity]=(0,_sortBy.sortBy)(i[e.entity],e.sortClauses),i[e.entity]=(0,_groupBy.groupBy)(i[e.entity],e.groupBy),i[e.entity]=(0,_limitOffset.limitOffset)(i[e.entity],e.offset,e.limit),i[e.entity]=(0,_selectFields.selectFields)(i[e.entity],e.selectClauses,Boolean(e.groupBy?.length)),i};exports.runQuery=runQuery;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/es.array.includes.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"),_isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType"),_conditionTree=require("./conditionTree"),_conditionEntities=require("./conditionEntities"),_requireNode=require("./requireNode");const typeClauses=async(e,t)=>{for(const r of[...(0,_conditionTree.conditionsOf)(e.where),...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=>{const t=void 0!==e.where&&(0,_conditionEntities.conditionEntities)(e);switch(["insert","update","delete","create","drop"].includes(e.command)&&(0,_requireNode.requireNode)(`"${e.command}"`),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 r={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(r[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity)),await typeClauses(e,r);let i={[e.entity]:[]};const s=new Set;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,r,i,s);const n=s.has(e.entity);switch("delete"!==e.command&&"update"!==e.command||(n||(i=await(0,_readEntity.readEntity)(e.entity,i)),i[e.entity]=(0,_where.whereTree)(i[e.entity],e.where)),e.command){case"delete":i=await(0,_deleteEntity.deleteEntity)(e.entity,i);break;case"insert":i=await(0,_insertEntity.insertEntity)(e.entity,e.insertValues,i);break;case"read":n||(i=await(0,_readEntity.readEntity)(e.entity,i));break;case"update":i=await(0,_updateEntity.updateEntity)(e.entity,e.updateValues,i);break;default:throw new Error(`Unknown command: ${e.command}`)}return i=await(0,_joinEntity.joinEntity)(e.entity,e.joinEntity,i,e.joinClauses,n,s.has(e.joinEntity)),i=await(0,_mergeJoins.mergeJoins)(i,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(i[e.entity]=(0,_where.whereTree)(i[e.entity],e.where,t?e.joinEntity:void 0)),i[e.entity]=(0,_sortBy.sortBy)(i[e.entity],e.sortClauses),i[e.entity]=(0,_groupBy.groupBy)(i[e.entity],e.groupBy),i[e.entity]=(0,_limitOffset.limitOffset)(i[e.entity],e.offset,e.limit),i[e.entity]=(0,_selectFields.selectFields)(i[e.entity],e.selectClauses,Boolean(e.groupBy?.length)),i};exports.runQuery=runQuery;

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

@@ -0,0 +1,27 @@
+import { RowLookups } from './rowLookup';
+/**
+ * Rows of one record in a join: either all the rows the join read for it (with their lookups, built once and reused
+ * for every row joined) or a narrower list for one row's join.
+ */
+export type JoinSide = {
+    rows: any[];
+    lookups?: RowLookups;
+};
+/**
+ * One step of a join, `target.targetProperty <comparator> source.sourceProperty`: the target rows that match at least
+ * one source row, compared by `type` (the target field's declared type).
+ *
+ * The order is the one the join has always produced: through the source rows in order, each adding the target rows it
+ * matches (in their order) that aren't in yet. For `=` on a keyed type (see isKeyedType) that's computed from lookups
+ * instead of comparing every pair: by going through the source rows and taking each key's group of target rows once,
+ * or, when the source is all of its record's rows and the target is smaller, by placing each target row at its key's
+ * first source row. Other comparators, and types compared loosely, compare row by row as before.
+ * @param target
+ * @param source
+ * @param targetProperty
+ * @param sourceProperty
+ * @param comparator
+ * @param type
+ */
+export declare const semiJoin: (target: JoinSide, source: JoinSide, targetProperty: string, sourceProperty: string, comparator: string, type: string | undefined) => any[];
+//# sourceMappingURL=semiJoin.d.ts.map

package/dist/data/utilities/semiJoin.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.semiJoin = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.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 _where = require("../queries/where");
+var _joinKey = require("./joinKey");
+var _rowLookup = require("./rowLookup");
+/**
+ * One step of a join, `target.targetProperty <comparator> source.sourceProperty`: the target rows that match at least
+ * one source row, compared by `type` (the target field's declared type).
+ *
+ * The order is the one the join has always produced: through the source rows in order, each adding the target rows it
+ * matches (in their order) that aren't in yet. For `=` on a keyed type (see isKeyedType) that's computed from lookups
+ * instead of comparing every pair: by going through the source rows and taking each key's group of target rows once,
+ * or, when the source is all of its record's rows and the target is smaller, by placing each target row at its key's
+ * first source row. Other comparators, and types compared loosely, compare row by row as before.
+ * @param target
+ * @param source
+ * @param targetProperty
+ * @param sourceProperty
+ * @param comparator
+ * @param type
+ */
+const semiJoin = (target, source, targetProperty, sourceProperty, comparator, type) => {
+  if (comparator === '=' && (0, _joinKey.isKeyedType)(type)) {
+    if (source.lookups && target.rows.length < source.rows.length) {
+      const positions = source.lookups.positionsBy(sourceProperty, type);
+      const placed = [];
+      target.rows.forEach((row, index) => {
+        const position = positions.get((0, _joinKey.joinKey)(type, row[targetProperty]));
+        if (typeof position !== 'undefined') {
+          placed.push({
+            row,
+            position,
+            index
+          });
+        }
+      });
+      return placed.sort((a, b) => a.position - b.position || a.index - b.index).map(({
+        row
+      }) => row);
+    }
+    const groups = target.lookups ? target.lookups.groupsBy(targetProperty, type) : (0, _rowLookup.groupRows)(target.rows, targetProperty, type);
+    const matched = [];
+    const taken = new Set();
+    for (const row of source.rows) {
+      const key = (0, _joinKey.joinKey)(type, row[sourceProperty]);
+      if (typeof key === 'undefined' || taken.has(key)) {
+        continue;
+      }
+      taken.add(key);
+      const group = groups.get(key);
+      if (group) {
+        matched.push(...group);
+      }
+    }
+    return matched;
+  }
+  const matched = [];
+  const kept = new Set();
+  for (const row of source.rows) {
+    for (const match of (0, _where.where)(target.rows, {
+      property: targetProperty,
+      comparator,
+      value: row[sourceProperty],
+      type
+    })) {
+      if (!kept.has(match)) {
+        kept.add(match);
+        matched.push(match);
+      }
+    }
+  }
+  return matched;
+};
+exports.semiJoin = semiJoin;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.semiJoin=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.for-each.js"),require("core-js/modules/esnext.iterator.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 _where=require("../queries/where"),_joinKey=require("./joinKey"),_rowLookup=require("./rowLookup");const semiJoin=(e,s,o,r,t,i)=>{if("="===t&&(0,_joinKey.isKeyedType)(i)){if(s.lookups&&e.rows.length<s.rows.length){const t=s.lookups.positionsBy(r,i),n=[];return e.rows.forEach(((e,s)=>{const r=t.get((0,_joinKey.joinKey)(i,e[o]));void 0!==r&&n.push({row:e,position:r,index:s})})),n.sort(((e,s)=>e.position-s.position||e.index-s.index)).map((({row:e})=>e))}const t=e.lookups?e.lookups.groupsBy(o,i):(0,_rowLookup.groupRows)(e.rows,o,i),n=[],u=new Set;for(const e of s.rows){const s=(0,_joinKey.joinKey)(i,e[r]);if(void 0===s||u.has(s))continue;u.add(s);const o=t.get(s);o&&n.push(...o)}return n}const n=[],u=new Set;for(const j of s.rows)for(const s of(0,_where.where)(e.rows,{property:o,comparator:t,value:j[r],type:i}))u.has(s)||(u.add(s),n.push(s));return n};exports.semiJoin=semiJoin;

package/dist/data/utilities/updateIndex.js

@@ -5,16 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.updateIndex = void 0;
 require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
-var _config = require("./config");
 var _compareAs = require("./compareAs");
-const {
-  readFile,
-  writeFile,
-  mkdir
-} = require('fs/promises');
+var _storage = require("../storage");
 /**
  * Add a single entry file to the index that backs one of a record's keys, creating the index
  * file (and its __indexes/{record} directory) the first time a value is indexed. Keys with no
@@ -29,12 +23,11 @@ const updateIndex = async (path = '', key = null, value = undefined, fileName =
   if (!key || !key.lookup) {
     return null;
   }
-  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
-  const indexDir = `${databasePath}__indexes/${path}`;
+  const indexDir = `__indexes/${path}`;
   const indexPath = `${indexDir}/${key.lookup}`;
   let index = [];
   try {
-    index = JSON.parse(await readFile(indexPath, 'utf8'));
+    index = await (0, _storage.readJson)(indexPath);
   } catch (err) {
     index = [];
   }
@@ -49,10 +42,8 @@ const updateIndex = async (path = '', key = null, value = undefined, fileName =
       record: [fileName]
     });
   }
-  await mkdir(indexDir, {
-    recursive: true
-  });
-  await writeFile(indexPath, JSON.stringify(index, null, 2));
+  await (0, _storage.makeDirectory)(indexDir);
+  await (0, _storage.writeJson)(indexPath, index);
   return index;
 };
 exports.updateIndex = updateIndex;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.updateIndex=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js");var _config=require("./config"),_compareAs=require("./compareAs");const{readFile:readFile,writeFile:writeFile,mkdir:mkdir}=require("fs/promises"),updateIndex=async(e="",r=null,s=void 0,i="",t=void 0)=>{if(!r||!r.lookup)return null;const o=`${(0,_config.getSetting)("databasePath","database/")}__indexes/${e}`,a=`${o}/${r.lookup}`;let u=[];try{u=JSON.parse(await readFile(a,"utf8"))}catch(e){u=[]}const d=u.find((e=>(0,_compareAs.sameValue)(t,e.value,s)));return d?d.record.includes(i)||d.record.push(i):u.push({value:s,record:[i]}),await mkdir(o,{recursive:!0}),await writeFile(a,JSON.stringify(u,null,2)),u};exports.updateIndex=updateIndex;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.updateIndex=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js");var _compareAs=require("./compareAs"),_storage=require("../storage");const updateIndex=async(e="",r=null,o=void 0,s="",t=void 0)=>{if(!r||!r.lookup)return null;const a=`__indexes/${e}`,u=`${a}/${r.lookup}`;let d=[];try{d=await(0,_storage.readJson)(u)}catch(e){d=[]}const i=d.find((e=>(0,_compareAs.sameValue)(t,e.value,o)));return i?i.record.includes(s)||i.record.push(s):d.push({value:o,record:[s]}),await(0,_storage.makeDirectory)(a),await(0,_storage.writeJson)(u,d),d};exports.updateIndex=updateIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-fs-query",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "description": "Use json files to manage and read data.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,8 @@
     "watch": "gulp watchFull",
     "watch:test": "gulp watchTest",
     "lint": "gulp lint",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "benchmark": "node scripts/benchmark.cjs"
   },
   "repository": {
     "type": "git",
@@ -46,6 +47,7 @@
     "@babel/core": "^8.1.0",
     "gulp": "^5.0.1",
     "js-build-tools": "^8.0.0",
+    "playwright": "~1.64.1",
     "release-it": "^21.1.1",
     "test-filesystem": "^2.0.2",
     "typedoc": "^0.28.20"

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

@@ -1,3 +0,0 @@
-import { ParsedQuery } from './parsers/parseQuery';
-export declare const getJoinIndexedList: (parsed: ParsedQuery, recordData: any, dataSets: any) => Promise<ParsedQuery>;
-//# sourceMappingURL=getJoinIndexedList.d.ts.map

package/dist/data/utilities/getJoinIndexedList.js

@@ -1,76 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getJoinIndexedList = void 0;
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _retrieveRecord = require("./retrieveRecord");
-var _getMatchingIndexes = require("./getMatchingIndexes");
-var _matchIndexedJoins = require("./matchIndexedJoins");
-var _restrictIndexedList = require("./restrictIndexedList");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const getJoinIndexedList = async (parsed, recordData, dataSets) => {
-  const reducedJoins = [];
-  const indexed = {};
-  let firstIteration = true;
-  const entity = parsed.entity;
-  const joinEntity = parsed.joinEntity;
-  const joinClauses = parsed.joinClauses;
-  if (!dataSets[entity].length) {
-    // Nothing indexed entity's own rows yet (no WHERE condition narrowed them down ahead of this -
-    // that only happens via getConditionIndexedList, called just before this). The loop below can't
-    // pre-resolve anything against zero rows, so leave parsed.joinClauses exactly as parsed: the
-    // later, unconditional joinEntity() call (once this command's own read actually runs) still
-    // needs the real clauses to do the join itself. Previously this fell through to the loop,
-    // which never ran, leaving reducedJoins (and so parsed.joinClauses) empty regardless of what
-    // was actually parsed - silently discarding every join clause whenever the query had no WHERE.
-    return parsed;
-  }
-  if (!joinClauses.length) {
-    // A WHERE condition DID index entity's own rows above, but this query has no join at all -
-    // joinEntity is undefined. The loop below writes dataSets[entity][anEntity][joinEntity]
-    // unconditionally; left unguarded, that assigns a literal "undefined" key (object[undefined]
-    // coerces to the string "undefined") onto every row, since there's no join to actually attach.
-    return parsed;
-  }
-  for (const anEntity in dataSets[entity]) {
-    const currentEntity = dataSets[entity][anEntity];
-    // Loop over each of the main entities
-    const filterJoins = {};
-    filterJoins[entity] = [_siFunciona.default.cloneObject(currentEntity)];
-    for (const joinClause of joinClauses) {
-      let indexedClone = _siFunciona.default.cloneObject(indexed);
-      const {
-        entity: entityA,
-        property: propertyA
-      } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
-      const {
-        entity: entityB,
-        property: propertyB
-      } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
-      // Get the record for the entities A and B, store on the recordData
-      if (!Object.prototype.hasOwnProperty.call(recordData, entityA)) {
-        recordData[entityA] = await (0, _retrieveRecord.retrieveRecord)(entityA);
-      }
-      if (!Object.prototype.hasOwnProperty.call(recordData, entityB)) {
-        recordData[entityB] = await (0, _retrieveRecord.retrieveRecord)(entityB);
-      }
-      indexedClone = (0, _restrictIndexedList.restrictIndexedList)(joinClause, filterJoins, indexedClone);
-      const retrieveMatchedFiles = (0, _matchIndexedJoins.matchIndexedJoins)(entity, indexedClone, dataSets);
-      // Check if there are matching keys for the join condition
-      const matchAResult = await (0, _getMatchingIndexes.getMatchingIndexes)(entityA, propertyA, recordData, joinClause, filterJoins, indexed);
-      const matchBResult = await (0, _getMatchingIndexes.getMatchingIndexes)(entityB, propertyB, recordData, joinClause, filterJoins, indexed, retrieveMatchedFiles);
-      const isIndexed = matchAResult || matchBResult;
-      if (!isIndexed && firstIteration) {
-        reducedJoins.push(joinClause);
-        firstIteration = false;
-      }
-    }
-    dataSets[entity][anEntity][joinEntity] = filterJoins[joinEntity];
-  }
-  parsed.joinClauses = reducedJoins;
-  return parsed;
-};
-exports.getJoinIndexedList = getJoinIndexedList;

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

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.getJoinIndexedList=void 0;var _siFunciona=_interopRequireDefault(require("si-funciona")),_splitEntityProperty=require("./parsers/splitEntityProperty"),_retrieveRecord=require("./retrieveRecord"),_getMatchingIndexes=require("./getMatchingIndexes"),_matchIndexedJoins=require("./matchIndexedJoins"),_restrictIndexedList=require("./restrictIndexedList");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const getJoinIndexedList=async(e,t,r)=>{const i=[],n={};let o=!0;const s=e.entity,c=e.joinEntity,d=e.joinClauses;if(!r[s].length)return e;if(!d.length)return e;for(const e in r[s]){const a=r[s][e],p={};p[s]=[_siFunciona.default.cloneObject(a)];for(const e of d){let c=_siFunciona.default.cloneObject(n);const{entity:d,property:a}=(0,_splitEntityProperty.splitEntityProperty)(e.propertyA),{entity:u,property:l}=(0,_splitEntityProperty.splitEntityProperty)(e.propertyB);Object.prototype.hasOwnProperty.call(t,d)||(t[d]=await(0,_retrieveRecord.retrieveRecord)(d)),Object.prototype.hasOwnProperty.call(t,u)||(t[u]=await(0,_retrieveRecord.retrieveRecord)(u)),c=(0,_restrictIndexedList.restrictIndexedList)(e,p,c);const y=(0,_matchIndexedJoins.matchIndexedJoins)(s,c,r),_=await(0,_getMatchingIndexes.getMatchingIndexes)(d,a,t,e,p,n),x=await(0,_getMatchingIndexes.getMatchingIndexes)(u,l,t,e,p,n,y);!(_||x)&&o&&(i.push(e),o=!1)}r[s][e][c]=p[c]}return e.joinClauses=i,e};exports.getJoinIndexedList=getJoinIndexedList;

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

@@ -1,2 +0,0 @@
-export declare const getMatchingIndexes: (entity: string, property: string, recordData: Object, clause: Object, dataSet: Object, indexed: Object, cb?: Function) => Promise<boolean>;
-//# sourceMappingURL=getMatchingIndexes.d.ts.map

package/dist/data/utilities/getMatchingIndexes.js

@@ -1,28 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getMatchingIndexes = void 0;
-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 ((0, _isSingleFieldKey.isSingleFieldKey)(key, property)) {
-      dataSet[entity] = [];
-      if (!Object.prototype.hasOwnProperty.call(indexed, entity)) {
-        indexed[entity] = {};
-      }
-      if (!Object.prototype.hasOwnProperty.call(indexed[entity], property)) {
-        indexed[entity][property] = (await (0, _retrieveIndexes.retrieveIndexes)(entity, [property], recordData))[property];
-      }
-      if (typeof cb === 'function') {
-        await cb(entity, property, recordData, clause, dataSet, indexed);
-      }
-      isIndexed = true;
-    }
-  }
-  return isIndexed;
-};
-exports.getMatchingIndexes = getMatchingIndexes;

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

@@ -1 +0,0 @@
-"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/matchIndexedJoins.d.ts

@@ -1,2 +0,0 @@
-export declare const matchIndexedJoins: (entity: any, indexedClone: any, dataSets: any) => (focusEntity: any, property: any, recordData: any, joinClause: any, filterJoins: any, indexed: any) => Promise<void>;
-//# sourceMappingURL=matchIndexedJoins.d.ts.map

package/dist/data/utilities/matchIndexedJoins.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.matchIndexedJoins = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.reduce.js");
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
-var _where = require("../queries/where");
-var _retrieveFile = require("./retrieveFile");
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _fieldType = require("./fieldType");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const matchIndexedJoins = (entity, indexedClone, dataSets) => async (focusEntity, property, recordData, joinClause, filterJoins, indexed) => {
-  const {
-    entity: entityA,
-    property: propertyA
-  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
-  const {
-    entity: entityB,
-    property: propertyB
-  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
-  const properties = [{
-    entityFirst: entityA,
-    propertyFirst: propertyA,
-    entitySecond: entityB,
-    propertySecond: propertyB
-  }, {
-    entityFirst: entityB,
-    propertyFirst: propertyB,
-    entitySecond: entityA,
-    propertySecond: propertyA
-  }];
-  for (const checkProp of properties) {
-    if (!Object.prototype.hasOwnProperty.call(indexedClone, checkProp.entitySecond)) {
-      indexedClone[checkProp.entitySecond] = _siFunciona.default.cloneObject(indexed[checkProp.entitySecond]);
-    }
-    const matchedRecords = indexedClone[checkProp.entitySecond][checkProp.propertySecond].reduce((dataA, dataB) => _siFunciona.default.mergeArrays(dataA, (0, _where.where)(indexedClone[checkProp.entityFirst][checkProp.propertyFirst], {
-      property: 'value',
-      comparator: joinClause.comparator,
-      value: dataB.value,
-      type: (0, _fieldType.fieldType)(recordData[checkProp.entityFirst], checkProp.propertyFirst)
-    })), []);
-    const skipPush = checkProp.entityFirst === entity;
-    if (!Object.prototype.hasOwnProperty.call(dataSets, checkProp.entityFirst)) {
-      dataSets[checkProp.entityFirst] = [];
-    }
-    for (const matchedRecord of matchedRecords) {
-      for (const file of matchedRecord.record) {
-        let entityRecord = file;
-        if (typeof file === 'string') {
-          entityRecord = await (0, _retrieveFile.retrieveFile)(`${checkProp.entityFirst}/${file}`);
-        }
-        if (!skipPush) {
-          dataSets[checkProp.entityFirst].push(entityRecord);
-        }
-        filterJoins[checkProp.entityFirst].push(entityRecord);
-      }
-    }
-  }
-};
-exports.matchIndexedJoins = matchIndexedJoins;

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

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.matchIndexedJoins=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _siFunciona=_interopRequireDefault(require("si-funciona")),_where=require("../queries/where"),_retrieveFile=require("./retrieveFile"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const matchIndexedJoins=(e,t,r)=>async(i,o,n,s,p,y)=>{const{entity:c,property:u}=(0,_splitEntityProperty.splitEntityProperty)(s.propertyA),{entity:a,property:d}=(0,_splitEntityProperty.splitEntityProperty)(s.propertyB),l=[{entityFirst:c,propertyFirst:u,entitySecond:a,propertySecond:d},{entityFirst:a,propertyFirst:d,entitySecond:c,propertySecond:u}];for(const i of l){Object.prototype.hasOwnProperty.call(t,i.entitySecond)||(t[i.entitySecond]=_siFunciona.default.cloneObject(y[i.entitySecond]));const o=t[i.entitySecond][i.propertySecond].reduce(((e,r)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(t[i.entityFirst][i.propertyFirst],{property:"value",comparator:s.comparator,value:r.value,type:(0,_fieldType.fieldType)(n[i.entityFirst],i.propertyFirst)}))),[]),c=i.entityFirst===e;Object.prototype.hasOwnProperty.call(r,i.entityFirst)||(r[i.entityFirst]=[]);for(const e of o)for(const t of e.record){let e=t;"string"==typeof t&&(e=await(0,_retrieveFile.retrieveFile)(`${i.entityFirst}/${t}`)),c||r[i.entityFirst].push(e),p[i.entityFirst].push(e)}}};exports.matchIndexedJoins=matchIndexedJoins;