@weborigami/origami 0.0.36 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/origami",
-  "version": "0.0.36",
+  "version": "0.0.38",
   "description": "Web Origami language, CLI, framework, and server",
   "type": "module",
   "repository": {
@@ -19,9 +19,9 @@
     "typescript": "5.2.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "https://gitpkg.now.sh/WebOrigami/origami/async-tree?main",
-    "@weborigami/language": "https://gitpkg.now.sh/WebOrigami/origami/language?main",
-    "@weborigami/types": "0.0.36",
+    "@weborigami/async-tree": "*",
+    "@weborigami/language": "*",
+    "@weborigami/types": "0.0.38",
     "graphviz-wasm": "3.0.1",
     "highlight.js": "11.9.0",
     "marked": "9.1.5",

package/src/builtins/@debug.js

@@ -50,13 +50,8 @@ function DebugTransform(Base) {
 
       // Ensure debug transforms are applied to explorable results.
       if (Tree.isAsyncTree(value)) {
-        if (!isTransformApplied(ExplorableSiteTransform, value)) {
-          value = transformObject(ExplorableSiteTransform, value);
-        }
-
-        if (!isTransformApplied(DebugTransform, value)) {
-          value = transformObject(DebugTransform, value);
-        }
+        value = transformObject(ExplorableSiteTransform, value);
+        value = transformObject(DebugTransform, value);
       }
 
       if (value?.unpack) {
@@ -70,12 +65,8 @@ function DebugTransform(Base) {
           }
           /** @type {any} */
           let tree = Tree.from(content);
-          if (!isTransformApplied(ExplorableSiteTransform, tree)) {
-            tree = transformObject(ExplorableSiteTransform, tree);
-          }
-          if (!isTransformApplied(DebugTransform, tree)) {
-            tree = transformObject(DebugTransform, tree);
-          }
+          tree = transformObject(ExplorableSiteTransform, tree);
+          tree = transformObject(DebugTransform, tree);
           return tree;
         };
       }

package/src/builtins/@json.js

@@ -14,6 +14,9 @@ export default async function json(obj) {
   if (obj === undefined) {
     return undefined;
   }
+  if (typeof obj.unpack === "function") {
+    obj = await obj.unpack();
+  }
   const value = await serialize.toJsonValue(obj);
   return JSON.stringify(value, null, 2);
 }

package/src/builtins/@yaml.js

@@ -15,6 +15,9 @@ export default async function toYaml(obj) {
   if (obj === undefined) {
     return undefined;
   }
+  if (typeof obj.unpack === "function") {
+    obj = await obj.unpack();
+  }
   const value = await serialize.toJsonValue(obj);
   return YAML.stringify(value);
 }

package/src/common/ExplorableSiteTransform.js

@@ -1,7 +1,7 @@
 import { Tree, keysJson } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import index from "../builtins/@index.js";
-import { isTransformApplied, transformObject } from "../common/utilities.js";
+import { transformObject } from "../common/utilities.js";
 
 /**
  * Wraps a tree (typically a SiteTree) to turn a standard site into an
@@ -47,10 +47,7 @@ export default function ExplorableSiteTransform(Base) {
       // Ensure this transform is applied to any explorable result. This lets
       // the user browse into data and explorable trees of types other than the
       // current class.
-      if (
-        Tree.isAsyncTree(value) &&
-        !isTransformApplied(ExplorableSiteTransform, value)
-      ) {
+      if (Tree.isAsyncTree(value)) {
         value = transformObject(ExplorableSiteTransform, value);
       }
 
@@ -65,9 +62,7 @@ export default function ExplorableSiteTransform(Base) {
           }
           /** @type {any} */
           let tree = Tree.from(content);
-          if (!isTransformApplied(ExplorableSiteTransform, tree)) {
-            tree = transformObject(ExplorableSiteTransform, tree);
-          }
+          tree = transformObject(ExplorableSiteTransform, tree);
           return tree;
         };
       }

package/src/misc/OriCommandTransform.js

@@ -2,11 +2,7 @@
 import { ObjectTree, Tree } from "@weborigami/async-tree";
 import { Scope } from "@weborigami/language";
 import ori from "../builtins/@ori.js";
-import {
-  isTransformApplied,
-  keySymbol,
-  transformObject,
-} from "../common/utilities.js";
+import { keySymbol, transformObject } from "../common/utilities.js";
 
 /**
  * Add support for commands prefixed with `!`.
@@ -40,10 +36,7 @@ export default function OriCommandTransform(Base) {
         value = await ori.call(extendedScope, source);
 
         // Ensure this transform is applied to any subtree.
-        if (
-          Tree.isAsyncTree(value) &&
-          !isTransformApplied(OriCommandTransform, value)
-        ) {
+        if (Tree.isAsyncTree(value)) {
           value = transformObject(OriCommandTransform, value);
         }
       }