@weborigami/language 0.4.0 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weborigami/language",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Web Origami expression language compiler and runtime",
   "type": "module",
   "main": "./main.js",
@@ -11,8 +11,8 @@
     "typescript": "5.8.2"
   },
   "dependencies": {
-    "@weborigami/async-tree": "0.4.0",
-    "@weborigami/types": "0.4.0",
+    "@weborigami/async-tree": "0.4.2",
+    "@weborigami/types": "0.4.2",
     "watcher": "2.3.1",
     "yaml": "2.7.0"
   },

package/src/runtime/expressionObject.js

@@ -156,14 +156,29 @@ export function entryKey(entry, object = null, eagerProperties = []) {
     return trailingSlash.add(key);
   }
 
+  if (!(value instanceof Array)) {
+    // Can't be a subtree
+    return trailingSlash.remove(key);
+  }
+
+  // If we're dealing with a getter, work with what that gets
+  if (value[0] === ops.getter) {
+    value = value[1];
+  }
+
   // If entry will definitely create a subtree, add a trailing slash
-  const entryCreatesSubtree =
-    value instanceof Array &&
-    (value[0] === ops.object ||
-      (value[0] === ops.getter &&
-        value[1] instanceof Array &&
-        (value[1][0] === ops.object || value[1][0] === ops.merge)));
-  return trailingSlash.toggle(key, entryCreatesSubtree);
+  if (value[0] === ops.object) {
+    // Subtree
+    return trailingSlash.add(key);
+  }
+
+  // See if it looks a merged object
+  if (value[1] === "_result" && value[0][0] === ops.object) {
+    // Merge
+    return trailingSlash.add(key);
+  }
+
+  return key;
 }
 
 function keys(object, eagerProperties, propertyIsEnumerable, entries) {

package/src/runtime/jsGlobals.js

@@ -18,8 +18,6 @@ const globals = {
   AggregateError,
   Array,
   ArrayBuffer,
-  // @ts-ignore this exists despite what TypeScript thinks
-  AsyncDisposableStack,
   Atomics,
   BigInt,
   BigInt64Array,
@@ -29,7 +27,6 @@ const globals = {
   BroadcastChannel,
   Buffer,
   ByteLengthQueuingStrategy,
-  CloseEvent,
   CompressionStream,
   CountQueuingStrategy,
   Crypto,
@@ -39,16 +36,14 @@ const globals = {
   DataView,
   Date,
   DecompressionStream,
-  // @ts-ignore this exists despite what TypeScript thinks
-  DisposableStack,
+  DisposableStack: globalThis.DisposableStack,
   Error,
   EvalError,
   Event,
   EventTarget,
   File,
   FinalizationRegistry,
-  // @ts-ignore this exists despite what TypeScript thinks
-  Float16Array,
+  Float16Array: globalThis.Float16Array,
   Float32Array,
   Float64Array,
   FormData,
@@ -59,8 +54,7 @@ const globals = {
   Int32Array,
   Int8Array,
   Intl,
-  // @ts-ignore this exists despite what TypeScript thinks
-  Iterator,
+  Iterator: globalThis.Iterator,
   JSON,
   Map,
   Math,
@@ -95,8 +89,7 @@ const globals = {
   SharedArrayBuffer,
   String,
   SubtleCrypto,
-  // @ts-ignore this exists despite what TypeScript thinks
-  SuppressedError,
+  SuppressedError: globalThis.SuppressedError,
   Symbol,
   SyntaxError,
   TextDecoder,
@@ -108,8 +101,7 @@ const globals = {
   TypeError,
   URIError,
   URL,
-  // @ts-ignore this exists despite what TypeScript thinks
-  URLPattern,
+  URLPattern: globalThis.URLPattern,
   URLSearchParams,
   Uint16Array,
   Uint32Array,
@@ -119,7 +111,7 @@ const globals = {
   WeakRef,
   WeakSet,
   WebAssembly,
-  WebSocket,
+  WebSocket: globalThis.WebSocket,
   WritableStream,
   WritableStreamDefaultController,
   WritableStreamDefaultWriter,