adnbn 0.12.0 → 0.14.0

package/dist/entry/content/lifecycle/Builder.d.ts

@@ -1,26 +1,32 @@
 import EntrypointBuilder from "../../core/Builder.js";
 import { ManagedContext, EventEmitter } from "./context/index.js";
-import { ContentScriptAnchor, ContentScriptAnchorGetter, ContentScriptBuilder, ContentScriptContainerCreator, ContentScriptContainerFactory, ContentScriptContainerOptions, ContentScriptContainerTag, ContentScriptContext, ContentScriptDefinition, ContentScriptIsolation, ContentScriptMarkerContract, ContentScriptMarkerGetter, ContentScriptMarkerResolver, ContentScriptMarkerType, ContentScriptMountFunction, ContentScriptNode, ContentScriptPrepareProps, ContentScriptRenderHandler, ContentScriptRenderValue, ContentScriptResolvedDefinition, ContentScriptWatchStrategy } from "../../../types/content/index.js";
+import type { ContentScriptNodeAssembly } from "./types.js";
+import { ContentScriptAnchor, ContentScriptAnchorGetter, ContentScriptBuilder, ContentScriptContainerCreator, ContentScriptContainerFactory, ContentScriptContainerOptions, ContentScriptContainerTag, ContentScriptContext, ContentScriptDefinition, ContentScriptIsolation, ContentScriptIsolationOptions, ContentScriptMarkerContract, ContentScriptMarkerGetter, ContentScriptMarkerResolver, ContentScriptMarkerType, ContentScriptMountFunction, ContentScriptPrepareProps, ContentScriptPrepareResult, ContentScriptRenderHandler, ContentScriptRenderValue, ContentScriptResolvedDefinition, ContentScriptTarget, ContentScriptTargetCreator, ContentScriptWatchStrategy } from "../../../types/content/index.js";
 export default abstract class Builder<Data = unknown, Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`> extends EntrypointBuilder implements ContentScriptBuilder {
-    private lock;
+    private cycle?;
     protected generation: number;
     protected readonly definition: ContentScriptResolvedDefinition<Data>;
     protected readonly emitter: EventEmitter;
     protected readonly context: ManagedContext;
     protected marker: ContentScriptMarkerContract;
     protected unwatch?: () => void;
-    protected abstract createNode(anchor: Element, data: Data, enabled: boolean): Promise<ContentScriptNode>;
+    protected abstract createNode(anchor: Element, result: ContentScriptPrepareResult<Data> | undefined): Promise<ContentScriptNodeAssembly>;
     protected constructor(input: ContentScriptDefinition<Data, Isolation>);
     protected resolveMarker(marker: ContentScriptMarkerType | ContentScriptMarkerGetter): ContentScriptMarkerResolver;
     protected resolveAnchor(anchor?: ContentScriptAnchor | ContentScriptAnchorGetter): ContentScriptAnchorGetter;
     protected resolveMount(mount?: ContentScriptMountFunction): ContentScriptMountFunction;
     protected resolveContainer(container?: ContentScriptContainerTag | ContentScriptContainerOptions | ContentScriptContainerFactory<Data>): ContentScriptContainerCreator<Data>;
-    protected resolveRender(render?: ContentScriptRenderValue<Data> | ContentScriptRenderHandler<Data>): ContentScriptRenderHandler<Data> | undefined;
+    protected resolveTarget(target?: ContentScriptTarget<Data>): ContentScriptTargetCreator<Data>;
+    protected resolveIsolation(definition: ContentScriptDefinition<Data>): ContentScriptIsolationOptions;
+    protected resolveRender(render?: ContentScriptRenderValue<Data> | ContentScriptRenderHandler<Data>): true | ContentScriptRenderHandler<Data> | undefined;
     protected resolveWatch(watch?: true | ContentScriptWatchStrategy): ContentScriptWatchStrategy;
     getContext(): ContentScriptContext;
     build(): Promise<void>;
     destroy(): Promise<void>;
     protected getPrepareProps(anchor: Element): ContentScriptPrepareProps;
+    private requestProcessing;
+    private drainProcessing;
     protected processing(generation: number): Promise<void>;
     protected processAnchor(anchor: Element, generation: number): Promise<void>;
+    private handleRenderError;
 }

package/dist/entry/content/lifecycle/Builder.js

@@ -1,15 +1,10 @@
 import { isContentScriptFrameNavigation, resolveContentScriptIsolation } from "./../../../shared/content/index.js";
-import AwaitLock from "await-lock";
 import EntrypointBuilder from "./../../../entry/core/Builder.js";
-import {
-  createAnchorResolver,
-  createAwaitFirstStrategy,
-  createContainerResolver,
-  createTargetResolver,
-  withLocationTracking,
-  createAppendMountHandler,
-  createMutationObserverStrategy
-} from "../resolvers/index.js";
+import { createAnchorResolver } from "../resolvers/anchor.js";
+import { createContainerResolver } from "../resolvers/container.js";
+import { createAppendMountHandler } from "../resolvers/mount.js";
+import { createTargetResolver } from "../resolvers/target.js";
+import { createAwaitFirstStrategy, createMutationObserverStrategy, withLocationTracking } from "../resolvers/watch.js";
 import { ManagedContext, EventEmitter } from "./context/index.js";
 import { AttributeMarker, WeakMarker } from "./markers/index.js";
 import { EventNode } from "./nodes/index.js";
@@ -17,7 +12,7 @@ import {
   ContentScriptMarker
 } from "./../../../types/content/index.js";
 class Builder extends EntrypointBuilder {
-  lock = new AwaitLock();
+  cycle;
   generation = 0;
   definition;
   emitter = new EventEmitter();
@@ -27,27 +22,15 @@ class Builder extends EntrypointBuilder {
   constructor(input) {
     super();
     const definition = input;
-    const isolation = resolveContentScriptIsolation(definition.isolation, "render" in definition);
-    if (definition.boundary !== void 0) {
-      if (typeof definition.boundary !== "function") {
-        throw new Error("Content script boundary must be a synchronous setup handler");
-      }
-      if (isolation.type === "none") {
-        throw new Error("Content script boundary requires Shadow DOM or an iframe");
-      }
-    }
-    if (definition.target !== void 0 && (isolation.type === "none" || isContentScriptFrameNavigation(isolation))) {
-      throw new Error("Content script target requires Shadow DOM or an iframe with local rendering");
-    }
     this.definition = {
       ...definition,
       marker: this.resolveMarker(definition.marker),
       anchor: this.resolveAnchor(definition.anchor),
       mount: this.resolveMount(definition.mount),
       container: this.resolveContainer(definition.container),
-      target: createTargetResolver(definition.target),
-      render: definition.render === true ? true : this.resolveRender(definition.render),
-      isolation,
+      target: this.resolveTarget(definition.target),
+      isolation: this.resolveIsolation(definition),
+      render: this.resolveRender(definition.render),
       watch: this.resolveWatch(definition.watch)
     };
   }
@@ -80,11 +63,29 @@ class Builder extends EntrypointBuilder {
   resolveContainer(container) {
     return createContainerResolver(container);
   }
+  resolveTarget(target) {
+    return createTargetResolver(target);
+  }
+  resolveIsolation(definition) {
+    const isolation = resolveContentScriptIsolation(definition.isolation, "render" in definition);
+    if (definition.boundary !== void 0) {
+      if (typeof definition.boundary !== "function") {
+        throw new Error("Content script boundary must be a synchronous setup handler");
+      }
+      if (isolation.type === "none") {
+        throw new Error("Content script boundary requires Shadow DOM or an iframe");
+      }
+    }
+    if (definition.target !== void 0 && (isolation.type === "none" || isContentScriptFrameNavigation(isolation))) {
+      throw new Error("Content script target requires Shadow DOM or an iframe with local rendering");
+    }
+    return isolation;
+  }
   resolveRender(render) {
-    if (render !== void 0) {
-      throw new Error("Content script rendering requires a renderer adapter");
+    if (render === true || render === void 0) {
+      return render;
     }
-    return void 0;
+    throw new Error("Content script rendering requires a renderer adapter");
   }
   resolveWatch(watch) {
     if (watch === void 0) {
@@ -105,42 +106,38 @@ class Builder extends EntrypointBuilder {
       return;
     }
     const { render, prepare, main, anchor, marker, container, boundary, target, watch, mount, ...options } = this.definition;
-    const resolvedMarker = await marker(options);
-    if (generation !== this.generation) {
-      return;
-    }
-    this.marker = resolvedMarker;
     await (main == null ? void 0 : main(this.context, options));
     if (generation !== this.generation) {
       return;
     }
     if (render !== void 0 || prepare !== void 0 || isContentScriptFrameNavigation(this.definition.isolation)) {
-      await this.processing(generation);
+      const resolvedMarker = await marker(options);
       if (generation !== this.generation) {
         return;
       }
-      this.unwatch = watch(async () => {
-        if (generation !== this.generation) {
-          return;
-        }
-        try {
-          this.context.mount();
-          await this.processing(generation);
-        } catch (error) {
-          console.error("Content script processing on watch error", error);
-        }
-      }, this.context);
+      this.marker = resolvedMarker;
+      await this.requestProcessing(generation);
+      if (generation !== this.generation) {
+        return;
+      }
+      const onError = (error) => {
+        console.error("Content script processing on watch error", error);
+      };
+      this.unwatch = watch(() => this.requestProcessing(generation, onError), this.context);
     }
   }
   async destroy() {
     var _a;
     this.generation++;
-    this.lock = new AwaitLock();
+    this.cycle = void 0;
     (_a = this.unwatch) == null ? void 0 : _a.call(this);
     this.unwatch = void 0;
-    this.context.clear();
-    this.context.unwatch();
-    this.marker.reset();
+    try {
+      this.context.clear();
+    } finally {
+      this.context.unwatch();
+      this.marker.reset();
+    }
   }
   getPrepareProps(anchor) {
     const {
@@ -158,46 +155,75 @@ class Builder extends EntrypointBuilder {
     } = this.definition;
     return { ...options, anchor };
   }
-  async processing(generation) {
-    const lock = this.lock;
-    await lock.acquireAsync();
+  requestProcessing(generation, onError) {
+    var _a;
+    if (generation !== this.generation) {
+      return Promise.resolve();
+    }
+    if (((_a = this.cycle) == null ? void 0 : _a.generation) === generation) {
+      this.cycle.pending = true;
+      return this.cycle.promise;
+    }
+    const cycle = {
+      generation,
+      pending: true,
+      promise: Promise.resolve().then(() => this.drainProcessing(cycle))
+    };
+    if (onError) {
+      cycle.promise = cycle.promise.catch(onError);
+    }
+    this.cycle = cycle;
+    return cycle.promise;
+  }
+  async drainProcessing(cycle) {
     try {
-      if (generation !== this.generation) {
-        return;
-      }
-      const anchor = await this.definition.anchor();
-      if (generation !== this.generation) {
-        return;
-      }
-      const anchors = this.marker.for(anchor).unmarked().filter((anchor2) => anchor2.isConnected);
-      const results = await Promise.allSettled(anchors.map((anchor2) => this.processAnchor(anchor2, generation)));
-      const errors = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
-      if (errors.length && generation === this.generation) {
-        console.error(new AggregateError(errors, "Content script anchor processing failed"));
+      while (cycle.pending && cycle.generation === this.generation) {
+        cycle.pending = false;
+        this.context.mount();
+        if (cycle.generation !== this.generation) {
+          return;
+        }
+        await this.processing(cycle.generation);
       }
     } finally {
-      lock.release();
+      if (this.cycle === cycle) {
+        this.cycle = void 0;
+      }
+    }
+  }
+  async processing(generation) {
+    const anchor = await this.definition.anchor();
+    if (generation !== this.generation) {
+      return;
+    }
+    const anchors = this.marker.for(anchor).unmarked().filter((anchor2) => anchor2.isConnected);
+    const results = await Promise.allSettled(anchors.map((anchor2) => this.processAnchor(anchor2, generation)));
+    const errors = results.flatMap((result) => result.status === "rejected" ? [result.reason] : []);
+    if (errors.length && generation === this.generation) {
+      console.error(new AggregateError(errors, "Content script anchor processing failed"));
     }
   }
   async processAnchor(anchor, generation) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const current = () => generation === this.generation && anchor.isConnected;
     const data = await ((_b = (_a = this.definition).prepare) == null ? void 0 : _b.call(_a, this.getPrepareProps(anchor)));
     if (!current()) {
       return;
     }
-    const node = new EventNode(await this.createNode(anchor, data, data !== false), this.emitter);
+    const assembly = await this.createNode(anchor, data);
+    const node = new EventNode(assembly.node, this.emitter, assembly.renderer);
     if (!current()) {
       node.unmount();
       return;
     }
+    (_c = assembly.renderer) == null ? void 0 : _c.setErrorHandler((error) => this.handleRenderError(node, error, generation));
     this.context.add(node);
     if (generation !== this.generation) {
       return;
     }
     try {
       node.mount();
-      if (!current() && !((_c = node.container) == null ? void 0 : _c.isConnected)) {
+      if (!current() && !((_d = node.container) == null ? void 0 : _d.isConnected)) {
         this.context.remove(node);
       }
     } catch (error) {
@@ -205,6 +231,18 @@ class Builder extends EntrypointBuilder {
       throw error;
     }
   }
+  handleRenderError(node, error, generation) {
+    if (generation !== this.generation) {
+      return;
+    }
+    const errors = [error];
+    try {
+      this.context.remove(node);
+    } catch (cause) {
+      errors.push(cause);
+    }
+    console.error(new AggregateError(errors, "Content script deferred mount failed"));
+  }
 }
 export {
   Builder as default

package/dist/entry/content/lifecycle/Builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/entry/content/lifecycle/Builder.ts"],"sourcesContent":["import {isContentScriptFrameNavigation, resolveContentScriptIsolation} from \"@shared/content\";\nimport AwaitLock from \"await-lock\";\n\nimport EntrypointBuilder from \"@entry/core/Builder\";\n\nimport {\n    createAnchorResolver,\n    createAwaitFirstStrategy,\n    createContainerResolver,\n    createTargetResolver,\n    withLocationTracking,\n    createAppendMountHandler,\n    createMutationObserverStrategy,\n} from \"../resolvers\";\n\nimport {ManagedContext, EventEmitter} from \"./context\";\nimport {AttributeMarker, WeakMarker} from \"./markers\";\nimport {EventNode} from \"./nodes\";\n\nimport {\n    ContentScriptAnchor,\n    ContentScriptAnchorGetter,\n    ContentScriptBuilder,\n    ContentScriptContainerCreator,\n    ContentScriptContainerFactory,\n    ContentScriptContainerOptions,\n    ContentScriptContainerTag,\n    ContentScriptContext,\n    ContentScriptDefinition,\n    ContentScriptIsolation,\n    ContentScriptMarker,\n    ContentScriptMarkerContract,\n    ContentScriptMarkerGetter,\n    ContentScriptMarkerResolver,\n    ContentScriptMarkerType,\n    ContentScriptMountFunction,\n    ContentScriptNode,\n    ContentScriptPrepareProps,\n    ContentScriptOptions,\n    ContentScriptRenderHandler,\n    ContentScriptRenderValue,\n    ContentScriptResolvedDefinition,\n    ContentScriptWatchStrategy,\n} from \"@typing/content\";\n\nexport default abstract class Builder<\n    Data = unknown,\n    Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`,\n>\n    extends EntrypointBuilder\n    implements ContentScriptBuilder\n{\n    private lock = new AwaitLock();\n\n    protected generation = 0;\n\n    protected readonly definition: ContentScriptResolvedDefinition<Data>;\n\n    protected readonly emitter = new EventEmitter();\n\n    protected readonly context = new ManagedContext(this.emitter);\n\n    protected marker: ContentScriptMarkerContract = new AttributeMarker();\n\n    protected unwatch?: () => void;\n\n    protected abstract createNode(anchor: Element, data: Data, enabled: boolean): Promise<ContentScriptNode>;\n\n    protected constructor(input: ContentScriptDefinition<Data, Isolation>) {\n        super();\n\n        // Normalization selects the isolation at runtime; its node supplies the matching callback props.\n        const definition = input as ContentScriptDefinition<Data>;\n        const isolation = resolveContentScriptIsolation(definition.isolation, \"render\" in definition);\n\n        if (definition.boundary !== undefined) {\n            if (typeof definition.boundary !== \"function\") {\n                throw new Error(\"Content script boundary must be a synchronous setup handler\");\n            }\n\n            if (isolation.type === \"none\") {\n                throw new Error(\"Content script boundary requires Shadow DOM or an iframe\");\n            }\n        }\n\n        if (\n            definition.target !== undefined &&\n            (isolation.type === \"none\" || isContentScriptFrameNavigation(isolation))\n        ) {\n            throw new Error(\"Content script target requires Shadow DOM or an iframe with local rendering\");\n        }\n\n        this.definition = {\n            ...definition,\n            marker: this.resolveMarker(definition.marker),\n            anchor: this.resolveAnchor(definition.anchor),\n            mount: this.resolveMount(definition.mount),\n            container: this.resolveContainer(definition.container),\n            target: createTargetResolver(definition.target),\n            render: definition.render === true ? true : this.resolveRender(definition.render),\n            isolation,\n            watch: this.resolveWatch(definition.watch),\n        };\n    }\n\n    protected resolveMarker(marker: ContentScriptMarkerType | ContentScriptMarkerGetter): ContentScriptMarkerResolver {\n        return async (options: ContentScriptOptions) => {\n            if (typeof marker === \"function\") {\n                marker = await marker(options);\n            }\n\n            if (!marker) {\n                marker = ContentScriptMarker.Attribute;\n            }\n\n            if (typeof marker === \"string\") {\n                switch (marker) {\n                    case ContentScriptMarker.Weak:\n                        return new WeakMarker();\n\n                    case ContentScriptMarker.Attribute:\n                    default:\n                        return new AttributeMarker();\n                }\n            }\n\n            return marker;\n        };\n    }\n\n    protected resolveAnchor(anchor?: ContentScriptAnchor | ContentScriptAnchorGetter): ContentScriptAnchorGetter {\n        return createAnchorResolver(anchor);\n    }\n\n    protected resolveMount(mount?: ContentScriptMountFunction): ContentScriptMountFunction {\n        return mount || createAppendMountHandler();\n    }\n\n    protected resolveContainer(\n        container?: ContentScriptContainerTag | ContentScriptContainerOptions | ContentScriptContainerFactory<Data>\n    ): ContentScriptContainerCreator<Data> {\n        return createContainerResolver(container);\n    }\n\n    protected resolveRender(\n        render?: ContentScriptRenderValue<Data> | ContentScriptRenderHandler<Data>\n    ): ContentScriptRenderHandler<Data> | undefined {\n        if (render !== undefined) {\n            throw new Error(\"Content script rendering requires a renderer adapter\");\n        }\n\n        return undefined;\n    }\n\n    protected resolveWatch(watch?: true | ContentScriptWatchStrategy): ContentScriptWatchStrategy {\n        if (watch === undefined) {\n            watch = createAwaitFirstStrategy();\n        } else if (watch === true) {\n            watch = createMutationObserverStrategy();\n        }\n\n        return withLocationTracking(watch);\n    }\n\n    public getContext(): ContentScriptContext {\n        return this.context;\n    }\n\n    public async build(): Promise<void> {\n        const destroying = this.destroy();\n        const generation = this.generation;\n        await destroying;\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        const {render, prepare, main, anchor, marker, container, boundary, target, watch, mount, ...options} =\n            this.definition;\n\n        const resolvedMarker = await marker(options);\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        this.marker = resolvedMarker;\n\n        await main?.(this.context, options);\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        if (\n            render !== undefined ||\n            prepare !== undefined ||\n            isContentScriptFrameNavigation(this.definition.isolation)\n        ) {\n            await this.processing(generation);\n\n            if (generation !== this.generation) {\n                return;\n            }\n\n            this.unwatch = watch(async () => {\n                if (generation !== this.generation) {\n                    return;\n                }\n\n                try {\n                    this.context.mount();\n                    await this.processing(generation);\n                } catch (error) {\n                    console.error(\"Content script processing on watch error\", error);\n                }\n            }, this.context);\n        }\n    }\n\n    public async destroy(): Promise<void> {\n        this.generation++;\n        this.lock = new AwaitLock();\n\n        this.unwatch?.();\n        this.unwatch = undefined;\n\n        this.context.clear();\n        this.context.unwatch();\n        this.marker.reset();\n    }\n\n    protected getPrepareProps(anchor: Element): ContentScriptPrepareProps {\n        const {\n            anchor: _,\n            marker,\n            mount,\n            watch,\n            prepare,\n            render,\n            container,\n            boundary,\n            target,\n            main,\n            ...options\n        } = this.definition;\n\n        return {...options, anchor};\n    }\n\n    protected async processing(generation: number): Promise<void> {\n        const lock = this.lock;\n        await lock.acquireAsync();\n\n        try {\n            if (generation !== this.generation) {\n                return;\n            }\n\n            const anchor = await this.definition.anchor();\n\n            if (generation !== this.generation) {\n                return;\n            }\n\n            const anchors = this.marker\n                .for(anchor)\n                .unmarked()\n                .filter(anchor => anchor.isConnected);\n\n            const results = await Promise.allSettled(anchors.map(anchor => this.processAnchor(anchor, generation)));\n            const errors = results.flatMap(result => (result.status === \"rejected\" ? [result.reason] : []));\n\n            if (errors.length && generation === this.generation) {\n                console.error(new AggregateError(errors, \"Content script anchor processing failed\"));\n            }\n        } finally {\n            lock.release();\n        }\n    }\n\n    protected async processAnchor(anchor: Element, generation: number): Promise<void> {\n        const current = () => generation === this.generation && anchor.isConnected;\n        const data = await this.definition.prepare?.(this.getPrepareProps(anchor));\n\n        if (!current()) {\n            return;\n        }\n\n        const node = new EventNode(await this.createNode(anchor, data as Data, data !== false), this.emitter);\n\n        if (!current()) {\n            node.unmount();\n\n            return;\n        }\n\n        this.context.add(node);\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        try {\n            node.mount();\n\n            if (!current() && !node.container?.isConnected) {\n                this.context.remove(node);\n            }\n        } catch (error) {\n            this.context.remove(node);\n            throw error;\n        }\n    }\n}\n"],"mappings":"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","names":["anchor"]}
+{"version":3,"sources":["../../../../src/entry/content/lifecycle/Builder.ts"],"sourcesContent":["import {isContentScriptFrameNavigation, resolveContentScriptIsolation} from \"@shared/content\";\n\nimport EntrypointBuilder from \"@entry/core/Builder\";\n\nimport {createAnchorResolver} from \"../resolvers/anchor\";\nimport {createContainerResolver} from \"../resolvers/container\";\nimport {createAppendMountHandler} from \"../resolvers/mount\";\nimport {createTargetResolver} from \"../resolvers/target\";\nimport {createAwaitFirstStrategy, createMutationObserverStrategy, withLocationTracking} from \"../resolvers/watch\";\n\nimport {ManagedContext, EventEmitter} from \"./context\";\nimport {AttributeMarker, WeakMarker} from \"./markers\";\nimport {EventNode} from \"./nodes\";\n\nimport type {ContentScriptNodeAssembly, ContentScriptCycle} from \"./types\";\n\nimport {\n    ContentScriptNode,\n    ContentScriptAnchor,\n    ContentScriptAnchorGetter,\n    ContentScriptBuilder,\n    ContentScriptContainerCreator,\n    ContentScriptContainerFactory,\n    ContentScriptContainerOptions,\n    ContentScriptContainerTag,\n    ContentScriptContext,\n    ContentScriptDefinition,\n    ContentScriptIsolation,\n    ContentScriptIsolationOptions,\n    ContentScriptMarker,\n    ContentScriptMarkerContract,\n    ContentScriptMarkerGetter,\n    ContentScriptMarkerResolver,\n    ContentScriptMarkerType,\n    ContentScriptMountFunction,\n    ContentScriptPrepareProps,\n    ContentScriptPrepareResult,\n    ContentScriptOptions,\n    ContentScriptRenderHandler,\n    ContentScriptRenderValue,\n    ContentScriptResolvedDefinition,\n    ContentScriptTarget,\n    ContentScriptTargetCreator,\n    ContentScriptWatchStrategy,\n} from \"@typing/content\";\n\nexport default abstract class Builder<\n    Data = unknown,\n    Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`,\n>\n    extends EntrypointBuilder\n    implements ContentScriptBuilder\n{\n    private cycle?: ContentScriptCycle;\n\n    protected generation = 0;\n\n    protected readonly definition: ContentScriptResolvedDefinition<Data>;\n\n    protected readonly emitter = new EventEmitter();\n\n    protected readonly context = new ManagedContext(this.emitter);\n\n    protected marker: ContentScriptMarkerContract = new AttributeMarker();\n\n    protected unwatch?: () => void;\n\n    protected abstract createNode(\n        anchor: Element,\n        result: ContentScriptPrepareResult<Data> | undefined\n    ): Promise<ContentScriptNodeAssembly>;\n\n    protected constructor(input: ContentScriptDefinition<Data, Isolation>) {\n        super();\n\n        // Normalization selects the isolation at runtime; its node supplies the matching callback props.\n        const definition = input as ContentScriptDefinition<Data>;\n\n        this.definition = {\n            ...definition,\n            marker: this.resolveMarker(definition.marker),\n            anchor: this.resolveAnchor(definition.anchor),\n            mount: this.resolveMount(definition.mount),\n            container: this.resolveContainer(definition.container),\n            target: this.resolveTarget(definition.target),\n            isolation: this.resolveIsolation(definition),\n            render: this.resolveRender(definition.render),\n            watch: this.resolveWatch(definition.watch),\n        };\n    }\n\n    protected resolveMarker(marker: ContentScriptMarkerType | ContentScriptMarkerGetter): ContentScriptMarkerResolver {\n        return async (options: ContentScriptOptions) => {\n            if (typeof marker === \"function\") {\n                marker = await marker(options);\n            }\n\n            if (!marker) {\n                marker = ContentScriptMarker.Attribute;\n            }\n\n            if (typeof marker === \"string\") {\n                switch (marker) {\n                    case ContentScriptMarker.Weak:\n                        return new WeakMarker();\n\n                    case ContentScriptMarker.Attribute:\n                    default:\n                        return new AttributeMarker();\n                }\n            }\n\n            return marker;\n        };\n    }\n\n    protected resolveAnchor(anchor?: ContentScriptAnchor | ContentScriptAnchorGetter): ContentScriptAnchorGetter {\n        return createAnchorResolver(anchor);\n    }\n\n    protected resolveMount(mount?: ContentScriptMountFunction): ContentScriptMountFunction {\n        return mount || createAppendMountHandler();\n    }\n\n    protected resolveContainer(\n        container?: ContentScriptContainerTag | ContentScriptContainerOptions | ContentScriptContainerFactory<Data>\n    ): ContentScriptContainerCreator<Data> {\n        return createContainerResolver(container);\n    }\n\n    protected resolveTarget(target?: ContentScriptTarget<Data>): ContentScriptTargetCreator<Data> {\n        return createTargetResolver(target);\n    }\n\n    protected resolveIsolation(definition: ContentScriptDefinition<Data>): ContentScriptIsolationOptions {\n        const isolation = resolveContentScriptIsolation(definition.isolation, \"render\" in definition);\n\n        if (definition.boundary !== undefined) {\n            if (typeof definition.boundary !== \"function\") {\n                throw new Error(\"Content script boundary must be a synchronous setup handler\");\n            }\n\n            if (isolation.type === \"none\") {\n                throw new Error(\"Content script boundary requires Shadow DOM or an iframe\");\n            }\n        }\n\n        if (\n            definition.target !== undefined &&\n            (isolation.type === \"none\" || isContentScriptFrameNavigation(isolation))\n        ) {\n            throw new Error(\"Content script target requires Shadow DOM or an iframe with local rendering\");\n        }\n\n        return isolation;\n    }\n\n    protected resolveRender(\n        render?: ContentScriptRenderValue<Data> | ContentScriptRenderHandler<Data>\n    ): true | ContentScriptRenderHandler<Data> | undefined {\n        if (render === true || render === undefined) {\n            return render;\n        }\n\n        throw new Error(\"Content script rendering requires a renderer adapter\");\n    }\n\n    protected resolveWatch(watch?: true | ContentScriptWatchStrategy): ContentScriptWatchStrategy {\n        if (watch === undefined) {\n            watch = createAwaitFirstStrategy();\n        } else if (watch === true) {\n            watch = createMutationObserverStrategy();\n        }\n\n        return withLocationTracking(watch);\n    }\n\n    public getContext(): ContentScriptContext {\n        return this.context;\n    }\n\n    public async build(): Promise<void> {\n        const destroying = this.destroy();\n        const generation = this.generation;\n        await destroying;\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        const {render, prepare, main, anchor, marker, container, boundary, target, watch, mount, ...options} =\n            this.definition;\n\n        await main?.(this.context, options);\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        if (\n            render !== undefined ||\n            prepare !== undefined ||\n            isContentScriptFrameNavigation(this.definition.isolation)\n        ) {\n            const resolvedMarker = await marker(options);\n\n            if (generation !== this.generation) {\n                return;\n            }\n\n            this.marker = resolvedMarker;\n\n            await this.requestProcessing(generation);\n\n            if (generation !== this.generation) {\n                return;\n            }\n\n            const onError = (error: unknown): void => {\n                console.error(\"Content script processing on watch error\", error);\n            };\n\n            this.unwatch = watch(() => this.requestProcessing(generation, onError), this.context);\n        }\n    }\n\n    public async destroy(): Promise<void> {\n        this.generation++;\n        this.cycle = undefined;\n\n        this.unwatch?.();\n        this.unwatch = undefined;\n\n        try {\n            this.context.clear();\n        } finally {\n            this.context.unwatch();\n            this.marker.reset();\n        }\n    }\n\n    protected getPrepareProps(anchor: Element): ContentScriptPrepareProps {\n        const {\n            anchor: _,\n            marker,\n            mount,\n            watch,\n            prepare,\n            render,\n            container,\n            boundary,\n            target,\n            main,\n            ...options\n        } = this.definition;\n\n        return {...options, anchor};\n    }\n\n    private requestProcessing(generation: number, onError?: (error: unknown) => void): Promise<void> {\n        if (generation !== this.generation) {\n            return Promise.resolve();\n        }\n\n        if (this.cycle?.generation === generation) {\n            this.cycle.pending = true;\n\n            return this.cycle.promise;\n        }\n\n        const cycle: ContentScriptCycle = {\n            generation,\n            pending: true,\n            promise: Promise.resolve().then(() => this.drainProcessing(cycle)),\n        };\n\n        if (onError) {\n            // One handler per cycle, not one suspended async callback per watch notification.\n            cycle.promise = cycle.promise.catch(onError);\n        }\n\n        this.cycle = cycle;\n\n        return cycle.promise;\n    }\n\n    private async drainProcessing(cycle: ContentScriptCycle): Promise<void> {\n        try {\n            while (cycle.pending && cycle.generation === this.generation) {\n                cycle.pending = false;\n                this.context.mount();\n\n                if (cycle.generation !== this.generation) {\n                    return;\n                }\n\n                await this.processing(cycle.generation);\n            }\n        } finally {\n            if (this.cycle === cycle) {\n                this.cycle = undefined;\n            }\n        }\n    }\n\n    protected async processing(generation: number): Promise<void> {\n        const anchor = await this.definition.anchor();\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        const anchors = this.marker\n            .for(anchor)\n            .unmarked()\n            .filter(anchor => anchor.isConnected);\n\n        const results = await Promise.allSettled(anchors.map(anchor => this.processAnchor(anchor, generation)));\n        const errors = results.flatMap(result => (result.status === \"rejected\" ? [result.reason] : []));\n\n        if (errors.length && generation === this.generation) {\n            console.error(new AggregateError(errors, \"Content script anchor processing failed\"));\n        }\n    }\n\n    protected async processAnchor(anchor: Element, generation: number): Promise<void> {\n        const current = () => generation === this.generation && anchor.isConnected;\n        const data = await this.definition.prepare?.(this.getPrepareProps(anchor));\n\n        if (!current()) {\n            return;\n        }\n\n        const assembly = await this.createNode(anchor, data);\n        const node = new EventNode(assembly.node, this.emitter, assembly.renderer);\n\n        if (!current()) {\n            node.unmount();\n\n            return;\n        }\n\n        // Add listeners can mount immediately, so connect the renderer before publishing the node.\n        assembly.renderer?.setErrorHandler(error => this.handleRenderError(node, error, generation));\n        this.context.add(node);\n\n        if (generation !== this.generation) {\n            return;\n        }\n\n        try {\n            node.mount();\n\n            if (!current() && !node.container?.isConnected) {\n                this.context.remove(node);\n            }\n        } catch (error) {\n            this.context.remove(node);\n            throw error;\n        }\n    }\n\n    private handleRenderError(node: ContentScriptNode, error: unknown, generation: number): void {\n        if (generation !== this.generation) {\n            return;\n        }\n\n        const errors = [error];\n\n        try {\n            this.context.remove(node);\n        } catch (cause) {\n            errors.push(cause);\n        }\n\n        console.error(new AggregateError(errors, \"Content script deferred mount failed\"));\n    }\n}\n"],"mappings":"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","names":["anchor"]}

package/dist/entry/content/lifecycle/MountBuilder.d.ts

@@ -1,8 +1,11 @@
 import Builder from "./Builder.js";
-import { ContentScriptDefinition, ContentScriptIsolation, ContentScriptNode, ContentScriptProps, ContentScriptRenderHandler } from "../../../types/content/index.js";
+import type { ContentScriptIsolationAssembly, ContentScriptNodeAssembly, ContentScriptRenderLifecycle, ContentScriptRenderOptions } from "./types.js";
+import { ContentScriptDefinition, ContentScriptIsolation, ContentScriptNode, ContentScriptPrepareResult, ContentScriptProps, ContentScriptRenderHandler } from "../../../types/content/index.js";
 export default class MountBuilder<Data = unknown, Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`> extends Builder<Data, Isolation> {
     constructor(definition: ContentScriptDefinition<Data, Isolation>);
     protected getProps(node: ContentScriptNode, data: Data): ContentScriptProps<Data>;
-    protected createNode(anchor: Element, data: Data, enabled: boolean): Promise<ContentScriptNode>;
-    protected createRenderer(node: ContentScriptNode, render: ContentScriptRenderHandler<Data>, props: () => ContentScriptProps<Data>): ContentScriptNode;
+    protected createNode(anchor: Element, result: ContentScriptPrepareResult<Data> | undefined): Promise<ContentScriptNodeAssembly>;
+    protected createMountNode(anchor: Element, data: Data): Promise<ContentScriptNode>;
+    protected createIsolation(node: ContentScriptNode, data: Data): ContentScriptIsolationAssembly;
+    protected createRenderer(node: ContentScriptNode, render: ContentScriptRenderHandler<Data>, props: () => ContentScriptProps<Data>, options: ContentScriptRenderOptions): ContentScriptNode & ContentScriptRenderLifecycle;
 }

package/dist/entry/content/lifecycle/MountBuilder.js

@@ -21,33 +21,49 @@ class MountBuilder extends Builder {
       boundary: node.boundary
     };
   }
-  async createNode(anchor, data, enabled) {
+  async createNode(anchor, result) {
     const navigation = isContentScriptFrameNavigation(this.definition.isolation);
     const render = this.definition.render;
-    if (!enabled || !navigation && (render === void 0 || render === true)) {
-      return new MarkerNode(new Node(anchor), this.marker);
+    if (result === false || !navigation && (render === void 0 || render === true)) {
+      return { node: new MarkerNode(new Node(anchor), this.marker) };
     }
+    const data = result;
+    const mountedNode = await this.createMountNode(anchor, data);
+    const { node, ready } = this.createIsolation(mountedNode, data);
+    if (navigation || typeof render !== "function") {
+      return { node };
+    }
+    const renderer = this.createRenderer(node, render, () => this.getProps(node, data), { ready });
+    return { node: renderer, renderer };
+  }
+  async createMountNode(anchor, data) {
     const marker = this.marker;
     const container = await this.definition.container({ ...this.getPrepareProps(anchor), data });
-    const mountedNode = new MountNode(new MarkerNode(new Node(anchor, container), marker), this.definition.mount);
+    return new MountNode(
+      new MarkerNode(new Node(anchor, container), marker),
+      this.context.containers,
+      this.definition.mount
+    );
+  }
+  createIsolation(node, data) {
+    const options = this.definition.isolation;
+    if (options.type === ContentScriptIsolation.None) {
+      return { node };
+    }
     const setup = new IsolationSetup({
-      props: () => ({ ...this.getPrepareProps(anchor), data }),
-      container: () => mountedNode.container,
+      props: () => ({ ...this.getPrepareProps(node.anchor), data }),
+      container: () => node.container,
       boundary: this.definition.boundary,
       target: this.definition.target
     });
-    let node = mountedNode;
-    switch (this.definition.isolation.type) {
-      case ContentScriptIsolation.Shadow:
-        node = new ShadowNode(mountedNode, this.definition.isolation, setup);
-        break;
-      case ContentScriptIsolation.Iframe:
-        node = new FrameNode(mountedNode, this.definition.isolation, () => this.context.mount(), setup);
-        break;
+    if (options.type === ContentScriptIsolation.Shadow) {
+      const shadow = new ShadowNode(node, options, setup);
+      return { node: shadow, ready: () => shadow.ready() };
     }
-    return navigation || typeof render !== "function" ? node : this.createRenderer(node, render, () => this.getProps(node, data));
+    const frame = new FrameNode(node, options, () => this.context.mount(), setup);
+    return { node: frame, ready: () => frame.ready() };
   }
-  createRenderer(node, render, props) {
+  createRenderer(node, render, props, options) {
     throw new Error("Content script rendering requires a renderer adapter");
   }
 }

package/dist/entry/content/lifecycle/MountBuilder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/entry/content/lifecycle/MountBuilder.ts"],"sourcesContent":["import Builder from \"./Builder\";\nimport IsolationSetup from \"./IsolationSetup\";\nimport {FrameNode, MountNode, MarkerNode, ShadowNode, Node} from \"./nodes\";\nimport {isContentScriptFrameNavigation} from \"@shared/content\";\n\nimport {\n    ContentScriptDefinition,\n    ContentScriptIsolation,\n    ContentScriptNode,\n    ContentScriptProps,\n    ContentScriptRenderHandler,\n} from \"@typing/content\";\n\nexport default class MountBuilder<\n    Data = unknown,\n    Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`,\n> extends Builder<Data, Isolation> {\n    public constructor(definition: ContentScriptDefinition<Data, Isolation>) {\n        super(definition);\n    }\n\n    protected getProps(node: ContentScriptNode, data: Data): ContentScriptProps<Data> {\n        if (!node.container || !node.target) {\n            throw new Error(\"Content script render requires a container and target\");\n        }\n\n        return {\n            ...this.getPrepareProps(node.anchor),\n            data,\n            container: node.container,\n            target: node.target,\n            boundary: node.boundary,\n        };\n    }\n\n    protected async createNode(anchor: Element, data: Data, enabled: boolean): Promise<ContentScriptNode> {\n        const navigation = isContentScriptFrameNavigation(this.definition.isolation);\n        const render = this.definition.render;\n\n        if (!enabled || (!navigation && (render === undefined || render === true))) {\n            return new MarkerNode(new Node(anchor), this.marker);\n        }\n\n        const marker = this.marker;\n        const container = await this.definition.container({...this.getPrepareProps(anchor), data});\n\n        const mountedNode = new MountNode(new MarkerNode(new Node(anchor, container), marker), this.definition.mount);\n\n        const setup = new IsolationSetup({\n            props: () => ({...this.getPrepareProps(anchor), data}),\n            container: () => mountedNode.container,\n            boundary: this.definition.boundary,\n            target: this.definition.target,\n        });\n\n        let node: ContentScriptNode = mountedNode;\n\n        switch (this.definition.isolation.type) {\n            case ContentScriptIsolation.Shadow:\n                node = new ShadowNode(mountedNode, this.definition.isolation, setup);\n                break;\n            case ContentScriptIsolation.Iframe:\n                node = new FrameNode(mountedNode, this.definition.isolation, () => this.context.mount(), setup);\n                break;\n        }\n\n        return navigation || typeof render !== \"function\"\n            ? node\n            : this.createRenderer(node, render, () => this.getProps(node, data));\n    }\n\n    protected createRenderer(\n        node: ContentScriptNode,\n        render: ContentScriptRenderHandler<Data>,\n        props: () => ContentScriptProps<Data>\n    ): ContentScriptNode {\n        throw new Error(\"Content script rendering requires a renderer adapter\");\n    }\n}\n"],"mappings":"AAAA,OAAO,aAAa;AACpB,OAAO,oBAAoB;AAC3B,SAAQ,WAAW,WAAW,YAAY,YAAY,YAAW;AACjE,SAAQ,sCAAqC;AAE7C;AAAA,EAEI;AAAA,OAIG;AAEP,MAAO,qBAGG,QAAyB;AAAA,EACxB,YAAY,YAAsD;AACrE,UAAM,UAAU;AAAA,EACpB;AAAA,EAEU,SAAS,MAAyB,MAAsC;AAC9E,QAAI,CAAC,KAAK,aAAa,CAAC,KAAK,QAAQ;AACjC,YAAM,IAAI,MAAM,uDAAuD;AAAA,IAC3E;AAEA,WAAO;AAAA,MACH,GAAG,KAAK,gBAAgB,KAAK,MAAM;AAAA,MACnC;AAAA,MACA,WAAW,KAAK;AAAA,MAChB,QAAQ,KAAK;AAAA,MACb,UAAU,KAAK;AAAA,IACnB;AAAA,EACJ;AAAA,EAEA,MAAgB,WAAW,QAAiB,MAAY,SAA8C;AAClG,UAAM,aAAa,+BAA+B,KAAK,WAAW,SAAS;AAC3E,UAAM,SAAS,KAAK,WAAW;AAE/B,QAAI,CAAC,WAAY,CAAC,eAAe,WAAW,UAAa,WAAW,OAAQ;AACxE,aAAO,IAAI,WAAW,IAAI,KAAK,MAAM,GAAG,KAAK,MAAM;AAAA,IACvD;AAEA,UAAM,SAAS,KAAK;AACpB,UAAM,YAAY,MAAM,KAAK,WAAW,UAAU,EAAC,GAAG,KAAK,gBAAgB,MAAM,GAAG,KAAI,CAAC;AAEzF,UAAM,cAAc,IAAI,UAAU,IAAI,WAAW,IAAI,KAAK,QAAQ,SAAS,GAAG,MAAM,GAAG,KAAK,WAAW,KAAK;AAE5G,UAAM,QAAQ,IAAI,eAAe;AAAA,MAC7B,OAAO,OAAO,EAAC,GAAG,KAAK,gBAAgB,MAAM,GAAG,KAAI;AAAA,MACpD,WAAW,MAAM,YAAY;AAAA,MAC7B,UAAU,KAAK,WAAW;AAAA,MAC1B,QAAQ,KAAK,WAAW;AAAA,IAC5B,CAAC;AAED,QAAI,OAA0B;AAE9B,YAAQ,KAAK,WAAW,UAAU,MAAM;AAAA,MACpC,KAAK,uBAAuB;AACxB,eAAO,IAAI,WAAW,aAAa,KAAK,WAAW,WAAW,KAAK;AACnE;AAAA,MACJ,KAAK,uBAAuB;AACxB,eAAO,IAAI,UAAU,aAAa,KAAK,WAAW,WAAW,MAAM,KAAK,QAAQ,MAAM,GAAG,KAAK;AAC9F;AAAA,IACR;AAEA,WAAO,cAAc,OAAO,WAAW,aACjC,OACA,KAAK,eAAe,MAAM,QAAQ,MAAM,KAAK,SAAS,MAAM,IAAI,CAAC;AAAA,EAC3E;AAAA,EAEU,eACN,MACA,QACA,OACiB;AACjB,UAAM,IAAI,MAAM,sDAAsD;AAAA,EAC1E;AACJ;","names":[]}
+{"version":3,"sources":["../../../../src/entry/content/lifecycle/MountBuilder.ts"],"sourcesContent":["import Builder from \"./Builder\";\nimport IsolationSetup from \"./IsolationSetup\";\nimport {FrameNode, MountNode, MarkerNode, ShadowNode, Node} from \"./nodes\";\n\nimport {isContentScriptFrameNavigation} from \"@shared/content\";\n\nimport type {\n    ContentScriptIsolationAssembly,\n    ContentScriptNodeAssembly,\n    ContentScriptRenderLifecycle,\n    ContentScriptRenderOptions,\n} from \"./types\";\n\nimport {\n    ContentScriptDefinition,\n    ContentScriptIsolation,\n    ContentScriptNode,\n    ContentScriptPrepareResult,\n    ContentScriptProps,\n    ContentScriptRenderHandler,\n} from \"@typing/content\";\n\nexport default class MountBuilder<\n    Data = unknown,\n    Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`,\n> extends Builder<Data, Isolation> {\n    public constructor(definition: ContentScriptDefinition<Data, Isolation>) {\n        super(definition);\n    }\n\n    protected getProps(node: ContentScriptNode, data: Data): ContentScriptProps<Data> {\n        if (!node.container || !node.target) {\n            throw new Error(\"Content script render requires a container and target\");\n        }\n\n        return {\n            ...this.getPrepareProps(node.anchor),\n            data,\n            container: node.container,\n            target: node.target,\n            boundary: node.boundary,\n        };\n    }\n\n    protected async createNode(\n        anchor: Element,\n        result: ContentScriptPrepareResult<Data> | undefined\n    ): Promise<ContentScriptNodeAssembly> {\n        const navigation = isContentScriptFrameNavigation(this.definition.isolation);\n        const render = this.definition.render;\n\n        if (result === false || (!navigation && (render === undefined || render === true))) {\n            return {node: new MarkerNode(new Node(anchor), this.marker)};\n        }\n\n        const data = result as Data;\n        const mountedNode = await this.createMountNode(anchor, data);\n        const {node, ready} = this.createIsolation(mountedNode, data);\n\n        if (navigation || typeof render !== \"function\") {\n            return {node};\n        }\n\n        const renderer = this.createRenderer(node, render, () => this.getProps(node, data), {ready});\n\n        return {node: renderer, renderer};\n    }\n\n    protected async createMountNode(anchor: Element, data: Data): Promise<ContentScriptNode> {\n        const marker = this.marker;\n        const container = await this.definition.container({...this.getPrepareProps(anchor), data});\n\n        return new MountNode(\n            new MarkerNode(new Node(anchor, container), marker),\n            this.context.containers,\n            this.definition.mount\n        );\n    }\n\n    protected createIsolation(node: ContentScriptNode, data: Data): ContentScriptIsolationAssembly {\n        const options = this.definition.isolation;\n\n        if (options.type === ContentScriptIsolation.None) {\n            return {node};\n        }\n\n        const setup = new IsolationSetup({\n            props: () => ({...this.getPrepareProps(node.anchor), data}),\n            container: () => node.container,\n            boundary: this.definition.boundary,\n            target: this.definition.target,\n        });\n\n        if (options.type === ContentScriptIsolation.Shadow) {\n            const shadow = new ShadowNode(node, options, setup);\n\n            return {node: shadow, ready: () => shadow.ready()};\n        }\n\n        const frame = new FrameNode(node, options, () => this.context.mount(), setup);\n\n        return {node: frame, ready: () => frame.ready()};\n    }\n\n    protected createRenderer(\n        node: ContentScriptNode,\n        render: ContentScriptRenderHandler<Data>,\n        props: () => ContentScriptProps<Data>,\n        options: ContentScriptRenderOptions\n    ): ContentScriptNode & ContentScriptRenderLifecycle {\n        throw new Error(\"Content script rendering requires a renderer adapter\");\n    }\n}\n"],"mappings":"AAAA,OAAO,aAAa;AACpB,OAAO,oBAAoB;AAC3B,SAAQ,WAAW,WAAW,YAAY,YAAY,YAAW;AAEjE,SAAQ,sCAAqC;AAS7C;AAAA,EAEI;AAAA,OAKG;AAEP,MAAO,qBAGG,QAAyB;AAAA,EACxB,YAAY,YAAsD;AACrE,UAAM,UAAU;AAAA,EACpB;AAAA,EAEU,SAAS,MAAyB,MAAsC;AAC9E,QAAI,CAAC,KAAK,aAAa,CAAC,KAAK,QAAQ;AACjC,YAAM,IAAI,MAAM,uDAAuD;AAAA,IAC3E;AAEA,WAAO;AAAA,MACH,GAAG,KAAK,gBAAgB,KAAK,MAAM;AAAA,MACnC;AAAA,MACA,WAAW,KAAK;AAAA,MAChB,QAAQ,KAAK;AAAA,MACb,UAAU,KAAK;AAAA,IACnB;AAAA,EACJ;AAAA,EAEA,MAAgB,WACZ,QACA,QACkC;AAClC,UAAM,aAAa,+BAA+B,KAAK,WAAW,SAAS;AAC3E,UAAM,SAAS,KAAK,WAAW;AAE/B,QAAI,WAAW,SAAU,CAAC,eAAe,WAAW,UAAa,WAAW,OAAQ;AAChF,aAAO,EAAC,MAAM,IAAI,WAAW,IAAI,KAAK,MAAM,GAAG,KAAK,MAAM,EAAC;AAAA,IAC/D;AAEA,UAAM,OAAO;AACb,UAAM,cAAc,MAAM,KAAK,gBAAgB,QAAQ,IAAI;AAC3D,UAAM,EAAC,MAAM,MAAK,IAAI,KAAK,gBAAgB,aAAa,IAAI;AAE5D,QAAI,cAAc,OAAO,WAAW,YAAY;AAC5C,aAAO,EAAC,KAAI;AAAA,IAChB;AAEA,UAAM,WAAW,KAAK,eAAe,MAAM,QAAQ,MAAM,KAAK,SAAS,MAAM,IAAI,GAAG,EAAC,MAAK,CAAC;AAE3F,WAAO,EAAC,MAAM,UAAU,SAAQ;AAAA,EACpC;AAAA,EAEA,MAAgB,gBAAgB,QAAiB,MAAwC;AACrF,UAAM,SAAS,KAAK;AACpB,UAAM,YAAY,MAAM,KAAK,WAAW,UAAU,EAAC,GAAG,KAAK,gBAAgB,MAAM,GAAG,KAAI,CAAC;AAEzF,WAAO,IAAI;AAAA,MACP,IAAI,WAAW,IAAI,KAAK,QAAQ,SAAS,GAAG,MAAM;AAAA,MAClD,KAAK,QAAQ;AAAA,MACb,KAAK,WAAW;AAAA,IACpB;AAAA,EACJ;AAAA,EAEU,gBAAgB,MAAyB,MAA4C;AAC3F,UAAM,UAAU,KAAK,WAAW;AAEhC,QAAI,QAAQ,SAAS,uBAAuB,MAAM;AAC9C,aAAO,EAAC,KAAI;AAAA,IAChB;AAEA,UAAM,QAAQ,IAAI,eAAe;AAAA,MAC7B,OAAO,OAAO,EAAC,GAAG,KAAK,gBAAgB,KAAK,MAAM,GAAG,KAAI;AAAA,MACzD,WAAW,MAAM,KAAK;AAAA,MACtB,UAAU,KAAK,WAAW;AAAA,MAC1B,QAAQ,KAAK,WAAW;AAAA,IAC5B,CAAC;AAED,QAAI,QAAQ,SAAS,uBAAuB,QAAQ;AAChD,YAAM,SAAS,IAAI,WAAW,MAAM,SAAS,KAAK;AAElD,aAAO,EAAC,MAAM,QAAQ,OAAO,MAAM,OAAO,MAAM,EAAC;AAAA,IACrD;AAEA,UAAM,QAAQ,IAAI,UAAU,MAAM,SAAS,MAAM,KAAK,QAAQ,MAAM,GAAG,KAAK;AAE5E,WAAO,EAAC,MAAM,OAAO,OAAO,MAAM,MAAM,MAAM,EAAC;AAAA,EACnD;AAAA,EAEU,eACN,MACA,QACA,OACA,SACgD;AAChD,UAAM,IAAI,MAAM,sDAAsD;AAAA,EAC1E;AACJ;","names":[]}

package/dist/entry/content/lifecycle/context/ContainerRegistry.d.ts

@@ -0,0 +1,7 @@
+/** Tracks independent mount registrations without adding ownership to lifecycle nodes. */
+export default class ContainerRegistry {
+    private readonly registrations;
+    register(container: Element, anchor: Element): () => void;
+    owns(target: Node): boolean;
+    clear(): void;
+}

package/dist/entry/content/lifecycle/context/ContainerRegistry.js

@@ -0,0 +1,45 @@
+class ContainerRegistry {
+  registrations = /* @__PURE__ */ new Map();
+  register(container, anchor) {
+    let registrations = this.registrations.get(container);
+    if (!registrations) {
+      registrations = /* @__PURE__ */ new Set();
+      this.registrations.set(container, registrations);
+    }
+    const registration = { anchor };
+    const current = registrations;
+    current.add(registration);
+    return () => {
+      if (!current.delete(registration)) {
+        return;
+      }
+      if (current.size === 0 && this.registrations.get(container) === current) {
+        this.registrations.delete(container);
+      }
+    };
+  }
+  owns(target) {
+    var _a, _b;
+    if (this.registrations.size === 0) {
+      return false;
+    }
+    let current = target;
+    while (current) {
+      const registrations = this.registrations.get(current);
+      const container = current;
+      if (registrations && !Array.from(registrations).some(({ anchor }) => container.contains(anchor))) {
+        return true;
+      }
+      const shadowRoot = ((_b = (_a = current.ownerDocument) == null ? void 0 : _a.defaultView) == null ? void 0 : _b.ShadowRoot) ?? ShadowRoot;
+      current = current.parentNode ?? (current instanceof shadowRoot ? current.host : null);
+    }
+    return false;
+  }
+  clear() {
+    this.registrations.clear();
+  }
+}
+export {
+  ContainerRegistry as default
+};
+//# sourceMappingURL=ContainerRegistry.js.map

package/dist/entry/content/lifecycle/context/ContainerRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/entry/content/lifecycle/context/ContainerRegistry.ts"],"sourcesContent":["/** Tracks independent mount registrations without adding ownership to lifecycle nodes. */\nexport default class ContainerRegistry {\n    private readonly registrations = new Map<Node, Set<{anchor: Element}>>();\n\n    public register(container: Element, anchor: Element): () => void {\n        let registrations = this.registrations.get(container);\n\n        if (!registrations) {\n            registrations = new Set();\n            this.registrations.set(container, registrations);\n        }\n\n        const registration = {anchor};\n        const current = registrations;\n        current.add(registration);\n\n        return () => {\n            if (!current.delete(registration)) {\n                return;\n            }\n\n            if (current.size === 0 && this.registrations.get(container) === current) {\n                this.registrations.delete(container);\n            }\n        };\n    }\n\n    public owns(target: Node): boolean {\n        if (this.registrations.size === 0) {\n            return false;\n        }\n\n        let current: Node | null = target;\n\n        while (current) {\n            const registrations = this.registrations.get(current);\n            const container = current;\n\n            if (registrations && !Array.from(registrations).some(({anchor}) => container.contains(anchor))) {\n                return true;\n            }\n\n            const shadowRoot: typeof ShadowRoot = current.ownerDocument?.defaultView?.ShadowRoot ?? ShadowRoot;\n            current = current.parentNode ?? (current instanceof shadowRoot ? current.host : null);\n        }\n\n        return false;\n    }\n\n    public clear(): void {\n        this.registrations.clear();\n    }\n}\n"],"mappings":"AACA,MAAO,kBAAgC;AAAA,EAClB,gBAAgB,oBAAI,IAAkC;AAAA,EAEhE,SAAS,WAAoB,QAA6B;AAC7D,QAAI,gBAAgB,KAAK,cAAc,IAAI,SAAS;AAEpD,QAAI,CAAC,eAAe;AAChB,sBAAgB,oBAAI,IAAI;AACxB,WAAK,cAAc,IAAI,WAAW,aAAa;AAAA,IACnD;AAEA,UAAM,eAAe,EAAC,OAAM;AAC5B,UAAM,UAAU;AAChB,YAAQ,IAAI,YAAY;AAExB,WAAO,MAAM;AACT,UAAI,CAAC,QAAQ,OAAO,YAAY,GAAG;AAC/B;AAAA,MACJ;AAEA,UAAI,QAAQ,SAAS,KAAK,KAAK,cAAc,IAAI,SAAS,MAAM,SAAS;AACrE,aAAK,cAAc,OAAO,SAAS;AAAA,MACvC;AAAA,IACJ;AAAA,EACJ;AAAA,EAEO,KAAK,QAAuB;AA3BvC;AA4BQ,QAAI,KAAK,cAAc,SAAS,GAAG;AAC/B,aAAO;AAAA,IACX;AAEA,QAAI,UAAuB;AAE3B,WAAO,SAAS;AACZ,YAAM,gBAAgB,KAAK,cAAc,IAAI,OAAO;AACpD,YAAM,YAAY;AAElB,UAAI,iBAAiB,CAAC,MAAM,KAAK,aAAa,EAAE,KAAK,CAAC,EAAC,OAAM,MAAM,UAAU,SAAS,MAAM,CAAC,GAAG;AAC5F,eAAO;AAAA,MACX;AAEA,YAAM,eAAgC,mBAAQ,kBAAR,mBAAuB,gBAAvB,mBAAoC,eAAc;AACxF,gBAAU,QAAQ,eAAe,mBAAmB,aAAa,QAAQ,OAAO;AAAA,IACpF;AAEA,WAAO;AAAA,EACX;AAAA,EAEO,QAAc;AACjB,SAAK,cAAc,MAAM;AAAA,EAC7B;AACJ;","names":[]}

package/dist/entry/content/lifecycle/context/Context.d.ts

@@ -1,10 +1,13 @@
-import { ContentScriptContext, ContentScriptEventCallback, ContentScriptEventEmitter, ContentScriptNode, ContentScriptNodeSet } from "../../../../types/content/index.js";
+import type ContainerRegistry from "./ContainerRegistry.js";
+import { ContentScriptNode, ContentScriptContext, ContentScriptEventCallback, ContentScriptEventEmitter } from "../../../../types/content/index.js";
 export default class Context implements ContentScriptContext {
     protected readonly emitter: ContentScriptEventEmitter;
-    protected readonly collection: ContentScriptNodeSet;
+    private readonly registry;
+    protected readonly collection: Set<ContentScriptNode>;
     private unmounting;
-    constructor(emitter: ContentScriptEventEmitter);
+    constructor(emitter: ContentScriptEventEmitter, registry: ContainerRegistry);
     get nodes(): ReadonlySet<ContentScriptNode>;
+    owns(target: Node): boolean;
     mount(): void;
     unmount(): void;
     remove(node: ContentScriptNode): void;

package/dist/entry/content/lifecycle/context/Context.js

@@ -1,13 +1,18 @@
 class Context {
-  constructor(emitter) {
+  constructor(emitter, registry) {
     this.emitter = emitter;
+    this.registry = registry;
   }
   emitter;
+  registry;
   collection = /* @__PURE__ */ new Set();
   unmounting = false;
   get nodes() {
     return this.collection;
   }
+  owns(target) {
+    return this.registry.owns(target);
+  }
   mount() {
     if (this.unmounting) {
       return;
@@ -41,21 +46,31 @@ class Context {
     if (!this.collection.delete(node)) {
       return;
     }
-    node.unmount();
-    this.emitter.emitRemove(node);
+    try {
+      node.unmount();
+    } finally {
+      this.emitter.emitRemove(node);
+    }
   }
   clear() {
     const unmounting = this.unmounting;
     this.unmounting = true;
+    const errors = [];
     try {
       for (const node of this.collection) {
-        node.unmount();
-        this.collection.delete(node);
-        this.emitter.emitRemove(node);
+        try {
+          this.remove(node);
+        } catch (error) {
+          errors.push(error);
+        }
       }
     } finally {
+      this.registry.clear();
       this.unmounting = unmounting;
     }
+    if (errors.length > 0) {
+      throw new AggregateError(errors, "Content script context cleanup failed");
+    }
   }
   watch(callback) {
     this.emitter.on(callback);