pll-python 0.1.2 → 0.2.0

package/cli.cjs

@@ -252,7 +252,17 @@ function userTracebackFrames(traceback) {
   }
   return frames;
 }
-function parsePythonError(rawTraceback) {
+function sourceIndent(source, lineNumber) {
+  if (!source) {
+    return 0;
+  }
+  const line = source.split(/\r?\n/)[lineNumber - 1];
+  if (line === void 0) {
+    return 0;
+  }
+  return line.length - line.trimStart().length;
+}
+function parsePythonError(rawTraceback, source) {
   const traceback = rawTraceback.trimEnd();
   const lines = traceback.split(/\r?\n/);
   let errorType = "Error";
@@ -286,10 +296,11 @@ function parsePythonError(rawTraceback) {
   if (lineNumber !== null) {
     for (let i = 0; i < lines.length - 1; i++) {
       if (/^\s*\^+\s*$/.test(lines[i + 1] ?? "")) {
-        const caretLine = lines[i + 1];
-        const caretIdx = caretLine.indexOf("^");
+        const sourceLine = lines[i];
+        const caretIdx = lines[i + 1].indexOf("^");
         if (caretIdx >= 0) {
-          column = caretIdx;
+          const echoed = sourceLine.length - sourceLine.trimStart().length;
+          column = Math.max(0, caretIdx - echoed) + sourceIndent(source, lineNumber);
         }
       }
     }
@@ -689,11 +700,11 @@ function findRuntimeFinding(source, fileName, level, parsedError) {
 // src/common/analyzers/runtimeFinding.ts
 function findingForErrorEvent(event, source, fileName, level) {
   const traceback = event.traceback || `${event.errorType}: ${event.message}`;
-  const parsed = parsePythonError(traceback);
-  if (parsed.lineNumber === null && event.lineNumber !== null) {
+  const parsed = parsePythonError(traceback, source);
+  if (parsed.lineNumber === null && event.lineNumber != null) {
     parsed.lineNumber = event.lineNumber;
   }
-  if (parsed.column === null && event.column !== null) {
+  if (parsed.column === null && event.column != null) {
     parsed.column = event.column;
   }
   if (parsed.fileName === null && event.fileName) {
@@ -704,6 +715,11 @@ function findingForErrorEvent(event, source, fileName, level) {
 
 // src/common/pyodideRunner.ts
 var ANY_IMPORT_RE = /(^|\n)[ \t]*(import|from)[ \t]+\S/;
+var PANDAS_METHOD_RE = /\.\s*to_pandas\s*\(/;
+var NEEDS_PACKAGES_RE_LIST = [PANDAS_METHOD_RE];
+function needsPackages(code) {
+  return ANY_IMPORT_RE.test(code) || NEEDS_PACKAGES_RE_LIST.some((re) => re.test(code));
+}
 
 // src/cli/files.ts
 var fs = __toESM(require("node:fs/promises"));
@@ -721,8 +737,17 @@ var MOUNT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".md",
   ".dat",
   ".xml",
-  ".py"
+  ".py",
+  // Pictures, for `load_image`. `.svg` is not in BINARY_EXTENSIONS below
+  // because it is text, and mounting it as text is lossless.
+  ".svg",
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".webp"
 ]);
+var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".webp"]);
 var WRITEBACK_EXTENSIONS = /* @__PURE__ */ new Set([
   ".csv",
   ".txt",
@@ -757,9 +782,15 @@ function isMountableName(name) {
 function isWritebackName(name) {
   return isSafeBasename(name) && WRITEBACK_EXTENSIONS.has(extensionOf(name));
 }
+function isBinaryMountName(name) {
+  return BINARY_EXTENSIONS.has(extensionOf(name));
+}
 function utf8ByteLength(text) {
   return new TextEncoder().encode(text).byteLength;
 }
+function contentsByteLength(contents) {
+  return typeof contents === "string" ? utf8ByteLength(contents) : contents.byteLength;
+}
 function decodeMountContents(data) {
   if (data.byteLength > MAX_FILE_BYTES) {
     return void 0;
@@ -781,27 +812,33 @@ function selectMountableFiles(candidates) {
     if (!isMountableName(candidate.name)) {
       continue;
     }
-    let text;
-    if (typeof candidate.contents === "string") {
+    let contents;
+    if (isBinaryMountName(candidate.name)) {
+      const raw = typeof candidate.contents === "string" ? new TextEncoder().encode(candidate.contents) : candidate.contents;
+      if (raw.byteLength > MAX_FILE_BYTES) {
+        continue;
+      }
+      contents = raw;
+    } else if (typeof candidate.contents === "string") {
       if (utf8ByteLength(candidate.contents) > MAX_FILE_BYTES) {
         continue;
       }
       if (candidate.contents.includes("\0")) {
         continue;
       }
-      text = candidate.contents;
+      contents = candidate.contents;
     } else {
       const decoded = decodeMountContents(candidate.contents);
       if (decoded === void 0) {
         continue;
       }
-      text = decoded;
+      contents = decoded;
     }
-    const size = utf8ByteLength(text);
+    const size = contentsByteLength(contents);
     if (total + size > MAX_TOTAL_BYTES) {
       continue;
     }
-    selected.push({ name: candidate.name, contents: text });
+    selected.push({ name: candidate.name, contents });
     total += size;
   }
   return selected;
@@ -816,6 +853,9 @@ function selectWritebackFiles(files) {
     if (!isWritebackName(file.name)) {
       continue;
     }
+    if (typeof file.contents !== "string") {
+      continue;
+    }
     const size = utf8ByteLength(file.contents);
     if (size > MAX_FILE_BYTES || total + size > MAX_TOTAL_BYTES) {
       continue;
@@ -855,6 +895,9 @@ async function writeBackSiblingFiles(scriptPath, files) {
   const written = [];
   for (const file of selectWritebackFiles(files)) {
     try {
+      if (typeof file.contents !== "string") {
+        continue;
+      }
       await fs.writeFile(path.join(folder, file.name), file.contents, "utf8");
       written.push(file.name);
     } catch {
@@ -934,7 +977,7 @@ async function staticChecks(runtime, view, source, fileName, level) {
   return true;
 }
 async function ensurePackages(runtime, view, source) {
-  if (!ANY_IMPORT_RE.test(source)) {
+  if (!needsPackages(source)) {
     return;
   }
   try {
@@ -1302,18 +1345,33 @@ function asPlain(value) {
   }
   return value;
 }
-function adaptTestCase(raw) {
+function friendlyTypeCheckMessage(message, level) {
+  const marker = message.indexOf("TypeCheckError:");
+  if (marker < 0) {
+    return message;
+  }
+  const detail = message.slice(marker + "TypeCheckError:".length).trim();
+  if (!detail) {
+    return message;
+  }
+  const explanation = explainTypeCheckError(detail, null, level);
+  return [explanation.headline, ...explanation.howToFix.map((line) => `- ${line}`)].join(
+    "\n"
+  );
+}
+function adaptTestCase(raw, level) {
   const row = asPlain(raw) ?? {};
   const line = row.line_number;
+  const message = row.message == null ? null : String(row.message);
   return {
     name: String(row.name ?? ""),
     outcome: String(row.outcome ?? "failed"),
     lineNumber: typeof line === "number" ? line : null,
-    message: row.message == null ? null : String(row.message),
+    message: message === null ? null : friendlyTypeCheckMessage(message, level),
     stdout: row.stdout == null ? null : String(row.stdout)
   };
 }
-function deliverTestResult(result, onEvent, fileName) {
+function deliverTestResult(result, onEvent, fileName, level) {
   if (result.internal_error && result.error_type) {
     onEvent({
       kind: "error",
@@ -1327,7 +1385,7 @@ function deliverTestResult(result, onEvent, fileName) {
     onEvent({ kind: "done" });
     return;
   }
-  const tests = Array.isArray(result.tests) ? result.tests.map(adaptTestCase) : [];
+  const tests = Array.isArray(result.tests) ? result.tests.map((row) => adaptTestCase(row, level)) : [];
   onEvent({
     kind: "testReport",
     fileName,
@@ -1470,7 +1528,7 @@ var WorkerPythonRuntime = class {
       },
       "testResult"
     );
-    deliverTestResult(result, onEvent, request.fileName);
+    deliverTestResult(result, onEvent, request.fileName, request.level);
   }
   async staticAnalyze(request) {
     await this.initialize();
@@ -1690,11 +1748,12 @@ function findingLocation(finding) {
   if (finding.fileName === "<repl>" || finding.fileName === "<input>") {
     return null;
   }
-  const label = finding.column !== null ? `${finding.fileName}:${finding.lineNumber}:${finding.column + 1}` : `${finding.fileName}:${finding.lineNumber}`;
+  const column = typeof finding.column === "number" && Number.isFinite(finding.column) ? finding.column : null;
+  const label = column !== null ? `${finding.fileName}:${finding.lineNumber}:${column + 1}` : `${finding.fileName}:${finding.lineNumber}`;
   return {
     fileName: finding.fileName,
     line: finding.lineNumber,
-    column: finding.column,
+    column,
     label
   };
 }
@@ -1845,6 +1904,13 @@ var CliView = class {
           this.problem("        " + line);
         }
       }
+      const printed = (test.stdout ?? "").replace(/\s+$/, "");
+      if (printed) {
+        this.problem(this.dim("        output:"));
+        for (const line of printed.split("\n")) {
+          this.problem(this.dim("          " + line));
+        }
+      }
     }
   }
 };
@@ -1965,7 +2031,7 @@ async function main(argv) {
     return EXIT.ok;
   }
   if (args.version) {
-    process.stdout.write("0.1.2\n");
+    process.stdout.write("0.2.0\n");
     return EXIT.ok;
   }
   if (args.error !== void 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pll-python",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Run Python with PLL's language levels from the command line: level checks, in-file tests, friendly errors and the built-in image and table libraries, all on Pyodide. No Python install needed.",
   "license": "MIT",
   "repository": {