json-fs-query 1.0.5 → 1.1.0

package/dist/data/queries/updateEntity.js

@@ -14,6 +14,8 @@ var _retrieveFile = require("../utilities/retrieveFile");
 var _updateIndex = require("../utilities/updateIndex");
 var _removeFromIndex = require("../utilities/removeFromIndex");
 var _computeKeyValue = require("../utilities/computeKeyValue");
+var _fieldType = require("../utilities/fieldType");
+var _compareAs = require("../utilities/compareAs");
 var _keyUnique = require("../introspect/policies/keyUnique");
 var _typeCheck = require("../introspect/policies/typeCheck");
 var _foreignKeyExists = require("../introspect/policies/foreignKeyExists");
@@ -34,7 +36,7 @@ const {
 const findEntryFile = async (record, primaryKey, primaryValue) => {
   for (const fileName of record.entries) {
     const data = await (0, _retrieveFile.retrieveFile)(`${record.path}/${fileName}`);
-    if ((0, _computeKeyValue.computeKeyValue)(primaryKey.fields, data) == primaryValue) {
+    if ((0, _compareAs.sameValue)((0, _fieldType.keyValueType)(record, primaryKey), (0, _computeKeyValue.computeKeyValue)(primaryKey.fields, data), primaryValue)) {
       return fileName;
     }
   }
@@ -43,11 +45,12 @@ const findEntryFile = async (record, primaryKey, primaryValue) => {
 /**
  * True if the update actually changes at least one of this key's fields - a key none of whose
  * fields appear in newValues, or whose given values are all unchanged, doesn't need re-checking.
+ * @param record
  * @param key
  * @param oldData
  * @param newValues
  */
-const keyFieldsChanged = (key, oldData, newValues) => key.fields.some(field => Object.prototype.hasOwnProperty.call(newValues, field) && newValues[field] != oldData[field]);
+const keyFieldsChanged = (record, key, oldData, newValues) => key.fields.some(field => Object.prototype.hasOwnProperty.call(newValues, field) && !(0, _compareAs.sameValue)((0, _fieldType.fieldType)(record, field), newValues[field], oldData[field]));
 /**
  * Only check uniqueness for a primary/unique key (single-field, or composite) whose value is
  * actually changing - checking an unchanged value would find the record's own existing entry and
@@ -60,7 +63,7 @@ const keyFieldsChanged = (key, oldData, newValues) => key.fields.some(field => O
  */
 const assertUniqueForUpdate = async (entity, record, oldData, newData, newValues) => {
   for (const key of record.keys) {
-    if (key.type !== 'primary' && key.type !== 'unique' || !keyFieldsChanged(key, oldData, newValues)) {
+    if (key.type !== 'primary' && key.type !== 'unique' || !keyFieldsChanged(record, key, oldData, newValues)) {
       continue;
     }
     const checkKeys = key.fields.map(field => newData[field]);
@@ -85,7 +88,7 @@ const assertForeignKeysForUpdate = async (entity, record, oldData, newValues) =>
       continue;
     }
     const field = key.fields[0];
-    if (!Object.prototype.hasOwnProperty.call(newValues, field) || newValues[field] == oldData[field]) {
+    if (!Object.prototype.hasOwnProperty.call(newValues, field) || (0, _compareAs.sameValue)((0, _fieldType.fieldType)(record, field), newValues[field], oldData[field])) {
       continue;
     }
     const {
@@ -104,12 +107,13 @@ const assertForeignKeysForUpdate = async (entity, record, oldData, newValues) =>
  * dangling, since the row itself isn't gone, just re-keyed. Only meaningful for a single-field
  * primary key, matching foreign key support's own single-field-only scope.
  * @param entity
+ * @param record
  * @param primaryKey
  * @param oldData
  * @param newValues
  */
-const assertNoDependentsForUpdate = async (entity, primaryKey, oldData, newValues) => {
-  if (!(0, _config.getSetting)('enforceForeignKeys', true) || primaryKey.fields.length !== 1 || !keyFieldsChanged(primaryKey, oldData, newValues)) {
+const assertNoDependentsForUpdate = async (entity, record, primaryKey, oldData, newValues) => {
+  if (!(0, _config.getSetting)('enforceForeignKeys', true) || primaryKey.fields.length !== 1 || !keyFieldsChanged(record, primaryKey, oldData, newValues)) {
     return;
   }
   const property = primaryKey.fields[0];
@@ -128,11 +132,11 @@ const assertNoDependentsForUpdate = async (entity, primaryKey, oldData, newValue
  */
 const reconcileIndexes = async (record, oldData, newData, newValues, fileName) => {
   for (const key of record.keys) {
-    if (!keyFieldsChanged(key, oldData, newValues)) {
+    if (!keyFieldsChanged(record, key, oldData, newValues)) {
       continue;
     }
-    await (0, _removeFromIndex.removeFromIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, oldData), fileName);
-    await (0, _updateIndex.updateIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, newData), fileName);
+    await (0, _removeFromIndex.removeFromIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, oldData), fileName, (0, _fieldType.keyValueType)(record, key));
+    await (0, _updateIndex.updateIndex)(record.path, key, (0, _computeKeyValue.computeKeyValue)(key.fields, newData), fileName, (0, _fieldType.keyValueType)(record, key));
   }
 };
 const assertRequiredFields = (entity, record, newData) => {
@@ -178,7 +182,7 @@ const updateEntity = async (entity = '', values = {}, dataSet = {}) => {
     const newData = Object.assign({}, oldData, typedValues);
     await assertUniqueForUpdate(entity, record, oldData, newData, typedValues);
     await assertForeignKeysForUpdate(entity, record, oldData, typedValues);
-    await assertNoDependentsForUpdate(entity, primaryKey, oldData, typedValues);
+    await assertNoDependentsForUpdate(entity, record, primaryKey, oldData, typedValues);
     assertRequiredFields(entity, record, newData);
     await reconcileIndexes(record, oldData, newData, typedValues, fileName);
     await writeFile(`${databasePath}${record.path}/${fileName}`, JSON.stringify(newData, null, 2));

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.updateEntity=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js"),require("core-js/modules/esnext.iterator.map.js"),require("core-js/modules/esnext.iterator.some.js");var _retrieveRecord=require("../utilities/retrieveRecord"),_retrieveFile=require("../utilities/retrieveFile"),_updateIndex=require("../utilities/updateIndex"),_removeFromIndex=require("../utilities/removeFromIndex"),_computeKeyValue=require("../utilities/computeKeyValue"),_keyUnique=require("../introspect/policies/keyUnique"),_typeCheck=require("../introspect/policies/typeCheck"),_foreignKeyExists=require("../introspect/policies/foreignKeyExists"),_hasDependents=require("../introspect/policies/hasDependents"),_splitEntityProperty=require("../utilities/parsers/splitEntityProperty"),_config=require("../utilities/config");const{writeFile:writeFile}=require("fs/promises"),findEntryFile=async(e,t,r)=>{for(const i of e.entries){const s=await(0,_retrieveFile.retrieveFile)(`${e.path}/${i}`);if((0,_computeKeyValue.computeKeyValue)(t.fields,s)==r)return i}return null},keyFieldsChanged=(e,t,r)=>e.fields.some((e=>Object.prototype.hasOwnProperty.call(r,e)&&r[e]!=t[e])),assertUniqueForUpdate=async(e,t,r,i,s)=>{for(const o of t.keys){if("primary"!==o.type&&"unique"!==o.type||!keyFieldsChanged(o,r,s))continue;const t=o.fields.map((e=>i[e]));if(!await(0,_keyUnique.keyUnique)(e,o.fields,t))throw new Error(`Duplicate value for ${o.type} key "${o.fields.join(", ")}" on ${e}`)}},assertForeignKeysForUpdate=async(e,t,r,i)=>{for(const s of t.keys){if("foreign"!==s.type||1!==s.fields.length||!s.references||1!==s.references.length)continue;const t=s.fields[0];if(!Object.prototype.hasOwnProperty.call(i,t)||i[t]==r[t])continue;const{entity:o,property:n}=(0,_splitEntityProperty.splitEntityProperty)(s.references[0].fields[0]);if(!await(0,_foreignKeyExists.foreignKeyExists)(o,n,i[t]))throw new Error(`Foreign key "${t}" on ${e} references a nonexistent ${o}.${n} = ${i[t]}`)}},assertNoDependentsForUpdate=async(e,t,r,i)=>{if(!(0,_config.getSetting)("enforceForeignKeys",!0)||1!==t.fields.length||!keyFieldsChanged(t,r,i))return;const s=t.fields[0];if(await(0,_hasDependents.hasDependents)(e,s,r[s]))throw new Error(`Cannot update "${e}" where "${s}" = ${r[s]} - other records still reference it`)},reconcileIndexes=async(e,t,r,i,s)=>{for(const o of e.keys)keyFieldsChanged(o,t,i)&&(await(0,_removeFromIndex.removeFromIndex)(e.path,o,(0,_computeKeyValue.computeKeyValue)(o.fields,t),s),await(0,_updateIndex.updateIndex)(e.path,o,(0,_computeKeyValue.computeKeyValue)(o.fields,r),s))},assertRequiredFields=(e,t,r)=>{for(const i of t.definition)if(!i.optional&&void 0===r[i.name])throw new Error(`Missing required field "${i.name}" for ${e}`)},applyFieldTypes=(e,t)=>{const r=Object.assign({},t);for(const t of e.definition)Object.prototype.hasOwnProperty.call(r,t.name)&&(r[t.name]=(0,_typeCheck.typeCheck)(t.type,r[t.name]));return r},updateEntity=async(e="",t={},r={})=>{const i=(0,_config.getSetting)("databasePath","database/"),s=await(0,_retrieveRecord.retrieveRecord)(e),o=s.keys.find((e=>"primary"===e.type));if(!o)throw new Error(`Cannot update "${e}" without a primary key`);const n=applyFieldTypes(s,t),a=r[e]||[],p=[];for(const t of a){const r=await findEntryFile(s,o,(0,_computeKeyValue.computeKeyValue)(o.fields,t));if(!r)throw new Error(`Could not find entry for ${e} where "${o.fields.join(", ")}" = ${(0,_computeKeyValue.computeKeyValue)(o.fields,t)}`);const a=await(0,_retrieveFile.retrieveFile)(`${s.path}/${r}`),u=Object.assign({},a,n);await assertUniqueForUpdate(e,s,a,u,n),await assertForeignKeysForUpdate(e,s,a,n),await assertNoDependentsForUpdate(e,o,a,n),assertRequiredFields(e,s,u),await reconcileIndexes(s,a,u,n,r),await writeFile(`${i}${s.path}/${r}`,JSON.stringify(u,null,2)),p.push(u)}return r[e]=p,r};exports.updateEntity=updateEntity;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.updateEntity=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js"),require("core-js/modules/esnext.iterator.map.js"),require("core-js/modules/esnext.iterator.some.js");var _retrieveRecord=require("../utilities/retrieveRecord"),_retrieveFile=require("../utilities/retrieveFile"),_updateIndex=require("../utilities/updateIndex"),_removeFromIndex=require("../utilities/removeFromIndex"),_computeKeyValue=require("../utilities/computeKeyValue"),_fieldType=require("../utilities/fieldType"),_compareAs=require("../utilities/compareAs"),_keyUnique=require("../introspect/policies/keyUnique"),_typeCheck=require("../introspect/policies/typeCheck"),_foreignKeyExists=require("../introspect/policies/foreignKeyExists"),_hasDependents=require("../introspect/policies/hasDependents"),_splitEntityProperty=require("../utilities/parsers/splitEntityProperty"),_config=require("../utilities/config");const{writeFile:writeFile}=require("fs/promises"),findEntryFile=async(e,t,i)=>{for(const r of e.entries){const s=await(0,_retrieveFile.retrieveFile)(`${e.path}/${r}`);if((0,_compareAs.sameValue)((0,_fieldType.keyValueType)(e,t),(0,_computeKeyValue.computeKeyValue)(t.fields,s),i))return r}return null},keyFieldsChanged=(e,t,i,r)=>t.fields.some((t=>Object.prototype.hasOwnProperty.call(r,t)&&!(0,_compareAs.sameValue)((0,_fieldType.fieldType)(e,t),r[t],i[t]))),assertUniqueForUpdate=async(e,t,i,r,s)=>{for(const o of t.keys){if("primary"!==o.type&&"unique"!==o.type||!keyFieldsChanged(t,o,i,s))continue;const n=o.fields.map((e=>r[e]));if(!await(0,_keyUnique.keyUnique)(e,o.fields,n))throw new Error(`Duplicate value for ${o.type} key "${o.fields.join(", ")}" on ${e}`)}},assertForeignKeysForUpdate=async(e,t,i,r)=>{for(const s of t.keys){if("foreign"!==s.type||1!==s.fields.length||!s.references||1!==s.references.length)continue;const o=s.fields[0];if(!Object.prototype.hasOwnProperty.call(r,o)||(0,_compareAs.sameValue)((0,_fieldType.fieldType)(t,o),r[o],i[o]))continue;const{entity:n,property:a}=(0,_splitEntityProperty.splitEntityProperty)(s.references[0].fields[0]);if(!await(0,_foreignKeyExists.foreignKeyExists)(n,a,r[o]))throw new Error(`Foreign key "${o}" on ${e} references a nonexistent ${n}.${a} = ${r[o]}`)}},assertNoDependentsForUpdate=async(e,t,i,r,s)=>{if(!(0,_config.getSetting)("enforceForeignKeys",!0)||1!==i.fields.length||!keyFieldsChanged(t,i,r,s))return;const o=i.fields[0];if(await(0,_hasDependents.hasDependents)(e,o,r[o]))throw new Error(`Cannot update "${e}" where "${o}" = ${r[o]} - other records still reference it`)},reconcileIndexes=async(e,t,i,r,s)=>{for(const o of e.keys)keyFieldsChanged(e,o,t,r)&&(await(0,_removeFromIndex.removeFromIndex)(e.path,o,(0,_computeKeyValue.computeKeyValue)(o.fields,t),s,(0,_fieldType.keyValueType)(e,o)),await(0,_updateIndex.updateIndex)(e.path,o,(0,_computeKeyValue.computeKeyValue)(o.fields,i),s,(0,_fieldType.keyValueType)(e,o)))},assertRequiredFields=(e,t,i)=>{for(const r of t.definition)if(!r.optional&&void 0===i[r.name])throw new Error(`Missing required field "${r.name}" for ${e}`)},applyFieldTypes=(e,t)=>{const i=Object.assign({},t);for(const t of e.definition)Object.prototype.hasOwnProperty.call(i,t.name)&&(i[t.name]=(0,_typeCheck.typeCheck)(t.type,i[t.name]));return i},updateEntity=async(e="",t={},i={})=>{const r=(0,_config.getSetting)("databasePath","database/"),s=await(0,_retrieveRecord.retrieveRecord)(e),o=s.keys.find((e=>"primary"===e.type));if(!o)throw new Error(`Cannot update "${e}" without a primary key`);const n=applyFieldTypes(s,t),a=i[e]||[],p=[];for(const t of a){const i=await findEntryFile(s,o,(0,_computeKeyValue.computeKeyValue)(o.fields,t));if(!i)throw new Error(`Could not find entry for ${e} where "${o.fields.join(", ")}" = ${(0,_computeKeyValue.computeKeyValue)(o.fields,t)}`);const a=await(0,_retrieveFile.retrieveFile)(`${s.path}/${i}`),l=Object.assign({},a,n);await assertUniqueForUpdate(e,s,a,l,n),await assertForeignKeysForUpdate(e,s,a,n),await assertNoDependentsForUpdate(e,s,o,a,n),assertRequiredFields(e,s,l),await reconcileIndexes(s,a,l,n,i),await writeFile(`${r}${s.path}/${i}`,JSON.stringify(l,null,2)),p.push(l)}return i[e]=p,i};exports.updateEntity=updateEntity;

package/dist/data/queries/where.d.ts

@@ -1,7 +1,8 @@
-export declare const where: (dataSet?: any[], { property, joinEntity, comparator, value }?: {
-    property?: string;
-    joinEntity?: any;
-    comparator?: string;
-    value?: any;
-}) => any[];
+export declare const where: (dataSet?: any[], { property, joinEntity, comparator, value, type }?: {
+    property?: string;
+    joinEntity?: any;
+    comparator?: string;
+    value?: any;
+    type?: any;
+}) => any[];
 //# sourceMappingURL=where.d.ts.map

package/dist/data/queries/where.js

@@ -7,6 +7,8 @@ exports.where = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.some.js");
+var _compareAs = require("../utilities/compareAs");
 const likeMatch = (dataValue, pattern) => {
   if (typeof dataValue !== 'string' || typeof pattern !== 'string') {
     return false;
@@ -14,17 +16,26 @@ const likeMatch = (dataValue, pattern) => {
   const regexPattern = pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace(/%/g, '.*').replace(/_/g, '.');
   return new RegExp(`^${regexPattern}$`, 'i').test(dataValue);
 };
-const makeCondition = (data, property, comparator, value) => {
+/**
+ * Equality (=, !=, <>, in) compares by the field's declared type when given one (see sameValue), so
+ * '3' and 3 match in a string or int field. Ordering (>, <, between, like) compares the raw values.
+ * @param data
+ * @param property
+ * @param comparator
+ * @param value
+ * @param type
+ */
+const makeCondition = (data, property, comparator, value, type = undefined) => {
   if (!Object.prototype.hasOwnProperty.call(data, property)) {
     return false;
   }
   const dataValue = data[property];
   switch (comparator) {
     case '=':
-      return dataValue == value;
+      return (0, _compareAs.sameValue)(type, dataValue, value);
     case '!=':
     case '<>':
-      return dataValue != value;
+      return !(0, _compareAs.sameValue)(type, dataValue, value);
     case '>':
       return dataValue > value;
     case '>=':
@@ -34,7 +45,7 @@ const makeCondition = (data, property, comparator, value) => {
     case '<=':
       return dataValue <= value;
     case 'in':
-      return Array.isArray(value) && value.includes(dataValue);
+      return Array.isArray(value) && (type ? value.some(item => (0, _compareAs.sameValue)(type, dataValue, item)) : value.includes(dataValue));
     case 'between':
       return Array.isArray(value) && value.length === 2 && dataValue >= value[0] && dataValue <= value[1];
     case 'like':
@@ -46,11 +57,12 @@ const where = (dataSet = [], {
   property = '',
   joinEntity = undefined,
   comparator = '=',
-  value = null
+  value = null,
+  type = undefined
 } = {}) => {
   return dataSet.filter(data => {
     const testProperty = joinEntity ? `${joinEntity}.${property}` : property;
-    return makeCondition(data, testProperty, comparator, value);
+    return makeCondition(data, testProperty, comparator, value, type);
   });
 };
 exports.where = where;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.where=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js");const likeMatch=(e,r)=>{if("string"!=typeof e||"string"!=typeof r)return!1;const t=r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/%/g,".*").replace(/_/g,".");return new RegExp(`^${t}$`,"i").test(e)},makeCondition=(e,r,t,s)=>{if(!Object.prototype.hasOwnProperty.call(e,r))return!1;const n=e[r];switch(t){case"=":return n==s;case"!=":case"<>":return n!=s;case">":return n>s;case">=":return n>=s;case"<":return n<s;case"<=":return n<=s;case"in":return Array.isArray(s)&&s.includes(n);case"between":return Array.isArray(s)&&2===s.length&&n>=s[0]&&n<=s[1];case"like":return likeMatch(n,s)}return!1},where=(e=[],{property:r="",joinEntity:t,comparator:s="=",value:n=null}={})=>e.filter((e=>makeCondition(e,t?`${t}.${r}`:r,s,n)));exports.where=where;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.where=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.some.js");var _compareAs=require("../utilities/compareAs");const likeMatch=(e,r)=>{if("string"!=typeof e||"string"!=typeof r)return!1;const t=r.replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/%/g,".*").replace(/_/g,".");return new RegExp(`^${t}$`,"i").test(e)},makeCondition=(e,r,t,s,a=void 0)=>{if(!Object.prototype.hasOwnProperty.call(e,r))return!1;const o=e[r];switch(t){case"=":return(0,_compareAs.sameValue)(a,o,s);case"!=":case"<>":return!(0,_compareAs.sameValue)(a,o,s);case">":return o>s;case">=":return o>=s;case"<":return o<s;case"<=":return o<=s;case"in":return Array.isArray(s)&&(a?s.some((e=>(0,_compareAs.sameValue)(a,o,e))):s.includes(o));case"between":return Array.isArray(s)&&2===s.length&&o>=s[0]&&o<=s[1];case"like":return likeMatch(o,s)}return!1},where=(e=[],{property:r="",joinEntity:t,comparator:s="=",value:a=null,type:o}={})=>e.filter((e=>makeCondition(e,t?`${t}.${r}`:r,s,a,o)));exports.where=where;

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

@@ -0,0 +1,20 @@
+/**
+ * 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
+ */
+export declare const compareAs: (type: string | undefined, value: any) => any;
+/**
+ * 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
+ */
+export declare const sameValue: (type: string | undefined, a: any, b: any) => boolean;
+//# sourceMappingURL=compareAs.d.ts.map

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/computeKeyValue.js

@@ -1,26 +1,26 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.computeKeyValue = void 0;
-require("core-js/modules/es.json.stringify.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.map.js");
-/**
- * The value a key (of any field count) indexes and checks uniqueness by. A single-field key uses
- * the field's own raw value directly - this is the pre-existing, already-shipped index file
- * format (e.g. a plain "2024-06-02" or 1), and stays exactly as it was for backward compatibility
- * with real fixture data. A multi-field key has no single value to use, so its fields' values are
- * combined into one deterministic composite (a JSON array), in the same field order as key.fields
- * - two records only share a composite value if every field matches.
- * @param fields
- * @param values
- */
-const computeKeyValue = (fields, values) => {
-  if (fields.length === 1) {
-    return values[fields[0]];
-  }
-  return JSON.stringify(fields.map(field => values[field]));
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeKeyValue = void 0;
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.js");
+/**
+ * The value a key (of any field count) indexes and checks uniqueness by. A single-field key uses
+ * the field's own raw value directly - this is the pre-existing, already-shipped index file
+ * format (e.g. a plain "2024-06-02" or 1), and stays exactly as it was for backward compatibility
+ * with real fixture data. A multi-field key has no single value to use, so its fields' values are
+ * combined into one deterministic composite (a JSON array), in the same field order as key.fields
+ * - two records only share a composite value if every field matches.
+ * @param fields
+ * @param values
+ */
+const computeKeyValue = (fields, values) => {
+  if (fields.length === 1) {
+    return values[fields[0]];
+  }
+  return JSON.stringify(fields.map(field => values[field]));
+};
 exports.computeKeyValue = computeKeyValue;

package/dist/data/utilities/config.js

@@ -1,45 +1,45 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getSetting = exports.configure = void 0;
-const defaults = {
-  databasePath: 'database/',
-  relativePath: '',
-  enforceForeignKeys: true
-};
-let settings = {
-  ...defaults
-};
-/**
- * Set where this package's data lives: databasePath (a filesystem path, used in Node) and/or
- * relativePath (a URL prefix prepended to databasePath, used when reading over fetch() in a
- * browser). Call this once before using create()/drop()/query() - a fresh consumer has no other
- * way to point this package at their own data directory.
- *
- * enforceForeignKeys (default true) controls whether deleteEntity/updateEntity block an operation
- * that would leave another record's foreign key pointing at a value that no longer exists -
- * mirroring MySQL's own foreign_key_checks setting, which is also toggleable rather than always
- * on, since strict enforcement isn't always what every consumer wants.
- * @param newSettings
- */
-const configure = newSettings => {
-  settings = {
-    ...settings,
-    ...newSettings
-  };
-};
-/**
- * Read one runtime setting, falling back to the given default if it was never configured. This is
- * the package's own lightweight replacement for reading settings via js-build-tools/gulp.config -
- * that module is a dev-time build tool, not something a published package should require at
- * runtime, and it isn't available at all once a consumer installs this package on its own.
- * @param key
- * @param defaultValue
- */
-exports.configure = configure;
-const getSetting = (key, defaultValue) => {
-  return typeof settings[key] !== 'undefined' ? settings[key] : defaultValue;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSetting = exports.configure = void 0;
+const defaults = {
+  databasePath: 'database/',
+  relativePath: '',
+  enforceForeignKeys: true
+};
+let settings = {
+  ...defaults
+};
+/**
+ * Set where this package's data lives: databasePath (a filesystem path, used in Node) and/or
+ * relativePath (a URL prefix prepended to databasePath, used when reading over fetch() in a
+ * browser). Call this once before using create()/drop()/query() - a fresh consumer has no other
+ * way to point this package at their own data directory.
+ *
+ * enforceForeignKeys (default true) controls whether deleteEntity/updateEntity block an operation
+ * that would leave another record's foreign key pointing at a value that no longer exists -
+ * mirroring MySQL's own foreign_key_checks setting, which is also toggleable rather than always
+ * on, since strict enforcement isn't always what every consumer wants.
+ * @param newSettings
+ */
+const configure = newSettings => {
+  settings = {
+    ...settings,
+    ...newSettings
+  };
+};
+/**
+ * Read one runtime setting, falling back to the given default if it was never configured. This is
+ * the package's own lightweight replacement for reading settings via js-build-tools/gulp.config -
+ * that module is a dev-time build tool, not something a published package should require at
+ * runtime, and it isn't available at all once a consumer installs this package on its own.
+ * @param key
+ * @param defaultValue
+ */
+exports.configure = configure;
+const getSetting = (key, defaultValue) => {
+  return typeof settings[key] !== 'undefined' ? settings[key] : defaultValue;
+};
 exports.getSetting = getSetting;

package/dist/data/utilities/deregisterRecord.js

@@ -1,34 +1,34 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.deregisterRecord = 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");
-var _config = require("./config");
-const {
-  readFile,
-  writeFile
-} = require('fs/promises');
-/**
- * Remove a record's filename from the __RECORDS registry. A missing registry file is left
- * untouched rather than created, since there's nothing to remove from it.
- * @param recordName
- */
-const deregisterRecord = 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) {
-    return null;
-  }
-  const fileName = `${recordName}.json`;
-  registry.entries = registry.entries.filter(entry => entry !== fileName);
-  await writeFile(registryPath, JSON.stringify(registry, null, 2));
-  return registry;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deregisterRecord = 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");
+var _config = require("./config");
+const {
+  readFile,
+  writeFile
+} = require('fs/promises');
+/**
+ * Remove a record's filename from the __RECORDS registry. A missing registry file is left
+ * untouched rather than created, since there's nothing to remove from it.
+ * @param recordName
+ */
+const deregisterRecord = 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) {
+    return null;
+  }
+  const fileName = `${recordName}.json`;
+  registry.entries = registry.entries.filter(entry => entry !== fileName);
+  await writeFile(registryPath, JSON.stringify(registry, null, 2));
+  return registry;
+};
 exports.deregisterRecord = deregisterRecord;

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

@@ -28,7 +28,8 @@ const getConditionIndexedList = async (parsed, recordData, dataSet) => {
       const matchedRecords = (0, _where.where)(indexed[entity][property], {
         property: 'value',
         comparator: condition.comparator,
-        value: condition.value
+        value: condition.value,
+        type: condition.type
       });
       for (const matchedRecord of matchedRecords) {
         for (const file of matchedRecord.record) {

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;