progress

lib/text_builder/utils.test.ts

@@ -0,0 +1,37 @@
+import { assertEquals } from "../../deps/std/testing.ts";
+import { T } from "../tokenize/mod.ts";
+import {
+  cleanComment,
+  makeFileEndEventContext,
+  makeFileStartEventContext,
+  makeInlineCommentEventContext,
+  makeLoadEventContext,
+  makeMultilineCommentEventContext,
+  makeSetPropertyEventContext,
+  makeStructCloseEventContext,
+  makeStructOpenEventContext,
+} from "./utils.ts";
+
+Deno.test("cleans inlined comments to extract text content", () => {
+  const expectation = ["example"];
+  const reality = cleanComment(T.comment("; example", 1, 1));
+  assertEquals(expectation, reality);
+});
+
+Deno.test("cleans multi-inlined comments to extract text content", () => {
+  const expectation = ["example"];
+  const reality = cleanComment(T.multiline_comment("/* example */", 1, 1));
+  assertEquals(expectation, reality);
+});
+
+Deno.test("cleans multi-inlined comments to extract text content (omits whitespace on edges)", () => {
+  const expectation = ["example"];
+  const reality = cleanComment(T.multiline_comment(
+    `/*
+  example
+*/`,
+    1,
+    1,
+  ));
+  assertEquals(expectation, reality);
+});

lib/text_builder/utils.ts

@@ -20,19 +20,17 @@ export const cleanComment = (commentToken: Token): string[] => {
       const rawComment = commentToken.value;
       const lineBreakIndex = rawComment.indexOf("\n");
       const inlineCommentContent = rawComment
-        .slice(
-          1,
-          lineBreakIndex > -1 ? lineBreakIndex : rawComment.length,
-        )
+        .slice(0, lineBreakIndex > -1 ? lineBreakIndex : rawComment.length)
         .trim();
       trimmedCommentLines.push(inlineCommentContent);
       break;
     }
     case Lexicon.MultilineComment: {
-      const rawCommentLines = commentToken.value.slice(2, -2).split("\n");
-      rawCommentLines.forEach((rawCommentLine) =>
-        trimmedCommentLines.push(rawCommentLine.trim())
-      );
+      const rawCommentLines = commentToken.value.split("\n");
+      rawCommentLines.forEach((rawCommentLine) => {
+        // TODO: push only if the line is not a blank edge
+        trimmedCommentLines.push(rawCommentLine.trim());
+      });
       break;
     }
   }

lib/tokenize/token.ts

@@ -31,7 +31,13 @@ export class Token {
     switch (this.kind) {
       case Lexicon.TextLiteral: {
         // strips expected text markers from beginning and end of input string
-        return this.value.slice(1, this.value.length - 1);
+        return this.raw.slice(1, this.value.length - 1);
+      }
+      case Lexicon.InlineComment: {
+        return this.raw.slice(1).trim();
+      }
+      case Lexicon.MultilineComment: {
+        return this.raw.slice(2, this.raw.length - 2).trim();
       }
       default: {
         return this.raw;