poe-code 11.0.5 → 11.0.7

package/packages/safejs/dist/loader/extract-block.js

@@ -39,12 +39,7 @@ export function extractBlock(markdown, startLine = 1) {
     const parts = [];
     let cursor = first.start;
     for (const block of blocks) {
-        let gap = "";
-        for (let offset = cursor; offset < block.start; offset++) {
-            const character = markdown[offset];
-            gap += character === "\n" || character === "\r" ? character : " ";
-        }
-        parts.push(gap, markdown.slice(block.start, block.end));
+        parts.push(maskSource(markdown.slice(cursor, block.start)), markdown.slice(block.start, block.end));
         cursor = block.end;
     }
     return {
@@ -55,6 +50,14 @@ export function extractBlock(markdown, startLine = 1) {
         ranges: blocks.map((block) => [block.start, block.end])
     };
 }
+export function maskSource(source) {
+    let masked = "";
+    for (let offset = 0; offset < source.length; offset++) {
+        const character = source[offset];
+        masked += character === "\n" || character === "\r" ? character : " ";
+    }
+    return masked;
+}
 function readOpeningFence(line) {
     const fenceStart = readFenceStart(line);
     if (fenceStart === undefined) {

package/packages/safejs/dist/parse/parser.js

@@ -759,7 +759,13 @@ class Parser {
                 }
             ];
         }
-        this.expectKeyword("from");
+        const fromToken = this.currentToken();
+        if (fromToken.type !== "identifier" ||
+            fromToken.value !== "from" ||
+            fromToken.end.offset - fromToken.start.offset !== fromToken.value.length) {
+            throw new Error(`Expected 'from' at line ${fromToken.start.line}, column ${fromToken.start.column}.`);
+        }
+        this.index += 1;
         const sourceToken = this.currentToken();
         if (sourceToken.type !== "string") {
             throw unexpectedTokenError(sourceToken);

package/packages/safejs/dist/parse/tokenizer.js

@@ -18,7 +18,6 @@ const KEYWORDS = new Set([
     "await",
     "yield",
     "import",
-    "from",
     "as",
     "true",
     "false",

package/packages/safejs/dist/runner/run-harness.js

@@ -3,7 +3,7 @@ import { extname } from "node:path";
 import { supportsSpawnMode } from "@poe-code/agent-spawn/configs";
 import { SPAWN_MODES } from "@poe-code/agent-spawn/types";
 import { hasOwnErrorCode } from "../error-codes.js";
-import { countLineBreaks, extractBlock } from "../loader/extract-block.js";
+import { countLineBreaks, extractBlock, maskSource } from "../loader/extract-block.js";
 import { splitFrontmatter } from "../loader/frontmatter.js";
 import { lint } from "../lint.js";
 import { createLintModulesFromRuntimeRegistry } from "../lint/runtime-modules.js";
@@ -52,7 +52,7 @@ export class LintError extends Error {
     }
 }
 export async function runHarness(filepath, options) {
-    const rawSource = stripByteOrderMark(await readHarnessFile(filepath));
+    const rawSource = await readHarnessFile(filepath);
     const { executableSource, frontmatter, isRawScript } = loadExecutableSource(filepath, rawSource);
     assertFrontmatterAgentModes(frontmatter);
     const meta = createHarnessMeta(filepath, frontmatter);
@@ -137,11 +137,12 @@ async function readHarnessFile(filepath) {
 }
 function loadExecutableSource(filepath, source) {
     if (isRawScriptPath(filepath)) {
-        if (source.length === 0) {
+        const executableSource = stripByteOrderMark(source);
+        if (executableSource.length === 0) {
             throw new Error(`No code block found in empty harness file: ${filepath}`);
         }
         return {
-            executableSource: source,
+            executableSource,
             frontmatter: {},
             isRawScript: true
         };
@@ -152,9 +153,8 @@ function loadExecutableSource(filepath, source) {
     }
     const bodyStartOffset = source.length - body.length;
     const { source: executableBlock, startOffset } = extractBlock(body, countLineBreaks(source, 0, bodyStartOffset) + 1);
-    const absoluteLineOffset = countLineBreaks(source, 0, bodyStartOffset + startOffset);
     return {
-        executableSource: createLineOffsetSource(stripHashbang(executableBlock), absoluteLineOffset),
+        executableSource: maskSource(source.slice(0, bodyStartOffset + startOffset)) + stripHashbang(executableBlock),
         frontmatter,
         isRawScript: false
     };
@@ -238,9 +238,6 @@ function stripHashbang(source) {
         end += 1;
     return `${" ".repeat(end)}${source.slice(end)}`;
 }
-function createLineOffsetSource(source, lineOffset) {
-    return `${"\n".repeat(Math.max(lineOffset, 0))}${source}`;
-}
 function formatLintErrorMessage(diagnostics) {
     if (diagnostics.length === 0) {
         return "Script lint failed.";