@weborigami/origami 0.0.58 → 0.0.60

package/exports/buildExports.js

@@ -1,5 +1,9 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { keyFunctionsForExtensions, map } from "@weborigami/async-tree";
+import {
+  keyFunctionsForExtensions,
+  map,
+  toString,
+} from "@weborigami/async-tree";
 import fileTypeOrigami from "../src/builtins/ori_handler.js";
 import { transformObject } from "../src/common/utilities.js";
 import PathTransform from "./PathTransform.js";
@@ -32,7 +36,7 @@ export default async function exportFile(src) {
  * @this {AsyncTree}
  */
 async function exportStatementForCode(codeBuffer, key) {
-  const code = String(codeBuffer);
+  const code = toString(codeBuffer);
 
   const exportsAnything = code.match(/^export /m);
   if (!exportsAnything) {

package/exports/exports.js

@@ -2,6 +2,7 @@
 export { default as addNextPrevious } from "../src/builtins/@addNextPrevious.js";
 export { default as arrowsMap } from "../src/builtins/@arrowsMap.js";
 export { default as basename } from "../src/builtins/@basename.js";
+export { default as breakpoint } from "../src/builtins/@breakpoint.js";
 export { default as builtins } from "../src/builtins/@builtins.js";
 export { default as cache } from "../src/builtins/@cache.js";
 export { default as changes } from "../src/builtins/@changes.js";
@@ -78,10 +79,6 @@ export { default as regexMatchFn } from "../src/builtins/@regexMatchFn.js";
 export { default as repeat } from "../src/builtins/@repeat.js";
 export { default as reverse } from "../src/builtins/@reverse.js";
 export { default as rss } from "../src/builtins/@rss.js";
-export { default as scopeExtend } from "../src/builtins/@scope/extend.js";
-export { default as scopeGet } from "../src/builtins/@scope/get.js";
-export { default as scopeInvoke } from "../src/builtins/@scope/invoke.js";
-export { default as scopeSet } from "../src/builtins/@scope/set.js";
 export { default as serve } from "../src/builtins/@serve.js";
 export { default as setDeep } from "../src/builtins/@setDeep.js";
 export { default as shell } from "../src/builtins/@shell.js";
@@ -122,7 +119,6 @@ export { default as yamlHandler } from "../src/builtins/yaml_handler.js";
 export { default as ymlHandler } from "../src/builtins/yml_handler.js";
 export { default as defaultModuleExport } from "../src/cli/defaultModuleExport.js";
 export { default as showUsage } from "../src/cli/showUsage.js";
-export { default as addValueKeyToScope } from "../src/common/addValueKeyToScope.js";
 export { default as arrowsMapFn } from "../src/common/arrowsMapFn.js";
 export { default as CommandModulesTransform } from "../src/common/CommandModulesTransform.js";
 export { default as ConstantTree } from "../src/common/ConstantTree.js";
@@ -134,7 +130,7 @@ export { default as processUnpackedContent } from "../src/common/processUnpacked
 export * from "../src/common/serialize.js";
 export { default as ShuffleTransform } from "../src/common/ShuffleTransform.js";
 export * from "../src/common/utilities.js";
-export { default as assertScopeIsDefined } from "../src/misc/assertScopeIsDefined.js";
+export { default as assertTreeIsDefined } from "../src/misc/assertTreeIsDefined.js";
 export { default as getTreeArgument } from "../src/misc/getTreeArgument.js";
 export { default as OriCommandTransform } from "../src/misc/OriCommandTransform.js";
 export { default as treeDot } from "../src/misc/treeDot.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -13,22 +13,22 @@
   "main": "./exports/exports.js",
   "types": "./index.ts",
   "devDependencies": {
-    "@types/node": "20.12.7",
-    "typescript": "5.4.5"
+    "@types/node": "20.14.9",
+    "typescript": "5.5.3"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.0.58",
-    "@weborigami/language": "0.0.58",
-    "@weborigami/types": "0.0.58",
+    "@weborigami/async-tree": "0.0.60",
+    "@weborigami/language": "0.0.60",
+    "@weborigami/types": "0.0.60",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",
     "highlight.js": "11.9.0",
-    "marked": "12.0.2",
-    "marked-gfm-heading-id": "3.1.3",
-    "marked-highlight": "2.1.1",
-    "marked-smartypants": "1.1.6",
-    "sharp": "0.33.3",
-    "yaml": "2.4.2"
+    "marked": "13.0.1",
+    "marked-gfm-heading-id": "4.0.0",
+    "marked-highlight": "2.1.3",
+    "marked-smartypants": "1.1.7",
+    "sharp": "0.33.4",
+    "yaml": "2.4.5"
   },
   "scripts": {
     "build": "ori exports/buildExports.js src > exports/exports.js",

package/src/builtins/@arrowsMap.js

@@ -1,4 +1,4 @@
-import { Scope, functionResultsMap } from "@weborigami/language";
+import { functionResultsMap } from "@weborigami/language";
 import arrowsMapFn from "../common/arrowsMapFn.js";
 import { keySymbol } from "../common/utilities.js";
 import getTreeArgument from "../misc/getTreeArgument.js";
@@ -15,10 +15,9 @@ import builtins from "./@builtins.js";
 export default async function arrowsMap(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "arrowsMap");
   const mapped = functionResultsMap(arrowsMapFn()(tree));
-  const scope = this ?? builtins;
-  const scoped = Scope.treeWithScope(mapped, scope);
-  scoped[keySymbol] = "@arrowsMap";
-  return scoped;
+  mapped.parent = this ?? builtins;
+  mapped[keySymbol] = "@arrowsMap";
+  return mapped;
 }
 
 arrowsMap.usage = `@arrowsMap <obj>\tInterpret arrow keys in the tree as function calls`;

package/src/builtins/@breakpoint.js

@@ -0,0 +1,12 @@
+/**
+ * Break into the JavaScript debugger.
+ *
+ * This can be used to pause execution of the JavaScript code and inspect the
+ * function argument and function target (`this`).
+ *
+ * @param {*} arg
+ */
+export default function breakpoint(arg) {
+  debugger;
+  return arg;
+}

package/src/builtins/@cache.js

@@ -1,6 +1,5 @@
 import { Tree, cache } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * Caches tree values in a storable cache.
@@ -18,12 +17,10 @@ export default async function cacheBuiltin(
   cacheTreelike,
   filterTreelike
 ) {
-  assertScopeIsDefined(this, "cache");
+  assertTreeIsDefined(this, "cache");
   /** @type {any} */
   const cacheTree = cacheTreelike ? Tree.from(cacheTreelike) : undefined;
-  /** @type {AsyncTree} */
-  let result = cache(sourceTreelike, cacheTree, filterTreelike);
-  result = Scope.treeWithScope(result, this);
+  const result = cache(sourceTreelike, cacheTree, filterTreelike);
   return result;
 }
 

package/src/builtins/@concat.js

@@ -1,6 +1,6 @@
 import { Tree } from "@weborigami/async-tree";
 import { ops } from "@weborigami/language";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * Concatenate the text content of objects or trees.
@@ -11,9 +11,8 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {any[]} args
  */
 export default async function concat(...args) {
-  assertScopeIsDefined(this, "concat");
-  const tree =
-    args.length === 0 ? await this?.get("@current") : Tree.from(args);
+  assertTreeIsDefined(this, "concat");
+  const tree = args.length === 0 ? this : Tree.from(args);
   return ops.concat.call(this, tree);
 }
 

package/src/builtins/@config.js

@@ -1,4 +1,3 @@
-import { Scope } from "@weborigami/language";
 import project from "./@project.js";
 
 /**
@@ -15,17 +14,9 @@ import project from "./@project.js";
 export default async function config(key) {
   const projectTree = await project.call(this);
   // HACK: We use specific knowledge of how @project returns a tree to get the
-  // config. We get the scope of the project's root folder, then remove that
-  // folder from the scope, leaving config + builtins.
-  /** @type {any} */
-  const projectTreeScope = Scope.getScope(projectTree);
-  const trees = projectTreeScope?.trees;
-  if (!trees) {
-    return undefined;
-  }
-  trees.shift();
-  const scope = new Scope(...trees);
-  return key === undefined ? scope : scope.get(key);
+  // config. The config is always the parent of the project folder.
+  const parent = projectTree.parent;
+  return key === undefined ? parent : parent.get(key);
 }
 
 config.usage = `@config\tThe current project's configuration tree`;

package/src/builtins/@constructor.js

@@ -1,5 +1,5 @@
 import { ops } from "@weborigami/language";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -8,10 +8,6 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param  {...any} keys
  */
 export default function constructor(...keys) {
-  assertScopeIsDefined(this, "constructor");
-  const scope = this;
-  if (!scope) {
-    throw new Error("@constructor requires a non-null scope.");
-  }
-  return ops.constructor.call(scope, ...keys);
+  assertTreeIsDefined(this, "constructor");
+  return ops.constructor.call(this, ...keys);
 }

package/src/builtins/@copy.js

@@ -1,7 +1,7 @@
 import { Tree } from "@weborigami/async-tree";
 import process, { stdout } from "node:process";
 import { transformObject } from "../common/utilities.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import setDeep from "./@setDeep.js";
 
 /**
@@ -13,7 +13,7 @@ import setDeep from "./@setDeep.js";
  * @param {Treelike} target
  */
 export default async function copy(source, target) {
-  assertScopeIsDefined(this, "copy");
+  assertTreeIsDefined(this, "copy");
   // const start = performance.now();
   const sourceTree = Tree.from(source);
   /** @type {any} */ let targetTree = Tree.from(target);

package/src/builtins/@crawl.js

@@ -5,9 +5,9 @@ import {
   isPlainObject,
   keysFromPath,
 } from "@weborigami/async-tree";
-import { InvokeFunctionsTransform, Scope, extname } from "@weborigami/language";
+import { InvokeFunctionsTransform, extname } from "@weborigami/language";
 import * as utilities from "../common/utilities.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import treeHttps from "./@treeHttps.js";
 
 // A fake base URL used to handle cases where an href is relative and must be
@@ -30,7 +30,7 @@ const fakeBaseUrl = new URL("https://fake");
  * @returns {Promise<AsyncTree>}
  */
 export default async function crawl(treelike, baseHref) {
-  assertScopeIsDefined(this, "crawl");
+  assertTreeIsDefined(this, "crawl");
   const tree =
     typeof treelike === "string"
       ? treeHttps.call(this, treelike)
@@ -92,12 +92,10 @@ export default async function crawl(treelike, baseHref) {
   // Merge the cache on top of the resources tree. If we have an actual value
   // for something already, that's better than a function that will get that
   // value.
-  /** @type {AsyncTree} */
-  let result = deepMerge(
+  const result = deepMerge(
     new DeepObjectTree(cache),
     new (InvokeFunctionsTransform(DeepObjectTree))(resources)
   );
-  result = Scope.treeWithScope(result, this);
   return result;
 }
 

package/src/builtins/@debug.js

@@ -1,5 +1,4 @@
 import { Tree } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
 import ExplorableSiteTransform from "../common/ExplorableSiteTransform.js";
 import { isTransformApplied, transformObject } from "../common/utilities.js";
 import OriCommandTransform from "../misc/OriCommandTransform.js";
@@ -37,14 +36,14 @@ function DebugTransform(Base) {
   return class Debug extends OriCommandTransform(Base) {
     async get(key) {
       let value = await super.get(key);
-      const scope = Scope.getScope(this);
+      const parent = this;
 
       // Since this transform is for diagnostic purposes, cast any treelike
       // result to a tree so we can debug the result too.
       if (Tree.isTreelike(value)) {
         value = Tree.from(value);
-        if (!value.parent && !value.scope) {
-          value = Scope.treeWithScope(value, scope);
+        if (!value.parent) {
+          value.parent = parent;
         }
         if (!isTransformApplied(DebugTransform, value)) {
           value = transformObject(DebugTransform, value);
@@ -60,8 +59,8 @@ function DebugTransform(Base) {
           }
           /** @type {any} */
           let tree = Tree.from(content);
-          if (!tree.parent && !tree.scope) {
-            tree = Scope.treeWithScope(tree, scope);
+          if (!tree.parent) {
+            tree.parent = parent;
           }
           if (!isTransformApplied(DebugTransform, tree)) {
             tree = transformObject(DebugTransform, tree);

package/src/builtins/@deepMap.js

@@ -1,4 +1,4 @@
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import deepMapFn from "./@deepMapFn.js";
 
 /**
@@ -14,6 +14,6 @@ import deepMapFn from "./@deepMapFn.js";
  * @param {ValueKeyFn|TreeMapOptions} operation
  */
 export default function deepMap(source, operation) {
-  assertScopeIsDefined(this, "deepMap");
+  assertTreeIsDefined(this, "deepMap");
   return deepMapFn.call(this, operation)(source);
 }

package/src/builtins/@deepMapFn.js

@@ -1,5 +1,5 @@
 import { isPlainObject } from "@weborigami/async-tree";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import mapFn from "./@mapFn.js";
 
 /**
@@ -14,7 +14,7 @@ import mapFn from "./@mapFn.js";
  * @param {ValueKeyFn|TreeMapOptions} operation
  */
 export default function deepMapFn(operation) {
-  assertScopeIsDefined(this, "deepMap");
+  assertTreeIsDefined(this, "deepMap");
   /** @type {TreeMapOptions} */
   const options = isPlainObject(operation)
     ? // Dictionary

package/src/builtins/@deepMerge.js

@@ -1,6 +1,5 @@
 import { deepMerge } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * Create a tree that's the result of deep merging the given trees.
@@ -11,7 +10,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike[]} trees
  */
 export default async function treedeepMerge(...trees) {
-  assertScopeIsDefined(this, "deepMerge");
+  assertTreeIsDefined(this, "deepMerge");
   // Filter out null or undefined trees.
   const filtered = trees.filter((tree) => tree);
 
@@ -20,22 +19,8 @@ export default async function treedeepMerge(...trees) {
     return filtered[0];
   }
 
-  // If a tree can take a scope, give it one that includes the other trees and
-  // the current scope.
-  const scopedTrees = filtered.map((tree) => {
-    const otherTrees = filtered.filter((g) => g !== tree);
-    const scope = new Scope(...otherTrees, this);
-    // Each tree will be included first in its own scope.
-    return Scope.treeWithScope(tree, scope);
-  });
-
   // Merge the trees.
-  const result = deepMerge(...scopedTrees);
-
-  // Give the overall mixed tree a scope that includes the component trees and
-  // the current scope.
-  /** @type {any} */ (result).scope = new Scope(result, this);
-
+  const result = deepMerge(...filtered);
   return result;
 }
 

package/src/builtins/@deepReverse.js

@@ -1,5 +1,4 @@
 import { deepReverse } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
 import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
@@ -13,7 +12,6 @@ import getTreeArgument from "../misc/getTreeArgument.js";
  */
 export default async function deepReverseBuiltin(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "@deepReverse");
-  let reversed = deepReverse(tree);
-  reversed = Scope.treeWithScope(reversed, this);
+  const reversed = deepReverse(tree);
   return reversed;
 }

package/src/builtins/@deepTakeFn.js

@@ -1,6 +1,5 @@
 import { deepTakeFn } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * Returns a function that traverses a tree deeply and returns the values of the
@@ -12,11 +11,11 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {number} count
  */
 export default function deepTakeFnBuiltin(count) {
-  assertScopeIsDefined(this, "deepTakeFn");
-  const scope = this;
+  assertTreeIsDefined(this, "deepTakeFn");
+  const parent = this;
   return async (treelike) => {
     const taken = await deepTakeFn(count)(treelike);
-    const scoped = Scope.treeWithScope(taken, scope);
-    return scoped;
+    taken.parent = parent;
+    return taken;
   };
 }

package/src/builtins/@defineds.js

@@ -1,5 +1,4 @@
 import { Tree } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
 import getTreeArgument from "../misc/getTreeArgument.js";
 
 /**
@@ -14,20 +13,18 @@ import getTreeArgument from "../misc/getTreeArgument.js";
 export default async function defineds(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "@defineds");
 
-  /** @type {AsyncTree} */
-  let result = await Tree.mapReduce(tree, null, async (values, keys) => {
-    const result = {};
+  const result = await Tree.mapReduce(tree, null, async (values, keys) => {
+    const object = {};
     let someValuesExist = false;
     for (let i = 0; i < keys.length; i++) {
       const value = values[i];
       if (value != null) {
         someValuesExist = true;
-        result[keys[i]] = values[i];
+        object[keys[i]] = values[i];
       }
     }
-    return someValuesExist ? result : null;
+    return someValuesExist ? object : null;
   });
 
-  result = Scope.treeWithScope(result, this);
   return result;
 }

package/src/builtins/@document.js

@@ -1,5 +1,5 @@
 import documentObject from "../common/documentObject.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * @typedef {import("@weborigami/types").AsyncTree} AsyncTree
@@ -10,6 +10,6 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {any} [data]
  */
 export default async function documentBuiltin(text, data) {
-  assertScopeIsDefined(this, "document");
+  assertTreeIsDefined(this, "document");
   return documentObject(text, data);
 }

package/src/builtins/@exceptions.js

@@ -1,5 +1,4 @@
 import { Tree } from "@weborigami/async-tree";
-import { Scope } from "@weborigami/language";
 import getTreeArgument from "../misc/getTreeArgument.js";
 import defineds from "./@defineds.js";
 
@@ -11,10 +10,7 @@ import defineds from "./@defineds.js";
  */
 export default async function exceptions(treelike) {
   const tree = await getTreeArgument(this, arguments, treelike, "@exceptions");
-
-  /** @type {AsyncTree} */
-  let exceptionsTree = new ExceptionsTree(tree);
-  exceptionsTree = Scope.treeWithScope(exceptionsTree, this);
+  const exceptionsTree = new ExceptionsTree(tree);
   return defineds.call(this, exceptionsTree);
 }
 

package/src/builtins/@explore.js

@@ -1,33 +1,33 @@
 /** @typedef {import("@weborigami/types").AsyncTree} AsyncTree */
-import { ObjectTree, Tree } from "@weborigami/async-tree";
-import { OrigamiFiles, Scope } from "@weborigami/language";
+import { Tree, scope } from "@weborigami/async-tree";
+import { OrigamiFiles } from "@weborigami/language";
 import builtins from "../builtins/@builtins.js";
 import { keySymbol } from "../common/utilities.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 import debug from "./@debug.js";
 
 const miscUrl = new URL("../misc", import.meta.url);
-const miscFiles = Scope.treeWithScope(new OrigamiFiles(miscUrl), builtins);
+const miscFiles = new OrigamiFiles(miscUrl);
+miscFiles.parent = builtins;
 
 /**
  * @this {AsyncTree|null}
  */
 export default async function explore(...keys) {
-  const scope = Scope.getScope(this);
-  const ambientsTree = new ObjectTree({
-    "@current": this,
-  });
-  ambientsTree[keySymbol] = "explore command";
-  const extendedScope = new Scope(ambientsTree, scope);
+  assertTreeIsDefined(this, "explore");
+  if (!this) {
+    return undefined;
+  }
 
   /** @type {any} */
   let result;
   if (keys.length > 0) {
     // Traverse the scope using the given keys.
-    const debugScope = await debug.call(scope, extendedScope);
-    if (!debugScope) {
+    const debugTree = await debug.call(this, this);
+    if (!debugTree) {
       return undefined;
     }
-
+    const debugScope = scope(debugTree);
     // 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`
@@ -42,11 +42,12 @@ export default async function explore(...keys) {
     const templateFile = await miscFiles.get("explore.ori");
     const template = await templateFile.unpack();
 
-    const data = await getScopeData(scope);
+    const data = await getScopeData(scope(this));
     const text = await template(data);
 
     result = new String(text);
-    result.unpack = () => debug.call(scope, extendedScope);
+    const tree = this;
+    result.unpack = () => debug.call(tree, tree);
   }
 
   return result;

package/src/builtins/@files.js

@@ -1,8 +1,8 @@
-import { OrigamiFiles, Scope } from "@weborigami/language";
+import { OrigamiFiles } from "@weborigami/language";
 import os from "node:os";
 import path from "node:path";
 import process from "node:process";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
@@ -11,7 +11,7 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {string[]} keys
  */
 export default async function files(...keys) {
-  assertScopeIsDefined(this, "files");
+  assertTreeIsDefined(this, "files");
 
   // If path begins with `~`, treat it relative to the home directory.
   // Otherwise, treat it relative to the current working directory.
@@ -25,9 +25,7 @@ export default async function files(...keys) {
   }
   const resolved = path.resolve(basePath, relativePath);
 
-  /** @type {AsyncTree} */
-  let result = new OrigamiFiles(resolved);
-  result = Scope.treeWithScope(result, this);
+  const result = new OrigamiFiles(resolved);
   return result;
 }
 

package/src/builtins/@filter.js

@@ -1,6 +1,5 @@
-import { Scope } from "@weborigami/language";
 import FilterTree from "../common/FilterTree.js";
-import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
+import assertTreeIsDefined from "../misc/assertTreeIsDefined.js";
 
 /**
  * Apply a filter to a tree.
@@ -12,10 +11,8 @@ import assertScopeIsDefined from "../misc/assertScopeIsDefined.js";
  * @param {Treelike} filterVariant
  */
 export default async function filter(treelike, filterVariant) {
-  assertScopeIsDefined(this, "filter");
-  /** @type {AsyncTree} */
-  let result = new FilterTree(treelike, filterVariant);
-  result = Scope.treeWithScope(result, this);
+  assertTreeIsDefined(this, "filter");
+  const result = new FilterTree(treelike, filterVariant);
   return result;
 }