@weborigami/origami 0.0.42 → 0.0.44

package/exports/buildExports.js

@@ -15,7 +15,7 @@ const specialBuiltinNames = {
 
 // Top-level template for the export file
 const templateText = `=\`// This file is generated by running buildExports.js -- do not edit by hand.
-{{ _ }}\``;
+\${ _ }\``;
 
 // Generate a top-level export file for the entire project. For each .js file in
 // the given source tree, generate an appropriate statement that includes that

package/exports/exports.js

@@ -38,18 +38,20 @@ export { default as js } from "../src/builtins/@js.js";
 export { default as json } from "../src/builtins/@json.js";
 export { default as keys } from "../src/builtins/@keys.js";
 export { default as keysJson } from "../src/builtins/@keysJson.js";
-export { default as loadersCss } from "../src/builtins/@loaders/css.js";
-export { default as loadersHtm } from "../src/builtins/@loaders/htm.js";
-export { default as loadersHtml } from "../src/builtins/@loaders/html.js";
+export * from "../src/builtins/@loaders/css.js";
+export * from "../src/builtins/@loaders/htm.js";
+export * from "../src/builtins/@loaders/html.js";
+export { default as loadersJpeg } from "../src/builtins/@loaders/jpeg.js";
+export * from "../src/builtins/@loaders/jpg.js";
 export { default as loadersJs } from "../src/builtins/@loaders/js.js";
 export { default as loadersJson } from "../src/builtins/@loaders/json.js";
-export { default as loadersMd } from "../src/builtins/@loaders/md.js";
-export { default as loadersMjs } from "../src/builtins/@loaders/mjs.js";
+export * from "../src/builtins/@loaders/md.js";
+export * from "../src/builtins/@loaders/mjs.js";
 export { default as loadersOri } from "../src/builtins/@loaders/ori.js";
 export { default as loadersTxt } from "../src/builtins/@loaders/txt.js";
-export { default as loadersXhtml } from "../src/builtins/@loaders/xhtml.js";
+export * from "../src/builtins/@loaders/xhtml.js";
 export { default as loadersYaml } from "../src/builtins/@loaders/yaml.js";
-export { default as loadersYml } from "../src/builtins/@loaders/yml.js";
+export * from "../src/builtins/@loaders/yml.js";
 export { default as map } from "../src/builtins/@map.js";
 export { default as mapDeep } from "../src/builtins/@mapDeep.js";
 export { default as match } from "../src/builtins/@match.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.42",
+  "version": "0.0.44",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -19,9 +19,10 @@
     "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "https://gitpkg.now.sh/WebOrigami/origami/async-tree?e08c2451",
-    "@weborigami/language": "https://gitpkg.now.sh/WebOrigami/origami/language?e08c2451",
-    "@weborigami/types": "0.0.42",
+    "@weborigami/async-tree": "0.0.44",
+    "@weborigami/language": "0.0.44",
+    "@weborigami/types": "0.0.44",
+    "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
     "marked": "11.1.1",

package/src/builtins/@arrows.js

@@ -1,8 +1,8 @@
 import { Scope, functionResultsMap } from "@weborigami/language";
-import builtins from "../../src/builtins/@builtins.js";
 import arrowFunctionsMap from "../common/arrowFunctionsMap.js";
 import { keySymbol } from "../common/utilities.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
+import builtins from "./@builtins.js";
 
 /**
  * Interpret arrow keys in the tree as function calls.

package/src/builtins/@count.js

@@ -10,7 +10,7 @@ import getTreeArgument from "../misc/getTreeArgument.js";
  */
 export default async function count(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "@count");
-  const keys = [...(await tree.keys())];
+  const keys = Array.from(await tree.keys());
   return keys.length;
 }
 

package/src/builtins/@image/resize.js

@@ -27,7 +27,9 @@ export default function resize(param1, param2) {
     options = param2;
   }
 
-  const transform = (buffer) => sharp(buffer).resize(options).toBuffer();
+  // Include `rotate()` to auto-rotate according to EXIF data.
+  const transform = (buffer) =>
+    sharp(buffer).rotate().resize(options).toBuffer();
 
   return buffer ? transform(buffer) : transform;
 }

package/src/builtins/@inline.js

@@ -1,10 +1,11 @@
+import { Tree, isPlainObject } from "@weborigami/async-tree";
 import { compile } from "@weborigami/language";
 import unpackText from "../builtins/@loaders/txt.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
 import unpackOrigamiExpression from "./@loaders/ori.js";
 
 /**
- * Inline any Origami expressions found inside {{...}} placeholders in the input
+ * Inline any Origami expressions found inside ${...} placeholders in the input
  * text.
  *
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -28,7 +29,17 @@ export default async function inline(input) {
     inputDocument = await unpackText(input);
   }
 
+  // If the input document is a plain object or AsyncTree, we'll have it
+  // included in scope for the evaluated expression. We ignore other kinds of
+  // treelike inputs for this test: in particular, a Buffer will be interpreted
+  // as a tree, but we don't want to put a Buffer in scope.
+  const attachedData =
+    isPlainObject(inputDocument) || Tree.isAsyncTree(inputDocument)
+      ? inputDocument
+      : null;
+
   const templateFn = await unpackOrigamiExpression(inputDocument, {
+    attachedData,
     compiler: compile.templateDocument,
   });
   const templateResult = await templateFn(inputDocument);

package/src/builtins/@loaders/css.js

@@ -1,4 +1,2 @@
-import unpackText from "./txt.js";
-
-// Load this file type as text with possible front matter.
-export default unpackText;
+// .css files use the .txt loader
+export { default } from "./txt.js";

package/src/builtins/@loaders/htm.js

@@ -1,4 +1,2 @@
-import unpackText from "./txt.js";
-
-// Load this file type as text with possible front matter.
-export default unpackText;
+// .htm files use the .txt loader
+export { default } from "./txt.js";

package/src/builtins/@loaders/html.js

@@ -1,4 +1,2 @@
-import unpackText from "./txt.js";
-
-// Load this file type as text with possible front matter.
-export default unpackText;
+// .html files use the .txt loader
+export { default } from "./txt.js";

package/src/builtins/@loaders/jpeg.js

@@ -0,0 +1,55 @@
+import exifParser from "exif-parser";
+
+const exifDateTags = [
+  "ModifyDate",
+  "MDPrepDate",
+  "DateTimeOriginal",
+  "CreateDate",
+  "PreviewDateTime",
+  "GPSDateStamp",
+];
+
+/**
+ * Load Exif data from a JPEG file.
+ *
+ * @type {import("@weborigami/language").FileUnpackFunction}
+ */
+export default async function unpackJpeg(buffer, options) {
+  const parser = exifParser.create(buffer);
+  parser.enableTagNames(true);
+  parser.enableSimpleValues(true);
+  const parsed = await parser.parse();
+
+  // The exif-parser `enableSimpleValues` option should convert dates to
+  // JavaScript Date objects, but that doesn't seem to work. Ensure dates are
+  // Date objects.
+  const exif = parsed.tags;
+  for (const tag of exifDateTags) {
+    if (typeof exif[tag] === "number") {
+      exif[tag] = new Date(exif[tag] * 1000);
+    }
+  }
+
+  const result = {
+    height: parsed.imageSize.height,
+    width: parsed.imageSize.width,
+    exif,
+  };
+
+  // Promote some Exif properties to the top level.
+  const tagsToPromote = {
+    ImageDescription: "caption",
+    ModifyDate: "modified",
+    Orientation: "orientation",
+  };
+  for (const [tag, key] of Object.entries(tagsToPromote)) {
+    if (exif[tag] !== undefined) {
+      result[key] = exif[tag];
+    }
+  }
+
+  // Add aspect ratio for use with `aspect-ratio` CSS.
+  result.aspectRatio = result.width / result.height;
+
+  return result;
+}

package/src/builtins/@loaders/jpg.js

@@ -0,0 +1,2 @@
+// .jpg extension is a synonym for .jpeg
+export { default } from "./jpeg.js";

package/src/builtins/@loaders/md.js

@@ -1,4 +1,2 @@
-import unpackText from "./txt.js";
-
-// Load this file type as text with possible front matter.
-export default unpackText;
+// .md files use the .txt loader
+export { default } from "./txt.js";

package/src/builtins/@loaders/mjs.js

@@ -1,4 +1,2 @@
-import unpackModule from "./js.js";
-
-// .mjs modules use the same loader as .js modules.
-export default unpackModule;
+// .mjs files use the .js loader
+export { default } from "./js.js";

package/src/builtins/@loaders/ori.js

@@ -1,5 +1,4 @@
-import { Scope } from "@weborigami/language";
-import * as compile from "../../../../language/src/compiler/compile.js";
+import { Scope, compile, symbols } from "@weborigami/language";
 import processUnpackedContent from "../../common/processUnpackedContent.js";
 import * as utilities from "../../common/utilities.js";
 import builtins from "../@builtins.js";
@@ -13,10 +12,11 @@ export default async function unpackOrigamiExpression(
   inputDocument,
   options = {}
 ) {
+  const attachedData = options.attachedData;
   const parent =
     options.parent ??
     /** @type {any} */ (inputDocument).parent ??
-    /** @type {any} */ (inputDocument)[utilities.parentSymbol];
+    /** @type {any} */ (inputDocument)[symbols.parent];
 
   // Construct an object to represent the source code.
   const sourceName = options.key;
@@ -41,5 +41,5 @@ export default async function unpackOrigamiExpression(
   const parentScope = parent ? Scope.getScope(parent) : builtins;
   let content = await fn.call(parentScope);
 
-  return processUnpackedContent(content, parent, inputDocument);
+  return processUnpackedContent(content, parent, attachedData);
 }

package/src/builtins/@loaders/xhtml.js

@@ -1,4 +1,2 @@
-import unpackText from "./txt.js";
-
-// Load this file type as text with possible front matter.
-export default unpackText;
+// .xhtml files use the .txt loader
+export { default } from "./txt.js";

package/src/builtins/@loaders/yaml.js

@@ -13,6 +13,6 @@ const YAML = YAMLModule.default ?? YAMLModule.YAML;
  */
 export default async function unpackYaml(input, options = {}) {
   const parent = options.parent ?? null;
-  const data = evaluateYaml(String(input), options.parent);
+  const data = await evaluateYaml(String(input), options.parent);
   return processUnpackedContent(data, parent);
 }

package/src/builtins/@loaders/yml.js

@@ -1,4 +1,2 @@
-import yaml from "./yaml.js";
-
-// .yml files uses the YAML loader
-export default yaml;
+// .yml extension is a synonym for .yaml
+export { default } from "./yaml.js";

package/src/builtins/@node.js

@@ -2,10 +2,21 @@ import path from "node:path";
 import process from "node:process";
 import url from "node:url";
 
+// Patch process.env to be a plain object. Among other things, this lets us dump
+// the complete environment to the terminal with `ori @node/process/env`.
+const patchedProcess = Object.create(null, {
+  ...Object.getOwnPropertyDescriptors(process),
+  env: {
+    value: function () {
+      return Object.assign({}, process.env);
+    },
+  },
+});
+
 const node = {
   Buffer,
   path,
-  process,
+  process: patchedProcess,
   url,
 };
 

package/src/builtins/@ori.js

@@ -1,5 +1,5 @@
 import { Tree, getRealmObjectPrototype } from "@weborigami/async-tree";
-import * as compile from "../../../language/src/compiler/compile.js";
+import { compile } from "@weborigami/language";
 import builtins from "../builtins/@builtins.js";
 import { toYaml } from "../common/serialize.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";

package/src/builtins/@rss.js

@@ -18,7 +18,7 @@ export default async function rss(jsonFeedTree) {
   parts.push("rss.xml");
   const rssUrl = parts.join("/");
 
-  const itemsRss = items?.map((story) => itemRss(story)).join("\n") ?? [];
+  const itemsRss = items?.map((story) => itemRss(story)).join("") ?? [];
 
   return `<?xml version="1.0" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
@@ -27,7 +27,7 @@ export default async function rss(jsonFeedTree) {
     <title>${title}</title>
     <link>${home_page_url}</link>
     <description>${description}</description>
-  ${itemsRss}</channel>
+${itemsRss}</channel>
 </rss>`;
 }
 
@@ -36,12 +36,14 @@ function itemRss(jsonFeedItem) {
   // RSS wants dates in RFC-822.
   const date = date_published?.toUTCString() ?? null;
   const dateElement = date ? `      <pubDate>${date}</pubDate>\n` : "";
+  const guidElement = id ? `      <guid>${id}</guid>\n` : "";
+  const contentElement = content_html
+    ? `      <description><![CDATA[${content_html}]]></description>\n`
+    : "";
   return `    <item>
-      ${dateElement}<title>${title}</title>
+${dateElement}      <title>${title}</title>
       <link>${url}</link>
-      <guid>${id}</guid>
-      <description><![CDATA[${content_html}]]></description>
-    </item>
+${guidElement}${contentElement}    </item>
 `;
 }
 

package/src/builtins/@sitemap.js

@@ -5,11 +5,11 @@ import paths from "./@paths.js";
 
 const templateText = `=\`<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-{{ @map(=\`
+\${ @map(=\`
   <url>
-    <loc>{{ _ }}</loc>
+    <loc>\${ _ }</loc>
   </url>
-\`)(_) }}
+\`)(_) }
 </urlset>
 \`
 `;

package/src/common/CommandModulesTransform.js

@@ -27,7 +27,7 @@ export default function CommandsModulesTransform(Base) {
     }
 
     async keys() {
-      const keys = [...(await super.keys())];
+      const keys = Array.from(await super.keys());
       // If we find a key like "foo.js", then return "foo" as the key.
       return keys.map((key) =>
         key.endsWith(".js") ? path.basename(key, ".js") : key

package/src/common/TextDocument.js

@@ -1,4 +1,5 @@
 import { isStringLike } from "@weborigami/async-tree";
+import { symbols } from "@weborigami/language";
 import { toYaml } from "./serialize.js";
 import * as utilities from "./utilities.js";
 
@@ -22,7 +23,7 @@ export default class TextDocument {
   constructor(data, parent) {
     Object.assign(this, data);
     if (parent) {
-      this[utilities.parentSymbol] = parent;
+      this[symbols.parent] = parent;
     }
   }
 

package/src/common/processUnpackedContent.js

@@ -10,18 +10,20 @@ import builtins from "../builtins/@builtins.js";
  *
  * @param {any} content
  * @param {AsyncTree|null} parent
- * @param {any} [inputDocument]
+ * @param {any} [attachedData]
  * @returns
  */
-export default function processUnpackedContent(content, parent, inputDocument) {
+export default function processUnpackedContent(content, parent, attachedData) {
   if (typeof content === "function") {
     // Wrap the function such to add ambients to the scope.
     const fn = content;
 
     // Use the parent's scope, adding any attached data.
     const parentScope = parent ? Scope.getScope(parent) : builtins;
-    const extendedScope = Tree.isTreelike(inputDocument)
-      ? new Scope(inputDocument, parentScope)
+
+    // If there's attached data, include it in the scope.
+    const extendedScope = attachedData
+      ? new Scope(attachedData, parentScope)
       : parentScope;
 
     const boundFn = fn.bind(extendedScope);

package/src/common/utilities.d.ts

@@ -1,6 +1,5 @@
 
 export const keySymbol: unique symbol;
-export const parentSymbol: unique symbol;
 export function hasNonPrintableCharacters(text: string): boolean;
 export function isTransformApplied(Transform: Function, object: any): boolean;
 export function replaceExtension(key: string, sourceExtension: string, resultExtension: string): string;

package/src/common/utilities.js

@@ -30,8 +30,6 @@ export function isTransformApplied(Transform, obj) {
 
 export const keySymbol = Symbol("key");
 
-export const parentSymbol = Symbol("parent");
-
 /**
  * If the given key ends in the source extension (which will generally include a
  * period), replace that extension with the result extension (which again should

package/src/misc/explore.ori

@@ -4,8 +4,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <title>Web Origami Explorer</title>
-    <style>{{ explore.css }}</style>
-    <script>{{ explore.js.inline }}</script>
+    <style>${ explore.css }</style>
+    <script>${ explore.js.inline }</script>
   </head>
   <body>
     <nav>
@@ -18,10 +18,10 @@
     </div>
     {{ @map(=`
       <ul>
-        <h2>{{ _/name }}</h2>
+        <h2>${ _/name }</h2>
         {{ @map(=`
         <li>
-          <a href="./!@explore/{{ _ }}" target="frame">{{ _ }}</a>
+          <a href="./!@explore/${ _ }" target="frame">${ _ }</a>
         </li>
         `)(_/keys) }}
       </ul>

package/src/misc/treeDot.js

@@ -154,7 +154,11 @@ async function statements(tree, nodePath, nodeLabel, options) {
   for (const key in nodes) {
     const node = nodes[key];
     const icon = node.isError ? "⚠️ " : "";
-    const label = `label="${icon}${node.label}"`;
+    // GraphViz has trouble rendering DOT nodes whose labels contain ellipsis
+    // characters, so we map those to three periods. GraphViz appears to turn
+    // those back into ellipsis characters when rendering the graph.
+    const text = node.label.replace(/…/g, "...");
+    const label = `label="${icon}${text}"`;
     const color = node.isError ? `; color="red"` : "";
     const fill = node.isError ? `; fillcolor="#FFF4F4"` : "";
     const destPath = nodePath ? `${nodePath}/${key}` : key;

package/src/misc/yamlOrigamiTag.js

@@ -1,5 +1,5 @@
-import { expressionFunction } from "@weborigami/language";
-import * as compile from "../../../language/src/compiler/compile.js";
+import { compile, expressionFunction } from "@weborigami/language";
+
 /**
  * A YAML tag for an Origami expression.
  */