json-fs-query 1.0.6 → 1.1.0

package/dist/data/utilities/compareAs.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sameValue = exports.compareAs = void 0;
+require("core-js/modules/es.array.includes.js");
+/**
+ * Normalize a value to a field's declared type for an equality comparison - never written back,
+ * only compared. Writes are coerced to the declared type (typeCheck), but values already stored
+ * may not match it (ids declared string, so they can hold an integer or a UUID, are often stored
+ * as numbers), and query literals carry their own type. A declared type is what says '3' and 3
+ * are the same value. A missing or unrecognized type returns the value unchanged.
+ * @param type
+ * @param value
+ */
+const compareAs = (type, value) => {
+  if (value === null || typeof value === 'undefined') {
+    return value;
+  }
+  switch (type) {
+    case 'string':
+      return typeof value === 'object' ? value : String(value);
+    case 'int':
+      {
+        const coerced = Number(value);
+        return Number.isNaN(coerced) ? value : coerced;
+      }
+    case 'boolean':
+      if (value === 'true') {
+        return true;
+      }
+      if (value === 'false') {
+        return false;
+      }
+      return value;
+    default:
+      return value;
+  }
+};
+exports.compareAs = compareAs;
+const comparableTypes = ['string', 'int', 'boolean'];
+/**
+ * Whether two values are equal for a field of the given declared type: both are normalized to
+ * that type (see compareAs) and compared strictly. A field with no declared type, or one that
+ * can't be normalized (object, array, or an unrecognized type), keeps loose equality.
+ * @param type
+ * @param a
+ * @param b
+ */
+const sameValue = (type, a, b) => {
+  if (!comparableTypes.includes(type)) {
+    // eslint-disable-next-line eqeqeq
+    return a == b;
+  }
+  return compareAs(type, a) === compareAs(type, b);
+};
+exports.sameValue = sameValue;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.sameValue=exports.compareAs=void 0,require("core-js/modules/es.array.includes.js");const compareAs=(e,r)=>{if(null==r)return r;switch(e){case"string":return"object"==typeof r?r:String(r);case"int":{const e=Number(r);return Number.isNaN(e)?r:e}case"boolean":return"true"===r||"false"!==r&&r;default:return r}};exports.compareAs=compareAs;const comparableTypes=["string","int","boolean"],sameValue=(e,r,s)=>comparableTypes.includes(e)?compareAs(e,r)===compareAs(e,s):r==s;exports.sameValue=sameValue;

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

@@ -0,0 +1,16 @@
+import { recordDefinition } from '../introspect/definitions/record';
+import { keyDefinition } from '../introspect/definitions/key';
+/**
+ * The declared type of one of a record's fields, or undefined when the record or field is unknown.
+ * @param record
+ * @param property
+ */
+export declare const fieldType: (record: recordDefinition | undefined, property: string) => string | undefined;
+/**
+ * The declared type of the value a key indexes: its field's type for a single-field key. A
+ * multi-field key's value is a composite (see computeKeyValue), so it has no single declared type.
+ * @param record
+ * @param key
+ */
+export declare const keyValueType: (record: recordDefinition | undefined, key: keyDefinition) => string | undefined;
+//# sourceMappingURL=fieldType.d.ts.map

package/dist/data/utilities/fieldType.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.keyValueType = exports.fieldType = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
+/**
+ * The declared type of one of a record's fields, or undefined when the record or field is unknown.
+ * @param record
+ * @param property
+ */
+const fieldType = (record, property) => record?.definition?.find(field => field.name === property)?.type;
+/**
+ * The declared type of the value a key indexes: its field's type for a single-field key. A
+ * multi-field key's value is a composite (see computeKeyValue), so it has no single declared type.
+ * @param record
+ * @param key
+ */
+exports.fieldType = fieldType;
+const keyValueType = (record, key) => key.fields.length === 1 ? fieldType(record, key.fields[0]) : undefined;
+exports.keyValueType = keyValueType;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.keyValueType=exports.fieldType=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js");const fieldType=(e,t)=>e?.definition?.find((e=>e.name===t))?.type;exports.fieldType=fieldType;const keyValueType=(e,t)=>1===t.fields.length?fieldType(e,t.fields[0]):void 0;exports.keyValueType=keyValueType;

package/dist/data/utilities/getConditionIndexedList.js

@@ -1,47 +1,48 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getConditionIndexedList = void 0;
-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) => {
-  const reducedConditions = [];
-  for (const condition of parsed.conditions) {
-    let entity = parsed.entity;
-    let property = condition.property;
-    if ((0, _isEntityProperty.isEntityProperty)(property)) {
-      const entityProperty = (0, _splitEntityProperty.splitEntityProperty)(property);
-      entity = entityProperty.entity;
-      property = entityProperty.property;
-    }
-    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], {
-        property: 'value',
-        comparator: condition.comparator,
-        value: condition.value
-      });
-      for (const matchedRecord of matchedRecords) {
-        for (const file of matchedRecord.record) {
-          dataSet[entity].push(await (0, _retrieveFile.retrieveFile)(`${entity}/${file}`));
-        }
-      }
-    };
-    const isIndexed = await (0, _getMatchingIndexes.getMatchingIndexes)(entity, property, recordData, condition, dataSet, indexed, retrieveMatchedFiles);
-    if (!isIndexed) {
-      reducedConditions.push(condition);
-    }
-  }
-  parsed.conditions = reducedConditions;
-  return parsed;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getConditionIndexedList = void 0;
+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) => {
+  const reducedConditions = [];
+  for (const condition of parsed.conditions) {
+    let entity = parsed.entity;
+    let property = condition.property;
+    if ((0, _isEntityProperty.isEntityProperty)(property)) {
+      const entityProperty = (0, _splitEntityProperty.splitEntityProperty)(property);
+      entity = entityProperty.entity;
+      property = entityProperty.property;
+    }
+    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], {
+        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}`));
+        }
+      }
+    };
+    const isIndexed = await (0, _getMatchingIndexes.getMatchingIndexes)(entity, property, recordData, condition, dataSet, indexed, retrieveMatchedFiles);
+    if (!isIndexed) {
+      reducedConditions.push(condition);
+    }
+  }
+  parsed.conditions = reducedConditions;
+  return parsed;
+};
 exports.getConditionIndexedList = getConditionIndexedList;

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={},c=async(e,t,r,i,o,n)=>{const s=(0,_where.where)(n[e][t],{property:"value",comparator:i.comparator,value:i.value});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,c)||i.push(o)}return e.conditions=i,e};exports.getConditionIndexedList=getConditionIndexedList;
+"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;

package/dist/data/utilities/matchIndexedJoins.js

@@ -1,61 +1,63 @@
-"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");
-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
-    })), []);
-    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);
-      }
-    }
-  }
-};
+"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 +1 @@
-"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");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}))),[]),n=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}`)),n||r[i.entityFirst].push(e),p[i.entityFirst].push(e)}}};exports.matchIndexedJoins=matchIndexedJoins;
+"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;

package/dist/data/utilities/mergeJoin.js

@@ -1,44 +1,48 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.mergeJoin = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.map.js");
-var _readEntity = require("../queries/readEntity");
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _where = require("../queries/where");
-const mergeJoin = async (propertyA = '', propertyB = '', dataSets = {}) => {
-  const {
-    entity: entityA,
-    property: propA
-  } = (0, _splitEntityProperty.splitEntityProperty)(propertyA);
-  const {
-    entity: entityB,
-    property: propB
-  } = (0, _splitEntityProperty.splitEntityProperty)(propertyB);
-  dataSets = await (0, _readEntity.readEntity)(entityA, dataSets);
-  dataSets = await (0, _readEntity.readEntity)(entityB, dataSets);
-  dataSets[entityA] = dataSets[entityA].map(dataA => {
-    const matches = (0, _where.where)(dataSets[entityB], {
-      property: propB,
-      comparator: '=',
-      value: dataA[propA]
-    });
-    if (!matches.length) {
-      return dataA;
-    }
-    const mergeMatch = matches[0];
-    for (const prop in mergeMatch) {
-      if (prop === propB) {
-        // Skip the condition property since it is irrelevant
-        continue;
-      }
-      dataA[`${entityB}.${prop}`] = mergeMatch[prop];
-    }
-    return dataA;
-  });
-  return dataSets;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeJoin = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.js");
+var _readEntity = require("../queries/readEntity");
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _where = require("../queries/where");
+var _retrieveRecord = require("./retrieveRecord");
+var _fieldType = require("./fieldType");
+const mergeJoin = async (propertyA = '', propertyB = '', dataSets = {}) => {
+  const {
+    entity: entityA,
+    property: propA
+  } = (0, _splitEntityProperty.splitEntityProperty)(propertyA);
+  const {
+    entity: entityB,
+    property: propB
+  } = (0, _splitEntityProperty.splitEntityProperty)(propertyB);
+  dataSets = await (0, _readEntity.readEntity)(entityA, dataSets);
+  dataSets = await (0, _readEntity.readEntity)(entityB, dataSets);
+  const typeB = (0, _fieldType.fieldType)(await (0, _retrieveRecord.retrieveRecord)(entityB), propB);
+  dataSets[entityA] = dataSets[entityA].map(dataA => {
+    const matches = (0, _where.where)(dataSets[entityB], {
+      property: propB,
+      comparator: '=',
+      value: dataA[propA],
+      type: typeB
+    });
+    if (!matches.length) {
+      return dataA;
+    }
+    const mergeMatch = matches[0];
+    for (const prop in mergeMatch) {
+      if (prop === propB) {
+        // Skip the condition property since it is irrelevant
+        continue;
+      }
+      dataA[`${entityB}.${prop}`] = mergeMatch[prop];
+    }
+    return dataA;
+  });
+  return dataSets;
+};
 exports.mergeJoin = mergeJoin;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.mergeJoin=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.map.js");var _readEntity=require("../queries/readEntity"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_where=require("../queries/where");const mergeJoin=async(e="",r="",t={})=>{const{entity:i,property:o}=(0,_splitEntityProperty.splitEntityProperty)(e),{entity:n,property:s}=(0,_splitEntityProperty.splitEntityProperty)(r);return t=await(0,_readEntity.readEntity)(i,t),(t=await(0,_readEntity.readEntity)(n,t))[i]=t[i].map((e=>{const r=(0,_where.where)(t[n],{property:s,comparator:"=",value:e[o]});if(!r.length)return e;const i=r[0];for(const r in i)r!==s&&(e[`${n}.${r}`]=i[r]);return e})),t};exports.mergeJoin=mergeJoin;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.mergeJoin=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.map.js");var _readEntity=require("../queries/readEntity"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_where=require("../queries/where"),_retrieveRecord=require("./retrieveRecord"),_fieldType=require("./fieldType");const mergeJoin=async(e="",r="",t={})=>{const{entity:i,property:o}=(0,_splitEntityProperty.splitEntityProperty)(e),{entity:n,property:s}=(0,_splitEntityProperty.splitEntityProperty)(r);t=await(0,_readEntity.readEntity)(i,t),t=await(0,_readEntity.readEntity)(n,t);const p=(0,_fieldType.fieldType)(await(0,_retrieveRecord.retrieveRecord)(n),s);return t[i]=t[i].map((e=>{const r=(0,_where.where)(t[n],{property:s,comparator:"=",value:e[o],type:p});if(!r.length)return e;const i=r[0];for(const r in i)r!==s&&(e[`${n}.${r}`]=i[r]);return e})),t};exports.mergeJoin=mergeJoin;

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

@@ -1,15 +1,16 @@
-import { LiteralValue } from './parseLiteralValue';
-import { ParsedQuery } from './parseQuery';
-export type ConditionValue = LiteralValue;
-export type ParsedCondition = {
-    property: string;
-    comparator: string;
-    value: ConditionValue;
-};
-/**
- * Extract condition clauses from the query.
- * @param parsed
- * @param query
- */
-export declare const findConditions: (parsed: ParsedQuery, query: string) => string;
+import { LiteralValue } from './parseLiteralValue';
+import { ParsedQuery } from './parseQuery';
+export type ConditionValue = LiteralValue;
+export type ParsedCondition = {
+    property: string;
+    comparator: string;
+    value: ConditionValue;
+    type?: string;
+};
+/**
+ * Extract condition clauses from the query.
+ * @param parsed
+ * @param query
+ */
+export declare const findConditions: (parsed: ParsedQuery, query: string) => string;
 //# sourceMappingURL=findConditions.d.ts.map

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

@@ -1,14 +1,15 @@
-import { keyDefinition } from '../introspect/definitions/key';
-import { recordPath } from '../introspect/definitions/record';
-import { indexEntry } from './updateIndex';
-/**
- * Remove a single entry file from the index that backs one of a record's keys, dropping a value
- * entirely once its last file is removed. A key with no lookup, or an index file that doesn't
- * exist yet, is left untouched.
- * @param path
- * @param key
- * @param value
- * @param fileName
- */
-export declare const removeFromIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string) => Promise<indexEntry[] | null>;
+import { keyDefinition } from '../introspect/definitions/key';
+import { recordPath } from '../introspect/definitions/record';
+import { indexEntry } from './updateIndex';
+/**
+ * Remove a single entry file from the index that backs one of a record's keys, dropping a value
+ * entirely once its last file is removed. A key with no lookup, or an index file that doesn't
+ * exist yet, is left untouched.
+ * @param path
+ * @param key
+ * @param value
+ * @param fileName
+ * @param type - The declared type of the indexed value (see keyValueType), so '3' and 3 are one entry.
+ */
+export declare const removeFromIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string, type?: string) => Promise<indexEntry[] | null>;
 //# sourceMappingURL=removeFromIndex.d.ts.map

package/dist/data/utilities/removeFromIndex.js

@@ -1,44 +1,46 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.removeFromIndex = void 0;
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.map.js");
-var _config = require("./config");
-const {
-  readFile,
-  writeFile
-} = require('fs/promises');
-/**
- * Remove a single entry file from the index that backs one of a record's keys, dropping a value
- * entirely once its last file is removed. A key with no lookup, or an index file that doesn't
- * exist yet, is left untouched.
- * @param path
- * @param key
- * @param value
- * @param fileName
- */
-const removeFromIndex = async (path = '', key = null, value = undefined, fileName = '') => {
-  if (!key || !key.lookup) {
-    return null;
-  }
-  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
-  const indexPath = `${databasePath}__indexes/${path}/${key.lookup}`;
-  let index = [];
-  try {
-    index = JSON.parse(await readFile(indexPath, 'utf8'));
-  } catch (err) {
-    return null;
-  }
-  index = index.map(entry => entry.value == value ? {
-    value: entry.value,
-    record: entry.record.filter(record => record !== fileName)
-  } : entry).filter(entry => entry.record.length);
-  await writeFile(indexPath, JSON.stringify(index, null, 2));
-  return index;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeFromIndex = void 0;
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.map.js");
+var _config = require("./config");
+var _compareAs = require("./compareAs");
+const {
+  readFile,
+  writeFile
+} = require('fs/promises');
+/**
+ * Remove a single entry file from the index that backs one of a record's keys, dropping a value
+ * entirely once its last file is removed. A key with no lookup, or an index file that doesn't
+ * exist yet, is left untouched.
+ * @param path
+ * @param key
+ * @param value
+ * @param fileName
+ * @param type - The declared type of the indexed value (see keyValueType), so '3' and 3 are one entry.
+ */
+const removeFromIndex = async (path = '', key = null, value = undefined, fileName = '', type = undefined) => {
+  if (!key || !key.lookup) {
+    return null;
+  }
+  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
+  const indexPath = `${databasePath}__indexes/${path}/${key.lookup}`;
+  let index = [];
+  try {
+    index = JSON.parse(await readFile(indexPath, 'utf8'));
+  } catch (err) {
+    return null;
+  }
+  index = index.map(entry => (0, _compareAs.sameValue)(type, entry.value, value) ? {
+    value: entry.value,
+    record: entry.record.filter(record => record !== fileName)
+  } : entry).filter(entry => entry.record.length);
+  await writeFile(indexPath, JSON.stringify(index, null, 2));
+  return index;
+};
 exports.removeFromIndex = removeFromIndex;

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

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