$mol_wire_task: catch and auto destruct promises

hyoo-ru · Dec 15, 2024 · 2f2d80b · 2f2d80b
1 parent 73c4af6
commit 2f2d80b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/wire/atom/atom.ts b/wire/atom/atom.ts
@@ -121,11 +121,6 @@ namespace $ {
 
 			super.destructor()
 
-			const prev = this.cache
-			if( $mol_owning_check( this, prev ) ) {
-				prev.destructor()
-			}
-
 			if( this.pub_from === 0 ) {
 				;( this.host as any ?? this.task )[ this.field() ] = null
 			} else {

diff --git a/wire/fiber/fiber.ts b/wire/fiber/fiber.ts
@@ -321,6 +321,16 @@ namespace $ {
 				}
 			} )
 		}
+
+		destructor() {
+
+			super.destructor()
+
+			if( $mol_owning_check( this, this.cache ) ) {
+				this.cache.destructor()
+			}
+
+		}
 
 	}
 

diff --git a/wire/task/task.ts b/wire/task/task.ts
@@ -69,6 +69,14 @@ namespace $ {
 				this.cursor = $mol_wire_cursor.fresh
 				if( next !== prev ) this.emit()
 
+				if( $mol_owning_catch( this, next ) ) {
+					try {
+						(next as any)[ Symbol.toStringTag ] = (this as any)[ Symbol.toStringTag ]
+					} catch { // Promises throw in strict mode
+						Object.defineProperty( next, Symbol.toStringTag, { value: (this as any)[ Symbol.toStringTag ] } )
+					}
+				}
+
 				return next
 			}