json-fs-query 1.1.0 → 2.1.0

package/dist/data/utilities/getConditionIndexedList.js

@@ -1,48 +1,48 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getConditionIndexedList = void 0;
-var _isEntityProperty = require("./parsers/isEntityProperty");
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _retrieveRecord = require("./retrieveRecord");
-var _where = require("../queries/where");
-var _retrieveFile = require("./retrieveFile");
-var _getMatchingIndexes = require("./getMatchingIndexes");
-const getConditionIndexedList = async (parsed, recordData, dataSet) => {
-  const reducedConditions = [];
-  for (const condition of parsed.conditions) {
-    let entity = parsed.entity;
-    let property = condition.property;
-    if ((0, _isEntityProperty.isEntityProperty)(property)) {
-      const entityProperty = (0, _splitEntityProperty.splitEntityProperty)(property);
-      entity = entityProperty.entity;
-      property = entityProperty.property;
-    }
-    if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
-      recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
-    }
-    const indexed = {};
-    const retrieveMatchedFiles = async (entity, property, recordData, condition, dataSet, indexed) => {
-      const matchedRecords = (0, _where.where)(indexed[entity][property], {
-        property: 'value',
-        comparator: condition.comparator,
-        value: condition.value,
-        type: condition.type
-      });
-      for (const matchedRecord of matchedRecords) {
-        for (const file of matchedRecord.record) {
-          dataSet[entity].push(await (0, _retrieveFile.retrieveFile)(`${entity}/${file}`));
-        }
-      }
-    };
-    const isIndexed = await (0, _getMatchingIndexes.getMatchingIndexes)(entity, property, recordData, condition, dataSet, indexed, retrieveMatchedFiles);
-    if (!isIndexed) {
-      reducedConditions.push(condition);
-    }
-  }
-  parsed.conditions = reducedConditions;
-  return parsed;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getConditionIndexedList = void 0;
+var _isEntityProperty = require("./parsers/isEntityProperty");
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _retrieveRecord = require("./retrieveRecord");
+var _where = require("../queries/where");
+var _retrieveFile = require("./retrieveFile");
+var _getMatchingIndexes = require("./getMatchingIndexes");
+const getConditionIndexedList = async (parsed, recordData, dataSet) => {
+  const reducedConditions = [];
+  for (const condition of parsed.conditions) {
+    let entity = parsed.entity;
+    let property = condition.property;
+    if ((0, _isEntityProperty.isEntityProperty)(property)) {
+      const entityProperty = (0, _splitEntityProperty.splitEntityProperty)(property);
+      entity = entityProperty.entity;
+      property = entityProperty.property;
+    }
+    if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
+      recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
+    }
+    const indexed = {};
+    const retrieveMatchedFiles = async (entity, property, recordData, condition, dataSet, indexed) => {
+      const matchedRecords = (0, _where.where)(indexed[entity][property], {
+        property: 'value',
+        comparator: condition.comparator,
+        value: condition.value,
+        type: condition.type
+      });
+      for (const matchedRecord of matchedRecords) {
+        for (const file of matchedRecord.record) {
+          dataSet[entity].push(await (0, _retrieveFile.retrieveFile)(`${entity}/${file}`));
+        }
+      }
+    };
+    const isIndexed = await (0, _getMatchingIndexes.getMatchingIndexes)(entity, property, recordData, condition, dataSet, indexed, retrieveMatchedFiles);
+    if (!isIndexed) {
+      reducedConditions.push(condition);
+    }
+  }
+  parsed.conditions = reducedConditions;
+  return parsed;
+};
 exports.getConditionIndexedList = getConditionIndexedList;

package/dist/data/utilities/matchIndexedJoins.js

@@ -1,63 +1,63 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.matchIndexedJoins = void 0;
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.reduce.js");
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
-var _where = require("../queries/where");
-var _retrieveFile = require("./retrieveFile");
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _fieldType = require("./fieldType");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const matchIndexedJoins = (entity, indexedClone, dataSets) => async (focusEntity, property, recordData, joinClause, filterJoins, indexed) => {
-  const {
-    entity: entityA,
-    property: propertyA
-  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
-  const {
-    entity: entityB,
-    property: propertyB
-  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
-  const properties = [{
-    entityFirst: entityA,
-    propertyFirst: propertyA,
-    entitySecond: entityB,
-    propertySecond: propertyB
-  }, {
-    entityFirst: entityB,
-    propertyFirst: propertyB,
-    entitySecond: entityA,
-    propertySecond: propertyA
-  }];
-  for (const checkProp of properties) {
-    if (!Object.prototype.hasOwnProperty.call(indexedClone, checkProp.entitySecond)) {
-      indexedClone[checkProp.entitySecond] = _siFunciona.default.cloneObject(indexed[checkProp.entitySecond]);
-    }
-    const matchedRecords = indexedClone[checkProp.entitySecond][checkProp.propertySecond].reduce((dataA, dataB) => _siFunciona.default.mergeArrays(dataA, (0, _where.where)(indexedClone[checkProp.entityFirst][checkProp.propertyFirst], {
-      property: 'value',
-      comparator: joinClause.comparator,
-      value: dataB.value,
-      type: (0, _fieldType.fieldType)(recordData[checkProp.entityFirst], checkProp.propertyFirst)
-    })), []);
-    const skipPush = checkProp.entityFirst === entity;
-    if (!Object.prototype.hasOwnProperty.call(dataSets, checkProp.entityFirst)) {
-      dataSets[checkProp.entityFirst] = [];
-    }
-    for (const matchedRecord of matchedRecords) {
-      for (const file of matchedRecord.record) {
-        let entityRecord = file;
-        if (typeof file === 'string') {
-          entityRecord = await (0, _retrieveFile.retrieveFile)(`${checkProp.entityFirst}/${file}`);
-        }
-        if (!skipPush) {
-          dataSets[checkProp.entityFirst].push(entityRecord);
-        }
-        filterJoins[checkProp.entityFirst].push(entityRecord);
-      }
-    }
-  }
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.matchIndexedJoins = void 0;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.reduce.js");
+var _siFunciona = _interopRequireDefault(require("si-funciona"));
+var _where = require("../queries/where");
+var _retrieveFile = require("./retrieveFile");
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _fieldType = require("./fieldType");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const matchIndexedJoins = (entity, indexedClone, dataSets) => async (focusEntity, property, recordData, joinClause, filterJoins, indexed) => {
+  const {
+    entity: entityA,
+    property: propertyA
+  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
+  const {
+    entity: entityB,
+    property: propertyB
+  } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
+  const properties = [{
+    entityFirst: entityA,
+    propertyFirst: propertyA,
+    entitySecond: entityB,
+    propertySecond: propertyB
+  }, {
+    entityFirst: entityB,
+    propertyFirst: propertyB,
+    entitySecond: entityA,
+    propertySecond: propertyA
+  }];
+  for (const checkProp of properties) {
+    if (!Object.prototype.hasOwnProperty.call(indexedClone, checkProp.entitySecond)) {
+      indexedClone[checkProp.entitySecond] = _siFunciona.default.cloneObject(indexed[checkProp.entitySecond]);
+    }
+    const matchedRecords = indexedClone[checkProp.entitySecond][checkProp.propertySecond].reduce((dataA, dataB) => _siFunciona.default.mergeArrays(dataA, (0, _where.where)(indexedClone[checkProp.entityFirst][checkProp.propertyFirst], {
+      property: 'value',
+      comparator: joinClause.comparator,
+      value: dataB.value,
+      type: (0, _fieldType.fieldType)(recordData[checkProp.entityFirst], checkProp.propertyFirst)
+    })), []);
+    const skipPush = checkProp.entityFirst === entity;
+    if (!Object.prototype.hasOwnProperty.call(dataSets, checkProp.entityFirst)) {
+      dataSets[checkProp.entityFirst] = [];
+    }
+    for (const matchedRecord of matchedRecords) {
+      for (const file of matchedRecord.record) {
+        let entityRecord = file;
+        if (typeof file === 'string') {
+          entityRecord = await (0, _retrieveFile.retrieveFile)(`${checkProp.entityFirst}/${file}`);
+        }
+        if (!skipPush) {
+          dataSets[checkProp.entityFirst].push(entityRecord);
+        }
+        filterJoins[checkProp.entityFirst].push(entityRecord);
+      }
+    }
+  }
+};
 exports.matchIndexedJoins = matchIndexedJoins;

package/dist/data/utilities/mergeJoin.js

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

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

@@ -1,16 +1,20 @@
-import { LiteralValue } from './parseLiteralValue';
-import { ParsedQuery } from './parseQuery';
-export type ConditionValue = LiteralValue;
-export type ParsedCondition = {
-    property: string;
-    comparator: string;
-    value: ConditionValue;
-    type?: string;
-};
-/**
- * Extract condition clauses from the query.
- * @param parsed
- * @param query
- */
-export declare const findConditions: (parsed: ParsedQuery, query: string) => string;
+import { LiteralValue } from './parseLiteralValue';
+import { ParsedQuery } from './parseQuery';
+export type ConditionValue = LiteralValue;
+export type ParsedCondition = {
+    property: string;
+    comparator: string;
+    value: ConditionValue;
+    type?: string;
+};
+/**
+ * Extract condition clauses from the query: `where <field> <comparator> <value>`, or `where <field> is null`,
+ * `is not null`, `exists` or `does not exist` (no value), each further one joined with `and where`. A comparison
+ * with the literal null (`= null`) is refused: it would never match, as null equals nothing (see where). `or where` is refused until or is built (TASKS: the where-clauses epic): it used to be read the same as
+ * `and where`, which silently returned the wrong rows.
+ * @param parsed
+ * @param query
+ * @throws {Error} For `or where`, and for a comparison with null.
+ */
+export declare const findConditions: (parsed: ParsedQuery, query: string) => string;
 //# sourceMappingURL=findConditions.d.ts.map

package/dist/data/utilities/parsers/findConditions.js

@@ -4,24 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findConditions = void 0;
+require("core-js/modules/es.array.includes.js");
 var _removeFromQuery = require("./removeFromQuery");
 var _parseLiteralValue = require("./parseLiteralValue");
-const conditionMatch = /(and|or)?\s*(where)\s+([a-z0-9_-]+\.?[a-z0-9_-]*)\s+(=|!=|>|<|>=|<=|in|between|like)\s+(["'](.*)['"]|([0-9]+)|(\[.*])|(null)|(true)|(false))/ig;
+var _maskStrings = require("./maskStrings");
+// `and`/`or`/`where` count only as whole words: in `on t.x = u.color where ...` the `or` is part of the name `color`
+const conditionMatch = new RegExp(`(^|[^a-z0-9._-])(?:(and|or)\\s+)?(where)\\s+([a-z0-9_-]+\\.?[a-z0-9_-]*)\\s+(?:(is\\s+not\\s+null|is\\s+null|exists|does\\s+not\\s+exist)(?![a-z0-9_.-])|(=|!=|>|<|>=|<=|in|between|like)\\s+(${_maskStrings.placeholderSource}|(${_parseLiteralValue.numberSource})|${_maskStrings.arraySource}|(null)|(true)|(false)))`, 'ig');
 /**
- * Extract condition clauses from the query.
+ * Extract condition clauses from the query: `where <field> <comparator> <value>`, or `where <field> is null`,
+ * `is not null`, `exists` or `does not exist` (no value), each further one joined with `and where`. A comparison
+ * with the literal null (`= null`) is refused: it would never match, as null equals nothing (see where). `or where` is refused until or is built (TASKS: the where-clauses epic): it used to be read the same as
+ * `and where`, which silently returned the wrong rows.
  * @param parsed
  * @param query
+ * @throws {Error} For `or where`, and for a comparison with null.
  */
 const findConditions = (parsed, query) => {
   const conditionsFound = query.matchAll(conditionMatch);
   // @ts-ignore
   for (const condition of conditionsFound) {
-    parsed['conditions'].push({
-      property: condition[3],
-      comparator: condition[4],
-      value: (0, _parseLiteralValue.parseLiteralValue)(condition, 6)
-    });
-    query = (0, _removeFromQuery.removeFromQuery)(condition[0], query);
+    if (typeof condition[2] !== 'undefined' && condition[2].toLowerCase() === 'or') {
+      throw new Error('`or where` is not supported yet: use `and where`, or run one query per alternative');
+    }
+    if (typeof condition[5] !== 'undefined') {
+      parsed['conditions'].push({
+        property: condition[4],
+        comparator: condition[5].toLowerCase().replace(/\s+/g, ' '),
+        value: null
+      });
+    } else {
+      const value = (0, _parseLiteralValue.parseLiteralValue)(condition, 8);
+      if (value === null) {
+        throw new Error(`\`${condition[4]} ${condition[6]} null\` never matches (null equals nothing, as in SQL): use \`${condition[4]} is null\` or \`${condition[4]} is not null\``);
+      }
+      if (condition[6].toLowerCase() === 'between' && Array.isArray(value) && value.includes(null)) {
+        throw new Error(`\`${condition[4]} between\` can't have a null bound: it would never match`);
+      }
+      parsed['conditions'].push({
+        property: condition[4],
+        comparator: condition[6],
+        value
+      });
+    }
+    // Leave out the character before the condition (group 1): it isn't part of it, and an earlier removal may have trimmed it
+    query = (0, _removeFromQuery.removeFromQuery)(condition[0].slice(condition[1].length), query);
   }
   return query;
 };

package/dist/data/utilities/parsers/findConditions.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findConditions=void 0;var _removeFromQuery=require("./removeFromQuery"),_parseLiteralValue=require("./parseLiteralValue");const conditionMatch=/(and|or)?\s*(where)\s+([a-z0-9_-]+\.?[a-z0-9_-]*)\s+(=|!=|>|<|>=|<=|in|between|like)\s+(["'](.*)['"]|([0-9]+)|(\[.*])|(null)|(true)|(false))/gi,findConditions=(e,r)=>{const o=r.matchAll(conditionMatch);for(const i of o)e.conditions.push({property:i[3],comparator:i[4],value:(0,_parseLiteralValue.parseLiteralValue)(i,6)}),r=(0,_removeFromQuery.removeFromQuery)(i[0],r);return r};exports.findConditions=findConditions;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findConditions=void 0,require("core-js/modules/es.array.includes.js");var _removeFromQuery=require("./removeFromQuery"),_parseLiteralValue=require("./parseLiteralValue"),_maskStrings=require("./maskStrings");const conditionMatch=new RegExp(`(^|[^a-z0-9._-])(?:(and|or)\\s+)?(where)\\s+([a-z0-9_-]+\\.?[a-z0-9_-]*)\\s+(?:(is\\s+not\\s+null|is\\s+null|exists|does\\s+not\\s+exist)(?![a-z0-9_.-])|(=|!=|>|<|>=|<=|in|between|like)\\s+(${_maskStrings.placeholderSource}|(${_parseLiteralValue.numberSource})|${_maskStrings.arraySource}|(null)|(true)|(false)))`,"ig"),findConditions=(e,r)=>{const o=r.matchAll(conditionMatch);for(const n of o){if(void 0!==n[2]&&"or"===n[2].toLowerCase())throw new Error("`or where` is not supported yet: use `and where`, or run one query per alternative");if(void 0!==n[5])e.conditions.push({property:n[4],comparator:n[5].toLowerCase().replace(/\s+/g," "),value:null});else{const r=(0,_parseLiteralValue.parseLiteralValue)(n,8);if(null===r)throw new Error(`\`${n[4]} ${n[6]} null\` never matches (null equals nothing, as in SQL): use \`${n[4]} is null\` or \`${n[4]} is not null\``);if("between"===n[6].toLowerCase()&&Array.isArray(r)&&r.includes(null))throw new Error(`\`${n[4]} between\` can't have a null bound: it would never match`);e.conditions.push({property:n[4],comparator:n[6],value:r})}r=(0,_removeFromQuery.removeFromQuery)(n[0].slice(n[1].length),r)}return r};exports.findConditions=findConditions;

package/dist/data/utilities/parsers/findInsertValues.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.findInsertValues = void 0;
 var _removeFromQuery = require("./removeFromQuery");
 var _parseLiteralValue = require("./parseLiteralValue");
-const literal = '(?:["\'][^"\']*[\'"]|[0-9]+|\\[.*?]|null|true|false)';
+var _maskStrings = require("./maskStrings");
+const literal = `(?:${_maskStrings.placeholderSource.replace('(', '(?:')}|${_parseLiteralValue.numberSource}|${_maskStrings.arraySource.replace('(', '(?:')}|null|true|false)`;
 const valuesClauseMatch = new RegExp(`(values)\\s+([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`, 'i');
-const assignmentMatch = /([a-z0-9_-]+)\s*=\s*(["'](.*?)['"]|([0-9]+)|(\[.*?])|(null)|(true)|(false))/ig;
+const assignmentMatch = new RegExp(`([a-z0-9_-]+)\\s*=\\s*(${_maskStrings.placeholderSource}|(${_parseLiteralValue.numberSource})|${_maskStrings.arraySource}|(null)|(true)|(false))`, 'ig');
 /**
  * Extract an insert's "values field = value, field2 = value2" clause from the query, the same way
  * findUpdateValues() does for "set". insertEntity() accepts an array of rows for bulk inserts, but

package/dist/data/utilities/parsers/findInsertValues.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findInsertValues=void 0;var _removeFromQuery=require("./removeFromQuery"),_parseLiteralValue=require("./parseLiteralValue");const literal="(?:[\"'][^\"']*['\"]|[0-9]+|\\[.*?]|null|true|false)",valuesClauseMatch=new RegExp(`(values)\\s+([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`,"i"),assignmentMatch=/([a-z0-9_-]+)\s*=\s*(["'](.*?)['"]|([0-9]+)|(\[.*?])|(null)|(true)|(false))/gi,findInsertValues=(e,r)=>{const s=r.match(valuesClauseMatch);if(e.insertValues=[],!s)return r;const a={},t=s[2].matchAll(assignmentMatch);for(const e of t)a[e[1]]=(0,_parseLiteralValue.parseLiteralValue)(e,3);return e.insertValues=[a],(0,_removeFromQuery.removeFromQuery)(s[0],r)};exports.findInsertValues=findInsertValues;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findInsertValues=void 0;var _removeFromQuery=require("./removeFromQuery"),_parseLiteralValue=require("./parseLiteralValue"),_maskStrings=require("./maskStrings");const literal=`(?:${_maskStrings.placeholderSource.replace("(","(?:")}|${_parseLiteralValue.numberSource}|${_maskStrings.arraySource.replace("(","(?:")}|null|true|false)`,valuesClauseMatch=new RegExp(`(values)\\s+([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`,"i"),assignmentMatch=new RegExp(`([a-z0-9_-]+)\\s*=\\s*(${_maskStrings.placeholderSource}|(${_parseLiteralValue.numberSource})|${_maskStrings.arraySource}|(null)|(true)|(false))`,"ig"),findInsertValues=(e,r)=>{const a=r.match(valuesClauseMatch);if(e.insertValues=[],!a)return r;const s={},l=a[2].matchAll(assignmentMatch);for(const e of l)s[e[1]]=(0,_parseLiteralValue.parseLiteralValue)(e,3);return e.insertValues=[s],(0,_removeFromQuery.removeFromQuery)(a[0],r)};exports.findInsertValues=findInsertValues;

package/dist/data/utilities/parsers/findJoinEntity.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.findJoinEntity = void 0;
 var _removeFromQuery = require("./removeFromQuery");
-const joinEntityMatch = /\.([a-z0-9_-]+)/i;
+// Only straight after the entity (findCommand leaves `.joined ...`): a `.` later on is a number's (`1.5`) or a
+// condition's `entity.field`, not the join
+const joinEntityMatch = /^\.([a-z0-9_-]+)/i;
 /**
  * Extract the main join entity from the query.
  * @param parsed

package/dist/data/utilities/parsers/findJoinEntity.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findJoinEntity=void 0;var _removeFromQuery=require("./removeFromQuery");const joinEntityMatch=/\.([a-z0-9_-]+)/i,findJoinEntity=(t,e)=>{const i=e.match(joinEntityMatch);return i?(t.joinEntity=i?i[1]:void 0,(0,_removeFromQuery.removeFromQuery)(i[0],e)):e};exports.findJoinEntity=findJoinEntity;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findJoinEntity=void 0;var _removeFromQuery=require("./removeFromQuery");const joinEntityMatch=/^\.([a-z0-9_-]+)/i,findJoinEntity=(t,e)=>{const i=e.match(joinEntityMatch);return i?(t.joinEntity=i?i[1]:void 0,(0,_removeFromQuery.removeFromQuery)(i[0],e)):e};exports.findJoinEntity=findJoinEntity;

package/dist/data/utilities/parsers/findSelects.js

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.findSelects = void 0;
 var _removeFromQuery = require("./removeFromQuery");
-const selectClausesMatch = /select\s+([a-z0-9=._-]+\s*(as\s+)?([a-z0-9_-]+)?)+\s*(,\s*[a-z0-9=._-]+\s*(as\s*[a-z0-9_-]+)?)*/i;
-const selectClauseMatch = /(select)?\s*,?\s*([a-z0-9=._-]+)\s*(as\s+)?([a-z0-9_-]+)?/ig;
+// One field is a name, then optionally `as <alias>` (`as` as a whole word); fields are separated by commas. The first
+// field used to accept an alias without `as`, so in `select name where a = 1` the word `where` became the alias.
+const selectField = '[a-z0-9=._-]+(?:\\s+as\\s+[a-z0-9_-]+)?';
+const selectClausesMatch = new RegExp(`select\\s+${selectField}(?:\\s*,\\s*${selectField})*`, 'i');
+const selectClauseMatch = /(select)?\s*,?\s*([a-z0-9=._-]+)(?:\s+as\s+([a-z0-9_-]+))?/ig;
 /**
  * Extract select clauses from the query.
  * @param parsed
@@ -20,7 +23,7 @@ const findSelects = (parsed, query) => {
     for (const selectClause of selectClausesFound) {
       parsed['selectClauses'].push({
         property: selectClause[2],
-        alias: selectClause[4]
+        alias: selectClause[3]
       });
     }
     return (0, _removeFromQuery.removeFromQuery)(selectsFound[0], query);

package/dist/data/utilities/parsers/findSelects.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findSelects=void 0;var _removeFromQuery=require("./removeFromQuery");const selectClausesMatch=/select\s+([a-z0-9=._-]+\s*(as\s+)?([a-z0-9_-]+)?)+\s*(,\s*[a-z0-9=._-]+\s*(as\s*[a-z0-9_-]+)?)*/i,selectClauseMatch=/(select)?\s*,?\s*([a-z0-9=._-]+)\s*(as\s+)?([a-z0-9_-]+)?/gi,findSelects=(e,s)=>{const t=s.match(selectClausesMatch);if(t){const r=t[0].matchAll(selectClauseMatch);for(const s of r)e.selectClauses.push({property:s[2],alias:s[4]});return(0,_removeFromQuery.removeFromQuery)(t[0],s)}return s};exports.findSelects=findSelects;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findSelects=void 0;var _removeFromQuery=require("./removeFromQuery");const selectField="[a-z0-9=._-]+(?:\\s+as\\s+[a-z0-9_-]+)?",selectClausesMatch=new RegExp(`select\\s+${selectField}(?:\\s*,\\s*${selectField})*`,"i"),selectClauseMatch=/(select)?\s*,?\s*([a-z0-9=._-]+)(?:\s+as\s+([a-z0-9_-]+))?/gi,findSelects=(e,s)=>{const t=s.match(selectClausesMatch);if(t){const r=t[0].matchAll(selectClauseMatch);for(const s of r)e.selectClauses.push({property:s[2],alias:s[3]});return(0,_removeFromQuery.removeFromQuery)(t[0],s)}return s};exports.findSelects=findSelects;

package/dist/data/utilities/parsers/findSortClauses.js

@@ -5,8 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.findSortClauses = void 0;
 var _removeFromQuery = require("./removeFromQuery");
-const sortMatch = /sort\s+([a-z0-9._-]+\s*(asc|desc)?)+\s*(,\s*[a-z0-9._-]+\s*(asc|desc)?)*/i;
-const sortRuleMatch = /(sort)?\s*,?\s*([a-z0-9._-]+)\s*(asc|desc)?/ig;
+// One rule is a field, then optionally asc or desc as a whole word. Rules are separated by commas, so the list ends
+// at the first word that doesn't follow a comma: in `sort a limit 1`, `limit` starts the next clause.
+const sortRule = '[a-z0-9._-]+(?:\\s+(?:asc|desc)(?![a-z0-9._-]))?';
+const sortMatch = new RegExp(`sort\\s+${sortRule}(?:\\s*,\\s*${sortRule})*`, 'i');
+const sortRuleMatch = /(sort)?\s*,?\s*([a-z0-9._-]+)(?:\s+(asc|desc)(?![a-z0-9._-]))?/ig;
 /**
  * Extract sort clauses from the query.
  * @param parsed

package/dist/data/utilities/parsers/findSortClauses.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findSortClauses=void 0;var _removeFromQuery=require("./removeFromQuery");const sortMatch=/sort\s+([a-z0-9._-]+\s*(asc|desc)?)+\s*(,\s*[a-z0-9._-]+\s*(asc|desc)?)*/i,sortRuleMatch=/(sort)?\s*,?\s*([a-z0-9._-]+)\s*(asc|desc)?/gi,findSortClauses=(s,r)=>{const e=r.match(sortMatch);if(e){const o=e[0].matchAll(sortRuleMatch);for(const r of o)s.sortClauses.push({property:r[2],direction:r[3]||"asc"});return(0,_removeFromQuery.removeFromQuery)(e[0],r)}return r};exports.findSortClauses=findSortClauses;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findSortClauses=void 0;var _removeFromQuery=require("./removeFromQuery");const sortRule="[a-z0-9._-]+(?:\\s+(?:asc|desc)(?![a-z0-9._-]))?",sortMatch=new RegExp(`sort\\s+${sortRule}(?:\\s*,\\s*${sortRule})*`,"i"),sortRuleMatch=/(sort)?\s*,?\s*([a-z0-9._-]+)(?:\s+(asc|desc)(?![a-z0-9._-]))?/gi,findSortClauses=(e,r)=>{const s=r.match(sortMatch);if(s){const o=s[0].matchAll(sortRuleMatch);for(const r of o)e.sortClauses.push({property:r[2],direction:r[3]||"asc"});return(0,_removeFromQuery.removeFromQuery)(s[0],r)}return r};exports.findSortClauses=findSortClauses;

package/dist/data/utilities/parsers/findUpdateValues.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.findUpdateValues = void 0;
 var _removeFromQuery = require("./removeFromQuery");
 var _parseLiteralValue = require("./parseLiteralValue");
-const literal = '(?:["\'][^"\']*[\'"]|[0-9]+|\\[.*?]|null|true|false)';
+var _maskStrings = require("./maskStrings");
+const literal = `(?:${_maskStrings.placeholderSource.replace('(', '(?:')}|${_parseLiteralValue.numberSource}|${_maskStrings.arraySource.replace('(', '(?:')}|null|true|false)`;
 const setClauseMatch = new RegExp(`(set)\\s+([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`, 'i');
-const assignmentMatch = /([a-z0-9_-]+)\s*=\s*(["'](.*?)['"]|([0-9]+)|(\[.*?])|(null)|(true)|(false))/ig;
+const assignmentMatch = new RegExp(`([a-z0-9_-]+)\\s*=\\s*(${_maskStrings.placeholderSource}|(${_parseLiteralValue.numberSource})|${_maskStrings.arraySource}|(null)|(true)|(false))`, 'ig');
 /**
  * Extract an update's "set field = value, field2 = value2" clause from the query. Uses a two-pass
  * match, unlike the other parsers here: the set clause's own boundary is found first (so it can

package/dist/data/utilities/parsers/findUpdateValues.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findUpdateValues=void 0;var _removeFromQuery=require("./removeFromQuery"),_parseLiteralValue=require("./parseLiteralValue");const literal="(?:[\"'][^\"']*['\"]|[0-9]+|\\[.*?]|null|true|false)",setClauseMatch=new RegExp(`(set)\\s+([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`,"i"),assignmentMatch=/([a-z0-9_-]+)\s*=\s*(["'](.*?)['"]|([0-9]+)|(\[.*?])|(null)|(true)|(false))/gi,findUpdateValues=(e,a)=>{const r=a.match(setClauseMatch);if(e.updateValues={},!r)return a;const s=r[2].matchAll(assignmentMatch);for(const a of s)e.updateValues[a[1]]=(0,_parseLiteralValue.parseLiteralValue)(a,3);return(0,_removeFromQuery.removeFromQuery)(r[0],a)};exports.findUpdateValues=findUpdateValues;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findUpdateValues=void 0;var _removeFromQuery=require("./removeFromQuery"),_parseLiteralValue=require("./parseLiteralValue"),_maskStrings=require("./maskStrings");const literal=`(?:${_maskStrings.placeholderSource.replace("(","(?:")}|${_parseLiteralValue.numberSource}|${_maskStrings.arraySource.replace("(","(?:")}|null|true|false)`,setClauseMatch=new RegExp(`(set)\\s+([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`,"i"),assignmentMatch=new RegExp(`([a-z0-9_-]+)\\s*=\\s*(${_maskStrings.placeholderSource}|(${_parseLiteralValue.numberSource})|${_maskStrings.arraySource}|(null)|(true)|(false))`,"ig"),findUpdateValues=(e,r)=>{const a=r.match(setClauseMatch);if(e.updateValues={},!a)return r;const s=a[2].matchAll(assignmentMatch);for(const r of s)e.updateValues[r[1]]=(0,_parseLiteralValue.parseLiteralValue)(r,3);return(0,_removeFromQuery.removeFromQuery)(a[0],r)};exports.findUpdateValues=findUpdateValues;

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

@@ -0,0 +1,39 @@
+/**
+ * Regex source matching one placeholder from maskStrings, with the hex-encoded value as its only group. The
+ * find* parsers use it where they would otherwise match a quoted string.
+ */
+export declare const placeholderSource = "\\u0000([0-9a-f]*)\\u0000";
+/**
+ * Regex source matching one placeholder from maskArrays, with the hex-encoded JSON of the array as its only group.
+ * The find* parsers use it where they would otherwise match `[...]`.
+ */
+export declare const arraySource = "\\u0001([0-9a-f]*)\\u0001";
+/**
+ * Turn the hex of a placeholder back into the string's value.
+ * @param hex
+ */
+export declare const fromPlaceholder: (hex: string) => string;
+/**
+ * Replace every quoted string in a query with a placeholder holding its value (with the escapes applied), so that
+ * nothing inside a string (a keyword, a quote, `and`, a `]`) can be matched by the find* parsers.
+ * @param query
+ * @throws {Error} For an unclosed string, comment or bracket, or a NUL or SOH character outside a string (which
+ * could otherwise pass for a placeholder).
+ */
+export declare const maskStrings: (query: string) => string;
+/**
+ * Put every placeholder back the way it would be written in a query: strings quoted, arrays as JSON. For error
+ * messages, and for reading an array's text as JSON.
+ * @param text
+ * @param quote - wrap strings with JSON's double quotes (the default) or with single quotes
+ */
+export declare const unmaskStrings: (text: string, quote?: "json" | "'") => string;
+/**
+ * Replace every array (outermost brackets only, so a nested array stays inside its parent) with a placeholder holding
+ * its JSON, so that the find* parsers never have to find where an array ends, and nothing inside one (a `.`, a `]`,
+ * a keyword) can be matched by them. Run it on the output of maskStrings, where no `[` or `]` is inside a string.
+ * @param masked
+ * @throws {Error} For an array which is not valid JSON once its strings are put back.
+ */
+export declare const maskArrays: (masked: string) => string;
+//# sourceMappingURL=maskStrings.d.ts.map