@sqlanvil/cli 1.33.0 → 1.33.1

package/bundle.js

@@ -51218,7 +51218,7 @@ function collectEvaluationQueries(queryOrAction, concatenate, queryModifier = (q
         .filter((validationQuery) => !!validationQuery.query);
 }
 
-const version = "1.33.0";
+const version = "1.33.1";
 const dataformVersion = "3.0.71";
 
 async function build(compiledGraph, runConfig, dbadapter) {
@@ -51767,6 +51767,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 +51800,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;
@@ -58998,7 +59003,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

@@ -82,7 +82,7 @@
     "engines": {
         "node": "^20.19.0 || >=22.12.0"
     },
-    "version": "1.33.0",
+    "version": "1.33.1",
     "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 })));