c64bridge 1.0.4 → 1.0.6

package/dist/petscii.js

@@ -61,8 +61,6 @@ function ensureScreenCodeMap() {
         }
         SCREEN_CODE_TO_ASCII.set(code, deriveGlyphChar(glyph));
     }
-    // Common control characters / gaps default to space to keep output tidy.
-    SCREEN_CODE_TO_ASCII.set(0x00, " ");
     screenCodeMapInitialised = true;
 }
 export function screenCodesToAscii(bytes, options) {
@@ -132,7 +130,7 @@ const NAMED_CHARS = Object.freeze({
     "cursor_left": 157,
     // Graphic glyphs (commonly referenced by name)
     // Note: Exact byte shown on screen depends on mode; these are PETSCII/CHR$ values
-    "heart": 81, // widely used PETSCII code for heart glyph
+    "heart": 115, // $73 (shifted S); $51 would print the letter Q
     "up_arrow": 94,
     "uparrow": 94,
     "left_arrow": 95,
@@ -146,7 +144,8 @@ export function listNamedPetscii() {
 }
 export function lookupNamedPetscii(name) {
     const key = name.trim().toLowerCase().replace(/\s+/g, "_");
-    return NAMED_CHARS[key];
+    // Own keys only, so names like "constructor" don't resolve to Object.prototype members.
+    return Object.prototype.hasOwnProperty.call(NAMED_CHARS, key) ? NAMED_CHARS[key] : undefined;
 }
 /**
  * Try to parse a named character token starting at the given index.
@@ -160,15 +159,16 @@ export function parseNamedCharToken(source, startIndex) {
         return null;
     }
     const close = open === "{" ? "}" : open === ":" ? ":" : ">";
-    let idx = startIndex + 1;
-    let name = "";
-    while (idx < source.length && source[idx] !== close) {
-        name += source[idx]
-            .replace(/[^A-Za-z0-9_\s-]/g, "") // restrict to sane name characters
-            .trim();
-        idx += 1;
-    }
-    if (idx >= source.length || source[idx] !== close) {
+    const idx = source.indexOf(close, startIndex + 1);
+    if (idx < 0) {
+        return null;
+    }
+    // Only sane name characters; anything else is ordinary text that happens to use the delimiters.
+    // Multi-word names such as {cursor up} need braces: ":" and "<" also appear in
+    // ordinary text ("Mode: reverse on: yes"), so they only delimit single words.
+    const name = source.slice(startIndex + 1, idx).trim();
+    const namePattern = open === "{" ? /^[A-Za-z0-9_\s-]+$/ : /^[A-Za-z0-9_-]+$/;
+    if (!namePattern.test(name)) {
         return null;
     }
     const value = lookupNamedPetscii(name.replace(/[-\s]+/g, "_"));
@@ -181,7 +181,7 @@ export function parseNamedCharToken(source, startIndex) {
  * Encode a text containing optional named tokens into PETSCII bytes.
  * Named tokens may appear as {heart}, :heart:, or <heart>.
  */
-export function encodeStringWithNames(input) {
+export function encodeStringWithNames(input, options = {}) {
     const bytes = [];
     let i = 0;
     while (i < input.length) {
@@ -191,7 +191,10 @@ export function encodeStringWithNames(input) {
             i = maybe.endIndex;
             continue;
         }
-        bytes.push(asciiToPetscii(input[i]));
+        // ASCII a-z are PETSCII graphics characters in the default character set,
+        // so callers can fold them to the letters $41-$5A. Named codes are not folded.
+        const char = input[i];
+        bytes.push(asciiToPetscii(options.foldLowercase && char >= "a" && char <= "z" ? char.toUpperCase() : char));
         i += 1;
     }
     return Uint8Array.from(bytes);

package/dist/petsciiArt.js

@@ -19,6 +19,11 @@ const POPCOUNT = (() => {
     }
     return table;
 })();
+const RVS_ON = 18;
+const RVS_OFF = 146;
+// Marks the end of a character row in the generated DATA statements.
+const ROW_END = -1;
+const SCREEN_COLUMNS = 40;
 const DEFAULT_MAX_WIDTH = 320;
 const DEFAULT_MAX_HEIGHT = 200;
 const SHAPES = [
@@ -252,10 +257,14 @@ function distanceBetween(block, glyph) {
     }
     return score;
 }
+/**
+ * Match each 8x8 block to a glyph. `glyphs` has one entry per cell; `codes` is the
+ * PETSCII stream that prints them, with each run of reverse-video glyphs (screen
+ * codes $80-$FF) wrapped in RVS ON/RVS OFF. `rowCodes` holds that stream per row.
+ */
 export function bitmapToPetsciiCodes(bitmap) {
     const { blocks, columns, rows } = splitIntoBlocks(bitmap);
     const glyphs = getChargenGlyphs();
-    const codes = [];
     const matchedGlyphs = [];
     for (const block of blocks) {
         let bestMatch;
@@ -270,11 +279,26 @@ export function bitmapToPetsciiCodes(bitmap) {
                 }
             }
         }
-        const selected = bestMatch ?? glyphs[0];
-        codes.push(selected.petsciiCode);
-        matchedGlyphs.push(selected);
+        matchedGlyphs.push(bestMatch ?? glyphs[0]);
     }
-    return { codes, glyphs: matchedGlyphs, columns, rows };
+    const rowCodes = [];
+    for (let row = 0; row < rows; row += 1) {
+        const stream = [];
+        let reverse = false;
+        for (const glyph of matchedGlyphs.slice(row * columns, (row + 1) * columns)) {
+            const glyphReverse = (glyph.screenCode & 0x80) !== 0;
+            if (glyphReverse !== reverse) {
+                stream.push(glyphReverse ? RVS_ON : RVS_OFF);
+                reverse = glyphReverse;
+            }
+            stream.push(glyph.petsciiCode);
+        }
+        if (reverse) {
+            stream.push(RVS_OFF);
+        }
+        rowCodes.push(stream);
+    }
+    return { codes: rowCodes.flat(), rowCodes, glyphs: matchedGlyphs, columns, rows };
 }
 function buildBasicProgram(params) {
     const lines = [];
@@ -288,19 +312,21 @@ function buildBasicProgram(params) {
         lines.push(`${lineNumber} POKE 646,${fg}`);
         lineNumber += 10;
     }
+    // Rows vary in length because of the RVS ON/OFF codes, so each row's DATA ends with ROW_END.
     lines.push(`${lineNumber} FORY=0TO${Math.max(0, params.rows - 1)}`);
     lineNumber += 10;
-    lines.push(`${lineNumber} FORX=0TO${Math.max(0, params.columns - 1)}`);
-    lineNumber += 10;
-    lines.push(`${lineNumber} READC:PRINT CHR$(C);`);
-    lineNumber += 10;
-    lines.push(`${lineNumber} NEXTX:PRINT`);
+    const readLine = lineNumber;
+    // POKE212,0 clears quote mode: after a printed '"' glyph the editor would
+    // otherwise draw the following RVS ON/OFF codes as characters.
+    lines.push(`${readLine} READC:IFC>=0THENPRINT CHR$(C);:POKE212,0:GOTO${readLine}`);
     lineNumber += 10;
-    lines.push(`${lineNumber} NEXTY`);
+    // A full 40-column row already wraps the cursor; an extra PRINT would leave a blank line.
+    lines.push(params.columns >= SCREEN_COLUMNS ? `${lineNumber} NEXTY` : `${lineNumber} PRINT:NEXTY`);
     lineNumber += 10;
+    const data = params.rowCodes.flatMap((row) => [...row, ROW_END]);
     const chunkSize = 16;
-    for (let i = 0; i < params.codes.length; i += chunkSize) {
-        const slice = params.codes.slice(i, i + chunkSize);
+    for (let i = 0; i < data.length; i += chunkSize) {
+        const slice = data.slice(i, i + chunkSize);
         const dataLine = slice.join(",");
         lines.push(`${lineNumber} DATA ${dataLine}`);
         lineNumber += 10;
@@ -334,7 +360,7 @@ export function createPetsciiArt(options) {
     const converted = bitmapToPetsciiCodes(bitmap);
     const codes = converted.codes;
     const program = buildBasicProgram({
-        codes,
+        rowCodes: converted.rowCodes,
         columns: converted.columns,
         rows: converted.rows,
         borderColor: options.borderColor,

package/dist/rag/indexer.js

@@ -12,7 +12,8 @@ const BASIC_DIR = path.join(ASSET_ROOT, "data/basic/examples");
 const ASM_DIR = path.join(ASSET_ROOT, "data/assembly/examples");
 const EXTERNAL_DIR = path.join(ASSET_ROOT, "external");
 const DOC_ROOT = path.join(ASSET_ROOT, "doc");
-const DOC_EXCLUDE_DIRS = new Set(["plans"]);
+// Plans and reviews are internal engineering notes, not C64 reference material.
+const DOC_EXCLUDE_DIRS = new Set(["plans", "reviews"]);
 const CONTEXT_DIR = path.join(ASSET_ROOT, "data/context");
 const BOOTSTRAP_PATH = path.join(CONTEXT_DIR, "bootstrap.md");
 const AGENTS_PATH = path.join(ASSET_ROOT, "AGENTS.md");