json-fs-query 1.0.6 → 2.0.0

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

@@ -0,0 +1,82 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.schemaStatementMatch = exports.parseSchemaStatement = void 0;
+var _maskStrings = require("./maskStrings");
+var _startsQuery = require("./startsQuery");
+const schemaStatementMatch = exports.schemaStatementMatch = /^\s*(drop|describe|show)(?![a-z0-9_-])/i;
+const dropMatch = /^\s*drop\s+(if\s+exists\s+)?([a-z0-9_-]+)/i;
+const describeMatch = /^\s*describe\s+([a-z0-9_-]+)/i;
+const showMatch = /^\s*show\s+records(?![a-z0-9_-])/i;
+/**
+ * Throw for anything left after a statement: "Missing ; before" when it is another query.
+ * @param rest
+ */
+const assertNothingAfter = rest => {
+  const after = rest.trim();
+  if (!after) {
+    return;
+  }
+  const shown = (0, _maskStrings.unmaskStrings)(after, '\'');
+  if (_startsQuery.startsQueryMatch.test(after)) {
+    throw new Error(`Missing ; before: ${shown}`);
+  }
+  throw new Error(`Unrecognized query value: ${shown}`);
+};
+/**
+ * Throw for the registry's own name, which the schema statements don't act on.
+ * @param entity
+ */
+const assertNotRegistry = entity => {
+  if (entity === '__RECORDS') {
+    throw new Error('__RECORDS is reserved for the list of records (use: show records)');
+  }
+};
+/**
+ * Parse `drop [if exists] <name>`, `describe <name>` or `show records` (strings and arrays already masked). `show`
+ * resolves to the registry, so its entity is `__RECORDS`.
+ * @param query
+ */
+const parseSchemaStatement = query => {
+  const command = query.match(schemaStatementMatch)[1].toLowerCase();
+  if (command === 'drop') {
+    const found = query.match(dropMatch);
+    // `drop if exists` with no name would otherwise read `if` as the name
+    if (!found || /^\s*drop\s+if\s+exists\s*$/i.test(query)) {
+      throw new Error('Expected: drop [if exists] <name>');
+    }
+    assertNotRegistry(found[2]);
+    assertNothingAfter(query.slice(found[0].length));
+    return {
+      command: 'drop',
+      entity: found[2],
+      ifExists: Boolean(found[1])
+    };
+  }
+  if (command === 'describe') {
+    const found = query.match(describeMatch);
+    if (!found) {
+      throw new Error('Expected: describe <name>');
+    }
+    assertNotRegistry(found[1]);
+    assertNothingAfter(query.slice(found[0].length));
+    return {
+      command: 'describe',
+      entity: found[1],
+      ifExists: false
+    };
+  }
+  const found = query.match(showMatch);
+  if (!found) {
+    throw new Error('Expected: show records (the only thing that can be shown so far)');
+  }
+  assertNothingAfter(query.slice(found[0].length));
+  return {
+    command: 'show',
+    entity: '__RECORDS',
+    ifExists: false
+  };
+};
+exports.parseSchemaStatement = parseSchemaStatement;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.schemaStatementMatch=exports.parseSchemaStatement=void 0;var _maskStrings=require("./maskStrings"),_startsQuery=require("./startsQuery");const schemaStatementMatch=exports.schemaStatementMatch=/^\s*(drop|describe|show)(?![a-z0-9_-])/i,dropMatch=/^\s*drop\s+(if\s+exists\s+)?([a-z0-9_-]+)/i,describeMatch=/^\s*describe\s+([a-z0-9_-]+)/i,showMatch=/^\s*show\s+records(?![a-z0-9_-])/i,assertNothingAfter=e=>{const t=e.trim();if(!t)return;const s=(0,_maskStrings.unmaskStrings)(t,"'");if(_startsQuery.startsQueryMatch.test(t))throw new Error(`Missing ; before: ${s}`);throw new Error(`Unrecognized query value: ${s}`)},assertNotRegistry=e=>{if("__RECORDS"===e)throw new Error("__RECORDS is reserved for the list of records (use: show records)")},parseSchemaStatement=e=>{const t=e.match(schemaStatementMatch)[1].toLowerCase();if("drop"===t){const t=e.match(dropMatch);if(!t||/^\s*drop\s+if\s+exists\s*$/i.test(e))throw new Error("Expected: drop [if exists] <name>");return assertNotRegistry(t[2]),assertNothingAfter(e.slice(t[0].length)),{command:"drop",entity:t[2],ifExists:Boolean(t[1])}}if("describe"===t){const t=e.match(describeMatch);if(!t)throw new Error("Expected: describe <name>");return assertNotRegistry(t[1]),assertNothingAfter(e.slice(t[0].length)),{command:"describe",entity:t[1],ifExists:!1}}const s=e.match(showMatch);if(!s)throw new Error("Expected: show records (the only thing that can be shown so far)");return assertNothingAfter(e.slice(s[0].length)),{command:"show",entity:"__RECORDS",ifExists:!1}};exports.parseSchemaStatement=parseSchemaStatement;

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

@@ -0,0 +1,52 @@
+export type QuoteChar = '\'' | '"';
+export type BracketChar = '[' | '(';
+export type ScannedString = {
+    start: number;
+    end: number;
+    quote: QuoteChar;
+    value: string;
+};
+export type ScannedComment = {
+    start: number;
+    end: number;
+    kind: 'line' | 'block';
+};
+export type ScanState = {
+    quote: QuoteChar | undefined;
+    escape: boolean;
+    blockComment: boolean;
+    brackets: BracketChar[];
+    strayCloser: {
+        char: string;
+        index: number;
+    } | undefined;
+};
+export type ScannedQuery = {
+    strings: ScannedString[];
+    comments: ScannedComment[];
+    semicolons: number[];
+    end: ScanState;
+    closed: boolean;
+    terminated: boolean;
+};
+/**
+ * Walk a query once, left to right, finding its strings, comments and the `;` between statements.
+ *
+ * Strings use `'` or `"` and close only with the quote they opened with. Inside a string a backslash escapes the
+ * next character: `\n` and `\t` are a newline and a tab, any other `\x` is `x` (so `\'`, `\"` and `\\` are a quote
+ * and a backslash). Outside strings a backslash has no meaning. Comments run from `--` to the end of the line, or
+ * from `/*` to `*\/`; anything inside a comment is ignored, and comment markers inside a string are just text. A `--`
+ * starts a comment only at the start of the text or after whitespace or a `;`, since names can contain `-`
+ * (`my--table` is a name). A `;` inside brackets does not end a query.
+ *
+ * Never throws: whatever is left open is reported in `end`, for a prompt which asks for more input. Use
+ * assertClosed to turn it into an error.
+ * @param text
+ */
+export declare const scanQuery: (text?: string) => ScannedQuery;
+/**
+ * Throw a clear error for anything scanQuery found left open or unmatched: a string, a block comment or a bracket.
+ * @param scanned
+ */
+export declare const assertClosed: (scanned: ScannedQuery) => ScannedQuery;
+//# sourceMappingURL=scanQuery.d.ts.map

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

@@ -0,0 +1,158 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.scanQuery = exports.assertClosed = void 0;
+const escapes = {
+  n: '\n',
+  t: '\t'
+};
+const closers = {
+  ']': '[',
+  ')': '('
+};
+/**
+ * Walk a query once, left to right, finding its strings, comments and the `;` between statements.
+ *
+ * Strings use `'` or `"` and close only with the quote they opened with. Inside a string a backslash escapes the
+ * next character: `\n` and `\t` are a newline and a tab, any other `\x` is `x` (so `\'`, `\"` and `\\` are a quote
+ * and a backslash). Outside strings a backslash has no meaning. Comments run from `--` to the end of the line, or
+ * from `/*` to `*\/`; anything inside a comment is ignored, and comment markers inside a string are just text. A `--`
+ * starts a comment only at the start of the text or after whitespace or a `;`, since names can contain `-`
+ * (`my--table` is a name). A `;` inside brackets does not end a query.
+ *
+ * Never throws: whatever is left open is reported in `end`, for a prompt which asks for more input. Use
+ * assertClosed to turn it into an error.
+ * @param text
+ */
+const scanQuery = (text = '') => {
+  const strings = [];
+  const comments = [];
+  const semicolons = [];
+  const brackets = [];
+  let strayCloser;
+  let openQuote;
+  let escape = false;
+  let blockComment = false;
+  let lastCode = -1;
+  let index = 0;
+  while (index < text.length) {
+    const char = text[index];
+    const next = text[index + 1];
+    if (char === '\'' || char === '"') {
+      const start = index;
+      let value = '';
+      index++;
+      while (index < text.length && text[index] !== char) {
+        if (text[index] === '\\') {
+          if (index + 1 === text.length) {
+            escape = true;
+            index++;
+            break;
+          }
+          value += escapes[text[index + 1]] ?? text[index + 1];
+          index += 2;
+          continue;
+        }
+        value += text[index];
+        index++;
+      }
+      if (index < text.length) {
+        index++;
+      } else {
+        openQuote = char;
+      }
+      strings.push({
+        start,
+        end: index,
+        quote: char,
+        value
+      });
+      lastCode = start;
+      continue;
+    }
+    if (char === '-' && next === '-' && (index === 0 || /[\s;]/.test(text[index - 1]))) {
+      const newline = text.indexOf('\n', index + 2);
+      const end = newline === -1 ? text.length : newline + 1;
+      comments.push({
+        start: index,
+        end,
+        kind: 'line'
+      });
+      index = end;
+      continue;
+    }
+    if (char === '/' && next === '*') {
+      const close = text.indexOf('*/', index + 2);
+      const end = close === -1 ? text.length : close + 2;
+      blockComment = close === -1;
+      comments.push({
+        start: index,
+        end,
+        kind: 'block'
+      });
+      index = end;
+      continue;
+    }
+    if (char === '[' || char === '(') {
+      brackets.push(char);
+    } else if (closers[char]) {
+      if (brackets[brackets.length - 1] === closers[char]) {
+        brackets.pop();
+      } else if (!strayCloser) {
+        strayCloser = {
+          char,
+          index
+        };
+      }
+    } else if (char === ';' && brackets.length === 0) {
+      semicolons.push(index);
+    }
+    if (!/\s/.test(char)) {
+      lastCode = index;
+    }
+    index++;
+  }
+  const end = {
+    quote: openQuote,
+    escape,
+    blockComment,
+    brackets,
+    strayCloser
+  };
+  const closed = !end.quote && !end.blockComment && brackets.length === 0;
+  return {
+    strings,
+    comments,
+    semicolons,
+    end,
+    closed,
+    terminated: closed && semicolons.length > 0 && semicolons[semicolons.length - 1] === lastCode
+  };
+};
+/**
+ * Throw a clear error for anything scanQuery found left open or unmatched: a string, a block comment or a bracket.
+ * @param scanned
+ */
+exports.scanQuery = scanQuery;
+const assertClosed = scanned => {
+  const {
+    end
+  } = scanned;
+  if (end.quote) {
+    const open = scanned.strings[scanned.strings.length - 1];
+    throw new Error(`Unclosed string: the ${end.quote} at position ${open.start} is never closed`);
+  }
+  if (end.blockComment) {
+    throw new Error(`Unclosed comment: the /* at position ${scanned.comments[scanned.comments.length - 1].start} is never closed`);
+  }
+  if (end.strayCloser) {
+    throw new Error(`Unexpected ${end.strayCloser.char} at position ${end.strayCloser.index}: there is nothing to close`);
+  }
+  if (end.brackets.length > 0) {
+    throw new Error(`Unclosed bracket: ${end.brackets.join(' ')} never closed`);
+  }
+  return scanned;
+};
+exports.assertClosed = assertClosed;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.scanQuery=exports.assertClosed=void 0;const escapes={n:"\n",t:"\t"},closers={"]":"[",")":"("},scanQuery=(e="")=>{const s=[],t=[],n=[],o=[];let r,l,c=!1,i=!1,a=-1,h=0;for(;h<e.length;){const d=e[h],p=e[h+1];if("'"!==d&&'"'!==d)if("-"!==d||"-"!==p||0!==h&&!/[\s;]/.test(e[h-1]))if("/"!==d||"*"!==p)"["===d||"("===d?o.push(d):closers[d]?o[o.length-1]===closers[d]?o.pop():r||(r={char:d,index:h}):";"===d&&0===o.length&&n.push(h),/\s/.test(d)||(a=h),h++;else{const s=e.indexOf("*/",h+2),n=-1===s?e.length:s+2;i=-1===s,t.push({start:h,end:n,kind:"block"}),h=n}else{const s=e.indexOf("\n",h+2),n=-1===s?e.length:s+1;t.push({start:h,end:n,kind:"line"}),h=n}else{const t=h;let n="";for(h++;h<e.length&&e[h]!==d;)if("\\"!==e[h])n+=e[h],h++;else{if(h+1===e.length){c=!0,h++;break}n+=escapes[e[h+1]]??e[h+1],h+=2}h<e.length?h++:l=d,s.push({start:t,end:h,quote:d,value:n}),a=t}}const d={quote:l,escape:c,blockComment:i,brackets:o,strayCloser:r},p=!d.quote&&!d.blockComment&&0===o.length;return{strings:s,comments:t,semicolons:n,end:d,closed:p,terminated:p&&n.length>0&&n[n.length-1]===a}};exports.scanQuery=scanQuery;const assertClosed=e=>{const{end:s}=e;if(s.quote){const t=e.strings[e.strings.length-1];throw new Error(`Unclosed string: the ${s.quote} at position ${t.start} is never closed`)}if(s.blockComment)throw new Error(`Unclosed comment: the /* at position ${e.comments[e.comments.length-1].start} is never closed`);if(s.strayCloser)throw new Error(`Unexpected ${s.strayCloser.char} at position ${s.strayCloser.index}: there is nothing to close`);if(s.brackets.length>0)throw new Error(`Unclosed bracket: ${s.brackets.join(" ")} never closed`);return e};exports.assertClosed=assertClosed;

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

@@ -1,2 +1,8 @@
+/**
+ * Split a string of queries into one query each, on the `;` between them. A `;` inside a string or a comment does
+ * not count, comments are removed, and the `;` after the last query is optional.
+ * @param queries
+ * @throws {Error} For an unclosed string, block comment or bracket.
+ */
 export declare const splitQueries: (queries?: string) => string[];
 //# sourceMappingURL=splitQueries.d.ts.map

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

@@ -6,6 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.splitQueries = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
-const queryMatch = /\s*(?=(?:delete|insert|read|update)\s+[a-z0-9._-]+)\s*/i;
-const splitQueries = (queries = '') => queries.split(queryMatch).filter(query => query.length > 0);
+require("core-js/modules/esnext.iterator.reduce.js");
+var _scanQuery = require("./scanQuery");
+/**
+ * Split a string of queries into one query each, on the `;` between them. A `;` inside a string or a comment does
+ * not count, comments are removed, and the `;` after the last query is optional.
+ * @param queries
+ * @throws {Error} For an unclosed string, block comment or bracket.
+ */
+const splitQueries = (queries = '') => {
+  const {
+    comments,
+    semicolons
+  } = (0, _scanQuery.assertClosed)((0, _scanQuery.scanQuery)(queries));
+  // Blank each comment out with spaces, so the positions of the ; stay the same and the words either side stay apart
+  const uncommented = comments.reduce((text, {
+    start,
+    end
+  }) => `${text.slice(0, start)}${' '.repeat(end - start)}${text.slice(end)}`, queries);
+  return [...semicolons, uncommented.length].map((end, index) => uncommented.slice(index === 0 ? 0 : semicolons[index - 1] + 1, end).trim()).filter(query => query.length > 0);
+};
 exports.splitQueries = splitQueries;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.splitQueries=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js");const queryMatch=/\s*(?=(?:delete|insert|read|update)\s+[a-z0-9._-]+)\s*/i,splitQueries=(e="")=>e.split(queryMatch).filter((e=>e.length>0));exports.splitQueries=splitQueries;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.splitQueries=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.reduce.js");var _scanQuery=require("./scanQuery");const splitQueries=(e="")=>{const{comments:r,semicolons:s}=(0,_scanQuery.assertClosed)((0,_scanQuery.scanQuery)(e)),t=r.reduce(((e,{start:r,end:s})=>`${e.slice(0,r)}${" ".repeat(s-r)}${e.slice(s)}`),e);return[...s,t.length].map(((e,r)=>t.slice(0===r?0:s[r-1]+1,e).trim())).filter((e=>e.length>0))};exports.splitQueries=splitQueries;

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

@@ -0,0 +1,5 @@
+/**
+ * Matches text that starts with a command word, for the "Missing ; before" error when a query runs on into the next.
+ */
+export declare const startsQueryMatch: RegExp;
+//# sourceMappingURL=startsQuery.d.ts.map

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

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.startsQueryMatch = void 0;
+/**
+ * Matches text that starts with a command word, for the "Missing ; before" error when a query runs on into the next.
+ */
+const startsQueryMatch = exports.startsQueryMatch = /^\s*(create|delete|describe|drop|insert|read|show|update)(?![a-z0-9_-])/i;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.startsQueryMatch=void 0;const startsQueryMatch=exports.startsQueryMatch=/^\s*(create|delete|describe|drop|insert|read|show|update)(?![a-z0-9_-])/i;

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

@@ -0,0 +1,6 @@
+/**
+ * Whether a record (its `<name>.json` file) exists in the database. Node only, like the schema statements that use it.
+ * @param entity
+ */
+export declare const recordExists: (entity: string) => boolean;
+//# sourceMappingURL=recordExists.d.ts.map

package/dist/data/utilities/recordExists.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.recordExists = void 0;
+var _config = require("./config");
+/**
+ * Whether a record (its `<name>.json` file) exists in the database. Node only, like the schema statements that use it.
+ * @param entity
+ */
+const recordExists = entity => {
+  const {
+    existsSync
+  } = require('fs');
+  return existsSync(`${(0, _config.getSetting)('databasePath', 'database/')}${entity}.json`);
+};
+exports.recordExists = recordExists;

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.recordExists=void 0;var _config=require("./config");const recordExists=e=>{const{existsSync:s}=require("fs");return s(`${(0,_config.getSetting)("databasePath","database/")}${e}.json`)};exports.recordExists=recordExists;

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

@@ -9,6 +9,7 @@ import { indexEntry } from './updateIndex';
  * @param key
  * @param value
  * @param fileName
+ * @param type - The declared type of the indexed value (see keyValueType), so '3' and 3 are one entry.
  */
-export declare const removeFromIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string) => Promise<indexEntry[] | null>;
+export declare const removeFromIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string, type?: string) => Promise<indexEntry[] | null>;
 //# sourceMappingURL=removeFromIndex.d.ts.map

package/dist/data/utilities/removeFromIndex.js

@@ -9,6 +9,7 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _config = require("./config");
+var _compareAs = require("./compareAs");
 const {
   readFile,
   writeFile
@@ -21,8 +22,9 @@ const {
  * @param key
  * @param value
  * @param fileName
+ * @param type - The declared type of the indexed value (see keyValueType), so '3' and 3 are one entry.
  */
-const removeFromIndex = async (path = '', key = null, value = undefined, fileName = '') => {
+const removeFromIndex = async (path = '', key = null, value = undefined, fileName = '', type = undefined) => {
   if (!key || !key.lookup) {
     return null;
   }
@@ -34,7 +36,7 @@ const removeFromIndex = async (path = '', key = null, value = undefined, fileNam
   } catch (err) {
     return null;
   }
-  index = index.map(entry => entry.value == value ? {
+  index = index.map(entry => (0, _compareAs.sameValue)(type, entry.value, value) ? {
     value: entry.value,
     record: entry.record.filter(record => record !== fileName)
   } : entry).filter(entry => entry.record.length);

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.removeFromIndex=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.map.js");var _config=require("./config");const{readFile:readFile,writeFile:writeFile}=require("fs/promises"),removeFromIndex=async(e="",r=null,t=void 0,o="")=>{if(!r||!r.lookup)return null;const i=`${(0,_config.getSetting)("databasePath","database/")}__indexes/${e}/${r.lookup}`;let s=[];try{s=JSON.parse(await readFile(i,"utf8"))}catch(e){return null}return s=s.map((e=>e.value==t?{value:e.value,record:e.record.filter((e=>e!==o))}:e)).filter((e=>e.record.length)),await writeFile(i,JSON.stringify(s,null,2)),s};exports.removeFromIndex=removeFromIndex;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.removeFromIndex=void 0,require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.filter.js"),require("core-js/modules/esnext.iterator.map.js");var _config=require("./config"),_compareAs=require("./compareAs");const{readFile:readFile,writeFile:writeFile}=require("fs/promises"),removeFromIndex=async(e="",r=null,o=void 0,t="",i=void 0)=>{if(!r||!r.lookup)return null;const s=`${(0,_config.getSetting)("databasePath","database/")}__indexes/${e}/${r.lookup}`;let a=[];try{a=JSON.parse(await readFile(s,"utf8"))}catch(e){return null}return a=a.map((e=>(0,_compareAs.sameValue)(i,e.value,o)?{value:e.value,record:e.record.filter((e=>e!==t))}:e)).filter((e=>e.record.length)),await writeFile(s,JSON.stringify(a,null,2)),a};exports.removeFromIndex=removeFromIndex;

package/dist/data/utilities/runQuery.js

@@ -10,6 +10,10 @@ var _deleteEntity = require("../queries/deleteEntity");
 var _insertEntity = require("../queries/insertEntity");
 var _readEntity = require("../queries/readEntity");
 var _updateEntity = require("../queries/updateEntity");
+var _createRecord = require("../queries/createRecord");
+var _dropRecord = require("../queries/dropRecord");
+var _describeRecord = require("../queries/describeRecord");
+var _showRecords = require("../queries/showRecords");
 var _joinEntity = require("../queries/joinEntity");
 var _mergeJoins = require("../queries/mergeJoins");
 var _where = require("../queries/where");
@@ -20,13 +24,58 @@ var _selectFields = require("../queries/selectFields");
 var _retrieveRecord = require("./retrieveRecord");
 var _getConditionIndexedList = require("./getConditionIndexedList");
 var _getJoinIndexedList = require("./getJoinIndexedList");
+var _isEntityProperty = require("./parsers/isEntityProperty");
+var _splitEntityProperty = require("./parsers/splitEntityProperty");
+var _fieldType = require("./fieldType");
+/**
+ * Give each condition its field's declared type, so where compares by it (a joined entity's field
+ * is looked up on that entity's record).
+ * @param parsed
+ * @param recordData
+ */
+const typeConditions = async (parsed, recordData) => {
+  for (const condition of parsed.conditions) {
+    let entity = parsed.entity;
+    let property = condition.property;
+    if ((0, _isEntityProperty.isEntityProperty)(property)) {
+      ({
+        entity,
+        property
+      } = (0, _splitEntityProperty.splitEntityProperty)(property));
+    }
+    if (!Object.prototype.hasOwnProperty.call(recordData, entity)) {
+      recordData[entity] = await (0, _retrieveRecord.retrieveRecord)(entity);
+    }
+    condition.type = (0, _fieldType.fieldType)(recordData[entity], property);
+  }
+};
 const runQuery = async parsed => {
+  // Schema statements act on the database, not on entries (for create there is no record to read yet)
+  switch (parsed.command) {
+    case 'create':
+      return {
+        [parsed.entity]: await (0, _createRecord.createRecord)(parsed.entity, parsed.create)
+      };
+    case 'drop':
+      return {
+        [parsed.entity]: await (0, _dropRecord.dropRecord)(parsed.entity, parsed.ifExists)
+      };
+    case 'describe':
+      return {
+        [parsed.entity]: await (0, _describeRecord.describeRecord)(parsed.entity)
+      };
+    case 'show':
+      return {
+        [parsed.entity]: await (0, _showRecords.showRecords)()
+      };
+  }
   const recordData = {
     [parsed.entity]: await (0, _retrieveRecord.retrieveRecord)(parsed.entity)
   };
   if (typeof parsed.joinEntity !== 'undefined') {
     recordData[parsed.joinEntity] = await (0, _retrieveRecord.retrieveRecord)(parsed.joinEntity);
   }
+  await typeConditions(parsed, recordData);
   let dataSet = {
     [parsed.entity]: []
   };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _deleteEntity=require("../queries/deleteEntity"),_insertEntity=require("../queries/insertEntity"),_readEntity=require("../queries/readEntity"),_updateEntity=require("../queries/updateEntity"),_joinEntity=require("../queries/joinEntity"),_mergeJoins=require("../queries/mergeJoins"),_where=require("../queries/where"),_sortBy=require("../queries/sortBy"),_groupBy=require("../queries/groupBy"),_limitOffset=require("../queries/limitOffset"),_selectFields=require("../queries/selectFields"),_retrieveRecord=require("./retrieveRecord"),_getConditionIndexedList=require("./getConditionIndexedList"),_getJoinIndexedList=require("./getJoinIndexedList");const runQuery=async e=>{const t={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(t[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity));let i={[e.entity]:[]};const r=e.conditions.length>0;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,t,i);const n=r&&0===e.conditions.length;switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,t,i)).command&&"update"!==e.command||(n||(i=await(0,_readEntity.readEntity)(e.entity,i)),i[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),i[e.entity])),e.command){case"delete":i=await(0,_deleteEntity.deleteEntity)(e.entity,i);break;case"insert":i=await(0,_insertEntity.insertEntity)(e.entity,e.insertValues,i);break;case"read":n||(i=await(0,_readEntity.readEntity)(e.entity,i));break;case"update":i=await(0,_updateEntity.updateEntity)(e.entity,e.updateValues,i);break;default:throw new Error(`Unknown command: ${e.command}`)}return i=await(0,_joinEntity.joinEntity)(e.entity,e.joinEntity,i,e.joinClauses,n),i=await(0,_mergeJoins.mergeJoins)(i,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(i[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),i[e.entity])),i[e.entity]=(0,_sortBy.sortBy)(i[e.entity],e.sortClauses),i[e.entity]=(0,_limitOffset.limitOffset)(i[e.entity],e.offset,e.limit),i[e.entity]=(0,_groupBy.groupBy)(i[e.entity],e.groupBy),i[e.entity]=(0,_selectFields.selectFields)(i[e.entity],e.selectClauses),i};exports.runQuery=runQuery;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.runQuery=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _deleteEntity=require("../queries/deleteEntity"),_insertEntity=require("../queries/insertEntity"),_readEntity=require("../queries/readEntity"),_updateEntity=require("../queries/updateEntity"),_createRecord=require("../queries/createRecord"),_dropRecord=require("../queries/dropRecord"),_describeRecord=require("../queries/describeRecord"),_showRecords=require("../queries/showRecords"),_joinEntity=require("../queries/joinEntity"),_mergeJoins=require("../queries/mergeJoins"),_where=require("../queries/where"),_sortBy=require("../queries/sortBy"),_groupBy=require("../queries/groupBy"),_limitOffset=require("../queries/limitOffset"),_selectFields=require("../queries/selectFields"),_retrieveRecord=require("./retrieveRecord"),_getConditionIndexedList=require("./getConditionIndexedList"),_getJoinIndexedList=require("./getJoinIndexedList"),_isEntityProperty=require("./parsers/isEntityProperty"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_fieldType=require("./fieldType");const typeConditions=async(e,t)=>{for(const r of e.conditions){let i=e.entity,n=r.property;(0,_isEntityProperty.isEntityProperty)(n)&&({entity:i,property:n}=(0,_splitEntityProperty.splitEntityProperty)(n)),Object.prototype.hasOwnProperty.call(t,i)||(t[i]=await(0,_retrieveRecord.retrieveRecord)(i)),r.type=(0,_fieldType.fieldType)(t[i],n)}},runQuery=async e=>{switch(e.command){case"create":return{[e.entity]:await(0,_createRecord.createRecord)(e.entity,e.create)};case"drop":return{[e.entity]:await(0,_dropRecord.dropRecord)(e.entity,e.ifExists)};case"describe":return{[e.entity]:await(0,_describeRecord.describeRecord)(e.entity)};case"show":return{[e.entity]:await(0,_showRecords.showRecords)()}}const t={[e.entity]:await(0,_retrieveRecord.retrieveRecord)(e.entity)};void 0!==e.joinEntity&&(t[e.joinEntity]=await(0,_retrieveRecord.retrieveRecord)(e.joinEntity)),await typeConditions(e,t);let r={[e.entity]:[]};const i=e.conditions.length>0;e=await(0,_getConditionIndexedList.getConditionIndexedList)(e,t,r);const n=i&&0===e.conditions.length;switch("delete"!==(e=await(0,_getJoinIndexedList.getJoinIndexedList)(e,t,r)).command&&"update"!==e.command||(n||(r=await(0,_readEntity.readEntity)(e.entity,r)),r[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),r[e.entity])),e.command){case"delete":r=await(0,_deleteEntity.deleteEntity)(e.entity,r);break;case"insert":r=await(0,_insertEntity.insertEntity)(e.entity,e.insertValues,r);break;case"read":n||(r=await(0,_readEntity.readEntity)(e.entity,r));break;case"update":r=await(0,_updateEntity.updateEntity)(e.entity,e.updateValues,r);break;default:throw new Error(`Unknown command: ${e.command}`)}return r=await(0,_joinEntity.joinEntity)(e.entity,e.joinEntity,r,e.joinClauses,n),r=await(0,_mergeJoins.mergeJoins)(r,e.mergeJoins),"delete"!==e.command&&"update"!==e.command&&(r[e.entity]=e.conditions.reduce(((e,t)=>(0,_where.where)(e,t)),r[e.entity])),r[e.entity]=(0,_sortBy.sortBy)(r[e.entity],e.sortClauses),r[e.entity]=(0,_limitOffset.limitOffset)(r[e.entity],e.offset,e.limit),r[e.entity]=(0,_groupBy.groupBy)(r[e.entity],e.groupBy),r[e.entity]=(0,_selectFields.selectFields)(r[e.entity],e.selectClauses),r};exports.runQuery=runQuery;

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

@@ -12,6 +12,7 @@ export type indexEntry = {
  * @param key
  * @param value
  * @param fileName
+ * @param type - The declared type of the indexed value (see keyValueType), so '3' and 3 share one entry.
  */
-export declare const updateIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string) => Promise<indexEntry[] | null>;
+export declare const updateIndex: (path?: recordPath, key?: keyDefinition, value?: any, fileName?: string, type?: string) => Promise<indexEntry[] | null>;
 //# sourceMappingURL=updateIndex.d.ts.map

package/dist/data/utilities/updateIndex.js

@@ -9,6 +9,7 @@ require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 var _config = require("./config");
+var _compareAs = require("./compareAs");
 const {
   readFile,
   writeFile,
@@ -22,8 +23,9 @@ const {
  * @param key
  * @param value
  * @param fileName
+ * @param type - The declared type of the indexed value (see keyValueType), so '3' and 3 share one entry.
  */
-const updateIndex = async (path = '', key = null, value = undefined, fileName = '') => {
+const updateIndex = async (path = '', key = null, value = undefined, fileName = '', type = undefined) => {
   if (!key || !key.lookup) {
     return null;
   }
@@ -36,7 +38,7 @@ const updateIndex = async (path = '', key = null, value = undefined, fileName =
   } catch (err) {
     index = [];
   }
-  const existingEntry = index.find(entry => entry.value == value);
+  const existingEntry = index.find(entry => (0, _compareAs.sameValue)(type, entry.value, value));
   if (existingEntry) {
     if (!existingEntry.record.includes(fileName)) {
       existingEntry.record.push(fileName);

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.updateIndex=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js");var _config=require("./config");const{readFile:readFile,writeFile:writeFile,mkdir:mkdir}=require("fs/promises"),updateIndex=async(e="",r=null,i=void 0,s="")=>{if(!r||!r.lookup)return null;const t=`${(0,_config.getSetting)("databasePath","database/")}__indexes/${e}`,o=`${t}/${r.lookup}`;let u=[];try{u=JSON.parse(await readFile(o,"utf8"))}catch(e){u=[]}const d=u.find((e=>e.value==i));return d?d.record.includes(s)||d.record.push(s):u.push({value:i,record:[s]}),await mkdir(t,{recursive:!0}),await writeFile(o,JSON.stringify(u,null,2)),u};exports.updateIndex=updateIndex;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.updateIndex=void 0,require("core-js/modules/es.array.includes.js"),require("core-js/modules/es.json.stringify.js"),require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.find.js");var _config=require("./config"),_compareAs=require("./compareAs");const{readFile:readFile,writeFile:writeFile,mkdir:mkdir}=require("fs/promises"),updateIndex=async(e="",r=null,s=void 0,i="",t=void 0)=>{if(!r||!r.lookup)return null;const o=`${(0,_config.getSetting)("databasePath","database/")}__indexes/${e}`,a=`${o}/${r.lookup}`;let u=[];try{u=JSON.parse(await readFile(a,"utf8"))}catch(e){u=[]}const d=u.find((e=>(0,_compareAs.sameValue)(t,e.value,s)));return d?d.record.includes(i)||d.record.push(i):u.push({value:s,record:[i]}),await mkdir(o,{recursive:!0}),await writeFile(a,JSON.stringify(u,null,2)),u};exports.updateIndex=updateIndex;

package/dist/data/utilities/useJoinClause.js

@@ -10,6 +10,8 @@ var _readEntity = require("../queries/readEntity");
 var _where = require("../queries/where");
 var _splitEntityProperty = require("./parsers/splitEntityProperty");
 var _siFunciona = _interopRequireDefault(require("si-funciona"));
+var _retrieveRecord = require("./retrieveRecord");
+var _fieldType = require("./fieldType");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const useJoinClause = async ({
   propertyA = null,
@@ -36,15 +38,19 @@ const useJoinClause = async ({
   if (!Object.prototype.hasOwnProperty.call(filterJoins, entityB)) {
     filterJoins[entityB] = _siFunciona.default.cloneObject(dataSets[entityB]);
   }
+  const typeA = (0, _fieldType.fieldType)(await (0, _retrieveRecord.retrieveRecord)(entityA), propA);
+  const typeB = (0, _fieldType.fieldType)(await (0, _retrieveRecord.retrieveRecord)(entityB), propB);
   filterJoins[entityA] = filterJoins[entityB].reduce((dataA, dataB) => _siFunciona.default.mergeArrays(dataA, (0, _where.where)(filterJoins[entityA], {
     property: propA,
     comparator,
-    value: dataB[propB]
+    value: dataB[propB],
+    type: typeA
   })), []);
   filterJoins[entityB] = filterJoins[entityA].reduce((dataB, dataA) => _siFunciona.default.mergeArrays(dataB, (0, _where.where)(filterJoins[entityB], {
     property: propB,
     comparator,
-    value: dataA[propA]
+    value: dataA[propA],
+    type: typeB
   })), []);
   return filterJoins;
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.useJoinClause=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _readEntity=require("../queries/readEntity"),_where=require("../queries/where"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_siFunciona=_interopRequireDefault(require("si-funciona"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const useJoinClause=async({propertyA:e=null,comparator:r="=",propertyB:t=null}={},o={},i={})=>{const{entity:a,property:n}=(0,_splitEntityProperty.splitEntityProperty)(e),{entity:s,property:u}=(0,_splitEntityProperty.splitEntityProperty)(t);return Object.prototype.hasOwnProperty.call(o,a)||(o=await(0,_readEntity.readEntity)(a,o)),Object.prototype.hasOwnProperty.call(o,s)||(o=await(0,_readEntity.readEntity)(s,o)),Object.prototype.hasOwnProperty.call(i,a)||(i[a]=_siFunciona.default.cloneObject(o[a])),Object.prototype.hasOwnProperty.call(i,s)||(i[s]=_siFunciona.default.cloneObject(o[s])),i[a]=i[s].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(i[a],{property:n,comparator:r,value:t[u]}))),[]),i[s]=i[a].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(i[s],{property:u,comparator:r,value:t[n]}))),[]),i};exports.useJoinClause=useJoinClause;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.useJoinClause=void 0,require("core-js/modules/esnext.iterator.constructor.js"),require("core-js/modules/esnext.iterator.reduce.js");var _readEntity=require("../queries/readEntity"),_where=require("../queries/where"),_splitEntityProperty=require("./parsers/splitEntityProperty"),_siFunciona=_interopRequireDefault(require("si-funciona")),_retrieveRecord=require("./retrieveRecord"),_fieldType=require("./fieldType");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const useJoinClause=async({propertyA:e=null,comparator:r="=",propertyB:t=null}={},i={},o={})=>{const{entity:a,property:p}=(0,_splitEntityProperty.splitEntityProperty)(e),{entity:n,property:s}=(0,_splitEntityProperty.splitEntityProperty)(t);Object.prototype.hasOwnProperty.call(i,a)||(i=await(0,_readEntity.readEntity)(a,i)),Object.prototype.hasOwnProperty.call(i,n)||(i=await(0,_readEntity.readEntity)(n,i)),Object.prototype.hasOwnProperty.call(o,a)||(o[a]=_siFunciona.default.cloneObject(i[a])),Object.prototype.hasOwnProperty.call(o,n)||(o[n]=_siFunciona.default.cloneObject(i[n]));const u=(0,_fieldType.fieldType)(await(0,_retrieveRecord.retrieveRecord)(a),p),y=(0,_fieldType.fieldType)(await(0,_retrieveRecord.retrieveRecord)(n),s);return o[a]=o[n].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(o[a],{property:p,comparator:r,value:t[s],type:u}))),[]),o[n]=o[a].reduce(((e,t)=>_siFunciona.default.mergeArrays(e,(0,_where.where)(o[n],{property:s,comparator:r,value:t[p],type:y}))),[]),o};exports.useJoinClause=useJoinClause;

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 export { query } from './data/queries/query';
+export { quote } from './data/queries/quote';
+export { queryStatus, QueryStatus } from './data/queries/queryStatus';
 export { create, drop, describe } from './data/introspect';
 export { configure } from './data/utilities/config';
 export { fieldProperties, fieldDefinition, fieldName, keyProperties, keyDefinition, indexType, indexLocation, referenceProperties, reference, recordProperties, recordDefinition, recordPath, entityPath } from './data/introspect';