json-fs-query 2.3.1 → 3.0.0

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),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_-]+)/gi,findJoinClauses=(e,o)=>{const r=o.matchAll(joinClauseMatch);for(const s of r)e.joinClauses.push({propertyA:s[2],comparator:s[3],propertyB:s[4]}),o=(0,_removeFromQuery.removeFromQuery)(s[0],o);return o};exports.findJoinClauses=findJoinClauses;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findJoinClauses=void 0;const joinClauseMatch=/^([a-z0-9_-]+\.[a-z0-9_-]+)\s+(=|!=|>|<|>=|<=|in|between|like)\s+([a-z0-9_-]+\.[a-z0-9_-]+)(?![a-z0-9._-])/i,nextMatch=/^and\s+on\s+/i,findJoinClauses=(e,t)=>{let s=t;for(let t=s.match(joinClauseMatch);t;t=s.match(joinClauseMatch)){e.joinClauses.push({propertyA:t[1],comparator:t[2],propertyB:t[3]}),s=s.slice(t[0].length).trim();const a=s.match(nextMatch);if(!a||!joinClauseMatch.test(s.slice(a[0].length)))break;s=s.slice(a[0].length)}return s};exports.findJoinClauses=findJoinClauses;

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

@@ -1,7 +1,7 @@
 import { ParsedQuery } from './parseQuery';
 export type ParsedJoinEntity = string;
 /**
- * Extract the main join entity from the query.
+ * Read the joined record from what findCommand left of the head.
  * @param parsed
  * @param query
  */

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

@@ -4,12 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findJoinEntity = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-// 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
+// What findCommand leaves of the head: `.joined`
 const joinEntityMatch = /^\.([a-z0-9_-]+)/i;
 /**
- * Extract the main join entity from the query.
+ * Read the joined record from what findCommand left of the head.
  * @param parsed
  * @param query
  */
@@ -17,7 +15,7 @@ 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.slice(joinEntityFound[0].length).trim();
   }
   return query;
 };

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;const joinEntityMatch=/^\.([a-z0-9_-]+)/i,findJoinEntity=(t,i)=>{const n=i.match(joinEntityMatch);return n?(t.joinEntity=n?n[1]:void 0,i.slice(n[0].length).trim()):i};exports.findJoinEntity=findJoinEntity;

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

@@ -1,9 +1,10 @@
 import { ParsedQuery } from './parseQuery';
 export type ParsedLimit = number;
 /**
- * Extract the limit clauses from the query.
+ * Read a limit clause body (a whole number, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the number.
  */
-export declare const findLimit: (parsed: ParsedQuery, query: string) => string;
+export declare const findLimit: (parsed: ParsedQuery, body: string) => string;
 //# sourceMappingURL=findLimit.d.ts.map

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

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findLimit = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const limitMatch = /limit\s*(\d+)/i;
+const limitMatch = /^(\d+)/;
 /**
- * Extract the limit clauses from the query.
+ * Read a limit clause body (a whole number, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the number.
  */
-const findLimit = (parsed, query) => {
-  const limitFound = query.match(limitMatch);
+const findLimit = (parsed, body) => {
+  const limitFound = body.match(limitMatch);
   if (limitFound) {
     parsed['limit'] = limitFound ? parseInt(limitFound[1]) : undefined;
-    return (0, _removeFromQuery.removeFromQuery)(limitFound[0], query);
+    return body.slice(limitFound[0].length).trim();
   }
-  return query;
+  return body;
 };
 exports.findLimit = findLimit;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findLimit=void 0;var _removeFromQuery=require("./removeFromQuery");const limitMatch=/limit\s*(\d+)/i,findLimit=(e,i)=>{const r=i.match(limitMatch);return r?(e.limit=r?parseInt(r[1]):void 0,(0,_removeFromQuery.removeFromQuery)(r[0],i)):i};exports.findLimit=findLimit;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findLimit=void 0;const limitMatch=/^(\d+)/,findLimit=(i,t)=>{const e=t.match(limitMatch);return e?(i.limit=e?parseInt(e[1]):void 0,t.slice(e[0].length).trim()):t};exports.findLimit=findLimit;

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

@@ -4,9 +4,10 @@ export type ParsedMergeJoin = {
     propertyB: string;
 };
 /**
- * Extract merge-join clauses from the query.
+ * Read a merge clause body (`a.x with b.y merge c.z with d.w`, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last merge.
  */
-export declare const findMergeJoins: (parsed: ParsedQuery, query: string) => string;
+export declare const findMergeJoins: (parsed: ParsedQuery, body: string) => string;
 //# sourceMappingURL=findMergeJoins.d.ts.map

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

@@ -4,23 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findMergeJoins = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const mergeJoinMatch = /(and)?\s*merge\s+([a-z0-9_-]+\.[a-z0-9_-]+)\s+with\s+([a-z0-9_-]+\.[a-z0-9_-]+)/ig;
+// One merge, at the start of the text; every one after the first starts with `merge` or `and merge` (see splitClauses)
+const mergeJoinMatch = /^([a-z0-9_-]+\.[a-z0-9_-]+)\s+with\s+([a-z0-9_-]+\.[a-z0-9_-]+)(?![a-z0-9._-])/i;
+const nextMatch = /^(?:and\s+)?merge\s+/i;
 /**
- * Extract merge-join clauses from the query.
+ * Read a merge clause body (`a.x with b.y merge c.z with d.w`, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last merge.
  */
-const findMergeJoins = (parsed, query) => {
-  const mergeJoinsFound = query.matchAll(mergeJoinMatch);
-  // @ts-ignore
-  for (const mergeJoin of mergeJoinsFound) {
+const findMergeJoins = (parsed, body) => {
+  let rest = body;
+  for (let mergeJoin = rest.match(mergeJoinMatch); mergeJoin; mergeJoin = rest.match(mergeJoinMatch)) {
     parsed['mergeJoins'].push({
-      propertyA: mergeJoin[2],
-      propertyB: mergeJoin[3]
+      propertyA: mergeJoin[1],
+      propertyB: mergeJoin[2]
     });
-    query = (0, _removeFromQuery.removeFromQuery)(mergeJoin[0].trim(), query);
+    rest = rest.slice(mergeJoin[0].length).trim();
+    // The connector only with another one after it, so a bad one is shown with its connector
+    const next = rest.match(nextMatch);
+    if (!next || !mergeJoinMatch.test(rest.slice(next[0].length))) {
+      break;
+    }
+    rest = rest.slice(next[0].length);
   }
-  return query;
+  return rest;
 };
 exports.findMergeJoins = findMergeJoins;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findMergeJoins=void 0;var _removeFromQuery=require("./removeFromQuery");const mergeJoinMatch=/(and)?\s*merge\s+([a-z0-9_-]+\.[a-z0-9_-]+)\s+with\s+([a-z0-9_-]+\.[a-z0-9_-]+)/gi,findMergeJoins=(e,r)=>{const o=r.matchAll(mergeJoinMatch);for(const s of o)e.mergeJoins.push({propertyA:s[2],propertyB:s[3]}),r=(0,_removeFromQuery.removeFromQuery)(s[0].trim(),r);return r};exports.findMergeJoins=findMergeJoins;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findMergeJoins=void 0;const mergeJoinMatch=/^([a-z0-9_-]+\.[a-z0-9_-]+)\s+with\s+([a-z0-9_-]+\.[a-z0-9_-]+)(?![a-z0-9._-])/i,nextMatch=/^(?:and\s+)?merge\s+/i,findMergeJoins=(e,t)=>{let r=t;for(let t=r.match(mergeJoinMatch);t;t=r.match(mergeJoinMatch)){e.mergeJoins.push({propertyA:t[1],propertyB:t[2]}),r=r.slice(t[0].length).trim();const i=r.match(nextMatch);if(!i||!mergeJoinMatch.test(r.slice(i[0].length)))break;r=r.slice(i[0].length)}return r};exports.findMergeJoins=findMergeJoins;

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

@@ -1,9 +1,10 @@
 import { ParsedQuery } from './parseQuery';
 export type ParsedOffset = number;
 /**
- * Extract the offset clauses from the query.
+ * Read a offset clause body (a whole number, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the number.
  */
-export declare const findOffset: (parsed: ParsedQuery, query: string) => string;
+export declare const findOffset: (parsed: ParsedQuery, body: string) => string;
 //# sourceMappingURL=findOffset.d.ts.map

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

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findOffset = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-const offsetMatch = /offset\s*(\d+)/i;
+const offsetMatch = /^(\d+)/;
 /**
- * Extract the offset clauses from the query.
+ * Read a offset clause body (a whole number, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the number.
  */
-const findOffset = (parsed, query) => {
-  const offsetFound = query.match(offsetMatch);
+const findOffset = (parsed, body) => {
+  const offsetFound = body.match(offsetMatch);
   if (offsetFound) {
     parsed['offset'] = offsetFound ? parseInt(offsetFound[1]) : undefined;
-    return (0, _removeFromQuery.removeFromQuery)(offsetFound[0], query);
+    return body.slice(offsetFound[0].length).trim();
   }
-  return query;
+  return body;
 };
 exports.findOffset = findOffset;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findOffset=void 0;var _removeFromQuery=require("./removeFromQuery");const offsetMatch=/offset\s*(\d+)/i,findOffset=(e,r)=>{const t=r.match(offsetMatch);return t?(e.offset=t?parseInt(t[1]):void 0,(0,_removeFromQuery.removeFromQuery)(t[0],r)):r};exports.findOffset=findOffset;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findOffset=void 0;const offsetMatch=/^(\d+)/,findOffset=(t,e)=>{const f=e.match(offsetMatch);return f?(t.offset=f?parseInt(f[1]):void 0,e.slice(f[0].length).trim()):e};exports.findOffset=findOffset;

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

@@ -4,9 +4,10 @@ export type ParsedSelect = {
     alias: string | undefined;
 };
 /**
- * Extract select clauses from the query.
+ * Read a select clause body (`a, b as c`, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last field.
  */
-export declare const findSelects: (parsed: ParsedQuery, query: string) => string;
+export declare const findSelects: (parsed: ParsedQuery, body: string) => string;
 //# sourceMappingURL=findSelects.d.ts.map

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

@@ -4,30 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findSelects = void 0;
-var _removeFromQuery = require("./removeFromQuery");
-// 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.
+// One field is a name, then optionally `as <alias>` (`as` as a whole word); fields are separated by commas
 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;
+const selectsMatch = new RegExp(`^${selectField}(?:\\s*,\\s*${selectField})*`, 'i');
+const selectFieldMatch = /,?\s*([a-z0-9=._-]+)(?:\s+as\s+([a-z0-9_-]+))?/ig;
 /**
- * Extract select clauses from the query.
+ * Read a select clause body (`a, b as c`, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last field.
  */
-const findSelects = (parsed, query) => {
-  const selectsFound = query.match(selectClausesMatch);
+const findSelects = (parsed, body) => {
+  const selectsFound = body.match(selectsMatch);
   if (selectsFound) {
-    const selectClausesFound = selectsFound[0].matchAll(selectClauseMatch);
+    const selectClausesFound = selectsFound[0].matchAll(selectFieldMatch);
     // @ts-ignore
     for (const selectClause of selectClausesFound) {
       parsed['selectClauses'].push({
-        property: selectClause[2],
-        alias: selectClause[3]
+        property: selectClause[1],
+        alias: selectClause[2]
       });
     }
-    return (0, _removeFromQuery.removeFromQuery)(selectsFound[0], query);
+    return body.slice(selectsFound[0].length).trim();
   }
-  return query;
+  return body;
 };
 exports.findSelects = findSelects;

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 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;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findSelects=void 0;const selectField="[a-z0-9=._-]+(?:\\s+as\\s+[a-z0-9_-]+)?",selectsMatch=new RegExp(`^${selectField}(?:\\s*,\\s*${selectField})*`,"i"),selectFieldMatch=/,?\s*([a-z0-9=._-]+)(?:\s+as\s+([a-z0-9_-]+))?/gi,findSelects=(e,s)=>{const t=s.match(selectsMatch);if(t){const c=t[0].matchAll(selectFieldMatch);for(const s of c)e.selectClauses.push({property:s[1],alias:s[2]});return s.slice(t[0].length).trim()}return s};exports.findSelects=findSelects;

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

@@ -5,9 +5,10 @@ export type ParsedSortClause = {
     type?: string;
 };
 /**
- * Extract sort clauses from the query.
+ * Read a sort clause body (`a, b desc`, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last rule.
  */
-export declare const findSortClauses: (parsed: ParsedQuery, query: string) => string;
+export declare const findSortClauses: (parsed: ParsedQuery, body: string) => string;
 //# sourceMappingURL=findSortClauses.d.ts.map

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

@@ -4,30 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findSortClauses = void 0;
-var _removeFromQuery = require("./removeFromQuery");
 // 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.
+// at the first word that doesn't follow a comma: in `sort a b`, `b` is left over.
 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;
+const sortMatch = new RegExp(`^${sortRule}(?:\\s*,\\s*${sortRule})*`, 'i');
+const sortRuleMatch = /,?\s*([a-z0-9._-]+)(?:\s+(asc|desc)(?![a-z0-9._-]))?/ig;
 /**
- * Extract sort clauses from the query.
+ * Read a sort clause body (`a, b desc`, see splitClauses).
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last rule.
  */
-const findSortClauses = (parsed, query) => {
-  const sortFound = query.match(sortMatch);
+const findSortClauses = (parsed, body) => {
+  const sortFound = body.match(sortMatch);
   if (sortFound) {
     const sortRulesFound = sortFound[0].matchAll(sortRuleMatch);
     // @ts-ignore
     for (const sortClause of sortRulesFound) {
       parsed['sortClauses'].push({
-        property: sortClause[2],
-        direction: (sortClause[3] || 'asc').toLowerCase()
+        property: sortClause[1],
+        direction: (sortClause[2] || 'asc').toLowerCase()
       });
     }
-    return (0, _removeFromQuery.removeFromQuery)(sortFound[0], query);
+    return body.slice(sortFound[0].length).trim();
   }
-  return query;
+  return body;
 };
 exports.findSortClauses = findSortClauses;

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

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

@@ -3,13 +3,11 @@ export type ParsedUpdateValues = {
     [field: string]: any;
 };
 /**
- * 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
- * be removed from the query as a whole, and so the comma-separated list doesn't get confused with
- * anything that follows, like a where clause), then each individual assignment is parsed out of
- * that captured substring.
+ * Read an update's set clause body (`field = value, field2 = value2`, see splitClauses). Uses a two-pass match: the
+ * whole comma-separated list first, so anything after it is left over, then each assignment out of that list.
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last assignment.
  */
-export declare const findUpdateValues: (parsed: ParsedQuery, query: string) => string;
+export declare const findUpdateValues: (parsed: ParsedQuery, body: string) => string;
 //# sourceMappingURL=findUpdateValues.d.ts.map

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

@@ -4,32 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.findUpdateValues = void 0;
-var _removeFromQuery = require("./removeFromQuery");
 var _parseLiteralValue = require("./parseLiteralValue");
 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 setMatch = new RegExp(`^([a-z0-9_-]+\\s*=\\s*${literal}(?:\\s*,\\s*[a-z0-9_-]+\\s*=\\s*${literal})*)`, 'i');
 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
- * be removed from the query as a whole, and so the comma-separated list doesn't get confused with
- * anything that follows, like a where clause), then each individual assignment is parsed out of
- * that captured substring.
+ * Read an update's set clause body (`field = value, field2 = value2`, see splitClauses). Uses a two-pass match: the
+ * whole comma-separated list first, so anything after it is left over, then each assignment out of that list.
  * @param parsed
- * @param query
+ * @param body
+ * @returns The rest of the body, after the last assignment.
  */
-const findUpdateValues = (parsed, query) => {
-  const clauseFound = query.match(setClauseMatch);
+const findUpdateValues = (parsed, body) => {
+  const clauseFound = body.match(setMatch);
   parsed['updateValues'] = {};
   if (!clauseFound) {
-    return query;
+    return body;
   }
-  const assignmentsFound = clauseFound[2].matchAll(assignmentMatch);
+  const assignmentsFound = clauseFound[1].matchAll(assignmentMatch);
   // @ts-ignore
   for (const assignment of assignmentsFound) {
     parsed['updateValues'][assignment[1]] = (0, _parseLiteralValue.parseLiteralValue)(assignment, 3);
   }
-  return (0, _removeFromQuery.removeFromQuery)(clauseFound[0], query);
+  return body.slice(clauseFound[0].length).trim();
 };
 exports.findUpdateValues = findUpdateValues;

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"),_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;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.findUpdateValues=void 0;var _parseLiteralValue=require("./parseLiteralValue"),_maskStrings=require("./maskStrings");const literal=`(?:${_maskStrings.placeholderSource.replace("(","(?:")}|${_parseLiteralValue.numberSource}|${_maskStrings.arraySource.replace("(","(?:")}|null|true|false)`,setMatch=new RegExp(`^([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,a)=>{const r=a.match(setMatch);if(e.updateValues={},!r)return a;const s=r[1].matchAll(assignmentMatch);for(const a of s)e.updateValues[a[1]]=(0,_parseLiteralValue.parseLiteralValue)(a,3);return a.slice(r[0].length).trim()};exports.findUpdateValues=findUpdateValues;

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

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.parseQuery = void 0;
-var _siFunciona = _interopRequireDefault(require("si-funciona"));
 var _findCommand = require("./findCommand");
 var _findInsertValues = require("./findInsertValues");
 var _findUpdateValues = require("./findUpdateValues");
 var _findJoinEntity = require("./findJoinEntity");
 var _findSelects = require("./findSelects");
 var _findConditions = require("./findConditions");
+var _conditionTree = require("../conditionTree");
 var _findJoinClauses = require("./findJoinClauses");
 var _findMergeJoins = require("./findMergeJoins");
 var _findSortClauses = require("./findSortClauses");
@@ -20,8 +20,63 @@ var _findOffset = require("./findOffset");
 var _maskStrings = require("./maskStrings");
 var _parseCreate = require("./parseCreate");
 var _parseSchemaStatement = require("./parseSchemaStatement");
+var _splitClauses = require("./splitClauses");
 var _startsQuery = require("./startsQuery");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// Each clause's own step, and what its body must start with (for the error when it doesn't)
+const clauseSteps = {
+  values: {
+    step: _findInsertValues.findInsertValues,
+    expected: 'an assignment (field = value)'
+  },
+  set: {
+    step: _findUpdateValues.findUpdateValues,
+    expected: 'an assignment (field = value)'
+  },
+  select: {
+    step: _findSelects.findSelects,
+    expected: 'a field'
+  },
+  on: {
+    step: _findJoinClauses.findJoinClauses,
+    expected: 'a join condition (a.x = b.y)'
+  },
+  merge: {
+    step: _findMergeJoins.findMergeJoins,
+    expected: 'a merge (a.x with b.y)'
+  },
+  where: {
+    step: _findConditions.findConditions,
+    expected: 'a condition'
+  },
+  'group by': {
+    step: _findGroupBy.findGroupBy,
+    expected: 'a field'
+  },
+  sort: {
+    step: _findSortClauses.findSortClauses,
+    expected: 'a field'
+  },
+  limit: {
+    step: _findLimit.findLimit,
+    expected: 'a whole number'
+  },
+  offset: {
+    step: _findOffset.findOffset,
+    expected: 'a whole number'
+  }
+};
+/**
+ * The error for text a step couldn't read: another query run on without a `;`, or text that doesn't belong.
+ * @param rest The text left over, masked
+ * @param after What was read before it, masked
+ */
+const leftoverError = (rest, after) => {
+  const shown = text => (0, _maskStrings.unmaskStrings)(text, '\'');
+  if (_startsQuery.startsQueryMatch.test(rest)) {
+    return new Error(`Missing ; before: ${shown(rest)}`);
+  }
+  return new Error(`Unexpected "${shown(rest)}" after "${shown(after)}"`);
+};
 /**
  * Break a query down into its components.
  * @param query
@@ -44,10 +99,6 @@ const parseQuery = query => {
     create: undefined,
     ifExists: undefined
   };
-  const {
-    curry,
-    pipe
-  } = _siFunciona.default;
   // No find* step may see inside a string or an array: each one becomes a placeholder holding its value
   query = (0, _maskStrings.maskArrays)((0, _maskStrings.maskStrings)(query));
   // A create statement has its own shape (a bracketed list of fields and keys), so it gets its own parser
@@ -65,13 +116,36 @@ const parseQuery = query => {
   if (_parseSchemaStatement.schemaStatementMatch.test(query)) {
     return Object.assign(parsedQuery, (0, _parseSchemaStatement.parseSchemaStatement)(query));
   }
-  query = pipe(curry(_findCommand.findCommand)(parsedQuery), curry(_findInsertValues.findInsertValues)(parsedQuery), curry(_findUpdateValues.findUpdateValues)(parsedQuery), curry(_findJoinEntity.findJoinEntity)(parsedQuery), curry(_findSelects.findSelects)(parsedQuery), curry(_findConditions.findConditions)(parsedQuery), curry(_findJoinClauses.findJoinClauses)(parsedQuery), curry(_findMergeJoins.findMergeJoins)(parsedQuery), curry(_findSortClauses.findSortClauses)(parsedQuery), curry(_findGroupBy.findGroupBy)(parsedQuery), curry(_findLimit.findLimit)(parsedQuery), curry(_findOffset.findOffset)(parsedQuery))(query);
-  if (query) {
+  // Clauses come at most once each, in a fixed order (see clauseOrder); each step reads only its own clause's body
+  const split = (0, _splitClauses.splitClauses)(query);
+  if (!split) {
+    query = query.trim();
     if (_startsQuery.startsQueryMatch.test(query)) {
-      throw new Error(`Missing ; before: ${(0, _maskStrings.unmaskStrings)(query.trim(), '\'')}`);
+      throw new Error(`Missing ; before: ${(0, _maskStrings.unmaskStrings)(query, '\'')}`);
     }
     throw new Error(`Unrecognized query value: ${(0, _maskStrings.unmaskStrings)(query, '\'')}`);
   }
+  (0, _findJoinEntity.findJoinEntity)(parsedQuery, (0, _findCommand.findCommand)(parsedQuery, split.head));
+  parsedQuery.where = (0, _conditionTree.allOf)([]);
+  if (split.leading) {
+    throw leftoverError(split.leading, split.head);
+  }
+  for (const {
+    keyword,
+    body
+  } of split.clauses) {
+    const {
+      step,
+      expected
+    } = clauseSteps[keyword];
+    const rest = step(parsedQuery, body);
+    if (rest === body) {
+      throw new Error(`Missing ${expected} after ${keyword}${body ? `: ${(0, _maskStrings.unmaskStrings)(body, '\'')}` : ''}`);
+    }
+    if (rest) {
+      throw leftoverError(rest, `${keyword} ${body.slice(0, body.length - rest.length).trim()}`);
+    }
+  }
   return parsedQuery;
 };
 exports.parseQuery = parseQuery;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.parseQuery=void 0;var _siFunciona=_interopRequireDefault(require("si-funciona")),_findCommand=require("./findCommand"),_findInsertValues=require("./findInsertValues"),_findUpdateValues=require("./findUpdateValues"),_findJoinEntity=require("./findJoinEntity"),_findSelects=require("./findSelects"),_findConditions=require("./findConditions"),_findJoinClauses=require("./findJoinClauses"),_findMergeJoins=require("./findMergeJoins"),_findSortClauses=require("./findSortClauses"),_findGroupBy=require("./findGroupBy"),_findLimit=require("./findLimit"),_findOffset=require("./findOffset"),_maskStrings=require("./maskStrings"),_parseCreate=require("./parseCreate"),_parseSchemaStatement=require("./parseSchemaStatement"),_startsQuery=require("./startsQuery");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const parseQuery=e=>{const i={command:void 0,entity:void 0,joinEntity:void 0,selectClauses:[],insertValues:[],updateValues:{},where:void 0,joinClauses:[],mergeJoins:[],sortClauses:[],groupBy:void 0,limit:void 0,offset:void 0,create:void 0,ifExists:void 0},{curry:r,pipe:n}=_siFunciona.default;if(e=(0,_maskStrings.maskArrays)((0,_maskStrings.maskStrings)(e)),_parseCreate.createMatch.test(e)){const{entity:r,create:n}=(0,_parseCreate.parseCreate)(e);return Object.assign(i,{command:"create",entity:r,create:n})}if(_parseSchemaStatement.schemaStatementMatch.test(e))return Object.assign(i,(0,_parseSchemaStatement.parseSchemaStatement)(e));if(e=n(r(_findCommand.findCommand)(i),r(_findInsertValues.findInsertValues)(i),r(_findUpdateValues.findUpdateValues)(i),r(_findJoinEntity.findJoinEntity)(i),r(_findSelects.findSelects)(i),r(_findConditions.findConditions)(i),r(_findJoinClauses.findJoinClauses)(i),r(_findMergeJoins.findMergeJoins)(i),r(_findSortClauses.findSortClauses)(i),r(_findGroupBy.findGroupBy)(i),r(_findLimit.findLimit)(i),r(_findOffset.findOffset)(i))(e)){if(_startsQuery.startsQueryMatch.test(e))throw new Error(`Missing ; before: ${(0,_maskStrings.unmaskStrings)(e.trim(),"'")}`);throw new Error(`Unrecognized query value: ${(0,_maskStrings.unmaskStrings)(e,"'")}`)}return i};exports.parseQuery=parseQuery;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.parseQuery=void 0;var _findCommand=require("./findCommand"),_findInsertValues=require("./findInsertValues"),_findUpdateValues=require("./findUpdateValues"),_findJoinEntity=require("./findJoinEntity"),_findSelects=require("./findSelects"),_findConditions=require("./findConditions"),_conditionTree=require("../conditionTree"),_findJoinClauses=require("./findJoinClauses"),_findMergeJoins=require("./findMergeJoins"),_findSortClauses=require("./findSortClauses"),_findGroupBy=require("./findGroupBy"),_findLimit=require("./findLimit"),_findOffset=require("./findOffset"),_maskStrings=require("./maskStrings"),_parseCreate=require("./parseCreate"),_parseSchemaStatement=require("./parseSchemaStatement"),_splitClauses=require("./splitClauses"),_startsQuery=require("./startsQuery");const clauseSteps={values:{step:_findInsertValues.findInsertValues,expected:"an assignment (field = value)"},set:{step:_findUpdateValues.findUpdateValues,expected:"an assignment (field = value)"},select:{step:_findSelects.findSelects,expected:"a field"},on:{step:_findJoinClauses.findJoinClauses,expected:"a join condition (a.x = b.y)"},merge:{step:_findMergeJoins.findMergeJoins,expected:"a merge (a.x with b.y)"},where:{step:_findConditions.findConditions,expected:"a condition"},"group by":{step:_findGroupBy.findGroupBy,expected:"a field"},sort:{step:_findSortClauses.findSortClauses,expected:"a field"},limit:{step:_findLimit.findLimit,expected:"a whole number"},offset:{step:_findOffset.findOffset,expected:"a whole number"}},leftoverError=(e,t)=>{const i=e=>(0,_maskStrings.unmaskStrings)(e,"'");return _startsQuery.startsQueryMatch.test(e)?new Error(`Missing ; before: ${i(e)}`):new Error(`Unexpected "${i(e)}" after "${i(t)}"`)},parseQuery=e=>{const t={command:void 0,entity:void 0,joinEntity:void 0,selectClauses:[],insertValues:[],updateValues:{},where:void 0,joinClauses:[],mergeJoins:[],sortClauses:[],groupBy:void 0,limit:void 0,offset:void 0,create:void 0,ifExists:void 0};if(e=(0,_maskStrings.maskArrays)((0,_maskStrings.maskStrings)(e)),_parseCreate.createMatch.test(e)){const{entity:i,create:r}=(0,_parseCreate.parseCreate)(e);return Object.assign(t,{command:"create",entity:i,create:r})}if(_parseSchemaStatement.schemaStatementMatch.test(e))return Object.assign(t,(0,_parseSchemaStatement.parseSchemaStatement)(e));const i=(0,_splitClauses.splitClauses)(e);if(!i){if(e=e.trim(),_startsQuery.startsQueryMatch.test(e))throw new Error(`Missing ; before: ${(0,_maskStrings.unmaskStrings)(e,"'")}`);throw new Error(`Unrecognized query value: ${(0,_maskStrings.unmaskStrings)(e,"'")}`)}if((0,_findJoinEntity.findJoinEntity)(t,(0,_findCommand.findCommand)(t,i.head)),t.where=(0,_conditionTree.allOf)([]),i.leading)throw leftoverError(i.leading,i.head);for(const{keyword:e,body:r}of i.clauses){const{step:i,expected:s}=clauseSteps[e],n=i(t,r);if(n===r)throw new Error(`Missing ${s} after ${e}${r?`: ${(0,_maskStrings.unmaskStrings)(r,"'")}`:""}`);if(n)throw leftoverError(n,`${e} ${r.slice(0,r.length-n.length).trim()}`)}return t};exports.parseQuery=parseQuery;

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

@@ -0,0 +1,29 @@
+/**
+ * The clauses each command allows, in the order they must come. create, drop, describe and show have their own
+ * parsers and never get here.
+ */
+export declare const clauseOrder: {
+    [command: string]: string[];
+};
+export declare const whereHint = "use and / or inside one where clause (where a = 1 and b = 2)";
+export type SplitClause = {
+    keyword: string;
+    body: string;
+};
+export type SplitQuery = {
+    command: string;
+    head: string;
+    leading: string;
+    clauses: SplitClause[];
+};
+/**
+ * Split a masked query (see maskStrings) into its clauses, reading its top-level words once, left to right. A clause
+ * word counts only as a whole word outside brackets, and not where it must be a name: as a clause's first word
+ * (`sort limit`), after a comma or `as`, or before a comparator (`where limit = 1`).
+ * @param query
+ * @returns undefined when the query doesn't start with read, insert, update or delete (left to the find* steps).
+ * @throws {Error} For a joined record outside read, a clause the command doesn't allow, a repeated clause, a clause out
+ * of order, or the 2.x forms of a second where (`and where`, `or where`, or a plain repeat).
+ */
+export declare const splitClauses: (query: string) => SplitQuery | undefined;
+//# sourceMappingURL=splitClauses.d.ts.map