json-fs-query 1.0.5 → 1.1.0

package/dist/data/utilities/reconcileJoins.js

@@ -1,26 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.reconcileJoins = void 0;
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _reconcileJoin = require("./reconcileJoin");
-const reconcileJoins = (propertyA, propertyB, dataSet) => {
-  const {
-    entity: entityA,
-    property: propA
-  } = (0, _splitEntityProperty.splitEntityProperty)(propertyA);
-  const {
-    entity: entityB,
-    property: propB
-  } = (0, _splitEntityProperty.splitEntityProperty)(propertyB);
-  for (const entityName in dataSet) {
-    for (const entityKey in dataSet[entityName]) {
-      dataSet = (0, _reconcileJoin.reconcileJoin)(dataSet, entityName, entityKey, entityA, propA);
-      dataSet = (0, _reconcileJoin.reconcileJoin)(dataSet, entityName, entityKey, entityB, propB);
-    }
-  }
-  return dataSet;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.reconcileJoins = void 0;
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _reconcileJoin = require("./reconcileJoin");
+const reconcileJoins = (propertyA, propertyB, dataSet) => {
+  const {
+    entity: entityA,
+    property: propA
+  } = (0, _splitEntityProperty.splitEntityProperty)(propertyA);
+  const {
+    entity: entityB,
+    property: propB
+  } = (0, _splitEntityProperty.splitEntityProperty)(propertyB);
+  for (const entityName in dataSet) {
+    for (const entityKey in dataSet[entityName]) {
+      dataSet = (0, _reconcileJoin.reconcileJoin)(dataSet, entityName, entityKey, entityA, propA);
+      dataSet = (0, _reconcileJoin.reconcileJoin)(dataSet, entityName, entityKey, entityB, propB);
+    }
+  }
+  return dataSet;
+};
 exports.reconcileJoins = reconcileJoins;

package/dist/data/utilities/registerRecord.js

@@ -1,67 +1,67 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.registerRecord = void 0;
-require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.json.stringify.js");
-var _config = require("./config");
-const {
-  readFile,
-  writeFile
-} = require('fs/promises');
-/**
- * __RECORDS is itself an ordinary record - path/definition/keys/entries - whose entries are the
- * filenames of every other record that has been created. This is the schema it's given the first
- * time a record is registered and no __RECORDS.json exists yet, matching what a hand-authored
- * database (see test-data/__RECORDS.json) already expects to find.
- */
-const defaultRegistry = () => ({
-  path: '',
-  definition: [{
-    name: 'path',
-    type: 'string',
-    optional: false,
-    autoGenerate: false
-  }, {
-    name: 'definition',
-    type: 'object',
-    optional: false,
-    autoGenerate: false
-  }, {
-    name: 'keys',
-    type: 'array',
-    optional: false,
-    autoGenerate: false
-  }, {
-    name: 'entries',
-    type: 'array',
-    optional: false,
-    autoGenerate: false
-  }],
-  keys: [],
-  entries: []
-});
-/**
- * Add a record's filename to the __RECORDS registry, creating the registry file the first time
- * a record is created if it doesn't already exist.
- * @param recordName
- */
-const registerRecord = async recordName => {
-  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
-  const registryPath = `${databasePath}__RECORDS.json`;
-  let registry;
-  try {
-    registry = JSON.parse(await readFile(registryPath, 'utf8'));
-  } catch (err) {
-    registry = defaultRegistry();
-  }
-  const fileName = `${recordName}.json`;
-  if (!registry.entries.includes(fileName)) {
-    registry.entries.push(fileName);
-  }
-  await writeFile(registryPath, JSON.stringify(registry, null, 2));
-  return registry;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.registerRecord = void 0;
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.json.stringify.js");
+var _config = require("./config");
+const {
+  readFile,
+  writeFile
+} = require('fs/promises');
+/**
+ * __RECORDS is itself an ordinary record - path/definition/keys/entries - whose entries are the
+ * filenames of every other record that has been created. This is the schema it's given the first
+ * time a record is registered and no __RECORDS.json exists yet, matching what a hand-authored
+ * database (see test-data/__RECORDS.json) already expects to find.
+ */
+const defaultRegistry = () => ({
+  path: '',
+  definition: [{
+    name: 'path',
+    type: 'string',
+    optional: false,
+    autoGenerate: false
+  }, {
+    name: 'definition',
+    type: 'object',
+    optional: false,
+    autoGenerate: false
+  }, {
+    name: 'keys',
+    type: 'array',
+    optional: false,
+    autoGenerate: false
+  }, {
+    name: 'entries',
+    type: 'array',
+    optional: false,
+    autoGenerate: false
+  }],
+  keys: [],
+  entries: []
+});
+/**
+ * Add a record's filename to the __RECORDS registry, creating the registry file the first time
+ * a record is created if it doesn't already exist.
+ * @param recordName
+ */
+const registerRecord = async recordName => {
+  const databasePath = (0, _config.getSetting)('databasePath', 'database/');
+  const registryPath = `${databasePath}__RECORDS.json`;
+  let registry;
+  try {
+    registry = JSON.parse(await readFile(registryPath, 'utf8'));
+  } catch (err) {
+    registry = defaultRegistry();
+  }
+  const fileName = `${recordName}.json`;
+  if (!registry.entries.includes(fileName)) {
+    registry.entries.push(fileName);
+  }
+  await writeFile(registryPath, JSON.stringify(registry, null, 2));
+  return registry;
+};
 exports.registerRecord = registerRecord;

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

@@ -9,6 +9,7 @@ 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
@@ -21,8 +22,9 @@ const {
  * @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 = '') => {
+const removeFromIndex = async (path = '', key = null, value = undefined, fileName = '', type = undefined) => {
   if (!key || !key.lookup) {
     return null;
   }
@@ -34,7 +36,7 @@ const removeFromIndex = async (path = '', key = null, value = undefined, fileNam
   } catch (err) {
     return null;
   }
-  index = index.map(entry => entry.value == value ? {
+  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);

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;

package/dist/data/utilities/restrictIndexedList.js

@@ -1,45 +1,45 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.restrictIndexedList = void 0;
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-const restrictIndexedList = (joinClause, filterJoins, indexedClone) => {
-  const {
-    entity: entityA,
-    property: propertyA
-  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
-  const {
-    entity: entityB,
-    property: propertyB
-  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
-  if (Object.prototype.hasOwnProperty.call(filterJoins, entityA)) {
-    const existingEntities = filterJoins[entityA];
-    if (!Object.prototype.hasOwnProperty.call(indexedClone, entityA)) {
-      indexedClone[entityA] = {};
-    }
-    if (!Object.prototype.hasOwnProperty.call(indexedClone[entityA], propertyA)) {
-      indexedClone[entityA][propertyA] = {};
-    }
-    indexedClone[entityA][propertyA] = [{
-      value: existingEntities[0][propertyA],
-      record: existingEntities
-    }];
-  }
-  if (Object.prototype.hasOwnProperty.call(filterJoins, entityB)) {
-    const existingEntities = filterJoins[entityB];
-    if (!Object.prototype.hasOwnProperty.call(indexedClone, entityB)) {
-      indexedClone[entityB] = {};
-    }
-    if (!Object.prototype.hasOwnProperty.call(indexedClone[entityB], propertyB)) {
-      indexedClone[entityB][propertyB] = {};
-    }
-    indexedClone[entityB][propertyB] = [{
-      value: existingEntities[0][propertyB],
-      record: existingEntities
-    }];
-  }
-  return indexedClone;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.restrictIndexedList = void 0;
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+const restrictIndexedList = (joinClause, filterJoins, indexedClone) => {
+  const {
+    entity: entityA,
+    property: propertyA
+  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
+  const {
+    entity: entityB,
+    property: propertyB
+  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
+  if (Object.prototype.hasOwnProperty.call(filterJoins, entityA)) {
+    const existingEntities = filterJoins[entityA];
+    if (!Object.prototype.hasOwnProperty.call(indexedClone, entityA)) {
+      indexedClone[entityA] = {};
+    }
+    if (!Object.prototype.hasOwnProperty.call(indexedClone[entityA], propertyA)) {
+      indexedClone[entityA][propertyA] = {};
+    }
+    indexedClone[entityA][propertyA] = [{
+      value: existingEntities[0][propertyA],
+      record: existingEntities
+    }];
+  }
+  if (Object.prototype.hasOwnProperty.call(filterJoins, entityB)) {
+    const existingEntities = filterJoins[entityB];
+    if (!Object.prototype.hasOwnProperty.call(indexedClone, entityB)) {
+      indexedClone[entityB] = {};
+    }
+    if (!Object.prototype.hasOwnProperty.call(indexedClone[entityB], propertyB)) {
+      indexedClone[entityB][propertyB] = {};
+    }
+    indexedClone[entityB][propertyB] = [{
+      value: existingEntities[0][propertyB],
+      record: existingEntities
+    }];
+  }
+  return indexedClone;
+};
 exports.restrictIndexedList = restrictIndexedList;

package/dist/data/utilities/retrieveFile.js

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

package/dist/data/utilities/retrieveIndexes.js

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

package/dist/data/utilities/retrieveRecord.js

@@ -1,9 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.retrieveRecord = void 0;
-var _retrieveFile = require("./retrieveFile");
-const retrieveRecord = async (entity = '') => await (0, _retrieveFile.retrieveFile)(`${entity}.json`);
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.retrieveRecord = void 0;
+var _retrieveFile = require("./retrieveFile");
+const retrieveRecord = async (entity = '') => await (0, _retrieveFile.retrieveFile)(`${entity}.json`);
 exports.retrieveRecord = retrieveRecord;

package/dist/data/utilities/retrieveRecords.js

@@ -1,21 +1,21 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.retrieveRecords = void 0;
-var _retrieveFile = require("./retrieveFile");
-var _retrieveRecord = require("./retrieveRecord");
-const retrieveRecords = async (entity = '') => {
-  const recordFile = await (0, _retrieveRecord.retrieveRecord)(entity);
-  const dataSet = [];
-  for (const file of recordFile.entries) {
-    const data = await (0, _retrieveFile.retrieveFile)(`${recordFile.path}/${file}`).catch(err => console.error(err));
-    if (!data) {
-      throw new Error(`Could not read entity ${file}`);
-    }
-    dataSet.push(data);
-  }
-  return dataSet;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.retrieveRecords = void 0;
+var _retrieveFile = require("./retrieveFile");
+var _retrieveRecord = require("./retrieveRecord");
+const retrieveRecords = async (entity = '') => {
+  const recordFile = await (0, _retrieveRecord.retrieveRecord)(entity);
+  const dataSet = [];
+  for (const file of recordFile.entries) {
+    const data = await (0, _retrieveFile.retrieveFile)(`${recordFile.path}/${file}`).catch(err => console.error(err));
+    if (!data) {
+      throw new Error(`Could not read entity ${file}`);
+    }
+    dataSet.push(data);
+  }
+  return dataSet;
+};
 exports.retrieveRecords = retrieveRecords;

package/dist/data/utilities/runQuery.js

@@ -20,6 +20,31 @@ 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)
@@ -27,6 +52,7 @@ const runQuery = async parsed => {
   if (typeof parsed.joinEntity !== 'undefined') {
     recordData[parsed.joinEntity] = await (0, _retrieveRecord.retrieveRecord)(parsed.joinEntity);
   }
+  await typeConditions(parsed, recordData);
   let dataSet = {
     [parsed.entity]: []
   };

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

@@ -9,6 +9,7 @@ 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,
@@ -22,8 +23,9 @@ const {
  * @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 = '') => {
+const updateIndex = async (path = '', key = null, value = undefined, fileName = '', type = undefined) => {
   if (!key || !key.lookup) {
     return null;
   }
@@ -36,7 +38,7 @@ const updateIndex = async (path = '', key = null, value = undefined, fileName =
   } catch (err) {
     index = [];
   }
-  const existingEntry = index.find(entry => entry.value == value);
+  const existingEntry = index.find(entry => (0, _compareAs.sameValue)(type, entry.value, value));
   if (existingEntry) {
     if (!existingEntry.record.includes(fileName)) {
       existingEntry.record.push(fileName);

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;