sql-typechecker 0.0.6 → 0.0.9

package/out/cli.js

@@ -2654,15 +2654,15 @@ var require_lib = __commonJS((exports2) => {
       let intervalTextCompiled;
       let intervalIsoCompiled;
       function parseFirst(sql) {
-        const first = parse3(sql);
+        const first = parse4(sql);
         return first[0];
       }
       exports3.parseFirst = parseFirst;
       function parseWithComments(sql, options) {
-        return lexer_1.trackingComments(() => parse3(sql, options));
+        return lexer_1.trackingComments(() => parse4(sql, options));
       }
       exports3.parseWithComments = parseWithComments;
-      function parse3(sql, optEntry) {
+      function parse4(sql, optEntry) {
         if (!sqlCompiled) {
           sqlCompiled = nearley_1.Grammar.fromCompiled(main_ne_1.default);
         }
@@ -2675,7 +2675,7 @@ var require_lib = __commonJS((exports2) => {
         }
         return parsed;
       }
-      exports3.parse = parse3;
+      exports3.parse = parse4;
       function parseArrayLiteral(sql) {
         if (!arrayCompiled) {
           arrayCompiled = nearley_1.Grammar.fromCompiled(array_ne_1.default);
@@ -12378,7 +12378,7 @@ ${ctx}
           };
         }
       };
-      function parse3(src) {
+      function parse4(src) {
         const cr = [];
         if (src.indexOf("\r") !== -1) {
           src = src.replace(/\r\n?/g, (match, offset2) => {
@@ -12412,7 +12412,7 @@ ${ctx}
         documents.toString = () => documents.join("...\n");
         return documents;
       }
-      exports22.parse = parse3;
+      exports22.parse = parse4;
     }
   });
   var require_resolveSeq_d03cb037 = __commonJS2({
@@ -13102,7 +13102,7 @@ ${ctx.indent}`;
       };
       function resolveScalar(str, tags, scalarFallback) {
         for (const {
-          format: format2,
+          format: format3,
           test,
           resolve: resolve2
         } of tags) {
@@ -13112,8 +13112,8 @@ ${ctx.indent}`;
               let res = resolve2.apply(null, match);
               if (!(res instanceof Scalar))
                 res = new Scalar(res);
-              if (format2)
-                res.format = format2;
+              if (format3)
+                res.format = format3;
               return res;
             }
           }
@@ -13516,7 +13516,7 @@ ${indent}`);
         return res;
       }
       function stringifyNumber({
-        format: format2,
+        format: format3,
         minFractionDigits,
         tag,
         value: value2
@@ -13526,7 +13526,7 @@ ${indent}`);
         if (!isFinite(value2))
           return isNaN(value2) ? ".nan" : value2 < 0 ? "-.inf" : ".inf";
         let n = JSON.stringify(value2);
-        if (!format2 && minFractionDigits && (!tag || tag === "tag:yaml.org,2002:float") && /^\d/.test(n)) {
+        if (!format3 && minFractionDigits && (!tag || tag === "tag:yaml.org,2002:float") && /^\d/.test(n)) {
           let i = n.indexOf(".");
           if (i < 0) {
             i = n.length;
@@ -15904,7 +15904,7 @@ ${cbNode.commentBefore}` : cb;
         }
         return doc;
       }
-      function parse3(src, options) {
+      function parse4(src, options) {
         const doc = parseDocument(src, options);
         doc.warnings.forEach((warning) => warnings2.warn(warning));
         if (doc.errors.length > 0)
@@ -15920,7 +15920,7 @@ ${cbNode.commentBefore}` : cb;
         createNode,
         defaultOptions: Document$1.defaultOptions,
         Document,
-        parse: parse3,
+        parse: parse4,
         parseAllDocuments,
         parseCST: parseCst.parse,
         parseDocument,
@@ -199952,7 +199952,7 @@ ${frame}`;
           return loadParser(opts.parser);
         }
       }
-      function parse3(text, opts) {
+      function parse4(text, opts) {
         const parsers = getParsers(opts);
         const parsersForCustomParserApi = Object.defineProperties({}, Object.fromEntries(Object.keys(parsers).map((parserName) => [parserName, {
           enumerable: true,
@@ -199987,7 +199987,7 @@ ${frame}`;
         }
       }
       module22.exports = {
-        parse: parse3,
+        parse: parse4,
         resolveParser
       };
     }
@@ -201999,7 +201999,7 @@ ${frame}`;
         let padded = zeros(startString) || zeros(endString) || zeros(stepString);
         let maxLen = padded ? Math.max(startString.length, endString.length, stepString.length) : 0;
         let toNumber = padded === false && stringify(start, end, options) === false;
-        let format2 = options.transform || transform(toNumber);
+        let format3 = options.transform || transform(toNumber);
         if (options.toRegex && step === 1) {
           return toRange(toMaxLen(start, maxLen), toMaxLen(end, maxLen), true, options);
         }
@@ -202014,7 +202014,7 @@ ${frame}`;
           if (options.toRegex === true && step > 1) {
             push(a);
           } else {
-            range.push(pad(format2(a, index), maxLen, toNumber));
+            range.push(pad(format3(a, index), maxLen, toNumber));
           }
           a = descending ? a - step : a + step;
           index++;
@@ -202030,7 +202030,7 @@ ${frame}`;
         if (!isNumber(start) && start.length > 1 || !isNumber(end) && end.length > 1) {
           return invalidRange(start, end, options);
         }
-        let format2 = options.transform || ((val) => String.fromCharCode(val));
+        let format3 = options.transform || ((val) => String.fromCharCode(val));
         let a = `${start}`.charCodeAt(0);
         let b = `${end}`.charCodeAt(0);
         let descending = a > b;
@@ -202042,7 +202042,7 @@ ${frame}`;
         let range = [];
         let index = 0;
         while (descending ? a >= b : a <= b) {
-          range.push(format2(a, index));
+          range.push(format3(a, index));
           a = descending ? a - step : a + step;
           index++;
         }
@@ -202306,7 +202306,7 @@ ${frame}`;
         CHAR_NO_BREAK_SPACE,
         CHAR_ZERO_WIDTH_NOBREAK_SPACE
       } = require_constants2();
-      var parse3 = (input, options = {}) => {
+      var parse4 = (input, options = {}) => {
         if (typeof input !== "string") {
           throw new TypeError("Expected a string");
         }
@@ -202568,7 +202568,7 @@ ${frame}`;
         });
         return ast;
       };
-      module22.exports = parse3;
+      module22.exports = parse4;
     }
   });
   var require_braces = __commonJS22({
@@ -202577,7 +202577,7 @@ ${frame}`;
       var stringify = require_stringify();
       var compile = require_compile();
       var expand = require_expand();
-      var parse3 = require_parse();
+      var parse4 = require_parse();
       var braces = (input, options = {}) => {
         let output = [];
         if (Array.isArray(input)) {
@@ -202597,7 +202597,7 @@ ${frame}`;
         }
         return output;
       };
-      braces.parse = (input, options = {}) => parse3(input, options);
+      braces.parse = (input, options = {}) => parse4(input, options);
       braces.stringify = (input, options = {}) => {
         if (typeof input === "string") {
           return stringify(braces.parse(input, options), options);
@@ -203205,7 +203205,7 @@ ${frame}`;
       var syntaxError = (type, char) => {
         return `Missing ${type}: "${char}" - use "\\\\${char}" to match literal characters`;
       };
-      var parse3 = (input, options) => {
+      var parse4 = (input, options) => {
         if (typeof input !== "string") {
           throw new TypeError("Expected a string");
         }
@@ -203371,7 +203371,7 @@ ${frame}`;
               output = token.close = `)$))${extglobStar}`;
             }
             if (token.inner.includes("*") && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-              const expression = parse3(rest, Object.assign(Object.assign({}, options), {}, {
+              const expression = parse4(rest, Object.assign(Object.assign({}, options), {}, {
                 fastpaths: false
               })).output;
               output = token.close = `)${expression})${extglobStar})`;
@@ -204024,7 +204024,7 @@ ${frame}`;
         }
         return state;
       };
-      parse3.fastpaths = (input, options) => {
+      parse4.fastpaths = (input, options) => {
         const opts = Object.assign({}, options);
         const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
         const len = input.length;
@@ -204096,7 +204096,7 @@ ${frame}`;
         }
         return source;
       };
-      module22.exports = parse3;
+      module22.exports = parse4;
     }
   });
   var require_picomatch = __commonJS22({
@@ -204104,7 +204104,7 @@ ${frame}`;
       "use strict";
       var path2 = require("path");
       var scan = require_scan();
-      var parse3 = require_parse2();
+      var parse4 = require_parse2();
       var utils = require_utils3();
       var constants = require_constants3();
       var isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
@@ -204196,11 +204196,11 @@ ${frame}`;
           };
         }
         const opts = options || {};
-        const format2 = opts.format || (posix ? utils.toPosixSlashes : null);
+        const format3 = opts.format || (posix ? utils.toPosixSlashes : null);
         let match = input === glob;
-        let output = match && format2 ? format2(input) : input;
+        let output = match && format3 ? format3(input) : input;
         if (match === false) {
-          output = format2 ? format2(input) : input;
+          output = format3 ? format3(input) : input;
           match = output === glob;
         }
         if (match === false || opts.capture === true) {
@@ -204224,7 +204224,7 @@ ${frame}`;
       picomatch.parse = (pattern, options) => {
         if (Array.isArray(pattern))
           return pattern.map((p) => picomatch.parse(p, options));
-        return parse3(pattern, Object.assign(Object.assign({}, options), {}, {
+        return parse4(pattern, Object.assign(Object.assign({}, options), {}, {
           fastpaths: false
         }));
       };
@@ -204255,10 +204255,10 @@ ${frame}`;
           fastpaths: true
         };
         if (options.fastpaths !== false && (input[0] === "." || input[0] === "*")) {
-          parsed.output = parse3.fastpaths(input, options);
+          parsed.output = parse4.fastpaths(input, options);
         }
         if (!parsed.output) {
-          parsed = parse3(input, options);
+          parsed = parse4(input, options);
         }
         return picomatch.compileRe(parsed, options, returnOutput, returnState);
       };
@@ -206075,10 +206075,10 @@ ${frame}`;
   var require_load_toml = __commonJS22({
     "src/utils/load-toml.js"(exports22, module22) {
       "use strict";
-      var parse3 = require_parse_string();
+      var parse4 = require_parse_string();
       module22.exports = function(filePath, content) {
         try {
-          return parse3(content);
+          return parse4(content);
         } catch (error) {
           error.message = `TOML Error in ${filePath}:
 ${error.message}`;
@@ -206128,7 +206128,7 @@ ${error.message}`;
       var token;
       var key;
       var root;
-      module22.exports = function parse3(text, reviver) {
+      module22.exports = function parse4(text, reviver) {
         source = String(text);
         parseState = "start";
         stack = [];
@@ -207157,10 +207157,10 @@ ${error.message}`;
   });
   var require_lib6 = __commonJS22({
     "node_modules/json5/lib/index.js"(exports22, module22) {
-      var parse3 = require_parse3();
+      var parse4 = require_parse3();
       var stringify = require_stringify2();
       var JSON5 = {
-        parse: parse3,
+        parse: parse4,
         stringify
       };
       module22.exports = JSON5;
@@ -207170,11 +207170,11 @@ ${error.message}`;
     "src/utils/load-json5.js"(exports22, module22) {
       "use strict";
       var {
-        parse: parse3
+        parse: parse4
       } = require_lib6();
       module22.exports = function(filePath, content) {
         try {
-          return parse3(content);
+          return parse4(content);
         } catch (error) {
           error.message = `JSON5 Error in ${filePath}:
 ${error.message}`;
@@ -207286,7 +207286,7 @@ ${error.message}`;
   var require_node_modules_paths = __commonJS22({
     "node_modules/resolve/lib/node-modules-paths.js"(exports22, module22) {
       var path2 = require("path");
-      var parse3 = path2.parse || require_path_parse();
+      var parse4 = path2.parse || require_path_parse();
       var getNodeModulesDirs = function getNodeModulesDirs2(absoluteStart, modules) {
         var prefix = "/";
         if (/^([A-Za-z]:)/.test(absoluteStart)) {
@@ -207295,10 +207295,10 @@ ${error.message}`;
           prefix = "\\\\";
         }
         var paths = [absoluteStart];
-        var parsed = parse3(absoluteStart);
+        var parsed = parse4(absoluteStart);
         while (parsed.dir !== paths[paths.length - 1]) {
           paths.push(parsed.dir);
-          parsed = parse3(parsed.dir);
+          parsed = parse4(parsed.dir);
         }
         return paths.reduce(function(dirs, aPath) {
           return dirs.concat(modules.map(function(moduleDir) {
@@ -209750,9 +209750,9 @@ ${fromBody}`;
         }
         return ret;
       }
-      Minimatch.prototype.parse = parse3;
+      Minimatch.prototype.parse = parse4;
       var SUBPARSE = {};
-      function parse3(pattern, isSub) {
+      function parse4(pattern, isSub) {
         var options = this.options;
         if (!options.noglobstar && pattern === "**")
           return GLOBSTAR;
@@ -210241,7 +210241,7 @@ ${fromBody}`;
         param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
         comment: /^\s*[#;].*$/
       };
-      function parse3(file) {
+      function parse4(file) {
         return __awaiter2(this, void 0, void 0, function() {
           return __generator2(this, function(_a) {
             return [2, new Promise(function(resolve2, reject) {
@@ -210256,7 +210256,7 @@ ${fromBody}`;
           });
         });
       }
-      exports22.parse = parse3;
+      exports22.parse = parse4;
       function parseSync(file) {
         return parseString(fs2.readFileSync(file, "utf8"));
       }
@@ -210673,7 +210673,7 @@ ${fromBody}`;
         return parseFromConfigs(getConfigsForFiles(files), resolvedFilePath, processedOptions);
       }
       exports22.parseFromFilesSync = parseFromFilesSync;
-      function parse3(_filepath, _options) {
+      function parse4(_filepath, _options) {
         if (_options === void 0) {
           _options = {};
         }
@@ -210688,7 +210688,7 @@ ${fromBody}`;
           });
         });
       }
-      exports22.parse = parse3;
+      exports22.parse = parse4;
       function parseSync(_filepath, _options) {
         if (_options === void 0) {
           _options = {};
@@ -210790,7 +210790,7 @@ ${fromBody}`;
       var jsonStringifyMem = (fn) => mem2(fn, {
         cacheKey: JSON.stringify
       });
-      var maybeParse = (filePath, parse3) => filePath && parse3(filePath, {
+      var maybeParse = (filePath, parse4) => filePath && parse4(filePath, {
         root: findProjectRoot(path2.dirname(path2.resolve(filePath)))
       });
       var editorconfigAsyncNoCache = async (filePath) => editorConfigToPrettier(await maybeParse(filePath, editorconfig.parse));
@@ -215099,7 +215099,7 @@ ${fromBody}`;
       var {
         escapeTemplateCharacters
       } = require_template_literal();
-      function format2(path2, print, textToDoc) {
+      function format3(path2, print, textToDoc) {
         const node = path2.getValue();
         let text = node.quasis[0].value.raw.replace(/((?:\\\\)*)\\`/g, (_, backslashes) => "\\".repeat(backslashes.length / 2) + "`");
         const indentation = getIndentation(text);
@@ -215119,7 +215119,7 @@ ${fromBody}`;
         const firstMatchedIndent = str.match(/^([^\S\n]*)\S/m);
         return firstMatchedIndent === null ? "" : firstMatchedIndent[1];
       }
-      module22.exports = format2;
+      module22.exports = format3;
     }
   });
   var require_css = __commonJS22({
@@ -215143,7 +215143,7 @@ ${fromBody}`;
       var {
         printTemplateExpressions
       } = require_template_literal();
-      function format2(path2, print, textToDoc) {
+      function format3(path2, print, textToDoc) {
         const node = path2.getValue();
         const rawQuasis = node.quasis.map((q) => q.value.raw);
         let placeholderID = 0;
@@ -215186,7 +215186,7 @@ ${fromBody}`;
         });
         return expressionDocs.length === replaceCounter ? newDoc : null;
       }
-      module22.exports = format2;
+      module22.exports = format3;
     }
   });
   var require_graphql = __commonJS22({
@@ -215203,7 +215203,7 @@ ${fromBody}`;
         escapeTemplateCharacters,
         printTemplateExpressions
       } = require_template_literal();
-      function format2(path2, print, textToDoc) {
+      function format3(path2, print, textToDoc) {
         const node = path2.getValue();
         const numQuasis = node.quasis.length;
         if (numQuasis === 1 && node.quasis[0].value.raw.trim() === "") {
@@ -215270,7 +215270,7 @@ ${fromBody}`;
         }
         return parts.length === 0 ? null : join2(hardline, parts);
       }
-      module22.exports = format2;
+      module22.exports = format3;
     }
   });
   var require_html = __commonJS22({
@@ -215292,7 +215292,7 @@ ${fromBody}`;
         uncookTemplateElementValue
       } = require_template_literal();
       var htmlTemplateLiteralCounter = 0;
-      function format2(path2, print, textToDoc, options, {
+      function format3(path2, print, textToDoc, options, {
         parser
       }) {
         const node = path2.getValue();
@@ -215345,7 +215345,7 @@ ${fromBody}`;
         }
         return group(["`", leadingWhitespace, topLevelCount > 1 ? indent(group(contentDoc)) : group(contentDoc), trailingWhitespace, "`"]);
       }
-      module22.exports = format2;
+      module22.exports = format3;
     }
   });
   var require_embed = __commonJS22({
@@ -215595,7 +215595,7 @@ ${fromBody}`;
         value: true
       });
       exports22.extract = extract;
-      exports22.parse = parse3;
+      exports22.parse = parse4;
       exports22.parseWithComments = parseWithComments;
       exports22.print = print;
       exports22.strip = strip;
@@ -215635,7 +215635,7 @@ ${fromBody}`;
         const match = contents.match(docblockRe);
         return match && match[0] ? contents.substring(match[0].length) : contents;
       }
-      function parse3(docblock) {
+      function parse4(docblock) {
         return parseWithComments(docblock).pragmas;
       }
       function parseWithComments(docblock) {
@@ -222465,7 +222465,7 @@ ${fromBody}`;
     "src/utils/front-matter/parse.js"(exports22, module22) {
       "use strict";
       var frontMatterRegex = new RegExp("^(?<startDelimiter>-{3}|\\+{3})(?<language>[^\\n]*)\\n(?:|(?<value>.*?)\\n)(?<endDelimiter>\\k<startDelimiter>|\\.{3})[^\\S\\n]*(?:\\n|$)", "s");
-      function parse3(text) {
+      function parse4(text) {
         const match = text.match(frontMatterRegex);
         if (!match) {
           return {
@@ -222501,7 +222501,7 @@ ${fromBody}`;
           content: raw.replace(/[^\n]/g, " ") + text.slice(raw.length)
         };
       }
-      module22.exports = parse3;
+      module22.exports = parse4;
     }
   });
   var require_pragma2 = __commonJS22({
@@ -237248,7 +237248,7 @@ async function go() {
   const outArgs = findInArgs({argv: process.argv, flags: ["-o", "--out"]});
   const outArg = outArgs[0];
   if (!outArg) {
-    throw new Error("Please provide -o/--out parameter");
+    throw new Error("Please provide -o/--out parameter for the domain and crud files");
   }
   const dirs = findInArgs({argv: process.argv, flags: ["-d", "--dir"]});
   const files = findInArgs({argv: process.argv, flags: ["-f", "--file"]});
@@ -237258,42 +237258,75 @@ async function go() {
   }
   const allStatements = [];
   for (let sqlFile of allSqlFiles) {
-    console.log("Processing file ${sqlFile}");
+    console.log(`Processing file ${sqlFile}`);
     const fileContents = await fs.readFile(sqlFile, "utf-8");
     const statements = import_pgsql_ast_parser2.parse(fileContents, {
       locationTracking: true
     });
-    allStatements.push(...statements);
+    allStatements.push({fileName: sqlFile, statements});
   }
   console.log(`Processing ${allStatements.length} statements`);
-  const g = parseSetupScripts(allStatements);
-  const createFunctionStatements = allStatements.filter(isCreateFunctionStatement);
-  await fs.mkdir(path.resolve(process.cwd(), outArg), {recursive: true});
-  const functionsOutFile = await prepOutFile(path.join(path.resolve(process.cwd(), outArg), "functions.ts"));
+  const g = parseSetupScripts(allStatements.flatMap((f) => f.statements));
+  const outDir = path.resolve(process.cwd(), outArg);
+  await fs.mkdir(outDir, {recursive: true});
+  const domainFile = path.format({
+    dir: outDir,
+    name: "domains",
+    ext: ".ts"
+  });
+  await prepOutFile(domainFile);
   for (let dom of g.domains) {
-    await fs.appendFile(functionsOutFile, genDomain(dom) + "\n", "utf-8");
+    await fs.appendFile(domainFile, genDomain(dom) + "\n", "utf-8");
   }
-  await fs.appendFile(functionsOutFile, `
+  await fs.appendFile(domainFile, `
 `, "utf-8");
-  for (let st of createFunctionStatements) {
-    try {
-      const res = doCreateFunction(g, {decls: [], froms: []}, st);
-      const writing = prettier.format(functionToTypescript(res), {
-        parser: "typescript"
-      });
-      await fs.appendFile(functionsOutFile, writing, "utf-8");
-    } catch (err) {
-      console.error(err instanceof Error ? err.message : JSON.stringify(err));
-      return;
-    }
-  }
-  const crudDir = path.join(path.resolve(process.cwd(), outArg), "crud");
-  await fs.mkdir(crudDir, {recursive: true});
+  const tablesIndexFile = path.format({
+    dir: outDir,
+    name: "tables",
+    ext: ".ts"
+  });
+  await fs.mkdir(path.join(outDir, "tables"), {recursive: true});
+  await prepOutFile(tablesIndexFile);
   for (let table of g.tables) {
-    const tableOutFile = await prepOutFile(path.join(crudDir, table.name.name + ".ts"));
+    const tableOutFile = path.format({
+      dir: path.join(outDir, "tables"),
+      name: table.name.name,
+      ext: ".ts"
+    });
+    await prepOutFile(tableOutFile);
     const text = genCrudOperations(table);
+    await fs.appendFile(tableOutFile, mkImportDomainsStatement(g.domains, tableOutFile, domainFile), "utf8");
     await fs.appendFile(tableOutFile, prettier.format(text, {parser: "typescript"}), "utf-8");
+    await fs.appendFile(tablesIndexFile, `export * as ${table.name.name} from "./tables/${table.name.name}";
+`);
   }
+  for (let f of allStatements) {
+    const createFunctionStatements = f.statements.filter(isCreateFunctionStatement);
+    const fParsed = path.parse(f.fileName);
+    const outFileName = path.format({
+      dir: fParsed.dir,
+      name: fParsed.name,
+      ext: ".ts"
+    });
+    const functionsOutFile = await prepOutFile(outFileName);
+    await fs.appendFile(outFileName, mkImportDomainsStatement(g.domains, outFileName, domainFile), "utf8");
+    console.log(`Writing functions to ${outFileName}`);
+    for (let st of createFunctionStatements) {
+      try {
+        const res = doCreateFunction(g, {decls: [], froms: []}, st);
+        const writing = prettier.format(functionToTypescript(res), {
+          parser: "typescript"
+        });
+        await fs.appendFile(functionsOutFile, writing, "utf-8");
+      } catch (err) {
+        console.error(err instanceof Error ? err.message : JSON.stringify(err));
+        return;
+      }
+    }
+    await fs.appendFile(functionsOutFile, `
+`, "utf-8");
+  }
+  console.log("Done!");
 }
 async function prepOutFile(path2) {
   await fs.writeFile(path2, getImports() + "\n", "utf-8");
@@ -237310,4 +237343,16 @@ function findInArgs(opts) {
   }
   return res;
 }
+function mkImportDomainsStatement(domains, thisFile, domainFile) {
+  const p = path.relative(path.dirname(thisFile), path.dirname(domainFile));
+  const formatted = path.format({
+    dir: p,
+    name: "domains",
+    ext: ""
+  });
+  const doms = domains.map((d) => d.name.name).join(", ");
+  return `import {${doms}} from "${formatted}";
+
+`;
+}
 //# sourceMappingURL=cli.js.map