json-fs-query 1.0.6 → 1.1.0

package/dist/data/utilities/runQuery.js

@@ -1,87 +1,113 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.runQuery = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.reduce.js");
-var _deleteEntity = require("../queries/deleteEntity");
-var _insertEntity = require("../queries/insertEntity");
-var _readEntity = require("../queries/readEntity");
-var _updateEntity = require("../queries/updateEntity");
-var _joinEntity = require("../queries/joinEntity");
-var _mergeJoins = require("../queries/mergeJoins");
-var _where = require("../queries/where");
-var _sortBy = require("../queries/sortBy");
-var _groupBy = require("../queries/groupBy");
-var _limitOffset = require("../queries/limitOffset");
-var _selectFields = require("../queries/selectFields");
-var _retrieveRecord = require("./retrieveRecord");
-var _getConditionIndexedList = require("./getConditionIndexedList");
-var _getJoinIndexedList = require("./getJoinIndexedList");
-const runQuery = async parsed => {
-  const recordData = {
-    [parsed.entity]: await (0, _retrieveRecord.retrieveRecord)(parsed.entity)
-  };
-  if (typeof parsed.joinEntity !== 'undefined') {
-    recordData[parsed.joinEntity] = await (0, _retrieveRecord.retrieveRecord)(parsed.joinEntity);
-  }
-  let dataSet = {
-    [parsed.entity]: []
-  };
-  // A condition that's indexed but genuinely matches nothing leaves dataSet[entity] at [] - the
-  // same state it starts in before anything has looked at it at all. readEntity() (below) can't
-  // tell those two states apart on its own (it reloads whenever the array is empty, regardless of
-  // why), so capture here, before that ambiguity can happen, whether every condition actually got
-  // resolved this way - if so, dataSet[entity] is already correct and must not be reloaded.
-  const hadConditions = parsed.conditions.length > 0;
-  parsed = await (0, _getConditionIndexedList.getConditionIndexedList)(parsed, recordData, dataSet);
-  const conditionsFullyIndexed = hadConditions && parsed.conditions.length === 0;
-  parsed = await (0, _getJoinIndexedList.getJoinIndexedList)(parsed, recordData, dataSet);
-  // delete/update act on whatever is already in dataSet[entity] - unlike read, which loads
-  // everything and lets the where-reduce below narrow it down afterward, they never get a second
-  // pass. So the matching rows have to be fully resolved (indexed conditions already are, via
-  // getConditionIndexedList above; anything left in parsed.conditions is not) before either runs.
-  if (parsed.command === 'delete' || parsed.command === 'update') {
-    if (!conditionsFullyIndexed) {
-      dataSet = await (0, _readEntity.readEntity)(parsed.entity, dataSet);
-    }
-    dataSet[parsed.entity] = parsed.conditions.reduce((remainingData, condition) => (0, _where.where)(remainingData, condition), dataSet[parsed.entity]);
-  }
-  switch (parsed.command) {
-    case 'delete':
-      dataSet = await (0, _deleteEntity.deleteEntity)(parsed.entity, dataSet);
-      break;
-    case 'insert':
-      dataSet = await (0, _insertEntity.insertEntity)(parsed.entity, parsed.insertValues, dataSet);
-      break;
-    case 'read':
-      if (!conditionsFullyIndexed) {
-        dataSet = await (0, _readEntity.readEntity)(parsed.entity, dataSet);
-      }
-      break;
-    case 'update':
-      dataSet = await (0, _updateEntity.updateEntity)(parsed.entity, parsed.updateValues, dataSet);
-      break;
-    default:
-      throw new Error(`Unknown command: ${parsed.command}`);
-  }
-  dataSet = await (0, _joinEntity.joinEntity)(parsed.entity, parsed.joinEntity, dataSet, parsed.joinClauses, conditionsFullyIndexed);
-  dataSet = await (0, _mergeJoins.mergeJoins)(dataSet, parsed.mergeJoins);
-  // delete/update already had parsed.conditions applied above, before they ran. Re-applying the
-  // same conditions here would be wrong, not just redundant, for update specifically: if the
-  // update just changed the very field a condition filters on, re-checking that condition against
-  // the now-changed data would filter the just-updated rows back out.
-  if (parsed.command !== 'delete' && parsed.command !== 'update') {
-    dataSet[parsed.entity] = parsed.conditions.reduce((remainingData, condition) => {
-      return (0, _where.where)(remainingData, condition);
-    }, dataSet[parsed.entity]);
-  }
-  dataSet[parsed.entity] = (0, _sortBy.sortBy)(dataSet[parsed.entity], parsed.sortClauses);
-  dataSet[parsed.entity] = (0, _limitOffset.limitOffset)(dataSet[parsed.entity], parsed.offset, parsed.limit);
-  dataSet[parsed.entity] = (0, _groupBy.groupBy)(dataSet[parsed.entity], parsed.groupBy);
-  dataSet[parsed.entity] = (0, _selectFields.selectFields)(dataSet[parsed.entity], parsed.selectClauses);
-  return dataSet;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.runQuery = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.reduce.js");
+var _deleteEntity = require("../queries/deleteEntity");
+var _insertEntity = require("../queries/insertEntity");
+var _readEntity = require("../queries/readEntity");
+var _updateEntity = require("../queries/updateEntity");
+var _joinEntity = require("../queries/joinEntity");
+var _mergeJoins = require("../queries/mergeJoins");
+var _where = require("../queries/where");
+var _sortBy = require("../queries/sortBy");
+var _groupBy = require("../queries/groupBy");
+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");
+/**
+ * Give each condition its field's declared type, so where compares by it (a joined entity's field
+ * is looked up on that entity's record).
+ * @param parsed
+ * @param recordData
+ */
+const typeConditions = async (parsed, recordData) => {
+  for (const condition of parsed.conditions) {
+    let entity = parsed.entity;
+    let property = condition.property;
+    if ((0, _isEntityProperty.isEntityProperty)(property)) {
+      ({
+        entity,
+        property
+      } = (0, _splitEntityProperty.splitEntityProperty)(property));
+    }
+    if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
+      recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
+    }
+    condition.type = (0, _fieldType.fieldType)(recordData[entity], property);
+  }
+};
+const runQuery = async parsed => {
+  const recordData = {
+    [parsed.entity]: await (0, _retrieveRecord.retrieveRecord)(parsed.entity)
+  };
+  if (typeof parsed.joinEntity !== 'undefined') {
+    recordData[parsed.joinEntity] = await (0, _retrieveRecord.retrieveRecord)(parsed.joinEntity);
+  }
+  await typeConditions(parsed, recordData);
+  let dataSet = {
+    [parsed.entity]: []
+  };
+  // A condition that's indexed but genuinely matches nothing leaves dataSet[entity] at [] - the
+  // same state it starts in before anything has looked at it at all. readEntity() (below) can't
+  // tell those two states apart on its own (it reloads whenever the array is empty, regardless of
+  // why), so capture here, before that ambiguity can happen, whether every condition actually got
+  // resolved this way - if so, dataSet[entity] is already correct and must not be reloaded.
+  const hadConditions = parsed.conditions.length > 0;
+  parsed = await (0, _getConditionIndexedList.getConditionIndexedList)(parsed, recordData, dataSet);
+  const conditionsFullyIndexed = hadConditions && parsed.conditions.length === 0;
+  parsed = await (0, _getJoinIndexedList.getJoinIndexedList)(parsed, recordData, dataSet);
+  // delete/update act on whatever is already in dataSet[entity] - unlike read, which loads
+  // everything and lets the where-reduce below narrow it down afterward, they never get a second
+  // pass. So the matching rows have to be fully resolved (indexed conditions already are, via
+  // getConditionIndexedList above; anything left in parsed.conditions is not) before either runs.
+  if (parsed.command === 'delete' || parsed.command === 'update') {
+    if (!conditionsFullyIndexed) {
+      dataSet = await (0, _readEntity.readEntity)(parsed.entity, dataSet);
+    }
+    dataSet[parsed.entity] = parsed.conditions.reduce((remainingData, condition) => (0, _where.where)(remainingData, condition), dataSet[parsed.entity]);
+  }
+  switch (parsed.command) {
+    case 'delete':
+      dataSet = await (0, _deleteEntity.deleteEntity)(parsed.entity, dataSet);
+      break;
+    case 'insert':
+      dataSet = await (0, _insertEntity.insertEntity)(parsed.entity, parsed.insertValues, dataSet);
+      break;
+    case 'read':
+      if (!conditionsFullyIndexed) {
+        dataSet = await (0, _readEntity.readEntity)(parsed.entity, dataSet);
+      }
+      break;
+    case 'update':
+      dataSet = await (0, _updateEntity.updateEntity)(parsed.entity, parsed.updateValues, dataSet);
+      break;
+    default:
+      throw new Error(`Unknown command: ${parsed.command}`);
+  }
+  dataSet = await (0, _joinEntity.joinEntity)(parsed.entity, parsed.joinEntity, dataSet, parsed.joinClauses, conditionsFullyIndexed);
+  dataSet = await (0, _mergeJoins.mergeJoins)(dataSet, parsed.mergeJoins);
+  // delete/update already had parsed.conditions applied above, before they ran. Re-applying the
+  // same conditions here would be wrong, not just redundant, for update specifically: if the
+  // update just changed the very field a condition filters on, re-checking that condition against
+  // the now-changed data would filter the just-updated rows back out.
+  if (parsed.command !== 'delete' && parsed.command !== 'update') {
+    dataSet[parsed.entity] = parsed.conditions.reduce((remainingData, condition) => {
+      return (0, _where.where)(remainingData, condition);
+    }, dataSet[parsed.entity]);
+  }
+  dataSet[parsed.entity] = (0, _sortBy.sortBy)(dataSet[parsed.entity], parsed.sortClauses);
+  dataSet[parsed.entity] = (0, _limitOffset.limitOffset)(dataSet[parsed.entity], parsed.offset, parsed.limit);
+  dataSet[parsed.entity] = (0, _groupBy.groupBy)(dataSet[parsed.entity], parsed.groupBy);
+  dataSet[parsed.entity] = (0, _selectFields.selectFields)(dataSet[parsed.entity], parsed.selectClauses);
+  return dataSet;
+};
 exports.runQuery = runQuery;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _deleteEntity=require("../queries/deleteEntity"),_insertEntity=require("../queries/insertEntity"),_readEntity=require("../queries/readEntity"),_updateEntity=require("../queries/updateEntity"),_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");const runQuery=async e=>{const t={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(t[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity));let i={[e.entity]:[]};const r=e.conditions.length>0;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,t,i);const n=r&&0===e.conditions.length;switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,t,i)).command&&"update"!==e.command||(n||(i=await(0,_readEntity.readEntity)(e.entity,i)),i[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),i[e.entity])),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),i=await(0,_mergeJoins.mergeJoins)(i,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(i[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),i[e.entity])),i[e.entity]=(0,_sortBy.sortBy)(i[e.entity],e.sortClauses),i[e.entity]=(0,_limitOffset.limitOffset)(i[e.entity],e.offset,e.limit),i[e.entity]=(0,_groupBy.groupBy)(i[e.entity],e.groupBy),i[e.entity]=(0,_selectFields.selectFields)(i[e.entity],e.selectClauses),i};exports.runQuery=runQuery;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _deleteEntity=require("../queries/deleteEntity"),_insertEntity=require("../queries/insertEntity"),_readEntity=require("../queries/readEntity"),_updateEntity=require("../queries/updateEntity"),_joinEntity=require("../queries/joinEntity"),_mergeJoins=require("../queries/mergeJoins"),_where=require("../queries/where"),_sortBy=require("../queries/sortBy"),_groupBy=require("../queries/groupBy"),_limitOffset=require("../queries/limitOffset"),_selectFields=require("../queries/selectFields"),_retrieveRecord=require("./retrieveRecord"),_getConditionIndexedList=require("./getConditionIndexedList"),_getJoinIndexedList=require("./getJoinIndexedList"),_isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType");const typeConditions=async(e,t)=>{for(const i of e.conditions){let r=e.entity,n=i.property;(0,_isEntityProperty.isEntityProperty)(n)&&({entity:r,property:n}=(0,_splitEntityProperty.splitEntityProperty)(n)),Object.prototype.hasOwnProperty.call(t,r)||(t[r]=await(0,_retrieveRecord.retrieveRecord)(r)),i.type=(0,_fieldType.fieldType)(t[r],n)}},runQuery=async e=>{const t={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(t[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity)),await typeConditions(e,t);let i={[e.entity]:[]};const r=e.conditions.length>0;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,t,i);const n=r&&0===e.conditions.length;switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,t,i)).command&&"update"!==e.command||(n||(i=await(0,_readEntity.readEntity)(e.entity,i)),i[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),i[e.entity])),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),i=await(0,_mergeJoins.mergeJoins)(i,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(i[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),i[e.entity])),i[e.entity]=(0,_sortBy.sortBy)(i[e.entity],e.sortClauses),i[e.entity]=(0,_limitOffset.limitOffset)(i[e.entity],e.offset,e.limit),i[e.entity]=(0,_groupBy.groupBy)(i[e.entity],e.groupBy),i[e.entity]=(0,_selectFields.selectFields)(i[e.entity],e.selectClauses),i};exports.runQuery=runQuery;

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

@@ -1,17 +1,18 @@
-import { keyDefinition } from '../introspect/definitions/key';
-import { recordPath } from '../introspect/definitions/record';
-export type indexEntry = {
-    value: any;
-    record: string[];
-};
-/**
- * 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
- * lookup (multi-field keys are not indexed here) are left untouched.
- * @param path
- * @param key
- * @param value
- * @param fileName
- */
-export declare const updateIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string) => Promise<indexEntry[] | null>;
+import { keyDefinition } from '../introspect/definitions/key';
+import { recordPath } from '../introspect/definitions/record';
+export type indexEntry = {
+    value: any;
+    record: string[];
+};
+/**
+ * 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
+ * lookup (multi-field keys are not indexed here) are 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 share one entry.
+ */
+export declare const updateIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string, type?: string) => Promise<indexEntry[] | null>;
 //# sourceMappingURL=updateIndex.d.ts.map

package/dist/data/utilities/updateIndex.js

@@ -1,56 +1,58 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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");
-const {
-  readFile,
-  writeFile,
-  mkdir
-} = require('fs/promises');
-/**
- * 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
- * lookup (multi-field keys are not indexed here) are left untouched.
- * @param path
- * @param key
- * @param value
- * @param fileName
- */
-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 indexPath = `${indexDir}/${key.lookup}`;
-  let index = [];
-  try {
-    index = JSON.parse(await readFile(indexPath, 'utf8'));
-  } catch (err) {
-    index = [];
-  }
-  const existingEntry = index.find(entry => entry.value == value);
-  if (existingEntry) {
-    if (!existingEntry.record.includes(fileName)) {
-      existingEntry.record.push(fileName);
-    }
-  } else {
-    index.push({
-      value,
-      record: [fileName]
-    });
-  }
-  await mkdir(indexDir, {
-    recursive: true
-  });
-  await writeFile(indexPath, JSON.stringify(index, null, 2));
-  return index;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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');
+/**
+ * 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
+ * lookup (multi-field keys are not indexed here) are 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 share one entry.
+ */
+const updateIndex = async (path = '', key = null, value = undefined, fileName = '', type = undefined) => {
+  if (!key || !key.lookup) {
+    return null;
+  }
+  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
+  const indexDir = `${databasePath}__indexes/${path}`;
+  const indexPath = `${indexDir}/${key.lookup}`;
+  let index = [];
+  try {
+    index = JSON.parse(await readFile(indexPath, 'utf8'));
+  } catch (err) {
+    index = [];
+  }
+  const existingEntry = index.find(entry => (0, _compareAs.sameValue)(type, entry.value, value));
+  if (existingEntry) {
+    if (!existingEntry.record.includes(fileName)) {
+      existingEntry.record.push(fileName);
+    }
+  } else {
+    index.push({
+      value,
+      record: [fileName]
+    });
+  }
+  await mkdir(indexDir, {
+    recursive: true
+  });
+  await writeFile(indexPath, JSON.stringify(index, null, 2));
+  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");const{readFile:readFile,writeFile:writeFile,mkdir:mkdir}=require("fs/promises"),updateIndex=async(e="",r=null,i=void 0,s="")=>{if(!r||!r.lookup)return null;const t=`${(0,_config.getSetting)("databasePath","database/")}__indexes/${e}`,o=`${t}/${r.lookup}`;let u=[];try{u=JSON.parse(await readFile(o,"utf8"))}catch(e){u=[]}const d=u.find((e=>e.value==i));return d?d.record.includes(s)||d.record.push(s):u.push({value:i,record:[s]}),await mkdir(t,{recursive:!0}),await writeFile(o,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/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;

package/dist/data/utilities/useJoinClause.js

@@ -1,51 +1,57 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useJoinClause = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.reduce.js");
-var _readEntity = require("../queries/readEntity");
-var _where = require("../queries/where");
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const useJoinClause = async ({
-  propertyA = null,
-  comparator = '=',
-  propertyB = null
-} = {}, dataSets = {}, filterJoins = {}) => {
-  const {
-    entity: entityA,
-    property: propA
-  } = (0, _splitEntityProperty.splitEntityProperty)(propertyA);
-  const {
-    entity: entityB,
-    property: propB
-  } = (0, _splitEntityProperty.splitEntityProperty)(propertyB);
-  if (!Object.prototype.hasOwnProperty.call(dataSets, entityA)) {
-    dataSets = await (0, _readEntity.readEntity)(entityA, dataSets);
-  }
-  if (!Object.prototype.hasOwnProperty.call(dataSets, entityB)) {
-    dataSets = await (0, _readEntity.readEntity)(entityB, dataSets);
-  }
-  if (!Object.prototype.hasOwnProperty.call(filterJoins, entityA)) {
-    filterJoins[entityA] = _siFunciona.default.cloneObject(dataSets[entityA]);
-  }
-  if (!Object.prototype.hasOwnProperty.call(filterJoins, entityB)) {
-    filterJoins[entityB] = _siFunciona.default.cloneObject(dataSets[entityB]);
-  }
-  filterJoins[entityA] = filterJoins[entityB].reduce((dataA, dataB) => _siFunciona.default.mergeArrays(dataA, (0, _where.where)(filterJoins[entityA], {
-    property: propA,
-    comparator,
-    value: dataB[propB]
-  })), []);
-  filterJoins[entityB] = filterJoins[entityA].reduce((dataB, dataA) => _siFunciona.default.mergeArrays(dataB, (0, _where.where)(filterJoins[entityB], {
-    property: propB,
-    comparator,
-    value: dataA[propA]
-  })), []);
-  return filterJoins;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useJoinClause = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.reduce.js");
+var _readEntity = require("../queries/readEntity");
+var _where = require("../queries/where");
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _siFunciona = _interopRequireDefault(require("si-funciona"));
+var _retrieveRecord = require("./retrieveRecord");
+var _fieldType = require("./fieldType");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const useJoinClause = async ({
+  propertyA = null,
+  comparator = '=',
+  propertyB = null
+} = {}, dataSets = {}, filterJoins = {}) => {
+  const {
+    entity: entityA,
+    property: propA
+  } = (0, _splitEntityProperty.splitEntityProperty)(propertyA);
+  const {
+    entity: entityB,
+    property: propB
+  } = (0, _splitEntityProperty.splitEntityProperty)(propertyB);
+  if (!Object.prototype.hasOwnProperty.call(dataSets, entityA)) {
+    dataSets = await (0, _readEntity.readEntity)(entityA, dataSets);
+  }
+  if (!Object.prototype.hasOwnProperty.call(dataSets, entityB)) {
+    dataSets = await (0, _readEntity.readEntity)(entityB, dataSets);
+  }
+  if (!Object.prototype.hasOwnProperty.call(filterJoins, entityA)) {
+    filterJoins[entityA] = _siFunciona.default.cloneObject(dataSets[entityA]);
+  }
+  if (!Object.prototype.hasOwnProperty.call(filterJoins, entityB)) {
+    filterJoins[entityB] = _siFunciona.default.cloneObject(dataSets[entityB]);
+  }
+  const typeA = (0, _fieldType.fieldType)(await (0, _retrieveRecord.retrieveRecord)(entityA), propA);
+  const typeB = (0, _fieldType.fieldType)(await (0, _retrieveRecord.retrieveRecord)(entityB), propB);
+  filterJoins[entityA] = filterJoins[entityB].reduce((dataA, dataB) => _siFunciona.default.mergeArrays(dataA, (0, _where.where)(filterJoins[entityA], {
+    property: propA,
+    comparator,
+    value: dataB[propB],
+    type: typeA
+  })), []);
+  filterJoins[entityB] = filterJoins[entityA].reduce((dataB, dataA) => _siFunciona.default.mergeArrays(dataB, (0, _where.where)(filterJoins[entityB], {
+    property: propB,
+    comparator,
+    value: dataA[propA],
+    type: typeB
+  })), []);
+  return filterJoins;
+};
 exports.useJoinClause = useJoinClause;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.useJoinClause=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _readEntity=require("../queries/readEntity"),_where=require("../queries/where"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_siFunciona=_interopRequireDefault(require("si-funciona"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const useJoinClause=async({propertyA:e=null,comparator:r="=",propertyB:t=null}={},o={},i={})=>{const{entity:a,property:n}=(0,_splitEntityProperty.splitEntityProperty)(e),{entity:s,property:u}=(0,_splitEntityProperty.splitEntityProperty)(t);return Object.prototype.hasOwnProperty.call(o,a)||(o=await(0,_readEntity.readEntity)(a,o)),Object.prototype.hasOwnProperty.call(o,s)||(o=await(0,_readEntity.readEntity)(s,o)),Object.prototype.hasOwnProperty.call(i,a)||(i[a]=_siFunciona.default.cloneObject(o[a])),Object.prototype.hasOwnProperty.call(i,s)||(i[s]=_siFunciona.default.cloneObject(o[s])),i[a]=i[s].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(i[a],{property:n,comparator:r,value:t[u]}))),[]),i[s]=i[a].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(i[s],{property:u,comparator:r,value:t[n]}))),[]),i};exports.useJoinClause=useJoinClause;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.useJoinClause=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _readEntity=require("../queries/readEntity"),_where=require("../queries/where"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_siFunciona=_interopRequireDefault(require("si-funciona")),_retrieveRecord=require("./retrieveRecord"),_fieldType=require("./fieldType");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const useJoinClause=async({propertyA:e=null,comparator:r="=",propertyB:t=null}={},i={},o={})=>{const{entity:a,property:p}=(0,_splitEntityProperty.splitEntityProperty)(e),{entity:n,property:s}=(0,_splitEntityProperty.splitEntityProperty)(t);Object.prototype.hasOwnProperty.call(i,a)||(i=await(0,_readEntity.readEntity)(a,i)),Object.prototype.hasOwnProperty.call(i,n)||(i=await(0,_readEntity.readEntity)(n,i)),Object.prototype.hasOwnProperty.call(o,a)||(o[a]=_siFunciona.default.cloneObject(i[a])),Object.prototype.hasOwnProperty.call(o,n)||(o[n]=_siFunciona.default.cloneObject(i[n]));const u=(0,_fieldType.fieldType)(await(0,_retrieveRecord.retrieveRecord)(a),p),y=(0,_fieldType.fieldType)(await(0,_retrieveRecord.retrieveRecord)(n),s);return o[a]=o[n].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(o[a],{property:p,comparator:r,value:t[s],type:u}))),[]),o[n]=o[a].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(o[n],{property:s,comparator:r,value:t[p],type:y}))),[]),o};exports.useJoinClause=useJoinClause;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-fs-query",
-  "version": "1.0.6",
+  "version": "1.1.0",
   "description": "Use json files to manage and read data.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -51,5 +51,10 @@
     "browser-or-node": "^3.0.0",
     "core-js": "^3.51.0",
     "si-funciona": "^2.8.0"
+  },
+  "standard": {
+    "env": [
+      "jest"
+    ]
   }
 }