fix: broaden DuckDB WASM package preloading

Author: peter-gy

frontend/src/core/wasm/__tests__/utils.test.ts

@@ -8,12 +8,14 @@ describe("shouldLoadDuckDBPackages", () => {
     expect(shouldLoadDuckDBPackages('df = mo.sql("SELECT 1")')).toBe(true);
   });
 
-  it("loads for detected duckdb imports and usage", () => {
+  it("loads for duckdb text", () => {
     expect(shouldLoadDuckDBPackages("import duckdb")).toBe(true);
     expect(shouldLoadDuckDBPackages("from duckdb import sql")).toBe(true);
+    expect(shouldLoadDuckDBPackages("import pandas, duckdb")).toBe(true);
     expect(shouldLoadDuckDBPackages("rows = duckdb.sql('SELECT 1')")).toBe(
       true,
     );
+    expect(shouldLoadDuckDBPackages("name = 'duckdb'")).toBe(true);
   });
 
   it("loads when package discovery found duckdb", () => {
@@ -22,13 +24,7 @@ describe("shouldLoadDuckDBPackages", () => {
     ).toBe(true);
   });
 
-  it("ignores incidental duckdb text", () => {
-    expect(shouldLoadDuckDBPackages("# duckdb is mentioned here")).toBe(false);
-    expect(shouldLoadDuckDBPackages("# duckdb.sql is mentioned here")).toBe(
-      false,
-    );
-    expect(shouldLoadDuckDBPackages("name = 'duckdb'")).toBe(false);
-    expect(shouldLoadDuckDBPackages("name = 'duckdb.sql'")).toBe(false);
-    expect(shouldLoadDuckDBPackages('name = "duckdb.sql"')).toBe(false);
+  it("does not load without mo.sql, duckdb text, or discovery", () => {
+    expect(shouldLoadDuckDBPackages("print('hello')")).toBe(false);
   });
 });

frontend/src/core/wasm/utils.ts

@@ -11,29 +11,13 @@ export function isWasm(): boolean {
   );
 }
 
-const DUCKDB_IMPORT = /^(import\s+duckdb\b|from\s+duckdb\s+import\b)/;
-const DUCKDB_USAGE = /(^|[^"'#])\bduckdb\s*\./;
-
-function hasDuckDBImportOrUsage(code: string): boolean {
-  return code.split("\n").some((line) => {
-    const trimmed = line.trimStart();
-    if (trimmed.startsWith("#")) {
-      return false;
-    }
-    if (DUCKDB_IMPORT.test(trimmed)) {
-      return true;
-    }
-    return DUCKDB_USAGE.test(line.split("#")[0]);
-  });
-}
-
 export function shouldLoadDuckDBPackages(
   code: string,
   foundPackages?: ReadonlySet<string>,
 ): boolean {
   return (
     code.includes("mo.sql") ||
-    foundPackages?.has("duckdb") === true ||
-    hasDuckDBImportOrUsage(code)
+    code.includes("duckdb") ||
+    foundPackages?.has("duckdb") === true
   );
 }