@weborigami/origami 0.2.9 → 0.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -13,13 +13,13 @@
   "main": "./main.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "22.13.5",
+    "@types/node": "22.13.13",
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.2.9",
-    "@weborigami/language": "0.2.9",
-    "@weborigami/types": "0.2.9",
+    "@weborigami/async-tree": "0.2.11",
+    "@weborigami/language": "0.2.11",
+    "@weborigami/types": "0.2.11",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.11.1",

package/src/handlers/oridocument.handler.js

@@ -1,15 +1,8 @@
-import {
-  extension,
-  ObjectTree,
-  symbols,
-  trailingSlash,
-} from "@weborigami/async-tree";
+import { extension, trailingSlash } from "@weborigami/async-tree";
 import { compile } from "@weborigami/language";
-import { parseYaml } from "../common/serialize.js";
 import { toString } from "../common/utilities.js";
 import { processUnpackedContent } from "../internal.js";
 import getParent from "./getParent.js";
-import parseFrontMatter from "./parseFrontMatter.js";
 
 /**
  * An Origami template document: a plain text file that contains Origami
@@ -23,7 +16,7 @@ export default {
     const parent = getParent(packed, options);
 
     // Unpack as a text document
-    const unpacked = toString(packed);
+    const text = toString(packed);
 
     // See if we can construct a URL to use in error messages
     const key = options.key;
@@ -36,79 +29,16 @@ export default {
       url = new URL(key, parentHref);
     }
 
-    // Determine the data (if present) and text content
-    let text;
-    let frontData = null;
-    let frontSource = null;
-    let offset = 0;
-    let extendedParent = parent;
-    const parsed = parseFrontMatter(unpacked);
-    if (!parsed) {
-      text = unpacked;
-    } else {
-      const { body, frontText, isOrigami } = parsed;
-      if (isOrigami) {
-        // Origami front matter
-        frontSource = { name: key, text: frontText, url };
-      } else {
-        // YAML front matter
-        frontData = parseYaml(frontText);
-        if (typeof frontData !== "object") {
-          throw new TypeError(`YAML or JSON front matter must be an object`);
-        }
-        extendedParent = new ObjectTree(frontData);
-        extendedParent.parent = parent;
-      }
-
-      // Determine how many lines the source code is offset by (if any) to
-      // account for front matter, plus 2 lines for `---` separators
-      offset = (frontText.match(/\r?\n/g) ?? []).length + 2;
-
-      text = body;
-    }
-
-    // Construct an object to represent the source code
-    const bodySource = {
+    // Compile the text as an Origami template document
+    const source = {
       name: key,
-      offset,
       text,
       url,
     };
+    const defineFn = compile.templateDocument(source);
 
-    // Compile the source as an Origami template document
-    const scopeCaching = frontSource ? false : true;
-    const defineTemplateFn = compile.templateDocument(bodySource, {
-      scopeCaching,
-    });
-
-    // Determine the result of the template
-    let result;
-    if (frontSource) {
-      // Result is the evaluated front source
-      const frontFn = compile.expression(frontSource, {
-        macros: {
-          "@template": defineTemplateFn.code,
-        },
-      });
-      result = await frontFn.call(parent);
-    } else {
-      const templateFn = await defineTemplateFn.call(extendedParent);
-      if (frontData) {
-        // Result is a function that adds the front data to the template result
-        result = async (input) => {
-          const text = await templateFn.call(extendedParent, input);
-          const object = {
-            ...frontData,
-            "@text": text,
-          };
-          object[symbols.parent] = extendedParent;
-          return object;
-        };
-      } else {
-        // Result is a function that calls the body template
-        result = templateFn;
-      }
-    }
+    // Invoke the definition to get back the template function
+    const result = await defineFn.call(parent);
 
     const resultExtension = key ? extension.extname(key) : null;
     if (resultExtension && Object.isExtensible(result)) {

package/src/handlers/parseFrontMatter.js

@@ -1,3 +1,5 @@
+import { isOrigamiFrontMatter } from "@weborigami/language";
+
 export default function parseFrontMatter(text) {
   const regex =
     /^(---\r?\n(?<frontText>[\s\S]*?\r?\n?)---\r?\n)(?<body>[\s\S]*$)/;
@@ -5,17 +7,10 @@ export default function parseFrontMatter(text) {
   if (!match?.groups) {
     return null;
   }
-  const isOrigami = detectOrigami(match.groups.frontText);
+  const isOrigami = isOrigamiFrontMatter(match.groups.frontText);
   return {
     body: match.groups.body,
     frontText: match.groups.frontText,
     isOrigami,
   };
 }
-
-function detectOrigami(text) {
-  // Find first character that's not whitespace, alphanumeric, or underscore
-  const first = text.match(/[^A-Za-z0-9_ \t\n\r]/)?.[0];
-  const origamiMarkers = ["(", ".", "/", "{"];
-  return origamiMarkers.includes(first);
-}

package/src/text/inline.js

@@ -43,14 +43,18 @@ export default async function inline(input) {
   }
 
   // @ts-ignore
-  const templateFn = await oridocumentHandler.unpack(input, {
+  let result = await oridocumentHandler.unpack(input, {
     parent: extendedParent,
   });
 
-  const inputData = inputIsDocument ? input : null;
-  const templateResult = await templateFn(inputData);
+  if (result instanceof Function) {
+    const text = await result();
+    if (inputIsDocument) {
+      return documentObject(text, input);
+    } else {
+      return text;
+    }
+  }
 
-  return inputIsDocument
-    ? documentObject(templateResult, inputData)
-    : templateResult;
+  return result;
 }

package/src/text/mdHtml.js

@@ -1,6 +1,6 @@
 import { extension, isUnpackable } from "@weborigami/async-tree";
 import highlight from "highlight.js";
-import { marked } from "marked";
+import { Marked } from "marked";
 import { gfmHeadingId as markedGfmHeadingId } from "marked-gfm-heading-id";
 import { markedHighlight } from "marked-highlight";
 import { markedSmartypants } from "marked-smartypants";
@@ -10,6 +10,8 @@ import origamiHighlightDefinition from "./origamiHighlightDefinition.js";
 
 highlight.registerLanguage("ori", origamiHighlightDefinition);
 
+// Create our own marked instance so we don't interfere with the global one
+const marked = new Marked();
 marked.use(
   // @ts-ignore
   markedGfmHeadingId(),
@@ -24,8 +26,6 @@ marked.use(
   markedSmartypants(),
   {
     gfm: true, // Use GitHub-flavored markdown.
-    // @ts-ignore
-    mangle: false,
   }
 );
 
@@ -52,7 +52,7 @@ export default async function mdHtml(input) {
   if (markdown === null) {
     throw new Error("mdHtml: The provided input couldn't be treated as text.");
   }
-  const html = marked(markdown);
+  const html = marked.parse(markdown);
   return inputIsDocument ? documentObject(html, input) : html;
 }