adnbn 0.9.0 → 0.11.0

package/dist/cli/plugins/background/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/background/index.ts"],"sourcesContent":["import {Configuration as RspackConfig} from \"@rspack/core\";\n\nimport {definePlugin} from \"@main/plugin\";\nimport {virtualBackgroundModule} from \"@cli/virtual/index.js\";\n\nimport {EntrypointPlugin} from \"@cli/bundler\";\n\nimport Background from \"./Background\";\nimport BackgroundEntry from \"./BackgroundEntry\";\nimport BackgroundManifest from \"./BackgroundManifest\";\nimport Command from \"./Command\";\nimport Service from \"./Service\";\nimport ServiceDeclaration from \"./ServiceDeclaration\";\n\nimport {Command as AppCommand} from \"@typing/app\";\n\nexport default definePlugin(() => {\n    let background: Background;\n    let command: Command;\n    let service: Service;\n    let serviceDeclaration: ServiceDeclaration;\n\n    return {\n        name: \"adnbn:background\",\n        startup: async ({config}) => {\n            background = new Background(config);\n            command = new Command(config);\n            service = new Service(config);\n            serviceDeclaration = new ServiceDeclaration(config);\n        },\n        background: () => background.files(),\n        command: () => command.files(),\n        service: () => service.files(),\n        bundler: async ({config}) => {\n            serviceDeclaration.dictionary(await service.dictionary()).build();\n\n            if ((await background.empty()) && (await command.empty()) && (await service.empty())) {\n                if (config.debug) {\n                    console.warn(\"Background, command or service entries not found\");\n                }\n\n                return {};\n            }\n\n            // prettier-ignore\n            const backgroundPlugin = EntrypointPlugin.from(await background.entry().entries())\n                .virtual(file => virtualBackgroundModule(file));\n\n            // prettier-ignore\n            const commandPlugin = EntrypointPlugin.from(await command.entry().entries())\n                .virtual(file => command.virtual(file));\n\n            // prettier-ignore\n            const servicePlugin = EntrypointPlugin.from(await service.entry().entries())\n                .virtual(file => service.virtual(file));\n\n            if (config.command === AppCommand.Watch) {\n                backgroundPlugin.watch(() => background.clear().entry().entries());\n\n                commandPlugin.watch(async () => {\n                    // Clear the command cache\n                    await command.clear().commands();\n\n                    return command.entry().entries();\n                });\n\n                servicePlugin.watch(async () => {\n                    serviceDeclaration.dictionary(await service.clear().dictionary()).build();\n\n                    return service.entry().entries();\n                });\n            }\n\n            return {\n                plugins: [servicePlugin, commandPlugin, backgroundPlugin],\n                optimization: {\n                    splitChunks: {\n                        chunks(chunk) {\n                            return chunk.name !== BackgroundEntry.name;\n                        },\n                    },\n                },\n            } satisfies RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            // prettier-ignore\n            const mft = new BackgroundManifest()\n                .add(background.entry())\n                .add(command.entry())\n                .add(service.entry());\n\n            manifest\n                .setBackground(\n                    (await mft.hasBackground())\n                        ? {\n                              entry: BackgroundEntry.name,\n                              persistent: await mft.isPersistent(),\n                          }\n                        : undefined\n                )\n                .setCommands(await command.manifest());\n\n            const permissions = await mft.getPermissions();\n            const optionalPermissions = await mft.getOptionalPermissions();\n            const hostPermissions = await mft.getHostPermissions();\n            const optionalHostPermissions = await mft.getOptionalHostPermissions();\n\n            if (permissions.size > 0) {\n                manifest.appendPermissions(permissions);\n            }\n\n            if (optionalPermissions.size > 0) {\n                manifest.appendOptionalPermissions(optionalPermissions);\n            }\n\n            if (hostPermissions.size > 0) {\n                manifest.appendHostPermissions(hostPermissions);\n            }\n\n            if (optionalHostPermissions.size > 0) {\n                manifest.appendOptionalHostPermissions(optionalHostPermissions);\n            }\n        },\n    };\n});\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/background/index.ts"],"sourcesContent":["import {Configuration as RspackConfig} from \"@rspack/core\";\n\nimport {definePlugin} from \"@main/plugin\";\nimport {virtualBackgroundModule} from \"@cli/virtual/index.js\";\n\nimport {EntrypointPlugin} from \"@cli/bundler\";\n\nimport Background from \"./Background\";\nimport BackgroundEntry from \"./BackgroundEntry\";\nimport BackgroundManifest from \"./BackgroundManifest\";\nimport Command from \"./Command\";\nimport Service from \"./Service\";\nimport ServiceDeclaration from \"./ServiceDeclaration\";\n\nimport {Command as AppCommand} from \"@typing/app\";\n\nexport default definePlugin(() => {\n    let background: Background;\n    let command: Command;\n    let service: Service;\n    let serviceDeclaration: ServiceDeclaration;\n\n    return {\n        name: \"adnbn:background\",\n        startup: async ({config}) => {\n            background = new Background(config);\n            command = new Command(config);\n            service = new Service(config);\n            serviceDeclaration = new ServiceDeclaration(config);\n        },\n        background: () => background.files(),\n        command: () => command.files(),\n        service: () => service.files(),\n        bundler: async ({config}) => {\n            serviceDeclaration.dictionary(await service.dictionary()).build();\n\n            if ((await background.empty()) && (await command.empty()) && (await service.empty())) {\n                if (config.debug) {\n                    console.warn(\"Background, command or service entries not found\");\n                }\n\n                return {};\n            }\n\n            // prettier-ignore\n            const backgroundPlugin = EntrypointPlugin.from(await background.entry().entries())\n                .entryOptions({asyncChunks: false, runtime: false})\n                .virtual(file => virtualBackgroundModule(file));\n\n            // prettier-ignore\n            const commandPlugin = EntrypointPlugin.from(await command.entry().entries())\n                .virtual(file => command.virtual(file));\n\n            // prettier-ignore\n            const servicePlugin = EntrypointPlugin.from(await service.entry().entries())\n                .virtual(file => service.virtual(file));\n\n            if (config.command === AppCommand.Watch) {\n                backgroundPlugin.watch(() => background.clear().entry().entries());\n\n                commandPlugin.watch(async () => {\n                    // Clear the command cache\n                    await command.clear().commands();\n\n                    return command.entry().entries();\n                });\n\n                servicePlugin.watch(async () => {\n                    serviceDeclaration.dictionary(await service.clear().dictionary()).build();\n\n                    return service.entry().entries();\n                });\n            }\n\n            return {\n                plugins: [servicePlugin, commandPlugin, backgroundPlugin],\n                optimization: {\n                    splitChunks: {\n                        chunks(chunk) {\n                            return chunk.name !== BackgroundEntry.name;\n                        },\n                    },\n                },\n            } satisfies RspackConfig;\n        },\n        manifest: async ({manifest}) => {\n            // prettier-ignore\n            const mft = new BackgroundManifest()\n                .add(background.entry())\n                .add(command.entry())\n                .add(service.entry());\n\n            manifest\n                .setBackground(\n                    (await mft.hasBackground())\n                        ? {\n                              entry: BackgroundEntry.name,\n                              persistent: await mft.isPersistent(),\n                          }\n                        : undefined\n                )\n                .setCommands(await command.manifest());\n\n            const permissions = await mft.getPermissions();\n            const optionalPermissions = await mft.getOptionalPermissions();\n            const hostPermissions = await mft.getHostPermissions();\n            const optionalHostPermissions = await mft.getOptionalHostPermissions();\n\n            if (permissions.size > 0) {\n                manifest.appendPermissions(permissions);\n            }\n\n            if (optionalPermissions.size > 0) {\n                manifest.appendOptionalPermissions(optionalPermissions);\n            }\n\n            if (hostPermissions.size > 0) {\n                manifest.appendHostPermissions(hostPermissions);\n            }\n\n            if (optionalHostPermissions.size > 0) {\n                manifest.appendOptionalHostPermissions(optionalHostPermissions);\n            }\n        },\n    };\n});\n"],"mappings":"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","names":[]}

package/dist/cli/plugins/content/Content.d.ts

@@ -8,6 +8,6 @@ export default class extends ContentFinder implements ContentProvider<ContentScr
     protected _driver?: ContentDriver<ContentScriptEntrypointOptions>;
     constructor(config: ReadonlyConfig);
     driver(): ContentDriver<ContentScriptEntrypointOptions>;
-    virtual(file: EntrypointFile): string;
+    virtual(file: EntrypointFile, options?: ContentScriptEntrypointOptions): string;
     clear(): this;
 }

package/dist/cli/plugins/content/Content.js

@@ -1,6 +1,7 @@
 import ContentDriver from "./ContentDriver.js";
 import { ContentFinder } from "./../../../cli/entrypoint/index.js";
 import { virtualContentScriptModule } from "./../../../cli/virtual/index.js";
+import { isContentScriptFrameNavigation } from "./../../../shared/content/index.js";
 class Content_default extends ContentFinder {
   _driver;
   constructor(config) {
@@ -9,11 +10,11 @@ class Content_default extends ContentFinder {
   driver() {
     return this._driver ?? (this._driver = new ContentDriver(this));
   }
-  virtual(file) {
+  virtual(file, options) {
     if (!this.holds(file)) {
       throw new Error(`File ${file} not found for content script`);
     }
-    return virtualContentScriptModule(file);
+    return virtualContentScriptModule(file, isContentScriptFrameNavigation(options == null ? void 0 : options.isolation));
   }
   clear() {
     var _a;

package/dist/cli/plugins/content/Content.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/content/Content.ts"],"sourcesContent":["import ContentDriver from \"./ContentDriver\";\n\nimport {ContentProvider} from \"./types\";\n\nimport {ContentFinder} from \"@cli/entrypoint/index.js\";\nimport {virtualContentScriptModule} from \"@cli/virtual/index.js\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\nimport {ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointFile} from \"@typing/entrypoint\";\n\nexport default class extends ContentFinder implements ContentProvider<ContentScriptEntrypointOptions> {\n    protected _driver?: ContentDriver<ContentScriptEntrypointOptions>;\n\n    constructor(config: ReadonlyConfig) {\n        super(config);\n    }\n\n    public driver(): ContentDriver<ContentScriptEntrypointOptions> {\n        return (this._driver ??= new ContentDriver(this));\n    }\n\n    public virtual(file: EntrypointFile): string {\n        if (!this.holds(file)) {\n            throw new Error(`File ${file} not found for content script`);\n        }\n\n        return virtualContentScriptModule(file);\n    }\n\n    public clear(): this {\n        this._driver?.clear();\n\n        return super.clear();\n    }\n}\n"],"mappings":"AAAA,OAAO,mBAAmB;AAI1B,SAAQ,qBAAoB;AAC5B,SAAQ,kCAAiC;AAMzC,MAAO,wBAAsB,cAAyE;AAAA,EACxF;AAAA,EAEV,YAAY,QAAwB;AAChC,UAAM,MAAM;AAAA,EAChB;AAAA,EAEO,SAAwD;AAC3D,WAAQ,KAAK,YAAL,KAAK,UAAY,IAAI,cAAc,IAAI;AAAA,EACnD;AAAA,EAEO,QAAQ,MAA8B;AACzC,QAAI,CAAC,KAAK,MAAM,IAAI,GAAG;AACnB,YAAM,IAAI,MAAM,QAAQ,IAAI,+BAA+B;AAAA,IAC/D;AAEA,WAAO,2BAA2B,IAAI;AAAA,EAC1C;AAAA,EAEO,QAAc;AA9BzB;AA+BQ,eAAK,YAAL,mBAAc;AAEd,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/content/Content.ts"],"sourcesContent":["import ContentDriver from \"./ContentDriver\";\n\nimport {ContentProvider} from \"./types\";\n\nimport {ContentFinder} from \"@cli/entrypoint/index.js\";\nimport {virtualContentScriptModule} from \"@cli/virtual/index.js\";\nimport {isContentScriptFrameNavigation} from \"@shared/content\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\nimport {ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointFile} from \"@typing/entrypoint\";\n\nexport default class extends ContentFinder implements ContentProvider<ContentScriptEntrypointOptions> {\n    protected _driver?: ContentDriver<ContentScriptEntrypointOptions>;\n\n    constructor(config: ReadonlyConfig) {\n        super(config);\n    }\n\n    public driver(): ContentDriver<ContentScriptEntrypointOptions> {\n        return (this._driver ??= new ContentDriver(this));\n    }\n\n    public virtual(file: EntrypointFile, options?: ContentScriptEntrypointOptions): string {\n        if (!this.holds(file)) {\n            throw new Error(`File ${file} not found for content script`);\n        }\n\n        return virtualContentScriptModule(file, isContentScriptFrameNavigation(options?.isolation));\n    }\n\n    public clear(): this {\n        this._driver?.clear();\n\n        return super.clear();\n    }\n}\n"],"mappings":"AAAA,OAAO,mBAAmB;AAI1B,SAAQ,qBAAoB;AAC5B,SAAQ,kCAAiC;AACzC,SAAQ,sCAAqC;AAM7C,MAAO,wBAAsB,cAAyE;AAAA,EACxF;AAAA,EAEV,YAAY,QAAwB;AAChC,UAAM,MAAM;AAAA,EAChB;AAAA,EAEO,SAAwD;AAC3D,WAAQ,KAAK,YAAL,KAAK,UAAY,IAAI,cAAc,IAAI;AAAA,EACnD;AAAA,EAEO,QAAQ,MAAsB,SAAkD;AACnF,QAAI,CAAC,KAAK,MAAM,IAAI,GAAG;AACnB,YAAM,IAAI,MAAM,QAAQ,IAAI,+BAA+B;AAAA,IAC/D;AAEA,WAAO,2BAA2B,MAAM,+BAA+B,mCAAS,SAAS,CAAC;AAAA,EAC9F;AAAA,EAEO,QAAc;AA/BzB;AAgCQ,eAAK,YAAL,mBAAc;AAEd,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}

package/dist/cli/plugins/content/ContentManager.d.ts

@@ -1,11 +1,12 @@
 import ContentName from "./ContentName.js";
 import { ContentGroupItems, ContentProvider } from "./types.js";
 import { ReadonlyConfig } from "../../../types/config.js";
-import { ContentScriptEntrypointOptions } from "../../../types/content.js";
+import { ContentScriptEntrypointOptions, ContentScriptWorld, type ContentScriptWorldValue } from "../../../types/content.js";
 import { EntrypointEntries, EntrypointFile } from "../../../types/entrypoint.js";
 import { ManifestContentScripts, ManifestHostPermissions, ManifestOptionalPermissions, ManifestPermissions } from "../../../types/manifest.js";
-export default class {
-    protected readonly providers: Set<ContentProvider<Partial<import("../../../types/content.js").ContentScriptOptions>>>;
+export default class ContentManager {
+    protected readonly config: ReadonlyConfig;
+    protected readonly providers: Set<ContentProvider<ContentScriptEntrypointOptions>>;
     protected readonly names: ContentName;
     protected _group?: ContentGroupItems<ContentScriptEntrypointOptions>;
     protected _hostPermissions?: [ManifestHostPermissions, ManifestHostPermissions];
@@ -13,8 +14,11 @@ export default class {
     constructor(config: ReadonlyConfig);
     provider(provider: ContentProvider<ContentScriptEntrypointOptions>): this;
     protected getGroup(): Promise<ContentGroupItems<ContentScriptEntrypointOptions>>;
+    protected normalizeOptions(file: EntrypointFile, options: ContentScriptEntrypointOptions): ContentScriptEntrypointOptions;
     group(): Promise<ContentGroupItems<ContentScriptEntrypointOptions>>;
     entries(): Promise<EntrypointEntries>;
+    /** Settings are keyed by the final grouped entrypoint name, not the original source files. */
+    entryOptions(): Promise<ReadonlyMap<string, ContentScriptEntrypointOptions>>;
     manifest(): Promise<ManifestContentScripts>;
     hostPermissions(): Promise<ManifestHostPermissions>;
     optionalHostPermissions(): Promise<ManifestHostPermissions>;
@@ -25,7 +29,6 @@ export default class {
     protected calculatePermissions(): Promise<[ManifestPermissions, ManifestOptionalPermissions]>;
     virtual(file: EntrypointFile): string;
     empty(): Promise<boolean>;
-    chunkName(): string;
-    likely(name?: string): boolean;
+    protected resolveWorld(world?: ContentScriptWorldValue): ContentScriptWorld;
     clear(): this;
 }

package/dist/cli/plugins/content/ContentManager.js

@@ -1,31 +1,59 @@
 import ContentName from "./ContentName.js";
-import { getContentScriptConfigFromOptions } from "./utils.js";
-import { ContentScriptDeclarative } from "./../../../types/content.js";
-import { EntrypointType } from "./../../../types/entrypoint.js";
-class ContentManager_default {
+import { getContentScriptConfigFromOptions, hasIsolatedTarget } from "./utils.js";
+import { getContentChunkName } from "./bundler.js";
+import {
+  ContentScriptDeclarative,
+  ContentScriptIsolation,
+  ContentScriptWorld
+} from "./../../../types/content.js";
+class ContentManager {
+  constructor(config) {
+    this.config = config;
+    this.names = new ContentName(config);
+    Object.values(ContentScriptWorld).forEach((world) => this.names.reserve(getContentChunkName(world)));
+  }
+  config;
   providers = /* @__PURE__ */ new Set();
   names;
   _group;
   _hostPermissions;
   _permissions;
-  constructor(config) {
-    this.names = new ContentName(config);
-  }
   provider(provider) {
     this.providers.add(provider);
     return this;
   }
   async getGroup() {
-    const content = await Promise.all(Array.from(this.providers, (provider) => provider.driver().items()));
+    const content = await Promise.all(
+      Array.from(this.providers, (provider) => provider.driver().items())
+    );
     const group = /* @__PURE__ */ new Map();
     for (const items of content) {
       for (const [name, item] of items) {
-        const entry = this.names.create(name, item.options);
-        group.set(entry, /* @__PURE__ */ new Set([...group.get(entry) || [], item]));
+        const options = this.normalizeOptions(item.file, item.options);
+        const entry = this.names.create(name, options);
+        group.set(entry, /* @__PURE__ */ new Set([...group.get(entry) || [], { ...item, options }]));
       }
     }
     return group;
   }
+  normalizeOptions(file, options) {
+    var _a, _b, _c;
+    const world = this.resolveWorld(options.world);
+    if (this.config.manifestVersion !== 2) {
+      if (world === ContentScriptWorld.Main && (((_a = options.isolation) == null ? void 0 : _a.type) === ContentScriptIsolation.Shadow || ((_b = options.isolation) == null ? void 0 : _b.type) === ContentScriptIsolation.Iframe && !(((_c = options.isolation) == null ? void 0 : _c.src) && /^https?:\/\//.test(options.isolation.src)))) {
+        throw new Error(
+          `Content script "${file.file}" cannot use this isolation in the MAIN execution world; only external HTTP(S) isolation.src is supported`
+        );
+      }
+      return options;
+    }
+    if (world === ContentScriptWorld.Main) {
+      console.warn(
+        `Content script "${file.file}" requests world "MAIN", but Addon Bone does not support MAIN content scripts in Manifest V2. It will be built and run in ISOLATED.`
+      );
+    }
+    return { ...options, world: ContentScriptWorld.Isolated };
+  }
   async group() {
     return this._group ?? (this._group = await this.getGroup());
   }
@@ -36,15 +64,29 @@ class ContentManager_default {
     }
     return entries;
   }
-  async manifest() {
-    const manifest = /* @__PURE__ */ new Set();
+  /** Settings are keyed by the final grouped entrypoint name, not the original source files. */
+  async entryOptions() {
+    const entries = /* @__PURE__ */ new Map();
     for (const [entry, items] of await this.group()) {
-      const options = Array.from(items, ({ options: options2 }) => options2).reduce((acc, opt) => {
-        return { ...acc, ...opt };
-      }, {});
-      manifest.add({ entry, ...getContentScriptConfigFromOptions(options) });
+      const options = Array.from(items, (item) => item.options);
+      const worlds = new Set(options.map((option) => this.resolveWorld(option.world)));
+      if (worlds.size !== 1) {
+        throw new Error(`Content entrypoint "${entry}" cannot mix execution worlds`);
+      }
+      if (new Set(options.map(hasIsolatedTarget)).size !== 1) {
+        throw new Error(`Content entrypoint "${entry}" cannot mix isolation style delivery modes`);
+      }
+      entries.set(entry, Object.assign({}, ...options));
     }
-    return manifest;
+    return entries;
+  }
+  async manifest() {
+    return new Set(
+      Array.from(await this.entryOptions(), ([entry, options]) => ({
+        entry,
+        ...getContentScriptConfigFromOptions(options)
+      }))
+    );
   }
   async hostPermissions() {
     return (await this.calculateHostPermissions())[0];
@@ -114,9 +156,18 @@ class ContentManager_default {
     return [permissions, optionalPermissions];
   }
   virtual(file) {
+    if (!this._group) {
+      throw new Error(
+        `Cannot create virtual file "${file.file}": content group is not prepared. Await entries() or entryOptions() before virtual().`
+      );
+    }
+    const item = Array.from(this._group.values()).flatMap((items) => Array.from(items)).find((item2) => item2.file.file === file.file);
+    if (!item) {
+      throw new Error(`Virtual file "${file.file}" is not in the prepared content group.`);
+    }
     for (const provider of this.providers) {
       try {
-        return provider.virtual(file);
+        return provider.virtual(file, item.options);
       } catch {
       }
     }
@@ -125,16 +176,16 @@ class ContentManager_default {
   async empty() {
     return (await this.group()).size === 0;
   }
-  chunkName() {
-    return this.names.getChunkName();
-  }
-  likely(name) {
-    if (!name) {
-      return false;
+  resolveWorld(world) {
+    switch (world) {
+      case void 0:
+      case ContentScriptWorld.Isolated:
+        return ContentScriptWorld.Isolated;
+      case ContentScriptWorld.Main:
+        return ContentScriptWorld.Main;
+      default:
+        throw new Error(`Unsupported content script execution world "${String(world)}"`);
     }
-    return [EntrypointType.Relay, EntrypointType.ContentScript].some(
-      (type) => name === type || name.endsWith(`.${type}`)
-    );
   }
   clear() {
     for (const provider of this.providers) {
@@ -148,6 +199,6 @@ class ContentManager_default {
   }
 }
 export {
-  ContentManager_default as default
+  ContentManager as default
 };
 //# sourceMappingURL=ContentManager.js.map

package/dist/cli/plugins/content/ContentManager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/content/ContentManager.ts"],"sourcesContent":["import ContentName from \"./ContentName\";\n\nimport {ContentGroupItems, ContentProvider} from \"./types\";\nimport {getContentScriptConfigFromOptions} from \"./utils\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\nimport {ContentScriptDeclarative, ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointEntries, EntrypointFile, EntrypointType} from \"@typing/entrypoint\";\nimport {\n    ManifestContentScripts,\n    ManifestHostPermissions,\n    ManifestOptionalPermissions,\n    ManifestPermissions,\n} from \"@typing/manifest\";\n\nexport default class {\n    protected readonly providers = new Set<ContentProvider<ContentScriptEntrypointOptions>>();\n\n    protected readonly names: ContentName;\n\n    protected _group?: ContentGroupItems<ContentScriptEntrypointOptions>;\n\n    protected _hostPermissions?: [ManifestHostPermissions, ManifestHostPermissions];\n\n    protected _permissions?: Promise<[ManifestPermissions, ManifestOptionalPermissions]>;\n\n    constructor(config: ReadonlyConfig) {\n        this.names = new ContentName(config);\n    }\n\n    public provider(provider: ContentProvider<ContentScriptEntrypointOptions>): this {\n        this.providers.add(provider);\n\n        return this;\n    }\n\n    protected async getGroup(): Promise<ContentGroupItems<ContentScriptEntrypointOptions>> {\n        const content = await Promise.all(Array.from(this.providers, provider => provider.driver().items()));\n\n        const group: ContentGroupItems<ContentScriptEntrypointOptions> = new Map();\n\n        for (const items of content) {\n            for (const [name, item] of items) {\n                const entry = this.names.create(name, item.options);\n\n                group.set(entry, new Set([...(group.get(entry) || []), item]));\n            }\n        }\n\n        return group;\n    }\n\n    public async group(): Promise<ContentGroupItems<ContentScriptEntrypointOptions>> {\n        return (this._group ??= await this.getGroup());\n    }\n\n    public async entries(): Promise<EntrypointEntries> {\n        const entries: EntrypointEntries = new Map();\n\n        for (const [entry, items] of await this.group()) {\n            entries.set(entry, new Set(Array.from(items, ({file}) => file)));\n        }\n\n        return entries;\n    }\n\n    public async manifest(): Promise<ManifestContentScripts> {\n        const manifest: ManifestContentScripts = new Set();\n\n        for (const [entry, items] of await this.group()) {\n            const options = Array.from(items, ({options}) => options).reduce((acc, opt) => {\n                return {...acc, ...opt};\n            }, {} as ContentScriptEntrypointOptions);\n\n            manifest.add({entry, ...getContentScriptConfigFromOptions(options)});\n        }\n\n        return manifest;\n    }\n\n    public async hostPermissions(): Promise<ManifestHostPermissions> {\n        return (await this.calculateHostPermissions())[0];\n    }\n\n    public async optionalHostPermissions(): Promise<ManifestHostPermissions> {\n        return (await this.calculateHostPermissions())[1];\n    }\n\n    protected async calculateHostPermissions(): Promise<[ManifestHostPermissions, ManifestHostPermissions]> {\n        if (this._hostPermissions) {\n            return this._hostPermissions;\n        }\n\n        const hostPermissions = new Set<string>();\n        const optionalHostPermissions = new Set<string>();\n\n        const group = await this.group();\n\n        for (const items of group.values()) {\n            for (const {options} of items) {\n                const {matches, declarative} = options;\n\n                if (!declarative || !matches) {\n                    continue;\n                }\n\n                for (const match of matches) {\n                    switch (declarative) {\n                        case ContentScriptDeclarative.Optional:\n                            optionalHostPermissions.add(match);\n\n                            break;\n                        case ContentScriptDeclarative.Required:\n                        case true:\n                            hostPermissions.add(match);\n\n                            break;\n                    }\n                }\n            }\n        }\n\n        return (this._hostPermissions = [hostPermissions, optionalHostPermissions]);\n    }\n\n    public async permissions(): Promise<ManifestPermissions> {\n        return (await this.getPermissions())[0];\n    }\n\n    public async optionalPermissions(): Promise<ManifestOptionalPermissions> {\n        return (await this.getPermissions())[1];\n    }\n\n    protected getPermissions(): Promise<[ManifestPermissions, ManifestOptionalPermissions]> {\n        return (this._permissions ??= this.calculatePermissions());\n    }\n\n    protected async calculatePermissions(): Promise<[ManifestPermissions, ManifestOptionalPermissions]> {\n        const permissions: ManifestPermissions = new Set();\n        const optionalPermissions: ManifestOptionalPermissions = new Set();\n\n        const contributions = await Promise.all(\n            Array.from(this.providers, async provider => {\n                const driver = provider.driver();\n\n                return Promise.all([driver.permissions(), driver.optionalPermissions()]);\n            })\n        );\n\n        for (const [required, optional] of contributions) {\n            for (const permission of required) {\n                permissions.add(permission);\n            }\n\n            for (const permission of optional) {\n                optionalPermissions.add(permission);\n            }\n        }\n\n        for (const permission of optionalPermissions) {\n            if (permissions.has(permission)) {\n                optionalPermissions.delete(permission);\n            }\n        }\n\n        return [permissions, optionalPermissions];\n    }\n\n    public virtual(file: EntrypointFile): string {\n        for (const provider of this.providers) {\n            try {\n                return provider.virtual(file);\n            } catch {}\n        }\n\n        throw new Error(`Virtual file \"${file.file}\" not found.`);\n    }\n\n    public async empty(): Promise<boolean> {\n        return (await this.group()).size === 0;\n    }\n\n    public chunkName(): string {\n        return this.names.getChunkName();\n    }\n\n    public likely(name?: string): boolean {\n        if (!name) {\n            return false;\n        }\n\n        return [EntrypointType.Relay, EntrypointType.ContentScript].some(\n            type => name === type || name.endsWith(`.${type}`)\n        );\n    }\n\n    public clear(): this {\n        for (const provider of this.providers) {\n            provider.clear();\n        }\n\n        this.names.reset();\n\n        this._group = undefined;\n        this._hostPermissions = undefined;\n        this._permissions = undefined;\n\n        return this;\n    }\n}\n"],"mappings":"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","names":["options"]}
+{"version":3,"sources":["../../../../src/cli/plugins/content/ContentManager.ts"],"sourcesContent":["import ContentName from \"./ContentName\";\n\nimport {ContentGroupItems, ContentProvider} from \"./types\";\nimport {getContentScriptConfigFromOptions, hasIsolatedTarget} from \"./utils\";\nimport {getContentChunkName} from \"./bundler\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\nimport {\n    ContentScriptDeclarative,\n    ContentScriptIsolation,\n    ContentScriptEntrypointOptions,\n    ContentScriptWorld,\n    type ContentScriptWorldValue,\n} from \"@typing/content\";\nimport {EntrypointEntries, EntrypointFile} from \"@typing/entrypoint\";\nimport {\n    ManifestContentScripts,\n    ManifestHostPermissions,\n    ManifestOptionalPermissions,\n    ManifestPermissions,\n} from \"@typing/manifest\";\n\nexport default class ContentManager {\n    protected readonly providers = new Set<ContentProvider<ContentScriptEntrypointOptions>>();\n\n    protected readonly names: ContentName;\n\n    protected _group?: ContentGroupItems<ContentScriptEntrypointOptions>;\n\n    protected _hostPermissions?: [ManifestHostPermissions, ManifestHostPermissions];\n\n    protected _permissions?: Promise<[ManifestPermissions, ManifestOptionalPermissions]>;\n\n    constructor(protected readonly config: ReadonlyConfig) {\n        this.names = new ContentName(config);\n\n        Object.values(ContentScriptWorld).forEach(world => this.names.reserve(getContentChunkName(world)));\n    }\n\n    public provider(provider: ContentProvider<ContentScriptEntrypointOptions>): this {\n        this.providers.add(provider);\n\n        return this;\n    }\n\n    protected async getGroup(): Promise<ContentGroupItems<ContentScriptEntrypointOptions>> {\n        // prettier-ignore\n        const content = await Promise.all(\n            Array.from(this.providers, provider => provider.driver().items())\n        );\n\n        const group: ContentGroupItems<ContentScriptEntrypointOptions> = new Map();\n\n        for (const items of content) {\n            for (const [name, item] of items) {\n                const options = this.normalizeOptions(item.file, item.options);\n                const entry = this.names.create(name, options);\n\n                group.set(entry, new Set([...(group.get(entry) || []), {...item, options}]));\n            }\n        }\n\n        return group;\n    }\n\n    protected normalizeOptions(\n        file: EntrypointFile,\n        options: ContentScriptEntrypointOptions\n    ): ContentScriptEntrypointOptions {\n        const world = this.resolveWorld(options.world);\n\n        if (this.config.manifestVersion !== 2) {\n            if (\n                world === ContentScriptWorld.Main &&\n                (options.isolation?.type === ContentScriptIsolation.Shadow ||\n                    (options.isolation?.type === ContentScriptIsolation.Iframe &&\n                        !(options.isolation?.src && /^https?:\\/\\//.test(options.isolation.src))))\n            ) {\n                throw new Error(\n                    `Content script \"${file.file}\" cannot use this isolation in the MAIN execution world; only external HTTP(S) isolation.src is supported`\n                );\n            }\n\n            return options;\n        }\n\n        if (world === ContentScriptWorld.Main) {\n            console.warn(\n                `Content script \"${file.file}\" requests world \"MAIN\", but Addon Bone does not support MAIN content scripts in Manifest V2. It will be built and run in ISOLATED.`\n            );\n        }\n\n        return {...options, world: ContentScriptWorld.Isolated};\n    }\n\n    public async group(): Promise<ContentGroupItems<ContentScriptEntrypointOptions>> {\n        return (this._group ??= await this.getGroup());\n    }\n\n    public async entries(): Promise<EntrypointEntries> {\n        const entries: EntrypointEntries = new Map();\n\n        for (const [entry, items] of await this.group()) {\n            entries.set(entry, new Set(Array.from(items, ({file}) => file)));\n        }\n\n        return entries;\n    }\n\n    /** Settings are keyed by the final grouped entrypoint name, not the original source files. */\n    public async entryOptions(): Promise<ReadonlyMap<string, ContentScriptEntrypointOptions>> {\n        const entries = new Map<string, ContentScriptEntrypointOptions>();\n\n        for (const [entry, items] of await this.group()) {\n            const options = Array.from(items, item => item.options);\n            const worlds = new Set(options.map(option => this.resolveWorld(option.world)));\n            if (worlds.size !== 1) {\n                throw new Error(`Content entrypoint \"${entry}\" cannot mix execution worlds`);\n            }\n\n            if (new Set(options.map(hasIsolatedTarget)).size !== 1) {\n                throw new Error(`Content entrypoint \"${entry}\" cannot mix isolation style delivery modes`);\n            }\n\n            entries.set(entry, Object.assign({}, ...options));\n        }\n\n        return entries;\n    }\n\n    public async manifest(): Promise<ManifestContentScripts> {\n        return new Set(\n            Array.from(await this.entryOptions(), ([entry, options]) => ({\n                entry,\n                ...getContentScriptConfigFromOptions(options),\n            }))\n        );\n    }\n\n    public async hostPermissions(): Promise<ManifestHostPermissions> {\n        return (await this.calculateHostPermissions())[0];\n    }\n\n    public async optionalHostPermissions(): Promise<ManifestHostPermissions> {\n        return (await this.calculateHostPermissions())[1];\n    }\n\n    protected async calculateHostPermissions(): Promise<[ManifestHostPermissions, ManifestHostPermissions]> {\n        if (this._hostPermissions) {\n            return this._hostPermissions;\n        }\n\n        const hostPermissions = new Set<string>();\n        const optionalHostPermissions = new Set<string>();\n\n        const group = await this.group();\n\n        for (const items of group.values()) {\n            for (const {options} of items) {\n                const {matches, declarative} = options;\n\n                if (!declarative || !matches) {\n                    continue;\n                }\n\n                for (const match of matches) {\n                    switch (declarative) {\n                        case ContentScriptDeclarative.Optional:\n                            optionalHostPermissions.add(match);\n\n                            break;\n                        case ContentScriptDeclarative.Required:\n                        case true:\n                            hostPermissions.add(match);\n\n                            break;\n                    }\n                }\n            }\n        }\n\n        return (this._hostPermissions = [hostPermissions, optionalHostPermissions]);\n    }\n\n    public async permissions(): Promise<ManifestPermissions> {\n        return (await this.getPermissions())[0];\n    }\n\n    public async optionalPermissions(): Promise<ManifestOptionalPermissions> {\n        return (await this.getPermissions())[1];\n    }\n\n    protected getPermissions(): Promise<[ManifestPermissions, ManifestOptionalPermissions]> {\n        return (this._permissions ??= this.calculatePermissions());\n    }\n\n    protected async calculatePermissions(): Promise<[ManifestPermissions, ManifestOptionalPermissions]> {\n        const permissions: ManifestPermissions = new Set();\n        const optionalPermissions: ManifestOptionalPermissions = new Set();\n\n        const contributions = await Promise.all(\n            Array.from(this.providers, async provider => {\n                const driver = provider.driver();\n\n                return Promise.all([driver.permissions(), driver.optionalPermissions()]);\n            })\n        );\n\n        for (const [required, optional] of contributions) {\n            for (const permission of required) {\n                permissions.add(permission);\n            }\n\n            for (const permission of optional) {\n                optionalPermissions.add(permission);\n            }\n        }\n\n        for (const permission of optionalPermissions) {\n            if (permissions.has(permission)) {\n                optionalPermissions.delete(permission);\n            }\n        }\n\n        return [permissions, optionalPermissions];\n    }\n\n    public virtual(file: EntrypointFile): string {\n        if (!this._group) {\n            throw new Error(\n                `Cannot create virtual file \"${file.file}\": content group is not prepared. Await entries() or entryOptions() before virtual().`\n            );\n        }\n\n        const item = Array.from(this._group.values())\n            .flatMap(items => Array.from(items))\n            .find(item => item.file.file === file.file);\n\n        if (!item) {\n            throw new Error(`Virtual file \"${file.file}\" is not in the prepared content group.`);\n        }\n\n        for (const provider of this.providers) {\n            try {\n                return provider.virtual(file, item.options);\n            } catch {}\n        }\n\n        throw new Error(`Virtual file \"${file.file}\" not found.`);\n    }\n\n    public async empty(): Promise<boolean> {\n        return (await this.group()).size === 0;\n    }\n\n    protected resolveWorld(world?: ContentScriptWorldValue): ContentScriptWorld {\n        switch (world) {\n            case undefined:\n            case ContentScriptWorld.Isolated:\n                return ContentScriptWorld.Isolated;\n            case ContentScriptWorld.Main:\n                return ContentScriptWorld.Main;\n            default:\n                throw new Error(`Unsupported content script execution world \"${String(world)}\"`);\n        }\n    }\n\n    public clear(): this {\n        for (const provider of this.providers) {\n            provider.clear();\n        }\n\n        this.names.reset();\n\n        this._group = undefined;\n        this._hostPermissions = undefined;\n        this._permissions = undefined;\n\n        return this;\n    }\n}\n"],"mappings":"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","names":["item"]}

package/dist/cli/plugins/content/ContentName.d.ts

@@ -6,6 +6,6 @@ export default class ContentName extends NameGenerator implements ContentNameGen
     protected readonly config: ReadonlyConfig;
     protected readonly _names: Map<string, string>;
     constructor(config: ReadonlyConfig);
-    getChunkName(): string;
     create(name: string, options: ContentScriptEntrypointOptions): string;
+    reset(): this;
 }

package/dist/cli/plugins/content/ContentName.js

@@ -2,30 +2,31 @@ import stringify from "json-stringify-deterministic";
 import { getContentScriptConfigFromOptions } from "./utils.js";
 import { NameGenerator } from "./../../../cli/entrypoint/index.js";
 import { EntrypointType } from "./../../../types/entrypoint.js";
+import { ContentScriptIsolation } from "./../../../types/content.js";
 class ContentName extends NameGenerator {
   constructor(config) {
     super(EntrypointType.ContentScript);
     this.config = config;
-    this.reserve(this.getChunkName());
   }
   config;
   _names = /* @__PURE__ */ new Map();
-  getChunkName() {
-    return "common." + this.entrypoint;
-  }
   create(name, options) {
-    const entry = this.name(name);
-    if (!this.config.concatContentScripts) {
-      return entry;
+    if (!this.config.concatContentScripts || options.isolation !== void 0 && options.isolation.type !== ContentScriptIsolation.None) {
+      return this.name(name);
     }
     const key = stringify(getContentScriptConfigFromOptions(options));
     const existingEntry = this._names.get(key);
     if (existingEntry) {
       return existingEntry;
     }
+    const entry = this.name(name);
     this._names.set(key, entry);
     return entry;
   }
+  reset() {
+    this._names.clear();
+    return super.reset();
+  }
 }
 export {
   ContentName as default

package/dist/cli/plugins/content/ContentName.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/content/ContentName.ts"],"sourcesContent":["import stringify from \"json-stringify-deterministic\";\n\nimport {getContentScriptConfigFromOptions} from \"./utils\";\nimport {ContentNameGenerator} from \"./types\";\n\nimport {NameGenerator} from \"@cli/entrypoint/index.js\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\nimport {EntrypointType} from \"@typing/entrypoint\";\nimport {ContentScriptEntrypointOptions} from \"@typing/content\";\n\nexport default class ContentName extends NameGenerator implements ContentNameGenerator<ContentScriptEntrypointOptions> {\n    protected readonly _names = new Map<string, string>();\n\n    constructor(protected readonly config: ReadonlyConfig) {\n        super(EntrypointType.ContentScript);\n\n        this.reserve(this.getChunkName());\n    }\n\n    public getChunkName(): string {\n        return \"common.\" + this.entrypoint;\n    }\n\n    public create(name: string, options: ContentScriptEntrypointOptions): string {\n        const entry = this.name(name);\n\n        if (!this.config.concatContentScripts) {\n            return entry;\n        }\n\n        const key = stringify(getContentScriptConfigFromOptions(options));\n\n        const existingEntry = this._names.get(key);\n\n        if (existingEntry) {\n            return existingEntry;\n        }\n\n        this._names.set(key, entry);\n\n        return entry;\n    }\n}\n"],"mappings":"AAAA,OAAO,eAAe;AAEtB,SAAQ,yCAAwC;AAGhD,SAAQ,qBAAoB;AAG5B,SAAQ,sBAAqB;AAG7B,MAAO,oBAAkC,cAA8E;AAAA,EAGnH,YAA+B,QAAwB;AACnD,UAAM,eAAe,aAAa;AADP;AAG3B,SAAK,QAAQ,KAAK,aAAa,CAAC;AAAA,EACpC;AAAA,EAJ+B;AAAA,EAFZ,SAAS,oBAAI,IAAoB;AAAA,EAQ7C,eAAuB;AAC1B,WAAO,YAAY,KAAK;AAAA,EAC5B;AAAA,EAEO,OAAO,MAAc,SAAiD;AACzE,UAAM,QAAQ,KAAK,KAAK,IAAI;AAE5B,QAAI,CAAC,KAAK,OAAO,sBAAsB;AACnC,aAAO;AAAA,IACX;AAEA,UAAM,MAAM,UAAU,kCAAkC,OAAO,CAAC;AAEhE,UAAM,gBAAgB,KAAK,OAAO,IAAI,GAAG;AAEzC,QAAI,eAAe;AACf,aAAO;AAAA,IACX;AAEA,SAAK,OAAO,IAAI,KAAK,KAAK;AAE1B,WAAO;AAAA,EACX;AACJ;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/content/ContentName.ts"],"sourcesContent":["import stringify from \"json-stringify-deterministic\";\n\nimport {getContentScriptConfigFromOptions} from \"./utils\";\nimport {ContentNameGenerator} from \"./types\";\n\nimport {NameGenerator} from \"@cli/entrypoint/index.js\";\n\nimport {ReadonlyConfig} from \"@typing/config\";\nimport {EntrypointType} from \"@typing/entrypoint\";\nimport {ContentScriptIsolation, ContentScriptEntrypointOptions} from \"@typing/content\";\n\nexport default class ContentName extends NameGenerator implements ContentNameGenerator<ContentScriptEntrypointOptions> {\n    protected readonly _names = new Map<string, string>();\n\n    constructor(protected readonly config: ReadonlyConfig) {\n        super(EntrypointType.ContentScript);\n    }\n\n    public create(name: string, options: ContentScriptEntrypointOptions): string {\n        if (\n            !this.config.concatContentScripts ||\n            (options.isolation !== undefined && options.isolation.type !== ContentScriptIsolation.None)\n        ) {\n            return this.name(name);\n        }\n\n        const key = stringify(getContentScriptConfigFromOptions(options));\n\n        const existingEntry = this._names.get(key);\n\n        if (existingEntry) {\n            return existingEntry;\n        }\n\n        const entry = this.name(name);\n\n        this._names.set(key, entry);\n\n        return entry;\n    }\n\n    public reset(): this {\n        this._names.clear();\n\n        return super.reset();\n    }\n}\n"],"mappings":"AAAA,OAAO,eAAe;AAEtB,SAAQ,yCAAwC;AAGhD,SAAQ,qBAAoB;AAG5B,SAAQ,sBAAqB;AAC7B,SAAQ,8BAA6D;AAErE,MAAO,oBAAkC,cAA8E;AAAA,EAGnH,YAA+B,QAAwB;AACnD,UAAM,eAAe,aAAa;AADP;AAAA,EAE/B;AAAA,EAF+B;AAAA,EAFZ,SAAS,oBAAI,IAAoB;AAAA,EAM7C,OAAO,MAAc,SAAiD;AACzE,QACI,CAAC,KAAK,OAAO,wBACZ,QAAQ,cAAc,UAAa,QAAQ,UAAU,SAAS,uBAAuB,MACxF;AACE,aAAO,KAAK,KAAK,IAAI;AAAA,IACzB;AAEA,UAAM,MAAM,UAAU,kCAAkC,OAAO,CAAC;AAEhE,UAAM,gBAAgB,KAAK,OAAO,IAAI,GAAG;AAEzC,QAAI,eAAe;AACf,aAAO;AAAA,IACX;AAEA,UAAM,QAAQ,KAAK,KAAK,IAAI;AAE5B,SAAK,OAAO,IAAI,KAAK,KAAK;AAE1B,WAAO;AAAA,EACX;AAAA,EAEO,QAAc;AACjB,SAAK,OAAO,MAAM;AAElB,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}

package/dist/cli/plugins/content/Relay.d.ts

@@ -11,7 +11,7 @@ export default class extends RelayFinder implements ContentProvider<ContentScrip
      * Before creating the virtual module, it is necessary to run a command `await this.transport()` that caches the Relays.
      * This command is executed during the type declaration generation stage for the Relays.
      */
-    virtual(file: EntrypointFile): string;
+    virtual(file: EntrypointFile, contentOptions?: ContentScriptEntrypointOptions): string;
     getOptionsMap(): Promise<Record<string, RelayOptions>>;
     clear(): this;
 }

package/dist/cli/plugins/content/Relay.js

@@ -1,6 +1,7 @@
 import RelayDriver from "./RelayDriver.js";
 import { RelayFinder } from "./../../../cli/entrypoint/index.js";
 import { virtualRelayModule } from "./../../../cli/virtual/index.js";
+import { isContentScriptFrameNavigation } from "./../../../shared/content/index.js";
 import { RelayMethod } from "./../../../types/relay.js";
 class Relay_default extends RelayFinder {
   _driver;
@@ -11,13 +12,13 @@ class Relay_default extends RelayFinder {
    * Before creating the virtual module, it is necessary to run a command `await this.transport()` that caches the Relays.
    * This command is executed during the type declaration generation stage for the Relays.
    */
-  virtual(file) {
+  virtual(file, contentOptions) {
     var _a, _b;
     const options = (_b = (_a = this._transport) == null ? void 0 : _a.get(file)) == null ? void 0 : _b.options;
     if (!options) {
       throw new Error(`Relay options not found for "${file}"`);
     }
-    return virtualRelayModule(file, options.name);
+    return virtualRelayModule(file, options.name, isContentScriptFrameNavigation(contentOptions == null ? void 0 : contentOptions.isolation));
   }
   async getOptionsMap() {
     const transport = await this.transport();

package/dist/cli/plugins/content/Relay.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/content/Relay.ts"],"sourcesContent":["import RelayDriver from \"./RelayDriver\";\n\nimport {ContentProvider} from \"./types\";\n\nimport {RelayFinder} from \"@cli/entrypoint/index.js\";\nimport {virtualRelayModule} from \"@cli/virtual/index.js\";\n\nimport {RelayMethod, RelayOptions} from \"@typing/relay\";\nimport {ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointFile} from \"@typing/entrypoint\";\n\nexport default class extends RelayFinder implements ContentProvider<ContentScriptEntrypointOptions> {\n    protected _driver?: RelayDriver;\n\n    public driver(): RelayDriver {\n        return (this._driver ??= new RelayDriver(this));\n    }\n\n    /**\n     * Before creating the virtual module, it is necessary to run a command `await this.transport()` that caches the Relays.\n     * This command is executed during the type declaration generation stage for the Relays.\n     */\n    public virtual(file: EntrypointFile): string {\n        const options = this._transport?.get(file)?.options;\n\n        if (!options) {\n            throw new Error(`Relay options not found for \"${file}\"`);\n        }\n\n        return virtualRelayModule(file, options.name);\n    }\n\n    public async getOptionsMap(): Promise<Record<string, RelayOptions>> {\n        const transport = await this.transport();\n\n        return Array.from(transport.values()).reduce(\n            (map, {options}) => {\n                map[options.name] = {\n                    ...options,\n                    method: options.method || RelayMethod.Messaging,\n                };\n\n                return map;\n            },\n            {} as Record<string, RelayOptions>\n        );\n    }\n\n    public clear(): this {\n        this._driver?.clear();\n\n        return super.clear();\n    }\n}\n"],"mappings":"AAAA,OAAO,iBAAiB;AAIxB,SAAQ,mBAAkB;AAC1B,SAAQ,0BAAyB;AAEjC,SAAQ,mBAAgC;AAIxC,MAAO,sBAAsB,YAAuE;AAAA,EACtF;AAAA,EAEH,SAAsB;AACzB,WAAQ,KAAK,YAAL,KAAK,UAAY,IAAI,YAAY,IAAI;AAAA,EACjD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMO,QAAQ,MAA8B;AAtBjD;AAuBQ,UAAM,WAAU,gBAAK,eAAL,mBAAiB,IAAI,UAArB,mBAA4B;AAE5C,QAAI,CAAC,SAAS;AACV,YAAM,IAAI,MAAM,gCAAgC,IAAI,GAAG;AAAA,IAC3D;AAEA,WAAO,mBAAmB,MAAM,QAAQ,IAAI;AAAA,EAChD;AAAA,EAEA,MAAa,gBAAuD;AAChE,UAAM,YAAY,MAAM,KAAK,UAAU;AAEvC,WAAO,MAAM,KAAK,UAAU,OAAO,CAAC,EAAE;AAAA,MAClC,CAAC,KAAK,EAAC,QAAO,MAAM;AAChB,YAAI,QAAQ,IAAI,IAAI;AAAA,UAChB,GAAG;AAAA,UACH,QAAQ,QAAQ,UAAU,YAAY;AAAA,QAC1C;AAEA,eAAO;AAAA,MACX;AAAA,MACA,CAAC;AAAA,IACL;AAAA,EACJ;AAAA,EAEO,QAAc;AAhDzB;AAiDQ,eAAK,YAAL,mBAAc;AAEd,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}
+{"version":3,"sources":["../../../../src/cli/plugins/content/Relay.ts"],"sourcesContent":["import RelayDriver from \"./RelayDriver\";\n\nimport {ContentProvider} from \"./types\";\n\nimport {RelayFinder} from \"@cli/entrypoint/index.js\";\nimport {virtualRelayModule} from \"@cli/virtual/index.js\";\nimport {isContentScriptFrameNavigation} from \"@shared/content\";\n\nimport {RelayMethod, RelayOptions} from \"@typing/relay\";\nimport {ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointFile} from \"@typing/entrypoint\";\n\nexport default class extends RelayFinder implements ContentProvider<ContentScriptEntrypointOptions> {\n    protected _driver?: RelayDriver;\n\n    public driver(): RelayDriver {\n        return (this._driver ??= new RelayDriver(this));\n    }\n\n    /**\n     * Before creating the virtual module, it is necessary to run a command `await this.transport()` that caches the Relays.\n     * This command is executed during the type declaration generation stage for the Relays.\n     */\n    public virtual(file: EntrypointFile, contentOptions?: ContentScriptEntrypointOptions): string {\n        const options = this._transport?.get(file)?.options;\n\n        if (!options) {\n            throw new Error(`Relay options not found for \"${file}\"`);\n        }\n\n        return virtualRelayModule(file, options.name, isContentScriptFrameNavigation(contentOptions?.isolation));\n    }\n\n    public async getOptionsMap(): Promise<Record<string, RelayOptions>> {\n        const transport = await this.transport();\n\n        return Array.from(transport.values()).reduce(\n            (map, {options}) => {\n                map[options.name] = {\n                    ...options,\n                    method: options.method || RelayMethod.Messaging,\n                };\n\n                return map;\n            },\n            {} as Record<string, RelayOptions>\n        );\n    }\n\n    public clear(): this {\n        this._driver?.clear();\n\n        return super.clear();\n    }\n}\n"],"mappings":"AAAA,OAAO,iBAAiB;AAIxB,SAAQ,mBAAkB;AAC1B,SAAQ,0BAAyB;AACjC,SAAQ,sCAAqC;AAE7C,SAAQ,mBAAgC;AAIxC,MAAO,sBAAsB,YAAuE;AAAA,EACtF;AAAA,EAEH,SAAsB;AACzB,WAAQ,KAAK,YAAL,KAAK,UAAY,IAAI,YAAY,IAAI;AAAA,EACjD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMO,QAAQ,MAAsB,gBAAyD;AAvBlG;AAwBQ,UAAM,WAAU,gBAAK,eAAL,mBAAiB,IAAI,UAArB,mBAA4B;AAE5C,QAAI,CAAC,SAAS;AACV,YAAM,IAAI,MAAM,gCAAgC,IAAI,GAAG;AAAA,IAC3D;AAEA,WAAO,mBAAmB,MAAM,QAAQ,MAAM,+BAA+B,iDAAgB,SAAS,CAAC;AAAA,EAC3G;AAAA,EAEA,MAAa,gBAAuD;AAChE,UAAM,YAAY,MAAM,KAAK,UAAU;AAEvC,WAAO,MAAM,KAAK,UAAU,OAAO,CAAC,EAAE;AAAA,MAClC,CAAC,KAAK,EAAC,QAAO,MAAM;AAChB,YAAI,QAAQ,IAAI,IAAI;AAAA,UAChB,GAAG;AAAA,UACH,QAAQ,QAAQ,UAAU,YAAY;AAAA,QAC1C;AAEA,eAAO;AAAA,MACX;AAAA,MACA,CAAC;AAAA,IACL;AAAA,EACJ;AAAA,EAEO,QAAc;AAjDzB;AAkDQ,eAAK,YAAL,mBAAc;AAEd,WAAO,MAAM,MAAM;AAAA,EACvB;AACJ;","names":[]}

package/dist/cli/plugins/content/bundler.d.ts

@@ -0,0 +1,7 @@
+import type { ResourceAccessPluginRequirement } from "../../bundler/plugins/resource-access/index.js";
+import type { IsolatedStylesPluginFiles } from "../../bundler/plugins/isolated-styles/index.js";
+import { ContentScriptWorld, type ContentScriptEntrypointOptions } from "../../../types/content.js";
+/** Reject unavailable destinations and warn about likely missing query flags without changing CSS routing. */
+export declare const validateContentStyles: (entry: string, options: ContentScriptEntrypointOptions | undefined, files: IsolatedStylesPluginFiles) => readonly string[];
+export declare const createPageAccessRequirements: (entries: ReadonlyMap<string, ContentScriptEntrypointOptions>, pages: ReadonlyMap<string, string>) => ResourceAccessPluginRequirement[];
+export declare const getContentChunkName: (world: ContentScriptWorld) => string;

package/dist/cli/plugins/content/bundler.js

@@ -0,0 +1,47 @@
+import { isContentScriptFrameNavigation } from "./../../../shared/content/index.js";
+import { hasIsolatedTarget } from "./utils.js";
+import { ContentScriptMatches, ContentScriptWorld } from "./../../../types/content.js";
+import { EntrypointType } from "./../../../types/entrypoint.js";
+const validateContentStyles = (entry, options, files) => {
+  var _a;
+  if (!options) return [];
+  if (files.isolated.length > 0 && isContentScriptFrameNavigation(options.isolation)) {
+    throw new Error(
+      `Entrypoint "${entry}" uses ?isolation CSS with isolation.page/isolation.src, but has no local render target. Import these styles in the embedded page instead.`
+    );
+  }
+  if (hasIsolatedTarget(options) && files.document.length > 0 && files.isolated.length === 0) {
+    return [
+      `[adnbn:missing-isolation-css] Entrypoint "${entry}" uses isolation: "${(_a = options.isolation) == null ? void 0 : _a.type}", but has no CSS marked with ?isolation. Imported CSS will be delivered to the page document. If these styles belong to the isolated UI, import them with ?isolation. Document-only styles are valid; this warning can be suppressed with bundler ignoreWarnings.`
+    ];
+  }
+  return [];
+};
+const createPageAccessRequirements = (entries, pages) => {
+  var _a;
+  const requirements = [];
+  for (const [entry, options] of entries) {
+    const alias = (_a = options.isolation) == null ? void 0 : _a.page;
+    if (alias === void 0) continue;
+    const resource = pages.get(alias);
+    if (!resource) {
+      throw new Error(`Content entrypoint "${entry}" references unknown page "${alias}"`);
+    }
+    requirements.push({
+      resource,
+      matches: options.matches ?? ContentScriptMatches,
+      issuer: `Content entrypoint "${entry}" embedding page "${alias}"`,
+      hint: "add matches to the page or narrow the content matches"
+    });
+  }
+  return requirements;
+};
+const getContentChunkName = (world) => {
+  return `${world === ContentScriptWorld.Main ? "common-main" : "common"}.${EntrypointType.ContentScript}`;
+};
+export {
+  createPageAccessRequirements,
+  getContentChunkName,
+  validateContentStyles
+};
+//# sourceMappingURL=bundler.js.map

package/dist/cli/plugins/content/bundler.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/cli/plugins/content/bundler.ts"],"sourcesContent":["import type {ResourceAccessPluginRequirement} from \"@cli/bundler/plugins/resource-access\";\nimport type {IsolatedStylesPluginFiles} from \"@cli/bundler/plugins/isolated-styles\";\nimport {isContentScriptFrameNavigation} from \"@shared/content\";\nimport {hasIsolatedTarget} from \"./utils\";\n\nimport {ContentScriptMatches, ContentScriptWorld, type ContentScriptEntrypointOptions} from \"@typing/content\";\nimport {EntrypointType} from \"@typing/entrypoint\";\n\n/** Reject unavailable destinations and warn about likely missing query flags without changing CSS routing. */\nexport const validateContentStyles = (\n    entry: string,\n    options: ContentScriptEntrypointOptions | undefined,\n    files: IsolatedStylesPluginFiles\n): readonly string[] => {\n    if (!options) return [];\n    if (files.isolated.length > 0 && isContentScriptFrameNavigation(options.isolation)) {\n        throw new Error(\n            `Entrypoint \"${entry}\" uses ?isolation CSS with isolation.page/isolation.src, but has no local render target. Import these styles in the embedded page instead.`\n        );\n    }\n    if (hasIsolatedTarget(options) && files.document.length > 0 && files.isolated.length === 0) {\n        return [\n            `[adnbn:missing-isolation-css] Entrypoint \"${entry}\" uses isolation: \"${options.isolation?.type}\", but has no CSS marked with ?isolation. Imported CSS will be delivered to the page document. If these styles belong to the isolated UI, import them with ?isolation. Document-only styles are valid; this warning can be suppressed with bundler ignoreWarnings.`,\n        ];\n    }\n    return [];\n};\n\nexport const createPageAccessRequirements = (\n    entries: ReadonlyMap<string, ContentScriptEntrypointOptions>,\n    pages: ReadonlyMap<string, string>\n): ResourceAccessPluginRequirement[] => {\n    const requirements: ResourceAccessPluginRequirement[] = [];\n\n    for (const [entry, options] of entries) {\n        const alias = options.isolation?.page;\n        if (alias === undefined) continue;\n\n        const resource = pages.get(alias);\n        if (!resource) {\n            throw new Error(`Content entrypoint \"${entry}\" references unknown page \"${alias}\"`);\n        }\n\n        requirements.push({\n            resource,\n            matches: options.matches ?? ContentScriptMatches,\n            issuer: `Content entrypoint \"${entry}\" embedding page \"${alias}\"`,\n            hint: \"add matches to the page or narrow the content matches\",\n        });\n    }\n\n    return requirements;\n};\n\nexport const getContentChunkName = (world: ContentScriptWorld): string => {\n    return `${world === ContentScriptWorld.Main ? \"common-main\" : \"common\"}.${EntrypointType.ContentScript}`;\n};\n"],"mappings":"AAEA,SAAQ,sCAAqC;AAC7C,SAAQ,yBAAwB;AAEhC,SAAQ,sBAAsB,0BAA8D;AAC5F,SAAQ,sBAAqB;AAGtB,MAAM,wBAAwB,CACjC,OACA,SACA,UACoB;AAbxB;AAcI,MAAI,CAAC,QAAS,QAAO,CAAC;AACtB,MAAI,MAAM,SAAS,SAAS,KAAK,+BAA+B,QAAQ,SAAS,GAAG;AAChF,UAAM,IAAI;AAAA,MACN,eAAe,KAAK;AAAA,IACxB;AAAA,EACJ;AACA,MAAI,kBAAkB,OAAO,KAAK,MAAM,SAAS,SAAS,KAAK,MAAM,SAAS,WAAW,GAAG;AACxF,WAAO;AAAA,MACH,6CAA6C,KAAK,uBAAsB,aAAQ,cAAR,mBAAmB,IAAI;AAAA,IACnG;AAAA,EACJ;AACA,SAAO,CAAC;AACZ;AAEO,MAAM,+BAA+B,CACxC,SACA,UACoC;AA/BxC;AAgCI,QAAM,eAAkD,CAAC;AAEzD,aAAW,CAAC,OAAO,OAAO,KAAK,SAAS;AACpC,UAAM,SAAQ,aAAQ,cAAR,mBAAmB;AACjC,QAAI,UAAU,OAAW;AAEzB,UAAM,WAAW,MAAM,IAAI,KAAK;AAChC,QAAI,CAAC,UAAU;AACX,YAAM,IAAI,MAAM,uBAAuB,KAAK,8BAA8B,KAAK,GAAG;AAAA,IACtF;AAEA,iBAAa,KAAK;AAAA,MACd;AAAA,MACA,SAAS,QAAQ,WAAW;AAAA,MAC5B,QAAQ,uBAAuB,KAAK,qBAAqB,KAAK;AAAA,MAC9D,MAAM;AAAA,IACV,CAAC;AAAA,EACL;AAEA,SAAO;AACX;AAEO,MAAM,sBAAsB,CAAC,UAAsC;AACtE,SAAO,GAAG,UAAU,mBAAmB,OAAO,gBAAgB,QAAQ,IAAI,eAAe,aAAa;AAC1G;","names":[]}