json-fs-query 1.0.5 → 1.1.0

package/dist/data/introspect/policies/typeCheck.js

@@ -1,57 +1,57 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.typeCheck = void 0;
-/**
- * Validate (and where sensible, coerce) a value against a field's declared type. Runs only
- * against values being written by insertEntity/updateEntity - it never re-validates data already
- * on disk, so a field whose declared type doesn't match its already-stored values (which can
- * happen, since nothing enforced this before) is left alone until something actually updates it.
- * An unrecognized type name is treated as unconstrained rather than rejected, so a typo in a
- * schema's field type can't silently block every write to that field.
- * @param type
- * @param value
- */
-const typeCheck = (type = 'string', value = undefined) => {
-  if (typeof value === 'undefined') {
-    return value;
-  }
-  switch (type) {
-    case 'string':
-      return typeof value === 'string' ? value : String(value);
-    case 'int':
-      {
-        const coerced = Number(value);
-        if (Number.isNaN(coerced) || !Number.isInteger(coerced)) {
-          throw new Error(`Value "${value}" is not a valid int`);
-        }
-        return coerced;
-      }
-    case 'boolean':
-      if (typeof value === 'boolean') {
-        return value;
-      }
-      if (value === 'true') {
-        return true;
-      }
-      if (value === 'false') {
-        return false;
-      }
-      throw new Error(`Value "${value}" is not a valid boolean`);
-    case 'object':
-      if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-        throw new Error(`Value "${value}" is not a valid object`);
-      }
-      return value;
-    case 'array':
-      if (!Array.isArray(value)) {
-        throw new Error(`Value "${value}" is not a valid array`);
-      }
-      return value;
-    default:
-      return value;
-  }
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.typeCheck = void 0;
+/**
+ * Validate (and where sensible, coerce) a value against a field's declared type. Runs only
+ * against values being written by insertEntity/updateEntity - it never re-validates data already
+ * on disk, so a field whose declared type doesn't match its already-stored values (which can
+ * happen, since nothing enforced this before) is left alone until something actually updates it.
+ * An unrecognized type name is treated as unconstrained rather than rejected, so a typo in a
+ * schema's field type can't silently block every write to that field.
+ * @param type
+ * @param value
+ */
+const typeCheck = (type = 'string', value = undefined) => {
+  if (typeof value === 'undefined') {
+    return value;
+  }
+  switch (type) {
+    case 'string':
+      return typeof value === 'string' ? value : String(value);
+    case 'int':
+      {
+        const coerced = Number(value);
+        if (Number.isNaN(coerced) || !Number.isInteger(coerced)) {
+          throw new Error(`Value "${value}" is not a valid int`);
+        }
+        return coerced;
+      }
+    case 'boolean':
+      if (typeof value === 'boolean') {
+        return value;
+      }
+      if (value === 'true') {
+        return true;
+      }
+      if (value === 'false') {
+        return false;
+      }
+      throw new Error(`Value "${value}" is not a valid boolean`);
+    case 'object':
+      if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+        throw new Error(`Value "${value}" is not a valid object`);
+      }
+      return value;
+    case 'array':
+      if (!Array.isArray(value)) {
+        throw new Error(`Value "${value}" is not a valid array`);
+      }
+      return value;
+    default:
+      return value;
+  }
+};
 exports.typeCheck = typeCheck;

package/dist/data/introspect/policies/typeEnum.js

@@ -1,14 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.typeEnum = void 0;
-require("core-js/modules/es.array.includes.js");
-const typeEnum = (values = [], value = '', optional = false) => {
-  if (values.includes(value)) {
-    return true;
-  }
-  return typeof value === 'undefined' && optional;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.typeEnum = void 0;
+require("core-js/modules/es.array.includes.js");
+const typeEnum = (values = [], value = '', optional = false) => {
+  if (values.includes(value)) {
+    return true;
+  }
+  return typeof value === 'undefined' && optional;
+};
 exports.typeEnum = typeEnum;

package/dist/data/introspect/policies/useDefault.js

@@ -1,13 +1,13 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useDefault = void 0;
-const useDefault = (defaultValue = '', value = undefined) => {
-  if (typeof value === 'undefined') {
-    return defaultValue;
-  }
-  return value;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDefault = void 0;
+const useDefault = (defaultValue = '', value = undefined) => {
+  if (typeof value === 'undefined') {
+    return defaultValue;
+  }
+  return value;
+};
 exports.useDefault = useDefault;

package/dist/data/queries/deleteEntity.js

@@ -28,6 +28,7 @@ var _retrieveRecord = require("../utilities/retrieveRecord");
 var _retrieveFile = require("../utilities/retrieveFile");
 var _removeFromIndex = require("../utilities/removeFromIndex");
 var _computeKeyValue = require("../utilities/computeKeyValue");
+var _fieldType = require("../utilities/fieldType");
 var _hasDependents = require("../introspect/policies/hasDependents");
 var _config = require("../utilities/config");
 const {
@@ -75,7 +76,7 @@ const removeMatchingEntries = async (entity, record, primaryKey, deletedValues)
     }
     await rm(`${databasePath}${record.path}/${fileName}`);
     for (const key of record.keys) {
-      await (0, _removeFromIndex.removeFromIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, data), fileName);
+      await (0, _removeFromIndex.removeFromIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, data), fileName, (0, _fieldType.keyValueType)(record, key));
     }
   }
   return remainingEntries;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.deleteEntity=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.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 _retrieveRecord=require("../utilities/retrieveRecord"),_retrieveFile=require("../utilities/retrieveFile"),_removeFromIndex=require("../utilities/removeFromIndex"),_computeKeyValue=require("../utilities/computeKeyValue"),_hasDependents=require("../introspect/policies/hasDependents"),_config=require("../utilities/config");const{rm:rm,writeFile:writeFile}=require("fs/promises"),assertNoDependents=async(e,r,s)=>{if(!(0,_config.getSetting)("enforceForeignKeys",!0)||1!==r.fields.length)return;const t=r.fields[0];for(const r of s)if(await(0,_hasDependents.hasDependents)(e,t,r[t]))throw new Error(`Cannot delete from "${e}" where "${t}" = ${r[t]} - other records still reference it`)},removeMatchingEntries=async(e,r,s,t)=>{const i=(0,_config.getSetting)("databasePath","database/"),o=[];for(const e of r.entries){const n=await(0,_retrieveFile.retrieveFile)(`${r.path}/${e}`);if(t.has((0,_computeKeyValue.computeKeyValue)(s.fields,n))){await rm(`${i}${r.path}/${e}`);for(const s of r.keys)await(0,_removeFromIndex.removeFromIndex)(r.path,s,(0,_computeKeyValue.computeKeyValue)(s.fields,n),e)}else o.push(e)}return o},deleteEntity=async(e="",r={})=>{const s=(0,_config.getSetting)("databasePath","database/"),t=await(0,_retrieveRecord.retrieveRecord)(e),i=t.keys.find((e=>"primary"===e.type));if(!i)throw new Error(`Cannot delete from "${e}" without a primary key`);const o=r[e]||[];if(!o.length)return r;await assertNoDependents(e,i,o);const n=new Set(o.map((e=>(0,_computeKeyValue.computeKeyValue)(i.fields,e))));return t.entries=await removeMatchingEntries(0,t,i,n),await writeFile(`${s}${t.path}.json`,JSON.stringify(t,null,2)),r};exports.deleteEntity=deleteEntity;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.deleteEntity=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.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 _retrieveRecord=require("../utilities/retrieveRecord"),_retrieveFile=require("../utilities/retrieveFile"),_removeFromIndex=require("../utilities/removeFromIndex"),_computeKeyValue=require("../utilities/computeKeyValue"),_fieldType=require("../utilities/fieldType"),_hasDependents=require("../introspect/policies/hasDependents"),_config=require("../utilities/config");const{rm:rm,writeFile:writeFile}=require("fs/promises"),assertNoDependents=async(e,r,s)=>{if(!(0,_config.getSetting)("enforceForeignKeys",!0)||1!==r.fields.length)return;const t=r.fields[0];for(const r of s)if(await(0,_hasDependents.hasDependents)(e,t,r[t]))throw new Error(`Cannot delete from "${e}" where "${t}" = ${r[t]} - other records still reference it`)},removeMatchingEntries=async(e,r,s,t)=>{const i=(0,_config.getSetting)("databasePath","database/"),o=[];for(const e of r.entries){const n=await(0,_retrieveFile.retrieveFile)(`${r.path}/${e}`);if(t.has((0,_computeKeyValue.computeKeyValue)(s.fields,n))){await rm(`${i}${r.path}/${e}`);for(const s of r.keys)await(0,_removeFromIndex.removeFromIndex)(r.path,s,(0,_computeKeyValue.computeKeyValue)(s.fields,n),e,(0,_fieldType.keyValueType)(r,s))}else o.push(e)}return o},deleteEntity=async(e="",r={})=>{const s=(0,_config.getSetting)("databasePath","database/"),t=await(0,_retrieveRecord.retrieveRecord)(e),i=t.keys.find((e=>"primary"===e.type));if(!i)throw new Error(`Cannot delete from "${e}" without a primary key`);const o=r[e]||[];if(!o.length)return r;await assertNoDependents(e,i,o);const n=new Set(o.map((e=>(0,_computeKeyValue.computeKeyValue)(i.fields,e))));return t.entries=await removeMatchingEntries(0,t,i,n),await writeFile(`${s}${t.path}.json`,JSON.stringify(t,null,2)),r};exports.deleteEntity=deleteEntity;

package/dist/data/queries/groupBy.js

@@ -1,22 +1,22 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.groupBy = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.reduce.js");
-const groupBy = (dataSet = [], groupProperty = '') => {
-  if (!groupProperty) {
-    return dataSet;
-  }
-  return dataSet.reduce((groupedData, data) => {
-    const property = data[groupProperty];
-    if (!Object.prototype.hasOwnProperty.call(groupedData, property)) {
-      groupedData[property] = [];
-    }
-    groupedData[property].push(data);
-    return groupedData;
-  }, {});
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupBy = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.reduce.js");
+const groupBy = (dataSet = [], groupProperty = '') => {
+  if (!groupProperty) {
+    return dataSet;
+  }
+  return dataSet.reduce((groupedData, data) => {
+    const property = data[groupProperty];
+    if (!Object.prototype.hasOwnProperty.call(groupedData, property)) {
+      groupedData[property] = [];
+    }
+    groupedData[property].push(data);
+    return groupedData;
+  }, {});
+};
 exports.groupBy = groupBy;

package/dist/data/queries/insertEntity.js

@@ -17,6 +17,7 @@ var _typeCheck = require("../introspect/policies/typeCheck");
 var _foreignKeyExists = require("../introspect/policies/foreignKeyExists");
 var _splitEntityProperty = require("../utilities/parsers/splitEntityProperty");
 var _computeKeyValue = require("../utilities/computeKeyValue");
+var _fieldType = require("../utilities/fieldType");
 var _config = require("../utilities/config");
 const {
   writeFile
@@ -108,7 +109,7 @@ const insertEntity = async (entity = '', values = [], dataSet = {}) => {
     record.entries.push(fileName);
     await writeFile(`${databasePath}${record.path}.json`, JSON.stringify(record, null, 2));
     for (const key of record.keys) {
-      await (0, _updateIndex.updateIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, entityValues), fileName);
+      await (0, _updateIndex.updateIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, entityValues), fileName, (0, _fieldType.keyValueType)(record, key));
     }
     dataSet[entity].push(entityValues);
   }

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.insertEntity=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js"),require("core-js/modules/esnext.iterator.map.js");var _retrieveRecord=require("../utilities/retrieveRecord"),_updateIndex=require("../utilities/updateIndex"),_keyGenerate=require("../introspect/policies/keyGenerate"),_keyUnique=require("../introspect/policies/keyUnique"),_useDefault=require("../introspect/policies/useDefault"),_typeCheck=require("../introspect/policies/typeCheck"),_foreignKeyExists=require("../introspect/policies/foreignKeyExists"),_splitEntityProperty=require("../utilities/parsers/splitEntityProperty"),_computeKeyValue=require("../utilities/computeKeyValue"),_config=require("../utilities/config");const{writeFile:writeFile}=require("fs/promises"),buildEntityValues=async(e,t,i={})=>{const r={};for(const s of t.definition){let t=i[s.name];if(s.autoGenerate?t=await(0,_keyGenerate.keyGenerate)(e,[s.name]):Object.prototype.hasOwnProperty.call(s,"default")&&(t=(0,_useDefault.useDefault)(s.default,t)),void 0!==t)r[s.name]=(0,_typeCheck.typeCheck)(s.type,t);else if(!s.optional)throw new Error(`Missing required field "${s.name}" for ${e}`)}return r},assertUnique=async(e,t,i)=>{for(const r of t.keys){if("primary"!==r.type&&"unique"!==r.type)continue;const t=r.fields.map((e=>i[e]));if(!await(0,_keyUnique.keyUnique)(e,r.fields,t))throw new Error(`Duplicate value for ${r.type} key "${r.fields.join(", ")}" on ${e}`)}},assertForeignKeys=async(e,t,i)=>{for(const r of t.keys){if("foreign"!==r.type||1!==r.fields.length||!r.references||1!==r.references.length)continue;const t=r.fields[0];if(!Object.prototype.hasOwnProperty.call(i,t))continue;const{entity:s,property:n}=(0,_splitEntityProperty.splitEntityProperty)(r.references[0].fields[0]);if(!await(0,_foreignKeyExists.foreignKeyExists)(s,n,i[t]))throw new Error(`Foreign key "${t}" on ${e} references a nonexistent ${s}.${n} = ${i[t]}`)}},insertEntity=async(e="",t=[],i={})=>{const r=(0,_config.getSetting)("databasePath","database/"),s=await(0,_retrieveRecord.retrieveRecord)(e),n=s.keys.find((e=>"primary"===e.type&&1===e.fields.length));Object.prototype.hasOwnProperty.call(i,e)||(i[e]=[]);for(const o of t){const t=await buildEntityValues(e,s,o);await assertUnique(e,s,t),await assertForeignKeys(e,s,t);const a=`${n?t[n.fields[0]]:crypto.randomUUID()}.json`;await writeFile(`${r}${s.path}/${a}`,JSON.stringify(t,null,2)),s.entries.push(a),await writeFile(`${r}${s.path}.json`,JSON.stringify(s,null,2));for(const e of s.keys)await(0,_updateIndex.updateIndex)(s.path,e,(0,_computeKeyValue.computeKeyValue)(e.fields,t),a);i[e].push(t)}return i};exports.insertEntity=insertEntity;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.insertEntity=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js"),require("core-js/modules/esnext.iterator.map.js");var _retrieveRecord=require("../utilities/retrieveRecord"),_updateIndex=require("../utilities/updateIndex"),_keyGenerate=require("../introspect/policies/keyGenerate"),_keyUnique=require("../introspect/policies/keyUnique"),_useDefault=require("../introspect/policies/useDefault"),_typeCheck=require("../introspect/policies/typeCheck"),_foreignKeyExists=require("../introspect/policies/foreignKeyExists"),_splitEntityProperty=require("../utilities/parsers/splitEntityProperty"),_computeKeyValue=require("../utilities/computeKeyValue"),_fieldType=require("../utilities/fieldType"),_config=require("../utilities/config");const{writeFile:writeFile}=require("fs/promises"),buildEntityValues=async(e,t,i={})=>{const r={};for(const s of t.definition){let t=i[s.name];if(s.autoGenerate?t=await(0,_keyGenerate.keyGenerate)(e,[s.name]):Object.prototype.hasOwnProperty.call(s,"default")&&(t=(0,_useDefault.useDefault)(s.default,t)),void 0!==t)r[s.name]=(0,_typeCheck.typeCheck)(s.type,t);else if(!s.optional)throw new Error(`Missing required field "${s.name}" for ${e}`)}return r},assertUnique=async(e,t,i)=>{for(const r of t.keys){if("primary"!==r.type&&"unique"!==r.type)continue;const t=r.fields.map((e=>i[e]));if(!await(0,_keyUnique.keyUnique)(e,r.fields,t))throw new Error(`Duplicate value for ${r.type} key "${r.fields.join(", ")}" on ${e}`)}},assertForeignKeys=async(e,t,i)=>{for(const r of t.keys){if("foreign"!==r.type||1!==r.fields.length||!r.references||1!==r.references.length)continue;const t=r.fields[0];if(!Object.prototype.hasOwnProperty.call(i,t))continue;const{entity:s,property:n}=(0,_splitEntityProperty.splitEntityProperty)(r.references[0].fields[0]);if(!await(0,_foreignKeyExists.foreignKeyExists)(s,n,i[t]))throw new Error(`Foreign key "${t}" on ${e} references a nonexistent ${s}.${n} = ${i[t]}`)}},insertEntity=async(e="",t=[],i={})=>{const r=(0,_config.getSetting)("databasePath","database/"),s=await(0,_retrieveRecord.retrieveRecord)(e),n=s.keys.find((e=>"primary"===e.type&&1===e.fields.length));Object.prototype.hasOwnProperty.call(i,e)||(i[e]=[]);for(const o of t){const t=await buildEntityValues(e,s,o);await assertUnique(e,s,t),await assertForeignKeys(e,s,t);const a=`${n?t[n.fields[0]]:crypto.randomUUID()}.json`;await writeFile(`${r}${s.path}/${a}`,JSON.stringify(t,null,2)),s.entries.push(a),await writeFile(`${r}${s.path}.json`,JSON.stringify(s,null,2));for(const e of s.keys)await(0,_updateIndex.updateIndex)(s.path,e,(0,_computeKeyValue.computeKeyValue)(e.fields,t),a,(0,_fieldType.keyValueType)(s,e));i[e].push(t)}return i};exports.insertEntity=insertEntity;

package/dist/data/queries/joinEntity.js

@@ -1,32 +1,32 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.joinEntity = void 0;
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
-var _readEntity = require("./readEntity");
-var _useJoinClause = require("../utilities/useJoinClause");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const joinEntity = async (entity, joinEntity, dataSets = {}, joinClauses = [], entityAlreadyResolved = false) => {
-  // Same ambiguity readEntity() always has (can't tell "never loaded" from "loaded, zero rows
-  // matched") - runQuery already resolved entity's rows via an indexed condition in that second
-  // case, so entityAlreadyResolved tells this call not to reload and silently discard that result.
-  if (!entityAlreadyResolved) {
-    dataSets = await (0, _readEntity.readEntity)(entity, dataSets);
-  }
-  if (!joinClauses.length) {
-    return dataSets;
-  }
-  dataSets = await (0, _readEntity.readEntity)(joinEntity, dataSets);
-  for (const anEntity in dataSets[entity]) {
-    let filterJoins = _siFunciona.default.cloneObject(dataSets);
-    filterJoins[entity] = [dataSets[entity][anEntity]];
-    for (const joinClause of joinClauses) {
-      filterJoins = await (0, _useJoinClause.useJoinClause)(joinClause, dataSets, filterJoins);
-    }
-    dataSets[entity][anEntity][joinEntity] = filterJoins[joinEntity];
-  }
-  return dataSets;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.joinEntity = void 0;
+var _siFunciona = _interopRequireDefault(require("si-funciona"));
+var _readEntity = require("./readEntity");
+var _useJoinClause = require("../utilities/useJoinClause");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const joinEntity = async (entity, joinEntity, dataSets = {}, joinClauses = [], entityAlreadyResolved = false) => {
+  // Same ambiguity readEntity() always has (can't tell "never loaded" from "loaded, zero rows
+  // matched") - runQuery already resolved entity's rows via an indexed condition in that second
+  // case, so entityAlreadyResolved tells this call not to reload and silently discard that result.
+  if (!entityAlreadyResolved) {
+    dataSets = await (0, _readEntity.readEntity)(entity, dataSets);
+  }
+  if (!joinClauses.length) {
+    return dataSets;
+  }
+  dataSets = await (0, _readEntity.readEntity)(joinEntity, dataSets);
+  for (const anEntity in dataSets[entity]) {
+    let filterJoins = _siFunciona.default.cloneObject(dataSets);
+    filterJoins[entity] = [dataSets[entity][anEntity]];
+    for (const joinClause of joinClauses) {
+      filterJoins = await (0, _useJoinClause.useJoinClause)(joinClause, dataSets, filterJoins);
+    }
+    dataSets[entity][anEntity][joinEntity] = filterJoins[joinEntity];
+  }
+  return dataSets;
+};
 exports.joinEntity = joinEntity;

package/dist/data/queries/limitOffset.js

@@ -1,21 +1,21 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.limitOffset = void 0;
-/**
- * Slice a dataSet down to at most `limit` rows, starting after the first `offset` of them.
- * @param dataSet
- * @param offset
- * @param limit
- */
-const limitOffset = (dataSet = [], offset, limit) => {
-  if (typeof offset === 'undefined' && typeof limit === 'undefined') {
-    return dataSet;
-  }
-  const start = offset ?? 0;
-  const end = typeof limit === 'number' ? start + limit : undefined;
-  return dataSet.slice(start, end);
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.limitOffset = void 0;
+/**
+ * Slice a dataSet down to at most `limit` rows, starting after the first `offset` of them.
+ * @param dataSet
+ * @param offset
+ * @param limit
+ */
+const limitOffset = (dataSet = [], offset, limit) => {
+  if (typeof offset === 'undefined' && typeof limit === 'undefined') {
+    return dataSet;
+  }
+  const start = offset ?? 0;
+  const end = typeof limit === 'number' ? start + limit : undefined;
+  return dataSet.slice(start, end);
+};
 exports.limitOffset = limitOffset;

package/dist/data/queries/mergeJoins.js

@@ -1,19 +1,19 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mergeJoins = void 0;
-var _mergeJoin = require("../utilities/mergeJoin");
-var _reconcileJoins = require("../utilities/reconcileJoins");
-const mergeJoins = async (dataSet = {}, merges = []) => {
-  if (!merges.length) {
-    return dataSet;
-  }
-  for (const merge of merges) {
-    dataSet = await (0, _mergeJoin.mergeJoin)(merge.propertyA, merge.propertyB, dataSet);
-    dataSet = (0, _reconcileJoins.reconcileJoins)(merge.propertyA, merge.propertyB, dataSet);
-  }
-  return dataSet;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeJoins = void 0;
+var _mergeJoin = require("../utilities/mergeJoin");
+var _reconcileJoins = require("../utilities/reconcileJoins");
+const mergeJoins = async (dataSet = {}, merges = []) => {
+  if (!merges.length) {
+    return dataSet;
+  }
+  for (const merge of merges) {
+    dataSet = await (0, _mergeJoin.mergeJoin)(merge.propertyA, merge.propertyB, dataSet);
+    dataSet = (0, _reconcileJoins.reconcileJoins)(merge.propertyA, merge.propertyB, dataSet);
+  }
+  return dataSet;
+};
 exports.mergeJoins = mergeJoins;

package/dist/data/queries/parser.js

@@ -1,30 +1,30 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.parser = void 0;
-var _splitQueries = require("../utilities/parsers/splitQueries");
-var _parseQuery = require("../utilities/parsers/parseQuery");
-const parser = (queries = '') => {
-  const queryArray = (0, _splitQueries.splitQueries)(queries);
-  const parsedQueries = [];
-  let mergeQuery = '';
-  for (const query of queryArray) {
-    mergeQuery = mergeQuery ? `${mergeQuery}${query}` : query;
-    let parsedQuery = {};
-    try {
-      parsedQuery = (0, _parseQuery.parseQuery)(mergeQuery);
-      mergeQuery = '';
-    } catch (e) {
-      // attempt to combine queries to fix bad splits
-      continue;
-    }
-    parsedQueries.push(parsedQuery);
-  }
-  if (mergeQuery) {
-    throw new Error(`Failed to interpret: ${mergeQuery}`);
-  }
-  return parsedQueries;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parser = void 0;
+var _splitQueries = require("../utilities/parsers/splitQueries");
+var _parseQuery = require("../utilities/parsers/parseQuery");
+const parser = (queries = '') => {
+  const queryArray = (0, _splitQueries.splitQueries)(queries);
+  const parsedQueries = [];
+  let mergeQuery = '';
+  for (const query of queryArray) {
+    mergeQuery = mergeQuery ? `${mergeQuery}${query}` : query;
+    let parsedQuery = {};
+    try {
+      parsedQuery = (0, _parseQuery.parseQuery)(mergeQuery);
+      mergeQuery = '';
+    } catch (e) {
+      // attempt to combine queries to fix bad splits
+      continue;
+    }
+    parsedQueries.push(parsedQuery);
+  }
+  if (mergeQuery) {
+    throw new Error(`Failed to interpret: ${mergeQuery}`);
+  }
+  return parsedQueries;
+};
 exports.parser = parser;

package/dist/data/queries/query.js

@@ -1,18 +1,18 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.query = void 0;
-var _parser = require("./parser");
-var _runQuery = require("../utilities/runQuery");
-const query = async (queryString = '') => {
-  const parsedQueries = (0, _parser.parser)(queryString);
-  const queryResults = [];
-  for (const parsed of parsedQueries) {
-    const dataSet = await (0, _runQuery.runQuery)(parsed);
-    queryResults.push(dataSet[parsed.entity]);
-  }
-  return queryResults;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.query = void 0;
+var _parser = require("./parser");
+var _runQuery = require("../utilities/runQuery");
+const query = async (queryString = '') => {
+  const parsedQueries = (0, _parser.parser)(queryString);
+  const queryResults = [];
+  for (const parsed of parsedQueries) {
+    const dataSet = await (0, _runQuery.runQuery)(parsed);
+    queryResults.push(dataSet[parsed.entity]);
+  }
+  return queryResults;
+};
 exports.query = query;

package/dist/data/queries/readEntity.js

@@ -1,14 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.readEntity = void 0;
-var _retrieveRecords = require("../utilities/retrieveRecords");
-const readEntity = async (entity = '', dataSet = {}) => {
-  if (!Object.prototype.hasOwnProperty.call(dataSet, entity) || !dataSet[entity].length) {
-    dataSet[entity] = await (0, _retrieveRecords.retrieveRecords)(entity);
-  }
-  return dataSet;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.readEntity = void 0;
+var _retrieveRecords = require("../utilities/retrieveRecords");
+const readEntity = async (entity = '', dataSet = {}) => {
+  if (!Object.prototype.hasOwnProperty.call(dataSet, entity) || !dataSet[entity].length) {
+    dataSet[entity] = await (0, _retrieveRecords.retrieveRecords)(entity);
+  }
+  return dataSet;
+};
 exports.readEntity = readEntity;

package/dist/data/queries/selectFields.js

@@ -1,36 +1,36 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.selectFields = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.map.js");
-require("core-js/modules/esnext.iterator.reduce.js");
-const shapeRow = (row, selectClauses) => selectClauses.reduce((shaped, {
-  property,
-  alias
-}) => {
-  shaped[alias || property] = row[property];
-  return shaped;
-}, {});
-/**
- * Shape each row down to only the selected properties (aliased, when given). dataSet is either a plain array of
- * rows, or (once groupBy has run) a plain object keyed by group value, each value an array of rows - both are
- * shaped the same way, row by row.
- * @param dataSet
- * @param selectClauses
- */
-const selectFields = (dataSet = [], selectClauses = []) => {
-  if (!selectClauses.length) {
-    return dataSet;
-  }
-  if (Array.isArray(dataSet)) {
-    return dataSet.map(row => shapeRow(row, selectClauses));
-  }
-  return Object.keys(dataSet).reduce((shaped, key) => {
-    shaped[key] = dataSet[key].map(row => shapeRow(row, selectClauses));
-    return shaped;
-  }, {});
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.selectFields = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.reduce.js");
+const shapeRow = (row, selectClauses) => selectClauses.reduce((shaped, {
+  property,
+  alias
+}) => {
+  shaped[alias || property] = row[property];
+  return shaped;
+}, {});
+/**
+ * Shape each row down to only the selected properties (aliased, when given). dataSet is either a plain array of
+ * rows, or (once groupBy has run) a plain object keyed by group value, each value an array of rows - both are
+ * shaped the same way, row by row.
+ * @param dataSet
+ * @param selectClauses
+ */
+const selectFields = (dataSet = [], selectClauses = []) => {
+  if (!selectClauses.length) {
+    return dataSet;
+  }
+  if (Array.isArray(dataSet)) {
+    return dataSet.map(row => shapeRow(row, selectClauses));
+  }
+  return Object.keys(dataSet).reduce((shaped, key) => {
+    shaped[key] = dataSet[key].map(row => shapeRow(row, selectClauses));
+    return shaped;
+  }, {});
+};
 exports.selectFields = selectFields;

package/dist/data/queries/sortBy.js

@@ -12,6 +12,9 @@ const sortBy = (dataSet = [], sortClauses = []) => {
     for (const sortClause of sortClauses) {
       const property = sortClause.property;
       const direction = sortClause.direction;
+      // 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.
+      // eslint-disable-next-line eqeqeq
       if (a[property] == b[property]) {
         continue;
       }