@weborigami/origami 0.3.4-jse.8 → 0.3.4-jse.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.3.4-jse.8",
+  "version": "0.3.4-jse.9",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -17,10 +17,10 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.3.4-jse.8",
+    "@weborigami/async-tree": "0.3.4-jse.9",
     "@weborigami/json-feed-to-rss": "1.0.0",
-    "@weborigami/language": "0.3.4-jse.8",
-    "@weborigami/types": "0.3.4-jse.8",
+    "@weborigami/language": "0.3.4-jse.9",
+    "@weborigami/types": "0.3.4-jse.9",
     "css-tree": "3.1.0",
     "exif-parser": "0.1.12",
     "graphviz-wasm": "3.0.2",

package/src/builtinsProgram.js

@@ -51,19 +51,25 @@ export default function builtinsProgram() {
 
 function deprecateFunctions(fns, oldPrefix, newPrefix) {
   const wrappedEntries = Object.entries(fns).map(([key, value]) => {
-    const wrappedFn = async function (...args) {
-      const oldKey = key === "indent" ? key : `${oldPrefix}${key}()`;
-      const newKey =
-        key === "indent" ? `${newPrefix}${key}` : `${newPrefix}${key}()`;
-      const result =
-        value instanceof Function
-          ? await value.apply(this, args)
-          : await Tree.traverseOrThrow.call(this, value, ...args);
-      return attachWarning(
-        result,
-        `${oldKey} is deprecated, use ${newKey} instead.`
-      );
-    };
+    const wrappedFn =
+      /** @this {import("@weborigami/types").AsyncTree} */
+      async function (...args) {
+        const oldKey = key === "indent" ? key : `${oldPrefix}${key}()`;
+        const newKey =
+          key === "indent"
+            ? `Tree.indent`
+            : key === "json"
+            ? `Tree.json`
+            : `${newPrefix}${key}()`;
+        const result =
+          value instanceof Function
+            ? await value.apply(this, args)
+            : await Tree.traverseOrThrow.call(this, value, ...args);
+        return attachWarning(
+          result,
+          `${oldKey} is deprecated, use ${newKey} instead.`
+        );
+      };
     Object.assign(wrappedFn, value);
     return [key, wrappedFn];
   });

package/src/cli/getConfig.js

@@ -5,6 +5,7 @@ export default function getConfig(tree) {
   if (!tree) {
     return null;
   }
+  /** @type {any} */
   const root = Tree.root(tree);
   return root.config;
 }

package/src/protocols/files.js

@@ -26,6 +26,6 @@ export default async function files(...keys) {
   const resolved = path.resolve(basePath, relativePath);
 
   const result = new OrigamiFiles(resolved);
-  result.handlers = getHandlers(this);
+  /** @type {any} */ (result).handlers = getHandlers(this);
   return result;
 }

package/src/protocols/js.js

@@ -1,6 +1,9 @@
 import { Tree } from "@weborigami/async-tree";
 import { attachWarning, jsGlobals } from "@weborigami/language";
 
+/**
+ * @this {import("@weborigami/types").AsyncTree}
+ */
 export default async function js(...keys) {
   const result = await Tree.traverseOrThrow.call(this, jsGlobals, ...keys);
   return attachWarning(

package/src/protocols/scope.js

@@ -1,5 +1,6 @@
 import { Tree, scope as scopeFn } from "@weborigami/async-tree";
 import { attachWarning } from "@weborigami/language";
+import assertTreeIsDefined from "../common/assertTreeIsDefined.js";
 
 /**
  * @typedef  {import("@weborigami/types").AsyncTree} AsyncTree
@@ -8,6 +9,7 @@ import { attachWarning } from "@weborigami/language";
  * @param {string[]} keys
  */
 export default async function scope(...keys) {
+  assertTreeIsDefined(this, "scope");
   const key = keys.shift();
   let value;
   try {

package/src/text/inline.js

@@ -11,7 +11,7 @@ import { jsedocumentHandler } from "../handlers/handlers.js";
  * @typedef {import("@weborigami/async-tree").StringLike} StringLike
  *
  * @this {AsyncTree|null}
- * @param {StringLike} input
+ * @param {StringLike & {_body?: StringLike}} input
  */
 export default async function inline(input) {
   assertTreeIsDefined(this, "inline");