@sqlanvil/cli 1.32.10 → 1.33.1

package/package.json

@@ -82,7 +82,7 @@
     "engines": {
         "node": "^20.19.0 || >=22.12.0"
     },
-    "version": "1.32.10",
+    "version": "1.33.1",
     "name": "@sqlanvil/cli",
     "description": "sqlanvil command line interface.",
     "main": "bundle.js"

package/worker_bundle.js

@@ -49557,7 +49557,7 @@ Struct.verify = function (object) {
         for (const [k, v] of Object.entries(object)) {
             fields[k] = unknownToValueShallow(v);
         }
-        Object.keys(object).forEach(key => delete object[key]);
+        Object.keys(object).forEach((key) => delete object[key]);
         object.fields = fields;
     }
     return originalVerify.call(this, object);
@@ -49568,7 +49568,7 @@ Struct.fromObject = function (object) {
         for (const [k, v] of Object.entries(object)) {
             fields[k] = unknownToValueShallow(v);
         }
-        Object.keys(object).forEach(key => delete object[key]);
+        Object.keys(object).forEach((key) => delete object[key]);
         object.fields = fields;
     }
     return originalFromObject.call(this, object);
@@ -49617,48 +49617,34 @@ function compile(compileConfig) {
             context: "sandbox",
             root: compileConfig.projectDir,
             external: true,
-            builtin: ["path"]
-        }
+            builtin: ["path"],
+        },
     });
     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",
         sandbox: {
-            __df_enter: (p) => { fileStack.push(p); },
-            __df_exit: () => { fileStack.pop(); },
-            __df_current: () => fileStack.length > 0 ? fileStack[fileStack.length - 1] : null
+            __df_enter: (p) => {
+                fileStack.push(p);
+            },
+            __df_exit: () => {
+                fileStack.pop();
+            },
+            __df_current: () => (fileStack.length > 0 ? fileStack[fileStack.length - 1] : null),
         },
         require: {
             builtin: ["path"],
             context: "sandbox",
             external: true,
             root: compileConfig.projectDir,
-            resolve: (moduleName, parentDirName) => path__namespace.join(parentDirName, path__namespace.relative(parentDirName, compileConfig.projectDir), moduleName)
+            resolve: (moduleName, parentDirName) => path__namespace.join(parentDirName, path__namespace.relative(parentDirName, compileConfig.projectDir), moduleName),
         },
         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 {
@@ -49667,7 +49653,7 @@ function compile(compileConfig) {
           __df_exit();
         }
       `;
-        }
+        },
     });
     const hasWorkflowSettingsYaml = fs__namespace.existsSync(path__namespace.join(compileConfig.projectDir, "workflow_settings.yaml"));
     return userCodeVm.run(`
@@ -49677,7 +49663,7 @@ function compile(compileConfig) {
       });
       ${hasWorkflowSettingsYaml
         ? 'global.workflowSettingsYaml = require("./workflow_settings.yaml");'
-        : ''}
+        : ""}
       return require("@sqlanvil/core").main("${createCoreExecutionRequest(compileConfig)}")
     `, vmIndexFileName);
 }
@@ -49715,16 +49701,27 @@ 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 })));
     return encode64(sqlanvil.CoreExecutionRequest, {
-        compile: { compileConfig: Object.assign({ filePaths }, compileConfig) }
+        compile: { compileConfig: Object.assign({ filePaths }, compileConfig) },
     });
 }