@weborigami/origami 0.0.38 → 0.0.40

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021–2023 Jan Miksovsky and other contributors
+Copyright (c) 2024 Jan Miksovsky and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/exports/buildExports.js

@@ -1,6 +1,6 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
 import { keyMapsForExtensions, map } from "@weborigami/async-tree";
-import unpackOrigamiTemplate from "../src/builtins/@loaders/orit.js";
+import unpackOrigamiTemplate from "../src/builtins/@loaders/ori.js";
 import { transformObject } from "../src/common/utilities.js";
 import PathTransform from "./PathTransform.js";
 
@@ -14,8 +14,8 @@ const specialBuiltinNames = {
 };
 
 // Top-level template for the export file
-const templateText = `// This file is generated by running buildExports.js -- do not edit by hand.
-{{ _ }}`;
+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

@@ -1,6 +1,7 @@
 // This file is generated by running buildExports.js -- do not edit by hand.
 export { default as apply } from "../src/builtins/@apply.js";
 export { default as arrows } from "../src/builtins/@arrows.js";
+export { default as basename } from "../src/builtins/@basename.js";
 export { default as builtins } from "../src/builtins/@builtins.js";
 export { default as cache } from "../src/builtins/@cache.js";
 export { default as config } from "../src/builtins/@config.js";
@@ -10,6 +11,7 @@ export { default as debug } from "../src/builtins/@debug.js";
 export { default as document } from "../src/builtins/@document.js";
 export { default as equals } from "../src/builtins/@equals.js";
 export { default as explore } from "../src/builtins/@explore.js";
+export { default as fetch } from "../src/builtins/@fetch.js";
 export { default as files } from "../src/builtins/@files.js";
 export { default as filter } from "../src/builtins/@filter.js";
 export { default as globs } from "../src/builtins/@globs.js";
@@ -33,19 +35,21 @@ 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 { default as loadersOri } from "../src/builtins/@loaders/ori.js";
-export { default as loadersOrit } from "../src/builtins/@loaders/orit.js";
 export { default as loadersTxt } from "../src/builtins/@loaders/txt.js";
 export { default as loadersXhtml } 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 { 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";
 export { default as mdHtml } from "../src/builtins/@mdHtml.js";
 export { default as node } from "../src/builtins/@node.js";
 export { default as not } from "../src/builtins/@not.js";
+export { default as once } from "../src/builtins/@once.js";
 export { default as or } from "../src/builtins/@or.js";
 export { default as ori } from "../src/builtins/@ori.js";
 export { default as pack } from "../src/builtins/@pack.js";
+export { default as package } from "../src/builtins/@package.js";
 export { default as parseJson } from "../src/builtins/@parse/json.js";
 export { default as parseYaml } from "../src/builtins/@parse/yaml.js";
 export { default as project } from "../src/builtins/@project.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -13,28 +13,28 @@
   "main": "./exports/exports.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/chai": "4.3.9",
-    "@types/mocha": "10.0.3",
-    "@types/node": "20.8.10",
-    "typescript": "5.2.2"
+    "@types/chai": "4.3.11",
+    "@types/mocha": "10.0.6",
+    "@types/node": "20.11.7",
+    "typescript": "5.3.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "*",
-    "@weborigami/language": "*",
-    "@weborigami/types": "0.0.38",
+    "@weborigami/async-tree": "0.0.40",
+    "@weborigami/language": "0.0.40",
+    "@weborigami/types": "0.0.40",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
-    "marked": "9.1.5",
-    "marked-gfm-heading-id": "3.1.0",
-    "marked-highlight": "2.0.6",
-    "marked-smartypants": "1.1.3",
-    "sharp": "0.32.6",
-    "yaml": "2.3.3"
+    "marked": "11.1.1",
+    "marked-gfm-heading-id": "3.1.2",
+    "marked-highlight": "2.1.0",
+    "marked-smartypants": "1.1.5",
+    "sharp": "0.33.2",
+    "yaml": "2.3.4"
   },
   "scripts": {
     "build": "ori exports/buildExports.js src > exports/exports.js",
     "prepublishOnly": "npm run build",
-    "test": "node --test --test-reporter=spec test/*/*.test.js test/*/*/*.test.js",
+    "test": "node --test --test-reporter=spec",
     "typecheck": "node node_modules/typescript/bin/tsc"
   }
 }

package/src/builtins/@basename.js

@@ -0,0 +1,6 @@
+import { extname } from "@weborigami/language";
+
+export default function basename(key) {
+  const ext = extname(key);
+  return ext ? key.slice(0, -ext.length) : key;
+}

package/src/builtins/@explore.js

@@ -1,5 +1,5 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { ObjectTree } from "@weborigami/async-tree";
+import { ObjectTree, Tree } from "@weborigami/async-tree";
 import { OrigamiFiles, Scope } from "@weborigami/language";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -14,14 +14,8 @@ const miscFiles = Scope.treeWithScope(new OrigamiFiles(miscDir), builtins);
 /**
  * @this {AsyncTree|null}
  */
-export default async function explore() {
+export default async function explore(...keys) {
   const scope = Scope.getScope(this);
-  const templateFile = await miscFiles.get("explore.orit");
-  const template = await templateFile.unpack();
-
-  const data = await getScopeData(scope);
-  const text = await template(data);
-
   const ambientsTree = new ObjectTree({
     "@current": this,
   });
@@ -29,8 +23,34 @@ export default async function explore() {
   const extendedScope = new Scope(ambientsTree, scope);
 
   /** @type {any} */
-  const result = new String(text);
-  result.unpack = () => debug.call(scope, extendedScope);
+  let result;
+  if (keys.length > 0) {
+    // Traverse the scope using the given keys.
+    const debugScope = await debug.call(scope, extendedScope);
+    if (!debugScope) {
+      return undefined;
+    }
+
+    // HACK: reproduce logic of ExplorableSiteTransform that turns a trailing
+    // slash into index.html. Calling `debug` applies that transform and the
+    // transform should handle that logic, but unfortunately the `traverse`
+    // operation has special casing to treat a trailing slash, and never gives
+    // ExplorableSiteTransform a chance.
+    if (keys.at(-1) === "") {
+      keys[keys.length - 1] = "index.html";
+    }
+    result = await Tree.traverse(debugScope, ...keys);
+  } else {
+    // Return the Explore page for the current scope.
+    const templateFile = await miscFiles.get("explore.ori");
+    const template = await templateFile.unpack();
+
+    const data = await getScopeData(scope);
+    const text = await template(data);
+
+    result = new String(text);
+    result.unpack = () => debug.call(scope, extendedScope);
+  }
 
   return result;
 }

package/src/builtins/@fetch.js

@@ -0,0 +1,7 @@
+export default async function fetchBuiltin(href) {
+  const response = await fetch(href);
+  return response.ok ? await response.arrayBuffer() : undefined;
+}
+
+fetchBuiltin.usage = `@fetch href\tReturns the contents of the given URL as an ArrayBuffer`;
+fetchBuiltin.documentation = "https://weborigami.org/languages/@fetch.html";

package/src/builtins/@inline.js

@@ -1,5 +1,7 @@
+import { compile } from "@weborigami/language";
+import unpackText from "../builtins/@loaders/txt.js";
 import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
-import unpackOrigamiTemplate from "./@loaders/orit.js";
+import unpackOrigamiExpression from "./@loaders/ori.js";
 
 /**
  * Inline any Origami expressions found inside {{...}} placeholders in the input
@@ -13,16 +15,26 @@ import unpackOrigamiTemplate from "./@loaders/orit.js";
  */
 export default async function inline(input) {
   assertScopeIsDefined(this);
-  if (/** @type {any} */ (input).unpack) {
-    input = await /** @type {any} */ (input).unpack();
+
+  // Get the input text and any attached front matter.
+  let inputDocument;
+  if (input["@text"]) {
+    inputDocument = input;
+  } else if (/** @type {any} */ (input).unpack) {
+    // Have the input unpack itself.
+    inputDocument = await /** @type {any} */ (input).unpack();
+  } else {
+    // Unpack the input as a text document with possible front matter.
+    inputDocument = await unpackText(input);
   }
-  const inputDocument = input["@text"] ? input : null;
-  const templateInput = inputDocument ?? input;
-  const templateFn = await unpackOrigamiTemplate(templateInput);
-  const text = await templateFn(inputDocument);
+
+  const templateFn = await unpackOrigamiExpression(inputDocument, {
+    compiler: compile.templateDocument,
+  });
+  const templateResult = await templateFn(inputDocument);
   return inputDocument
-    ? Object.assign({}, inputDocument, { "@text": String(text) })
-    : text;
+    ? Object.assign({}, inputDocument, { "@text": String(templateResult) })
+    : templateResult;
 }
 
 inline.usage = `@inline <text>\tInline Origami expressions found in the text`;

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

@@ -1,6 +1,7 @@
 import { Scope } from "@weborigami/language";
 import * as compile from "../../../../language/src/compiler/compile.js";
 import processUnpackedContent from "../../common/processUnpackedContent.js";
+import * as utilities from "../../common/utilities.js";
 import builtins from "../@builtins.js";
 
 /**
@@ -8,14 +9,37 @@ import builtins from "../@builtins.js";
  *
  * @type {import("@weborigami/language").FileUnpackFunction}
  */
-export default async function unpackOrigamiExpression(input, options = {}) {
-  const parent = options.parent ?? null;
+export default async function unpackOrigamiExpression(
+  inputDocument,
+  options = {}
+) {
+  const parent =
+    options.parent ??
+    /** @type {any} */ (inputDocument).parent ??
+    /** @type {any} */ (inputDocument)[utilities.parentSymbol];
+  const compiler = options.compiler ?? compile.expression;
 
   // Compile the body text as an Origami expression and evaluate it.
-  const text = String(input);
-  const fn = compile.expression(text);
+  const inputText = utilities.toString(inputDocument);
+  let fn;
+  try {
+    fn = compiler(inputText);
+  } catch (/** @type {any} */ error) {
+    let location = "";
+    if (options.key) {
+      location += `${options.key}`;
+    }
+    if (error.location) {
+      const { start } = error.location;
+      location += `, line ${start.line}, column ${start.column}`;
+    }
+    if (location) {
+      error.message += ` (${location})`;
+    }
+    throw error;
+  }
   const parentScope = parent ? Scope.getScope(parent) : builtins;
   let content = await fn.call(parentScope);
 
-  return processUnpackedContent(content, parent);
+  return processUnpackedContent(content, parent, inputDocument);
 }

package/src/builtins/@map.js

@@ -74,6 +74,7 @@ export default function treeMap(param1, param2) {
     inverseKeyMap,
     keyMap,
     keyName,
+    needsSourceValue,
     valueName,
   } = options;
 
@@ -105,7 +106,7 @@ export default function treeMap(param1, param2) {
 
   // Extend the key function to include the value and key in scope.
   let extendedKeyMap;
-  let extendedInnerKeyMap;
+  let extendedInverseKeyMap;
   if (extensions) {
     let { resultExtension, sourceExtension } = parseExtensions(extensions);
     const keyFns = keyMapsForExtensions({
@@ -113,7 +114,7 @@ export default function treeMap(param1, param2) {
       sourceExtension,
     });
     extendedKeyMap = keyFns.keyMap;
-    extendedInnerKeyMap = keyFns.inverseKeyMap;
+    extendedInverseKeyMap = keyFns.inverseKeyMap;
   } else if (keyMap) {
     const resolvedKeyFn = toFunction(keyMap);
     async function scopedKeyFn(sourceKey, tree) {
@@ -135,7 +136,11 @@ export default function treeMap(param1, param2) {
     }
     const keyFns = cachedKeyMaps(scopedKeyFn);
     extendedKeyMap = keyFns.keyMap;
-    extendedInnerKeyMap = keyFns.inverseKeyMap;
+    extendedInverseKeyMap = keyFns.inverseKeyMap;
+  } else {
+    // Use sidecar keyMap/inverseKeyMap functions if the valueMap defines them.
+    extendedKeyMap = valueMap?.keyMap;
+    extendedInverseKeyMap = valueMap?.inverseKeyMap;
   }
 
   const transform = function mapTreelike(treelike) {
@@ -143,8 +148,9 @@ export default function treeMap(param1, param2) {
     return map({
       deep,
       description,
-      inverseKeyMap: extendedInnerKeyMap,
+      inverseKeyMap: extendedInverseKeyMap,
       keyMap: extendedKeyMap,
+      needsSourceValue,
       valueMap: extendedValueFn,
     })(tree);
   };

package/src/builtins/@mapDeep.js

@@ -0,0 +1,22 @@
+import { isPlainObject } from "@weborigami/async-tree";
+import treeMap from "./@map.js";
+
+export default function mapDeep(param1, param2) {
+  // Identify whether the valueMap/options are the first parameter
+  // or the second.
+  let source;
+  let options;
+  if (param2 === undefined) {
+    options = param1;
+  } else {
+    source = param1;
+    if (isPlainObject(param2)) {
+      options = param2;
+    } else {
+      options = { valueMap: param2 };
+    }
+  }
+
+  options.deep = true;
+  return treeMap(source, options);
+}

package/src/builtins/@mdHtml.js

@@ -3,6 +3,7 @@ import { marked } from "marked";
 import { gfmHeadingId as markedGfmHeadingId } from "marked-gfm-heading-id";
 import { markedHighlight } from "marked-highlight";
 import { markedSmartypants } from "marked-smartypants";
+import { replaceExtension } from "../common/utilities.js";
 
 marked.use(
   markedGfmHeadingId(),
@@ -41,5 +42,9 @@ export default async function mdHtml(input) {
     : html;
 }
 
+mdHtml.keyMap = (sourceKey) => replaceExtension(sourceKey, ".md", ".html");
+mdHtml.inverseKeyMap = (resultKey) =>
+  replaceExtension(resultKey, ".html", ".md");
+
 mdHtml.usage = `@mdHtml <markdown>\tRender the markdown text as HTML`;
 mdHtml.documentation = "https://weborigami.org/language/@mdHtml.html";

package/src/builtins/@once.js

@@ -0,0 +1,18 @@
+import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+
+const fnPromiseMap = new WeakMap();
+
+/**
+ * Evaluate the given function only once and cache the result.
+ *
+ * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
+ * @this {AsyncTree|null}
+ * @param {Function} fn
+ */
+export default async function once(fn) {
+  assertScopeIsDefined(this);
+  if (!fnPromiseMap.has(fn)) {
+    fnPromiseMap.set(fn, fn.call(this));
+  }
+  return fnPromiseMap.get(fn);
+}

package/src/builtins/@ori.js

@@ -15,7 +15,10 @@ const TypedArray = Object.getPrototypeOf(Uint8Array);
  * @this {AsyncTree|null}
  * @param {string} expression
  */
-export default async function ori(expression) {
+export default async function ori(
+  expression,
+  options = { formatResult: true }
+) {
   assertScopeIsDefined(this);
   // In case expression is a Buffer, cast it to a string.
   expression = String(expression);
@@ -34,12 +37,15 @@ export default async function ori(expression) {
     result = await result.call(scope);
   }
 
-  const formatted = await formatResult(result);
-  return formatted;
+  return options.formatResult ? await formatResult(result) : result;
 }
 
 async function formatResult(result) {
-  if (typeof result === "string" || result instanceof TypedArray) {
+  if (
+    typeof result === "string" ||
+    result instanceof ArrayBuffer ||
+    result instanceof TypedArray
+  ) {
     // Use as is
     return result;
   }

package/src/builtins/@package.js

@@ -0,0 +1,52 @@
+import { Tree, keysFromPath } from "@weborigami/async-tree";
+import { Scope } from "@weborigami/language";
+import project from "./@project.js";
+
+/**
+ * @this {import("@weborigami/types").AsyncTree|null}
+ * @param {string[]} keys
+ */
+export default async function packageBuiltin(...keys) {
+  let scope = this;
+  if (!scope) {
+    const projectRoot = await project.call(null);
+    scope = Scope.getScope(projectRoot);
+  }
+
+  const packageKeys = [keys.shift()];
+  if (packageKeys[0]?.startsWith("@")) {
+    // First key is an npm organization, get the next key too.
+    packageKeys.push(keys.shift());
+  }
+
+  const packageRoot = await Tree.traverse(
+    // @ts-ignore
+    scope,
+    "node_modules",
+    ...packageKeys
+  );
+  if (!packageRoot) {
+    throw new Error(`Can't find node_modules/${packageKeys.join("/")}`);
+  }
+
+  const mainPath = await Tree.traverse(packageRoot, "package.json", "main");
+  if (!mainPath) {
+    throw new Error(
+      `node_modules/${keys.join(
+        "/"
+      )} doesn't contain a package.json with a "main" entry.`
+    );
+  }
+
+  const mainKeys = keysFromPath(mainPath);
+  const mainContainerKeys = mainKeys.slice(0, -1);
+  const mainFileName = mainKeys[mainKeys.length - 1];
+  const mainContainer = await Tree.traverse(packageRoot, ...mainContainerKeys);
+  const packageExports = await mainContainer.import(mainFileName);
+
+  const result =
+    keys.length > 0
+      ? await Tree.traverse(packageExports, ...keys)
+      : packageExports;
+  return result;
+}

package/src/builtins/@tree/dot.js

@@ -1,7 +1,10 @@
 import { Tree, isPlainObject, isStringLike } from "@weborigami/async-tree";
 import { extname } from "@weborigami/language";
 import * as serialize from "../../common/serialize.js";
-import { keySymbol } from "../../common/utilities.js";
+import {
+  hasNonPrintableCharacters,
+  keySymbol,
+} from "../../common/utilities.js";
 import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
 
 /**
@@ -36,12 +39,6 @@ ${treeArcs.join("\n")}
 }`;
 }
 
-// Return true if the text appears to contain non-printable binary characters.
-function probablyBinary(text) {
-  // https://stackoverflow.com/a/1677660/76472
-  return /[\x00-\x08\x0E-\x1F]/.test(text);
-}
-
 async function statements(tree, nodePath, nodeLabel, options) {
   let result = [];
   const createLinks = options.createLinks ?? true;
@@ -110,7 +107,7 @@ async function statements(tree, nodePath, nodeLabel, options) {
   let i = 0;
   for (const key of Object.keys(nodes)) {
     let label = String(nodes[key].label);
-    if (probablyBinary(label)) {
+    if (hasNonPrintableCharacters(label)) {
       nodes[key].label = "[binary data]";
     } else if (label) {
       let clippedStart = false;

package/src/builtins/@tree/sitemap.js

@@ -1,10 +1,10 @@
 import { Tree } from "@weborigami/async-tree";
 import assertScopeIsDefined from "../../misc/assertScopeIsDefined.js";
 import builtins from "../@builtins.js";
-import unpackOrigamiTemplate from "../@loaders/orit.js";
+import unpackOrigamiExpression from "../@loaders/ori.js";
 import paths from "./paths.js";
 
-const templateText = `<?xml version="1.0" encoding="UTF-8"?>
+const templateText = `=\`<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 {{ @map(=\`
   <url>
@@ -12,6 +12,7 @@ const templateText = `<?xml version="1.0" encoding="UTF-8"?>
   </url>
 \`)(_) }}
 </urlset>
+\`
 `;
 
 /**
@@ -50,7 +51,7 @@ export default async function sitemap(treelike, baseHref = "") {
     .filter((path) => path.endsWith(".html"))
     .map((path) => (path.endsWith("index.html") ? path.slice(0, -10) : path));
 
-  const templateFn = await unpackOrigamiTemplate(templateText);
+  const templateFn = await unpackOrigamiExpression(templateText);
   const templateResult = await templateFn.call(builtins, htmlPaths);
   return String(templateResult);
 }

package/src/cli/cli.js

@@ -9,6 +9,8 @@ import project from "../builtins/@project.js";
 import { keySymbol } from "../common/utilities.js";
 import showUsage from "./showUsage.js";
 
+const TypedArray = Object.getPrototypeOf(Uint8Array);
+
 async function main(...args) {
   const expression = args.join(" ");
 
@@ -42,7 +44,12 @@ async function main(...args) {
   const scope = Scope.getScope(tree);
   const result = await ori.call(scope, expression);
   if (result !== undefined) {
-    const output = result instanceof Buffer ? result : String(result);
+    const output =
+      result instanceof ArrayBuffer
+        ? new Uint8Array(result)
+        : typeof result === "string" || result instanceof TypedArray
+        ? result
+        : String(result);
     await stdout.write(output);
 
     // If stdout points to the console, and the result didn't end in a newline,

package/src/common/FilterTree.js

@@ -1,4 +1,4 @@
-import { Tree } from "@weborigami/async-tree";
+import { DeepObjectTree, Tree, isPlainObject } from "@weborigami/async-tree";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -7,7 +7,9 @@ import { Tree } from "@weborigami/async-tree";
 export default class FilterTree {
   constructor(tree, filter) {
     this.tree = Tree.from(tree);
-    this.filter = Tree.from(filter);
+    this.filter = isPlainObject(filter)
+      ? new DeepObjectTree(filter)
+      : Tree.from(filter);
   }
 
   async get(key) {

package/src/common/GlobTree.js

@@ -1,4 +1,10 @@
-import { ObjectTree, Tree, merge } from "@weborigami/async-tree";
+import {
+  DeepObjectTree,
+  ObjectTree,
+  Tree,
+  isPlainObject,
+  merge,
+} from "@weborigami/async-tree";
 
 const globstar = "**";
 
@@ -8,7 +14,9 @@ const globstar = "**";
  */
 export default class GlobTree {
   constructor(globs) {
-    this.globs = Tree.from(globs);
+    this.globs = isPlainObject(globs)
+      ? new DeepObjectTree(globs)
+      : Tree.from(globs);
   }
 
   async get(key) {

package/src/common/processUnpackedContent.js

@@ -10,17 +10,19 @@ import builtins from "../builtins/@builtins.js";
  *
  * @param {any} content
  * @param {AsyncTree|null} parent
- * @param {any} [attachedData]
+ * @param {any} [inputDocument]
  * @returns
  */
-export default function processUnpackedContent(content, parent, attachedData) {
+export default function processUnpackedContent(content, parent, inputDocument) {
   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 = new Scope(attachedData, parentScope);
+    const extendedScope = Tree.isTreelike(inputDocument)
+      ? new Scope(inputDocument, parentScope)
+      : parentScope;
 
     /** @this {AsyncTree|null} */
     async function extendScope(input, ...rest) {
@@ -29,7 +31,10 @@ export default function processUnpackedContent(content, parent, attachedData) {
 
     extendScope.code = fn.code;
     return extendScope;
-  } else if (Tree.isAsyncTree(content)) {
+  } else if (
+    Tree.isAsyncTree(content) &&
+    !(/** @type {any} */ (content).scope)
+  ) {
     const result = Object.create(content);
     result.parent = parent;
     return result;

package/src/common/utilities.d.ts

@@ -1,7 +1,9 @@
 
 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;
 export function toFunction(object: any): Function;
 export function toString(object: any): string|null;
 export function transformObject(Transform: Function, object: any): any;