@sqlanvil/cli 1.33.0 → 1.34.0

package/README.md

@@ -12,7 +12,7 @@ authority for the version you have installed: `sqlanvil help` lists the commands
 
 ```bash
 npm install -g @sqlanvil/cli
-sqlanvil --version    # sqlanvil 1.33.0 (Dataform core 3.0.71)
+sqlanvil --version    # sqlanvil 1.34.0 (Dataform core 3.1.0)
 ```
 
 Requires Node.js 20.19+ or 22.12+. `--version` reports the sqlanvil release and the Dataform core

package/bundle.js

@@ -49759,13 +49759,6 @@ function unknownToValueShallow(raw) {
     throw new Error(`Unsupported value: ${raw}`);
 }
 
-(() => {
-    if (typeof process !== "undefined") {
-        return process.platform === "win32" ? "\\" : "/";
-    }
-    return "/";
-})();
-
 const nativeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : require;
 function globToRegExp(pattern) {
     const escapeLiteral = (literal) => literal.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
@@ -51218,8 +51211,8 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter((validationQuery) => !!validationQuery.query);
 }
 
-const version = "1.33.0";
-const dataformVersion = "3.0.71";
+const version = "1.34.0";
+const dataformVersion = "3.1.0";
 
 async function build(compiledGraph, runConfig, dbadapter) {
     const prunedGraph = prune(compiledGraph, runConfig);
@@ -51322,7 +51315,7 @@ class BaseWorker {
     async runWorker(timeoutMillis, onBoot, onMessage) {
         const forkScript = this.resolveScript();
         const child = childProcess.fork(forkScript, [], {
-            stdio: [0, 1, 2, "ipc", "pipe"],
+            stdio: [0, 1, 2, "ipc"],
         });
         return new Promise((resolve, reject) => {
             let completed = false;
@@ -51767,6 +51760,12 @@ function mysqlCredentialsTemplate() {
     };
     return `${JSON.stringify(template, null, 2)}\n`;
 }
+function defaultSchemaFor(warehouse) {
+    if (warehouse === "supabase") {
+        return "analytics";
+    }
+    return warehouse === "postgres" ? "public" : "sqlanvil";
+}
 async function init(projectDir, projectConfig, options = {}) {
     var _a;
     const workflowSettingsYamlPath = path__namespace.join(projectDir, "workflow_settings.yaml");
@@ -51794,8 +51793,7 @@ async function init(projectDir, projectConfig, options = {}) {
         workflowSettings.defaultLocation = projectConfig.defaultLocation;
     }
     const isPostgresLike = warehouse === "postgres" || warehouse === "supabase";
-    workflowSettings.defaultDataset =
-        projectConfig.defaultSchema || (isPostgresLike ? "public" : "sqlanvil");
+    workflowSettings.defaultDataset = projectConfig.defaultSchema || defaultSchemaFor(warehouse);
     workflowSettings.defaultAssertionDataset = projectConfig.assertionSchema || "sqlanvil_assertions";
     if (isBigQuery && projectConfig.defaultIcebergConfig) {
         workflowSettings.defaultIcebergConfig = projectConfig.defaultIcebergConfig;
@@ -54232,7 +54230,7 @@ class Runner {
     }
     execute() {
         var _a, _b, _c;
-        if (!!this.executionTask) {
+        if (this.executionTask !== undefined) {
             throw new Error("Executor already started.");
         }
         this.executionTask = this.executeGraph();
@@ -56777,6 +56775,7 @@ function postProcessFormattedSqlx(formattedSql) {
     return `${formattedSql.trim()}\n`;
 }
 
+const normalizeLineEndings = (text) => text.replace(/\r\n/g, "\n");
 const checkOptionName = "check";
 const ignoreJsFilesOptionName = "ignore-js-files";
 const formatCommand = {
@@ -56803,7 +56802,10 @@ const formatCommand = {
             actions = argv[actionsOption.name];
         }
         const filenames = actions
-            .map((action) => glob__namespace.sync(action, { cwd: argv[projectDirMustExistOption.name] }))
+            .map((action) => glob__namespace.sync(action, {
+            cwd: argv[projectDirMustExistOption.name],
+            windowsPathsNoEscape: process.platform === "win32",
+        }))
             .flat();
         const isCheckMode = argv[checkOptionName];
         const results = await Promise.all(filenames.map(async (filename) => {
@@ -56816,7 +56818,7 @@ const formatCommand = {
                     });
                     return {
                         filename,
-                        needsFormatting: fileContent !== formattedContent,
+                        needsFormatting: normalizeLineEndings(fileContent) !== normalizeLineEndings(formattedContent),
                     };
                 }
                 else {
@@ -58998,7 +59000,7 @@ async function runFreshFlow(defaultProjectDir) {
         projectConfig.defaultDatabase = askRequired(INIT_BQ_PROJECT_QUESTION);
         projectConfig.defaultLocation = askRequired(INIT_BQ_LOCATION_QUESTION);
     }
-    projectConfig.defaultSchema = ask(INIT_DEFAULT_SCHEMA_QUESTION, isPostgresLike ? "public" : "sqlanvil");
+    projectConfig.defaultSchema = ask(INIT_DEFAULT_SCHEMA_QUESTION, defaultSchemaFor(warehouse));
     const includeSample = askYesNo(INIT_INCLUDE_SAMPLE_QUESTION, true);
     const includeBigQuerySource = includeSample && isPostgresLike ? askYesNo(INIT_INCLUDE_BQ_SOURCE_QUESTION, true) : undefined;
     let credentialsJson;

package/package.json

@@ -2,7 +2,7 @@
     "dependencies": {
         "@duckdb/node-api": "^1.5.4-r.1",
         "@google-cloud/bigquery": "~8.3.0",
-        "chokidar": "^3.5.3",
+        "chokidar": "^4.0.3",
         "deepmerge": "^4.2.2",
         "fs-extra": "^9.0.0",
         "glob": "13.0.6",
@@ -24,20 +24,20 @@
         "tmp": "^0.2.7",
         "typeid-js": "0.3.0",
         "untildify": "^4.0.0",
-        "vm2": "3.11.6",
+        "vm2": "3.12.2",
         "yargs": "^16.2.0"
     },
     "resolutions": {
         "**/object-path": "^0.11.5",
         "**/http-proxy": "^1.18.1",
-        "**/serialize-javascript": "^7.1.1",
+        "**/serialize-javascript": "^7.1.2",
         "**/ssri": "^7.1.1",
         "**/glob-parent": "^5.1.2",
         "**/node-forge": "^1.0.0",
         "**/json-bigint": "^1.0.0",
         "**/y18n": "^5.0.5",
         "**/underscore": "^1.12.1",
-        "**/protobufjs": "^7.0.0",
+        "**/protobufjs": "^7.6.5",
         "**/ansi-regex": "^3.0.1",
         "**/json-schema": "^0.4.0",
         "**/nth-check": "^2.0.1",
@@ -48,7 +48,8 @@
         "**/string-width": "4.1.0",
         "**/@eslint-community/eslint-utils": "4.9.1",
         "**/@ungap/structured-clone": "1.3.1",
-        "**/brace-expansion": "5.0.9",
+        "**/brace-expansion": "5.0.12",
+        "**/fast-uri": "^3.1.7",
         "**/linkify-it": "^5.0.2",
         "**/braces": "^3.0.3",
         "**/@eslint/plugin-kit": "0.7.2",
@@ -82,7 +83,7 @@
     "engines": {
         "node": "^20.19.0 || >=22.12.0"
     },
-    "version": "1.33.0",
+    "version": "1.34.0",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"

package/worker_bundle.js

@@ -49622,21 +49622,7 @@ function compile(compileConfig) {
     });
     const compiler = indexGeneratorVm.run('return require("@sqlanvil/core").compiler', vmIndexFileName);
     const sqlanvilCoreVersion = indexGeneratorVm.run('return require("@sqlanvil/core").version || "0.0.0"', vmIndexFileName);
-    const coreDataformVersion = indexGeneratorVm.run('return require("@sqlanvil/core").dataformVersion || require("@sqlanvil/core").version || "0.0.0"', vmIndexFileName);
-    const cliVersion = readCliVersion();
-    const cliParsed = semver__namespace.parse(cliVersion);
-    if (cliParsed && cliVersion !== "0.0.0") {
-        const minCoreVersion = `${cliParsed.major}.${cliParsed.minor}.0`;
-        if (semver__namespace.major(sqlanvilCoreVersion) !== cliParsed.major ||
-            semver__namespace.lt(sqlanvilCoreVersion, minCoreVersion)) {
-            throw new Error(`@sqlanvil/core ${sqlanvilCoreVersion} is not compatible with @sqlanvil/cli ` +
-                `${cliVersion}. The CLI requires @sqlanvil/core >= ${minCoreVersion} ` +
-                `(matching major.minor). Set \`sqlanvilCoreVersion: ${cliVersion}\` in ` +
-                `workflow_settings.yaml (or pin @sqlanvil/core in package.json), then run ` +
-                `\`sqlanvil install\`.`);
-        }
-    }
-    const needsCallerFileShim = semver__namespace.lt(coreDataformVersion, "3.0.57");
+    checkCoreCompatibility(sqlanvilCoreVersion, readCliVersion());
     const fileStack = [];
     const userCodeVm = new vm2.NodeVM({
         wrapper: "none",
@@ -49658,11 +49644,7 @@ function compile(compileConfig) {
         },
         sourceExtensions: ["js", "sql", "sqlx", "yaml", "yml"],
         compiler: (code, filePath) => {
-            let source = code;
-            if (needsCallerFileShim && filePath === coreBundlePath) {
-                source = patchOldCoreCallerFile(source);
-            }
-            const compiledCode = compiler(source, filePath);
+            const compiledCode = compiler(code, filePath);
             return `
         __df_enter(${JSON.stringify(filePath)});
         try {
@@ -49719,11 +49701,22 @@ function readCliVersion() {
         return "0.0.0";
     }
 }
-const OLD_CORE_THROW = 'if(!t)throw new Error("Unable to find valid caller file; please report this issue.")';
-const OLD_CORE_WITH_FALLBACK = "if(!t){if(global.__sqlanvil_current_file){t=global.__sqlanvil_current_file}" +
-    'else{throw new Error("Unable to find valid caller file; please report this issue.")}}';
-function patchOldCoreCallerFile(source) {
-    return source.replace(OLD_CORE_THROW, OLD_CORE_WITH_FALLBACK);
+const MIN_SUPPORTED_CORE_VERSION = "1.0.0";
+function checkCoreCompatibility(coreVersion, cliVersion) {
+    const cliParsed = semver__namespace.parse(cliVersion);
+    if (!cliParsed || cliVersion === "0.0.0") {
+        return;
+    }
+    const majorFloor = `${cliParsed.major}.0.0`;
+    const minCoreVersion = semver__namespace.gt(MIN_SUPPORTED_CORE_VERSION, majorFloor)
+        ? MIN_SUPPORTED_CORE_VERSION
+        : majorFloor;
+    if (semver__namespace.major(coreVersion) !== cliParsed.major || semver__namespace.lt(coreVersion, minCoreVersion)) {
+        throw new Error(`@sqlanvil/core ${coreVersion} is not compatible with @sqlanvil/cli ${cliVersion}. ` +
+            `The CLI requires @sqlanvil/core >=${minCoreVersion} <${cliParsed.major + 1}.0.0. ` +
+            `Set \`sqlanvilCoreVersion: ${cliVersion}\` in workflow_settings.yaml, or pin ` +
+            `@sqlanvil/core in package.json and run \`sqlanvil install\`.`);
+    }
 }
 function createCoreExecutionRequest(compileConfig) {
     const filePaths = Array.from(new Set(glob__namespace.sync("!(node_modules)/**/*.*", { cwd: compileConfig.projectDir })));