json-fs-query 1.0.5 → 1.1.0

package/dist/data/utilities/getJoinIndexedList.js

@@ -1,76 +1,76 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getJoinIndexedList = void 0;
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
-var _splitEntityProperty = require("./parsers/splitEntityProperty");
-var _retrieveRecord = require("./retrieveRecord");
-var _getMatchingIndexes = require("./getMatchingIndexes");
-var _matchIndexedJoins = require("./matchIndexedJoins");
-var _restrictIndexedList = require("./restrictIndexedList");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const getJoinIndexedList = async (parsed, recordData, dataSets) => {
-  const reducedJoins = [];
-  const indexed = {};
-  let firstIteration = true;
-  const entity = parsed.entity;
-  const joinEntity = parsed.joinEntity;
-  const joinClauses = parsed.joinClauses;
-  if (!dataSets[entity].length) {
-    // Nothing indexed entity's own rows yet (no WHERE condition narrowed them down ahead of this -
-    // that only happens via getConditionIndexedList, called just before this). The loop below can't
-    // pre-resolve anything against zero rows, so leave parsed.joinClauses exactly as parsed: the
-    // later, unconditional joinEntity() call (once this command's own read actually runs) still
-    // needs the real clauses to do the join itself. Previously this fell through to the loop,
-    // which never ran, leaving reducedJoins (and so parsed.joinClauses) empty regardless of what
-    // was actually parsed - silently discarding every join clause whenever the query had no WHERE.
-    return parsed;
-  }
-  if (!joinClauses.length) {
-    // A WHERE condition DID index entity's own rows above, but this query has no join at all -
-    // joinEntity is undefined. The loop below writes dataSets[entity][anEntity][joinEntity]
-    // unconditionally; left unguarded, that assigns a literal "undefined" key (object[undefined]
-    // coerces to the string "undefined") onto every row, since there's no join to actually attach.
-    return parsed;
-  }
-  for (const anEntity in dataSets[entity]) {
-    const currentEntity = dataSets[entity][anEntity];
-    // Loop over each of the main entities
-    const filterJoins = {};
-    filterJoins[entity] = [_siFunciona.default.cloneObject(currentEntity)];
-    for (const joinClause of joinClauses) {
-      let indexedClone = _siFunciona.default.cloneObject(indexed);
-      const {
-        entity: entityA,
-        property: propertyA
-      } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
-      const {
-        entity: entityB,
-        property: propertyB
-      } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
-      // Get the record for the entities A and B, store on the recordData
-      if (!Object.prototype.hasOwnProperty.call(recordData, entityA)) {
-        recordData[entityA] = await (0, _retrieveRecord.retrieveRecord)(entityA);
-      }
-      if (!Object.prototype.hasOwnProperty.call(recordData, entityB)) {
-        recordData[entityB] = await (0, _retrieveRecord.retrieveRecord)(entityB);
-      }
-      indexedClone = (0, _restrictIndexedList.restrictIndexedList)(joinClause, filterJoins, indexedClone);
-      const retrieveMatchedFiles = (0, _matchIndexedJoins.matchIndexedJoins)(entity, indexedClone, dataSets);
-      // Check if there are matching keys for the join condition
-      const matchAResult = await (0, _getMatchingIndexes.getMatchingIndexes)(entityA, propertyA, recordData, joinClause, filterJoins, indexed);
-      const matchBResult = await (0, _getMatchingIndexes.getMatchingIndexes)(entityB, propertyB, recordData, joinClause, filterJoins, indexed, retrieveMatchedFiles);
-      const isIndexed = matchAResult || matchBResult;
-      if (!isIndexed && firstIteration) {
-        reducedJoins.push(joinClause);
-        firstIteration = false;
-      }
-    }
-    dataSets[entity][anEntity][joinEntity] = filterJoins[joinEntity];
-  }
-  parsed.joinClauses = reducedJoins;
-  return parsed;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getJoinIndexedList = void 0;
+var _siFunciona = _interopRequireDefault(require("si-funciona"));
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _retrieveRecord = require("./retrieveRecord");
+var _getMatchingIndexes = require("./getMatchingIndexes");
+var _matchIndexedJoins = require("./matchIndexedJoins");
+var _restrictIndexedList = require("./restrictIndexedList");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const getJoinIndexedList = async (parsed, recordData, dataSets) => {
+  const reducedJoins = [];
+  const indexed = {};
+  let firstIteration = true;
+  const entity = parsed.entity;
+  const joinEntity = parsed.joinEntity;
+  const joinClauses = parsed.joinClauses;
+  if (!dataSets[entity].length) {
+    // Nothing indexed entity's own rows yet (no WHERE condition narrowed them down ahead of this -
+    // that only happens via getConditionIndexedList, called just before this). The loop below can't
+    // pre-resolve anything against zero rows, so leave parsed.joinClauses exactly as parsed: the
+    // later, unconditional joinEntity() call (once this command's own read actually runs) still
+    // needs the real clauses to do the join itself. Previously this fell through to the loop,
+    // which never ran, leaving reducedJoins (and so parsed.joinClauses) empty regardless of what
+    // was actually parsed - silently discarding every join clause whenever the query had no WHERE.
+    return parsed;
+  }
+  if (!joinClauses.length) {
+    // A WHERE condition DID index entity's own rows above, but this query has no join at all -
+    // joinEntity is undefined. The loop below writes dataSets[entity][anEntity][joinEntity]
+    // unconditionally; left unguarded, that assigns a literal "undefined" key (object[undefined]
+    // coerces to the string "undefined") onto every row, since there's no join to actually attach.
+    return parsed;
+  }
+  for (const anEntity in dataSets[entity]) {
+    const currentEntity = dataSets[entity][anEntity];
+    // Loop over each of the main entities
+    const filterJoins = {};
+    filterJoins[entity] = [_siFunciona.default.cloneObject(currentEntity)];
+    for (const joinClause of joinClauses) {
+      let indexedClone = _siFunciona.default.cloneObject(indexed);
+      const {
+        entity: entityA,
+        property: propertyA
+      } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyA);
+      const {
+        entity: entityB,
+        property: propertyB
+      } = (0, _splitEntityProperty.splitEntityProperty)(joinClause.propertyB);
+      // Get the record for the entities A and B, store on the recordData
+      if (!Object.prototype.hasOwnProperty.call(recordData, entityA)) {
+        recordData[entityA] = await (0, _retrieveRecord.retrieveRecord)(entityA);
+      }
+      if (!Object.prototype.hasOwnProperty.call(recordData, entityB)) {
+        recordData[entityB] = await (0, _retrieveRecord.retrieveRecord)(entityB);
+      }
+      indexedClone = (0, _restrictIndexedList.restrictIndexedList)(joinClause, filterJoins, indexedClone);
+      const retrieveMatchedFiles = (0, _matchIndexedJoins.matchIndexedJoins)(entity, indexedClone, dataSets);
+      // Check if there are matching keys for the join condition
+      const matchAResult = await (0, _getMatchingIndexes.getMatchingIndexes)(entityA, propertyA, recordData, joinClause, filterJoins, indexed);
+      const matchBResult = await (0, _getMatchingIndexes.getMatchingIndexes)(entityB, propertyB, recordData, joinClause, filterJoins, indexed, retrieveMatchedFiles);
+      const isIndexed = matchAResult || matchBResult;
+      if (!isIndexed && firstIteration) {
+        reducedJoins.push(joinClause);
+        firstIteration = false;
+      }
+    }
+    dataSets[entity][anEntity][joinEntity] = filterJoins[joinEntity];
+  }
+  parsed.joinClauses = reducedJoins;
+  return parsed;
+};
 exports.getJoinIndexedList = getJoinIndexedList;

package/dist/data/utilities/getMatchingIndexes.js

@@ -1,28 +1,28 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getMatchingIndexes = void 0;
-require("core-js/modules/es.array.includes.js");
-var _retrieveIndexes = require("./retrieveIndexes");
-const getMatchingIndexes = async (entity, property, recordData, clause, dataSet, indexed, cb = null) => {
-  let isIndexed = false;
-  for (const key of recordData[entity].keys) {
-    if (key.fields.includes(property)) {
-      dataSet[entity] = [];
-      if (!Object.prototype.hasOwnProperty.call(indexed, entity)) {
-        indexed[entity] = {};
-      }
-      if (!Object.prototype.hasOwnProperty.call(indexed[entity], property)) {
-        indexed[entity][property] = (await (0, _retrieveIndexes.retrieveIndexes)(entity, [property], recordData))[property];
-      }
-      if (typeof cb === 'function') {
-        await cb(entity, property, recordData, clause, dataSet, indexed);
-      }
-      isIndexed = true;
-    }
-  }
-  return isIndexed;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMatchingIndexes = void 0;
+require("core-js/modules/es.array.includes.js");
+var _retrieveIndexes = require("./retrieveIndexes");
+const getMatchingIndexes = async (entity, property, recordData, clause, dataSet, indexed, cb = null) => {
+  let isIndexed = false;
+  for (const key of recordData[entity].keys) {
+    if (key.fields.includes(property)) {
+      dataSet[entity] = [];
+      if (!Object.prototype.hasOwnProperty.call(indexed, entity)) {
+        indexed[entity] = {};
+      }
+      if (!Object.prototype.hasOwnProperty.call(indexed[entity], property)) {
+        indexed[entity][property] = (await (0, _retrieveIndexes.retrieveIndexes)(entity, [property], recordData))[property];
+      }
+      if (typeof cb === 'function') {
+        await cb(entity, property, recordData, clause, dataSet, indexed);
+      }
+      isIndexed = true;
+    }
+  }
+  return isIndexed;
+};
 exports.getMatchingIndexes = getMatchingIndexes;

package/dist/data/utilities/matchIndexedJoins.js

@@ -10,6 +10,7 @@ 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 {
@@ -38,7 +39,8 @@ const matchIndexedJoins = (entity, indexedClone, dataSets) => async (focusEntity
     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
+      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)) {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.matchIndexedJoins=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _siFunciona=_interopRequireDefault(require("si-funciona")),_where=require("../queries/where"),_retrieveFile=require("./retrieveFile"),_splitEntityProperty=require("./parsers/splitEntityProperty");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const matchIndexedJoins=(e,t,r)=>async(i,o,n,s,p,y)=>{const{entity:c,property:u}=(0,_splitEntityProperty.splitEntityProperty)(s.propertyA),{entity:a,property:d}=(0,_splitEntityProperty.splitEntityProperty)(s.propertyB),l=[{entityFirst:c,propertyFirst:u,entitySecond:a,propertySecond:d},{entityFirst:a,propertyFirst:d,entitySecond:c,propertySecond:u}];for(const i of l){Object.prototype.hasOwnProperty.call(t,i.entitySecond)||(t[i.entitySecond]=_siFunciona.default.cloneObject(y[i.entitySecond]));const o=t[i.entitySecond][i.propertySecond].reduce(((e,r)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(t[i.entityFirst][i.propertyFirst],{property:"value",comparator:s.comparator,value:r.value}))),[]),n=i.entityFirst===e;Object.prototype.hasOwnProperty.call(r,i.entityFirst)||(r[i.entityFirst]=[]);for(const e of o)for(const t of e.record){let e=t;"string"==typeof t&&(e=await(0,_retrieveFile.retrieveFile)(`${i.entityFirst}/${t}`)),n||r[i.entityFirst].push(e),p[i.entityFirst].push(e)}}};exports.matchIndexedJoins=matchIndexedJoins;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.matchIndexedJoins=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _siFunciona=_interopRequireDefault(require("si-funciona")),_where=require("../queries/where"),_retrieveFile=require("./retrieveFile"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const matchIndexedJoins=(e,t,r)=>async(i,o,n,s,p,y)=>{const{entity:c,property:u}=(0,_splitEntityProperty.splitEntityProperty)(s.propertyA),{entity:a,property:d}=(0,_splitEntityProperty.splitEntityProperty)(s.propertyB),l=[{entityFirst:c,propertyFirst:u,entitySecond:a,propertySecond:d},{entityFirst:a,propertyFirst:d,entitySecond:c,propertySecond:u}];for(const i of l){Object.prototype.hasOwnProperty.call(t,i.entitySecond)||(t[i.entitySecond]=_siFunciona.default.cloneObject(y[i.entitySecond]));const o=t[i.entitySecond][i.propertySecond].reduce(((e,r)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(t[i.entityFirst][i.propertyFirst],{property:"value",comparator:s.comparator,value:r.value,type:(0,_fieldType.fieldType)(n[i.entityFirst],i.propertyFirst)}))),[]),c=i.entityFirst===e;Object.prototype.hasOwnProperty.call(r,i.entityFirst)||(r[i.entityFirst]=[]);for(const e of o)for(const t of e.record){let e=t;"string"==typeof t&&(e=await(0,_retrieveFile.retrieveFile)(`${i.entityFirst}/${t}`)),c||r[i.entityFirst].push(e),p[i.entityFirst].push(e)}}};exports.matchIndexedJoins=matchIndexedJoins;

package/dist/data/utilities/mergeJoin.js

@@ -9,6 +9,8 @@ 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,
@@ -20,11 +22,13 @@ const mergeJoin = async (propertyA = '', propertyB = '', dataSets = {}) => {
   } = (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]
+      value: dataA[propA],
+      type: typeB
     });
     if (!matches.length) {
       return dataA;

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

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

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

@@ -1,25 +1,25 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findCommand = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const commandMatch = /^(delete|insert|read|update)\s+([a-z0-9_-]+)[\w\n]*/i;
-/**
- * Extract command clauses from the query.
- * @param parsed
- * @param query
- */
-const findCommand = (parsed, query) => {
-  const commandFound = query.match(commandMatch);
-  parsed['command'] = undefined;
-  parsed['entity'] = undefined;
-  if (commandFound) {
-    parsed['command'] = commandFound[1];
-    parsed['entity'] = commandFound[2];
-    return (0, _removeFromQuery.removeFromQuery)(commandFound[0], query);
-  }
-  return query;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findCommand = void 0;
+var _removeFromQuery = require("./removeFromQuery");
+const commandMatch = /^(delete|insert|read|update)\s+([a-z0-9_-]+)[\w\n]*/i;
+/**
+ * Extract command clauses from the query.
+ * @param parsed
+ * @param query
+ */
+const findCommand = (parsed, query) => {
+  const commandFound = query.match(commandMatch);
+  parsed['command'] = undefined;
+  parsed['entity'] = undefined;
+  if (commandFound) {
+    parsed['command'] = commandFound[1];
+    parsed['entity'] = commandFound[2];
+    return (0, _removeFromQuery.removeFromQuery)(commandFound[0], query);
+  }
+  return query;
+};
 exports.findCommand = findCommand;

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

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

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

@@ -1,28 +1,28 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findConditions = void 0;
-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;
-/**
- * Extract condition clauses from the query.
- * @param parsed
- * @param query
- */
-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);
-  }
-  return query;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findConditions = void 0;
+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;
+/**
+ * Extract condition clauses from the query.
+ * @param parsed
+ * @param query
+ */
+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);
+  }
+  return query;
+};
 exports.findConditions = findConditions;

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

@@ -1,22 +1,22 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findGroupBy = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const groupMatch = /group\s+by\s+(,?[a-z0-9._-]+)+/i;
-/**
- * Extract the group by clauses from the query.
- * @param parsed
- * @param query
- */
-const findGroupBy = (parsed, query) => {
-  const groupFound = query.match(groupMatch);
-  if (groupFound) {
-    parsed['groupBy'] = groupFound ? groupFound[1] : undefined;
-    return (0, _removeFromQuery.removeFromQuery)(groupFound[0], query);
-  }
-  return query;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findGroupBy = void 0;
+var _removeFromQuery = require("./removeFromQuery");
+const groupMatch = /group\s+by\s+(,?[a-z0-9._-]+)+/i;
+/**
+ * Extract the group by clauses from the query.
+ * @param parsed
+ * @param query
+ */
+const findGroupBy = (parsed, query) => {
+  const groupFound = query.match(groupMatch);
+  if (groupFound) {
+    parsed['groupBy'] = groupFound ? groupFound[1] : undefined;
+    return (0, _removeFromQuery.removeFromQuery)(groupFound[0], query);
+  }
+  return query;
+};
 exports.findGroupBy = findGroupBy;

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

@@ -1,34 +1,34 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findInsertValues = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-var _parseLiteralValue = require("./parseLiteralValue");
-const literal = '(?:["\'][^"\']*[\'"]|[0-9]+|\\[.*?]|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;
-/**
- * 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
- * a query string only describes a single row for now - wrapped in a one-element array to match.
- * @param parsed
- * @param query
- */
-const findInsertValues = (parsed, query) => {
-  const clauseFound = query.match(valuesClauseMatch);
-  parsed['insertValues'] = [];
-  if (!clauseFound) {
-    return query;
-  }
-  const row = {};
-  const assignmentsFound = clauseFound[2].matchAll(assignmentMatch);
-  // @ts-ignore
-  for (const assignment of assignmentsFound) {
-    row[assignment[1]] = (0, _parseLiteralValue.parseLiteralValue)(assignment, 3);
-  }
-  parsed['insertValues'] = [row];
-  return (0, _removeFromQuery.removeFromQuery)(clauseFound[0], query);
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findInsertValues = void 0;
+var _removeFromQuery = require("./removeFromQuery");
+var _parseLiteralValue = require("./parseLiteralValue");
+const literal = '(?:["\'][^"\']*[\'"]|[0-9]+|\\[.*?]|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;
+/**
+ * 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
+ * a query string only describes a single row for now - wrapped in a one-element array to match.
+ * @param parsed
+ * @param query
+ */
+const findInsertValues = (parsed, query) => {
+  const clauseFound = query.match(valuesClauseMatch);
+  parsed['insertValues'] = [];
+  if (!clauseFound) {
+    return query;
+  }
+  const row = {};
+  const assignmentsFound = clauseFound[2].matchAll(assignmentMatch);
+  // @ts-ignore
+  for (const assignment of assignmentsFound) {
+    row[assignment[1]] = (0, _parseLiteralValue.parseLiteralValue)(assignment, 3);
+  }
+  parsed['insertValues'] = [row];
+  return (0, _removeFromQuery.removeFromQuery)(clauseFound[0], query);
+};
 exports.findInsertValues = findInsertValues;

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

@@ -1,27 +1,27 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findJoinClauses = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const joinClauseMatch = /(and)?\s*on\s+([a-z0-9_-]+\.[a-z0-9_-]+)\s+(=|!=|>|<|>=|<=|in|between|like)\s+([a-z0-9_-]+\.[a-z0-9_-]+)/ig;
-/**
- * Extract condition clauses from the query.
- * @param parsed
- * @param query
- */
-const findJoinClauses = (parsed, query) => {
-  const joinClausesFound = query.matchAll(joinClauseMatch);
-  // @ts-ignore
-  for (const joinClause of joinClausesFound) {
-    parsed['joinClauses'].push({
-      propertyA: joinClause[2],
-      comparator: joinClause[3],
-      propertyB: joinClause[4]
-    });
-    query = (0, _removeFromQuery.removeFromQuery)(joinClause[0], query);
-  }
-  return query;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findJoinClauses = void 0;
+var _removeFromQuery = require("./removeFromQuery");
+const joinClauseMatch = /(and)?\s*on\s+([a-z0-9_-]+\.[a-z0-9_-]+)\s+(=|!=|>|<|>=|<=|in|between|like)\s+([a-z0-9_-]+\.[a-z0-9_-]+)/ig;
+/**
+ * Extract condition clauses from the query.
+ * @param parsed
+ * @param query
+ */
+const findJoinClauses = (parsed, query) => {
+  const joinClausesFound = query.matchAll(joinClauseMatch);
+  // @ts-ignore
+  for (const joinClause of joinClausesFound) {
+    parsed['joinClauses'].push({
+      propertyA: joinClause[2],
+      comparator: joinClause[3],
+      propertyB: joinClause[4]
+    });
+    query = (0, _removeFromQuery.removeFromQuery)(joinClause[0], query);
+  }
+  return query;
+};
 exports.findJoinClauses = findJoinClauses;

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

@@ -1,22 +1,22 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findJoinEntity = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const joinEntityMatch = /\.([a-z0-9_-]+)/i;
-/**
- * Extract the main join entity from the query.
- * @param parsed
- * @param query
- */
-const findJoinEntity = (parsed, query) => {
-  const joinEntityFound = query.match(joinEntityMatch);
-  if (joinEntityFound) {
-    parsed['joinEntity'] = joinEntityFound ? joinEntityFound[1] : undefined;
-    return (0, _removeFromQuery.removeFromQuery)(joinEntityFound[0], query);
-  }
-  return query;
-};
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findJoinEntity = void 0;
+var _removeFromQuery = require("./removeFromQuery");
+const joinEntityMatch = /\.([a-z0-9_-]+)/i;
+/**
+ * Extract the main join entity from the query.
+ * @param parsed
+ * @param query
+ */
+const findJoinEntity = (parsed, query) => {
+  const joinEntityFound = query.match(joinEntityMatch);
+  if (joinEntityFound) {
+    parsed['joinEntity'] = joinEntityFound ? joinEntityFound[1] : undefined;
+    return (0, _removeFromQuery.removeFromQuery)(joinEntityFound[0], query);
+  }
+  return query;
+};
 exports.findJoinEntity = findJoinEntity;