adnbn 0.13.0 → 0.14.0

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/cli/plugins/view/index.ts"],"sourcesContent":["import {NormalModule} from \"@rspack/core\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {onlyViaTopLevelEntry} from \"@cli/bundler\";\nimport {getResolvePath, getSourcePath} from \"@cli/resolvers/path\";\n\nexport {default as View} from \"./View\";\n\nexport default definePlugin(() => {\n    return {\n        name: \"adnbn:view\",\n        bundler: ({config}) => {\n            const entryTypeFilter = onlyViaTopLevelEntry([\"page\", \"popup\", \"sidebar\", \"offscreen\", \"options\"]);\n\n            return {\n                optimization: {\n                    splitChunks: {\n                        cacheGroups: {\n                            adnbnView: {\n                                minChunks: 2,\n                                minSize: 0,\n                                name: \"common.view\",\n                                test: (module, context) => {\n                                    const nm = module as NormalModule;\n\n                                    if (!nm.resource) {\n                                        return false;\n                                    }\n\n                                    if (nm.resource.startsWith(getResolvePath(getSourcePath(config)))) {\n                                        return false;\n                                    }\n\n                                    return entryTypeFilter(module, context);\n                                },\n                                enforce: false,\n                                reuseExistingChunk: true,\n                                priority: 50,\n                            },\n                        },\n                    },\n                },\n            };\n        },\n    };\n});\n"],"mappings":"AAEA,SAAQ,oBAAmB;AAE3B,SAAQ,4BAA2B;AACnC,SAAQ,gBAAgB,qBAAoB;AAE5C,SAAmB,WAAXA,gBAAsB;AAE9B,IAAO,eAAQ,aAAa,MAAM;AAC9B,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,YAAM,kBAAkB,qBAAqB,CAAC,QAAQ,SAAS,WAAW,aAAa,SAAS,CAAC;AAEjG,aAAO;AAAA,QACH,cAAc;AAAA,UACV,aAAa;AAAA,YACT,aAAa;AAAA,cACT,WAAW;AAAA,gBACP,WAAW;AAAA,gBACX,SAAS;AAAA,gBACT,MAAM;AAAA,gBACN,MAAM,CAAC,QAAQ,YAAY;AACvB,wBAAM,KAAK;AAEX,sBAAI,CAAC,GAAG,UAAU;AACd,2BAAO;AAAA,kBACX;AAEA,sBAAI,GAAG,SAAS,WAAW,eAAe,cAAc,MAAM,CAAC,CAAC,GAAG;AAC/D,2BAAO;AAAA,kBACX;AAEA,yBAAO,gBAAgB,QAAQ,OAAO;AAAA,gBAC1C;AAAA,gBACA,SAAS;AAAA,gBACT,oBAAoB;AAAA,gBACpB,UAAU;AAAA,cACd;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;","names":["default"]}
+{"version":3,"sources":["../../../../src/cli/plugins/view/index.ts"],"sourcesContent":["import {NormalModule} from \"@rspack/core\";\n\nimport {definePlugin} from \"@main/plugin\";\n\nimport {onlyViaTopLevelEntry} from \"@cli/bundler\";\nimport {getResolvePath, getSourcePath} from \"@cli/resolvers/path\";\n\nexport {default as View} from \"./View\";\n\nexport default definePlugin(() => {\n    return {\n        name: \"adnbn:view\",\n        bundler: ({config}) => {\n            const entryTypeFilter = onlyViaTopLevelEntry([\n                \"page\",\n                \"popup\",\n                \"sidebar\",\n                \"offscreen\",\n                \"options\",\n                \"newtab\",\n                \"bookmarks\",\n                \"history\",\n            ]);\n\n            return {\n                optimization: {\n                    splitChunks: {\n                        cacheGroups: {\n                            adnbnView: {\n                                minChunks: 2,\n                                minSize: 0,\n                                name: \"common.view\",\n                                test: (module, context) => {\n                                    const nm = module as NormalModule;\n\n                                    if (!nm.resource) {\n                                        return false;\n                                    }\n\n                                    if (nm.resource.startsWith(getResolvePath(getSourcePath(config)))) {\n                                        return false;\n                                    }\n\n                                    return entryTypeFilter(module, context);\n                                },\n                                enforce: false,\n                                reuseExistingChunk: true,\n                                priority: 50,\n                            },\n                        },\n                    },\n                },\n            };\n        },\n    };\n});\n"],"mappings":"AAEA,SAAQ,oBAAmB;AAE3B,SAAQ,4BAA2B;AACnC,SAAQ,gBAAgB,qBAAoB;AAE5C,SAAmB,WAAXA,gBAAsB;AAE9B,IAAO,eAAQ,aAAa,MAAM;AAC9B,SAAO;AAAA,IACH,MAAM;AAAA,IACN,SAAS,CAAC,EAAC,OAAM,MAAM;AACnB,YAAM,kBAAkB,qBAAqB;AAAA,QACzC;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACJ,CAAC;AAED,aAAO;AAAA,QACH,cAAc;AAAA,UACV,aAAa;AAAA,YACT,aAAa;AAAA,cACT,WAAW;AAAA,gBACP,WAAW;AAAA,gBACX,SAAS;AAAA,gBACT,MAAM;AAAA,gBACN,MAAM,CAAC,QAAQ,YAAY;AACvB,wBAAM,KAAK;AAEX,sBAAI,CAAC,GAAG,UAAU;AACd,2BAAO;AAAA,kBACX;AAEA,sBAAI,GAAG,SAAS,WAAW,eAAe,cAAc,MAAM,CAAC,CAAC,GAAG;AAC/D,2BAAO;AAAA,kBACX;AAEA,yBAAO,gBAAgB,QAAQ,OAAO;AAAA,gBAC1C;AAAA,gBACA,SAAS;AAAA,gBACT,oBAAoB;AAAA,gBACpB,UAAU;AAAA,cACd;AAAA,YACJ;AAAA,UACJ;AAAA,QACJ;AAAA,MACJ;AAAA,IACJ;AAAA,EACJ;AACJ,CAAC;","names":["default"]}

package/dist/cli/resolvers/config.js

@@ -17,6 +17,7 @@ import {
   pluginOptimization,
   pluginOptions,
   pluginOutput,
+  pluginOverride,
   pluginPage,
   pluginPopup,
   pluginPublic,
@@ -308,6 +309,7 @@ var config_default = async (config) => {
     pluginContent(),
     pluginBackground(),
     pluginOptions(),
+    pluginOverride(),
     pluginPopup(),
     pluginPublic(),
     pluginSidebar(),

package/dist/cli/resolvers/config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/cli/resolvers/config.ts"],"sourcesContent":["import {existsSync} from \"fs\";\nimport dotenv, {type DotenvParseOutput} from \"dotenv\";\nimport {loadConfig} from \"c12\";\nimport _ from \"lodash\";\n\nimport {\n    pluginAsset,\n    pluginBackground,\n    pluginBundler,\n    pluginContent,\n    pluginDotenv,\n    pluginHtml,\n    pluginIcon,\n    pluginLocale,\n    pluginMeta,\n    pluginOffscreen,\n    pluginManifest,\n    pluginOptimization,\n    pluginOptions,\n    pluginOutput,\n    pluginPage,\n    pluginPopup,\n    pluginPublic,\n    pluginReact,\n    pluginSandbox,\n    pluginSidebar,\n    pluginStyle,\n    pluginTypescript,\n    pluginVersion,\n    pluginView,\n} from \"../plugins\";\n\nimport {fromRootPath, getAppPath, getAppSourcePath, getConfigFile} from \"../resolvers/path\";\n\nimport type {Config, OptionalConfig, ReadonlyConfig, UserConfig} from \"@typing/config\";\nimport {Command, Mode, Workspace} from \"@typing/app\";\nimport {Browser} from \"@typing/browser\";\nimport {Plugin} from \"@typing/plugin\";\nimport {ManifestVersion} from \"@typing/manifest\";\nimport {Language, LanguageCodes} from \"@typing/locale\";\nimport {DefaultIconGroupName} from \"@typing/icon\";\n\nconst resolveLanguage = (lang?: `${Language}` | Language): Language => {\n    if (!lang) {\n        return Language.English;\n    }\n\n    if (LanguageCodes.has(lang)) {\n        return lang as Language;\n    }\n\n    throw new Error(`Invalid language \"${lang}\" provided by config`);\n};\n\nconst resolveWorkspace = (workspace?: Workspace | `${Workspace}`): Workspace => {\n    if (!workspace) {\n        return Workspace.Single;\n    }\n\n    if (Object.values(Workspace).includes(workspace as Workspace)) {\n        return workspace as Workspace;\n    }\n\n    throw new Error(`Invalid workspace \"${workspace}\" provided by config`);\n};\n\nconst resolveSharedDir = (workspace: Workspace, sharedDir: string): string => {\n    return workspace === Workspace.Multi ? sharedDir : \".\";\n};\n\nconst getUserConfig = async (config: ReadonlyConfig): Promise<UserConfig> => {\n    const configFilePath = getConfigFile(config);\n\n    if (existsSync(configFilePath)) {\n        const {config: userConfig} = await loadConfig<UserConfig>({\n            configFile: configFilePath,\n            dotenv: true,\n        });\n\n        if (config.debug) {\n            console.log(\"Loaded user config:\", configFilePath);\n        }\n\n        return userConfig || {};\n    } else if (config.debug) {\n        console.warn(\"Config file not found:\", configFilePath);\n    }\n\n    return {};\n};\n\nconst validateConfig = (config: ReadonlyConfig): ReadonlyConfig => {\n    const {\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        htmlDir,\n        publicDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n    } = config;\n\n    if (\n        [\n            outDir,\n            srcDir,\n            sharedDir,\n            appsDir,\n            appSrcDir,\n            jsDir,\n            cssDir,\n            assetsDir,\n            htmlDir,\n            publicDir,\n            localeDir,\n            iconSrcDir,\n            iconOutDir,\n        ]\n            .filter(dir => _.isString(dir))\n            .some(dir => dir.includes(\"..\"))\n    ) {\n        throw new Error('Directory paths cannot contain relative paths (\"..\") for security reasons.');\n    }\n\n    if (appsDir === sharedDir) {\n        throw new Error(\"Apps directory (appsDir) and shared directory (sharedDir) cannot be the same.\");\n    }\n\n    if (srcDir === outDir) {\n        throw new Error(\"Source directory (srcDir) and destination directory (outputDir) cannot be the same.\");\n    }\n\n    if (srcDir === \".\") {\n        throw new Error('Source directory cannot be the root directory (\".\") for security reasons.');\n    }\n\n    if (publicDir === \".\" || [srcDir, outDir, appSrcDir].includes(publicDir)) {\n        throw new Error(\n            'Public directory cannot be the root directory (\".\") or intersect with other root directories for security reasons.'\n        );\n    }\n\n    return config;\n};\n\nconst updateLocalDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, app, browser, manifestVersion} = config;\n\n    const localVars: DotenvParseOutput = {\n        APP: app,\n        BROWSER: browser,\n        MODE: mode,\n        MANIFEST_VERSION: String(manifestVersion),\n    };\n\n    Object.assign(process.env, localVars);\n\n    return localVars;\n};\n\nconst loadDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, browser, debug} = config;\n\n    const preset = [\n        `.env.${mode}.${browser}.local`,\n        `.env.${mode}.${browser}`,\n        `.env.${browser}.local`,\n        `.env.${browser}`,\n        `.env.${mode}.local`,\n        `.env.${mode}`,\n        `.env.local`,\n        `.env`,\n    ];\n\n    const appSourcePaths = preset.map(file => getAppSourcePath(config, file));\n    const appPaths = preset.map(file => getAppPath(config, file));\n    const rootPaths = preset.map(file => fromRootPath(config, file));\n\n    const paths = [...appSourcePaths, ...appPaths, ...rootPaths];\n\n    const {parsed: fileVars = {}} = dotenv.config({path: paths, quiet: !debug});\n\n    return {...fileVars, ...updateLocalDotenv(config)};\n};\n\nexport default async (config: OptionalConfig): Promise<Config> => {\n    let {\n        command = Command.Build,\n        debug = false,\n        configFile = \"adnbn.config.ts\",\n        browser = Browser.Chrome,\n        app = \"myapp\",\n        name = app,\n        description,\n        shortName,\n        version = \"VERSION\",\n        minimumVersion = \"MINIMUM_VERSION\",\n        author = undefined,\n        homepage = \"HOMEPAGE\",\n        icon = DefaultIconGroupName,\n        lang = Language.English,\n        incognito,\n        specific,\n        workspace = Workspace.Single,\n        rootDir = \".\",\n        outDir = \"dist\",\n        srcDir = \"src\",\n        sharedDir = \"shared\",\n        appsDir = \"apps\",\n        appSrcDir = \".\",\n        localeDir = \"locales\",\n        iconSrcDir = \"icons\",\n        iconOutDir = \"icons\",\n        jsDir = \"js\",\n        cssDir = \"css\",\n        assetsDir = \"assets\",\n        publicDir = \"public\",\n        htmlDir = \".\",\n        html = [],\n        bundler = {},\n        env = {},\n        manifest,\n        manifestVersion = (new Set<Browser>([Browser.Safari]).has(browser) ? 2 : 3) as ManifestVersion,\n        mode = Mode.Development,\n        analyze = false,\n        plugins = [],\n        mergeBackground = false,\n        mergeCommands = false,\n        mergeContentScripts = false,\n        concatContentScripts = true,\n        mergeStyles = true,\n        mergeIcons = false,\n        mergeLocales = true,\n        mergePages = false,\n        mergePopup = false,\n        mergePublic = false,\n        multiplePopup = false,\n        mergeSidebar = false,\n        multipleSidebar = false,\n        mergeRelay = false,\n        mergeService = false,\n        mergeOffscreen = false,\n        mergeSandbox = false,\n        commonChunks = true,\n        artifactName = \"[name]-[browser]-[mv]\",\n        assetsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:4][ext]\"\n            : \"[name]-[contenthash:4][ext]\",\n        jsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].js\"\n            : \"[name].js\",\n        cssFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].css\"\n            : \"[name].css\",\n        cssIdentName = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[app]-[hash:base64:5]\"\n            : \"[local]-[hash:base64:5]\",\n    } = config;\n\n    let resolvedConfig: Config = {\n        command,\n        debug,\n        mode,\n        browser,\n        app,\n        name,\n        description,\n        shortName,\n        version,\n        minimumVersion,\n        author,\n        homepage,\n        lang: resolveLanguage(lang),\n        icon,\n        incognito,\n        specific,\n        manifest,\n        manifestVersion,\n        workspace: resolveWorkspace(workspace),\n        rootDir,\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        publicDir,\n        htmlDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n        html,\n        bundler,\n        env,\n        plugins,\n        analyze,\n        configFile,\n        mergeBackground,\n        mergeCommands,\n        mergeContentScripts,\n        concatContentScripts,\n        mergeStyles,\n        mergeIcons,\n        mergeLocales,\n        mergePages,\n        mergePopup,\n        mergePublic,\n        multiplePopup,\n        mergeSidebar,\n        multipleSidebar,\n        mergeRelay,\n        mergeService,\n        mergeOffscreen,\n        mergeSandbox,\n        commonChunks,\n        artifactName,\n        assetsFilename,\n        jsFilename,\n        cssFilename,\n        cssIdentName,\n    };\n\n    let vars = loadDotenv(resolvedConfig);\n\n    const {\n        plugins: userPlugins = [],\n        lang: userLang,\n        workspace: userWorkspace,\n        ...userConfig\n    } = await getUserConfig(resolvedConfig);\n\n    resolvedConfig = {\n        ...resolvedConfig,\n        ...userConfig,\n        lang: resolveLanguage(userLang ?? resolvedConfig.lang),\n        workspace: resolveWorkspace(userWorkspace ?? resolvedConfig.workspace),\n    };\n\n    resolvedConfig.sharedDir = resolveSharedDir(resolvedConfig.workspace, resolvedConfig.sharedDir);\n\n    resolvedConfig = validateConfig(resolvedConfig);\n\n    vars = {...vars, ...loadDotenv(resolvedConfig)};\n\n    /**\n     * IMPORTANT: the order of plugins matters. Early plugins prepare the environment and artifacts for the following ones\n     * (e.g., environment variables/output/transpilation/assets → page/version generation → bundling).\n     * Reordering may result in missing artifacts, incorrect configuration, or build failures.\n     */\n    const corePlugins: Plugin[] = [\n        pluginDotenv(vars),\n        pluginOutput(),\n        pluginOptimization(),\n        pluginTypescript(),\n        pluginReact(),\n        pluginIcon(),\n        pluginAsset(),\n        pluginStyle(),\n        pluginLocale(),\n        pluginMeta(),\n        pluginContent(),\n        pluginBackground(),\n        pluginOptions(),\n        pluginPopup(),\n        pluginPublic(),\n        pluginSidebar(),\n        pluginOffscreen(),\n        pluginSandbox(),\n        pluginPage(),\n        pluginView(),\n        pluginHtml(),\n        pluginVersion(),\n        pluginBundler(),\n        pluginManifest(),\n    ];\n\n    return {\n        ...resolvedConfig,\n        plugins: [...plugins, ...userPlugins, ...corePlugins],\n    };\n};\n"],"mappings":"AAAA,SAAQ,kBAAiB;AACzB,OAAO,YAAsC;AAC7C,SAAQ,kBAAiB;AACzB,OAAO,OAAO;AAEd;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAEP,SAAQ,cAAc,YAAY,kBAAkB,qBAAoB;AAGxE,SAAQ,SAAS,MAAM,iBAAgB;AACvC,SAAQ,eAAc;AAGtB,SAAQ,UAAU,qBAAoB;AACtC,SAAQ,4BAA2B;AAEnC,MAAM,kBAAkB,CAAC,SAA8C;AACnE,MAAI,CAAC,MAAM;AACP,WAAO,SAAS;AAAA,EACpB;AAEA,MAAI,cAAc,IAAI,IAAI,GAAG;AACzB,WAAO;AAAA,EACX;AAEA,QAAM,IAAI,MAAM,qBAAqB,IAAI,sBAAsB;AACnE;AAEA,MAAM,mBAAmB,CAAC,cAAsD;AAC5E,MAAI,CAAC,WAAW;AACZ,WAAO,UAAU;AAAA,EACrB;AAEA,MAAI,OAAO,OAAO,SAAS,EAAE,SAAS,SAAsB,GAAG;AAC3D,WAAO;AAAA,EACX;AAEA,QAAM,IAAI,MAAM,sBAAsB,SAAS,sBAAsB;AACzE;AAEA,MAAM,mBAAmB,CAAC,WAAsB,cAA8B;AAC1E,SAAO,cAAc,UAAU,QAAQ,YAAY;AACvD;AAEA,MAAM,gBAAgB,OAAO,WAAgD;AACzE,QAAM,iBAAiB,cAAc,MAAM;AAE3C,MAAI,WAAW,cAAc,GAAG;AAC5B,UAAM,EAAC,QAAQ,WAAU,IAAI,MAAM,WAAuB;AAAA,MACtD,YAAY;AAAA,MACZ,QAAQ;AAAA,IACZ,CAAC;AAED,QAAI,OAAO,OAAO;AACd,cAAQ,IAAI,uBAAuB,cAAc;AAAA,IACrD;AAEA,WAAO,cAAc,CAAC;AAAA,EAC1B,WAAW,OAAO,OAAO;AACrB,YAAQ,KAAK,0BAA0B,cAAc;AAAA,EACzD;AAEA,SAAO,CAAC;AACZ;AAEA,MAAM,iBAAiB,CAAC,WAA2C;AAC/D,QAAM;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ,IAAI;AAEJ,MACI;AAAA,IACI;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ,EACK,OAAO,SAAO,EAAE,SAAS,GAAG,CAAC,EAC7B,KAAK,SAAO,IAAI,SAAS,IAAI,CAAC,GACrC;AACE,UAAM,IAAI,MAAM,4EAA4E;AAAA,EAChG;AAEA,MAAI,YAAY,WAAW;AACvB,UAAM,IAAI,MAAM,+EAA+E;AAAA,EACnG;AAEA,MAAI,WAAW,QAAQ;AACnB,UAAM,IAAI,MAAM,qFAAqF;AAAA,EACzG;AAEA,MAAI,WAAW,KAAK;AAChB,UAAM,IAAI,MAAM,2EAA2E;AAAA,EAC/F;AAEA,MAAI,cAAc,OAAO,CAAC,QAAQ,QAAQ,SAAS,EAAE,SAAS,SAAS,GAAG;AACtE,UAAM,IAAI;AAAA,MACN;AAAA,IACJ;AAAA,EACJ;AAEA,SAAO;AACX;AAEA,MAAM,oBAAoB,CAAC,WAA8C;AACrE,QAAM,EAAC,MAAM,KAAK,SAAS,gBAAe,IAAI;AAE9C,QAAM,YAA+B;AAAA,IACjC,KAAK;AAAA,IACL,SAAS;AAAA,IACT,MAAM;AAAA,IACN,kBAAkB,OAAO,eAAe;AAAA,EAC5C;AAEA,SAAO,OAAO,QAAQ,KAAK,SAAS;AAEpC,SAAO;AACX;AAEA,MAAM,aAAa,CAAC,WAA8C;AAC9D,QAAM,EAAC,MAAM,SAAS,MAAK,IAAI;AAE/B,QAAM,SAAS;AAAA,IACX,QAAQ,IAAI,IAAI,OAAO;AAAA,IACvB,QAAQ,IAAI,IAAI,OAAO;AAAA,IACvB,QAAQ,OAAO;AAAA,IACf,QAAQ,OAAO;AAAA,IACf,QAAQ,IAAI;AAAA,IACZ,QAAQ,IAAI;AAAA,IACZ;AAAA,IACA;AAAA,EACJ;AAEA,QAAM,iBAAiB,OAAO,IAAI,UAAQ,iBAAiB,QAAQ,IAAI,CAAC;AACxE,QAAM,WAAW,OAAO,IAAI,UAAQ,WAAW,QAAQ,IAAI,CAAC;AAC5D,QAAM,YAAY,OAAO,IAAI,UAAQ,aAAa,QAAQ,IAAI,CAAC;AAE/D,QAAM,QAAQ,CAAC,GAAG,gBAAgB,GAAG,UAAU,GAAG,SAAS;AAE3D,QAAM,EAAC,QAAQ,WAAW,CAAC,EAAC,IAAI,OAAO,OAAO,EAAC,MAAM,OAAO,OAAO,CAAC,MAAK,CAAC;AAE1E,SAAO,EAAC,GAAG,UAAU,GAAG,kBAAkB,MAAM,EAAC;AACrD;AAEA,IAAO,iBAAQ,OAAO,WAA4C;AAC9D,MAAI;AAAA,IACA,UAAU,QAAQ;AAAA,IAClB,QAAQ;AAAA,IACR,aAAa;AAAA,IACb,UAAU,QAAQ;AAAA,IAClB,MAAM;AAAA,IACN,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA,UAAU;AAAA,IACV,iBAAiB;AAAA,IACjB,SAAS;AAAA,IACT,WAAW;AAAA,IACX,OAAO;AAAA,IACP,OAAO,SAAS;AAAA,IAChB;AAAA,IACA;AAAA,IACA,YAAY,UAAU;AAAA,IACtB,UAAU;AAAA,IACV,SAAS;AAAA,IACT,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,aAAa;AAAA,IACb,aAAa;AAAA,IACb,QAAQ;AAAA,IACR,SAAS;AAAA,IACT,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,OAAO,CAAC;AAAA,IACR,UAAU,CAAC;AAAA,IACX,MAAM,CAAC;AAAA,IACP;AAAA,IACA,mBAAmB,oBAAI,IAAa,CAAC,QAAQ,MAAM,CAAC,GAAE,IAAI,OAAO,IAAI,IAAI;AAAA,IACzE,OAAO,KAAK;AAAA,IACZ,UAAU;AAAA,IACV,UAAU,CAAC;AAAA,IACX,kBAAkB;AAAA,IAClB,gBAAgB;AAAA,IAChB,sBAAsB;AAAA,IACtB,uBAAuB;AAAA,IACvB,cAAc;AAAA,IACd,aAAa;AAAA,IACb,eAAe;AAAA,IACf,aAAa;AAAA,IACb,aAAa;AAAA,IACb,cAAc;AAAA,IACd,gBAAgB;AAAA,IAChB,eAAe;AAAA,IACf,kBAAkB;AAAA,IAClB,aAAa;AAAA,IACb,eAAe;AAAA,IACf,iBAAiB;AAAA,IACjB,eAAe;AAAA,IACf,eAAe;AAAA,IACf,eAAe;AAAA,IACf,iBAAiB,SAAS,KAAK,cAAc,YAAY,QAAQ,SAAS,CAAC,QACrE,yBACA;AAAA,IACN,aAAa,SAAS,KAAK,cAAc,YAAY,QAAQ,SAAS,CAAC,QACjE,uBACA;AAAA,IACN,cAAc,SAAS,KAAK,cAAc,YAAY,QAAQ,SAAS,CAAC,QAClE,wBACA;AAAA,IACN,eAAe,SAAS,KAAK,cAAc,YAAY,QAAQ,SAAS,CAAC,QACnE,0BACA;AAAA,EACV,IAAI;AAEJ,MAAI,iBAAyB;AAAA,IACzB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,MAAM,gBAAgB,IAAI;AAAA,IAC1B;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,WAAW,iBAAiB,SAAS;AAAA,IACrC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACJ;AAEA,MAAI,OAAO,WAAW,cAAc;AAEpC,QAAM;AAAA,IACF,SAAS,cAAc,CAAC;AAAA,IACxB,MAAM;AAAA,IACN,WAAW;AAAA,IACX,GAAG;AAAA,EACP,IAAI,MAAM,cAAc,cAAc;AAEtC,mBAAiB;AAAA,IACb,GAAG;AAAA,IACH,GAAG;AAAA,IACH,MAAM,gBAAgB,YAAY,eAAe,IAAI;AAAA,IACrD,WAAW,iBAAiB,iBAAiB,eAAe,SAAS;AAAA,EACzE;AAEA,iBAAe,YAAY,iBAAiB,eAAe,WAAW,eAAe,SAAS;AAE9F,mBAAiB,eAAe,cAAc;AAE9C,SAAO,EAAC,GAAG,MAAM,GAAG,WAAW,cAAc,EAAC;AAO9C,QAAM,cAAwB;AAAA,IAC1B,aAAa,IAAI;AAAA,IACjB,aAAa;AAAA,IACb,mBAAmB;AAAA,IACnB,iBAAiB;AAAA,IACjB,YAAY;AAAA,IACZ,WAAW;AAAA,IACX,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ,aAAa;AAAA,IACb,WAAW;AAAA,IACX,cAAc;AAAA,IACd,iBAAiB;AAAA,IACjB,cAAc;AAAA,IACd,YAAY;AAAA,IACZ,aAAa;AAAA,IACb,cAAc;AAAA,IACd,gBAAgB;AAAA,IAChB,cAAc;AAAA,IACd,WAAW;AAAA,IACX,WAAW;AAAA,IACX,WAAW;AAAA,IACX,cAAc;AAAA,IACd,cAAc;AAAA,IACd,eAAe;AAAA,EACnB;AAEA,SAAO;AAAA,IACH,GAAG;AAAA,IACH,SAAS,CAAC,GAAG,SAAS,GAAG,aAAa,GAAG,WAAW;AAAA,EACxD;AACJ;","names":[]}
+{"version":3,"sources":["../../../src/cli/resolvers/config.ts"],"sourcesContent":["import {existsSync} from \"fs\";\nimport dotenv, {type DotenvParseOutput} from \"dotenv\";\nimport {loadConfig} from \"c12\";\nimport _ from \"lodash\";\n\nimport {\n    pluginAsset,\n    pluginBackground,\n    pluginBundler,\n    pluginContent,\n    pluginDotenv,\n    pluginHtml,\n    pluginIcon,\n    pluginLocale,\n    pluginMeta,\n    pluginOffscreen,\n    pluginManifest,\n    pluginOptimization,\n    pluginOptions,\n    pluginOutput,\n    pluginOverride,\n    pluginPage,\n    pluginPopup,\n    pluginPublic,\n    pluginReact,\n    pluginSandbox,\n    pluginSidebar,\n    pluginStyle,\n    pluginTypescript,\n    pluginVersion,\n    pluginView,\n} from \"../plugins\";\n\nimport {fromRootPath, getAppPath, getAppSourcePath, getConfigFile} from \"../resolvers/path\";\n\nimport type {Config, OptionalConfig, ReadonlyConfig, UserConfig} from \"@typing/config\";\nimport {Command, Mode, Workspace} from \"@typing/app\";\nimport {Browser} from \"@typing/browser\";\nimport {Plugin} from \"@typing/plugin\";\nimport {ManifestVersion} from \"@typing/manifest\";\nimport {Language, LanguageCodes} from \"@typing/locale\";\nimport {DefaultIconGroupName} from \"@typing/icon\";\n\nconst resolveLanguage = (lang?: `${Language}` | Language): Language => {\n    if (!lang) {\n        return Language.English;\n    }\n\n    if (LanguageCodes.has(lang)) {\n        return lang as Language;\n    }\n\n    throw new Error(`Invalid language \"${lang}\" provided by config`);\n};\n\nconst resolveWorkspace = (workspace?: Workspace | `${Workspace}`): Workspace => {\n    if (!workspace) {\n        return Workspace.Single;\n    }\n\n    if (Object.values(Workspace).includes(workspace as Workspace)) {\n        return workspace as Workspace;\n    }\n\n    throw new Error(`Invalid workspace \"${workspace}\" provided by config`);\n};\n\nconst resolveSharedDir = (workspace: Workspace, sharedDir: string): string => {\n    return workspace === Workspace.Multi ? sharedDir : \".\";\n};\n\nconst getUserConfig = async (config: ReadonlyConfig): Promise<UserConfig> => {\n    const configFilePath = getConfigFile(config);\n\n    if (existsSync(configFilePath)) {\n        const {config: userConfig} = await loadConfig<UserConfig>({\n            configFile: configFilePath,\n            dotenv: true,\n        });\n\n        if (config.debug) {\n            console.log(\"Loaded user config:\", configFilePath);\n        }\n\n        return userConfig || {};\n    } else if (config.debug) {\n        console.warn(\"Config file not found:\", configFilePath);\n    }\n\n    return {};\n};\n\nconst validateConfig = (config: ReadonlyConfig): ReadonlyConfig => {\n    const {\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        htmlDir,\n        publicDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n    } = config;\n\n    if (\n        [\n            outDir,\n            srcDir,\n            sharedDir,\n            appsDir,\n            appSrcDir,\n            jsDir,\n            cssDir,\n            assetsDir,\n            htmlDir,\n            publicDir,\n            localeDir,\n            iconSrcDir,\n            iconOutDir,\n        ]\n            .filter(dir => _.isString(dir))\n            .some(dir => dir.includes(\"..\"))\n    ) {\n        throw new Error('Directory paths cannot contain relative paths (\"..\") for security reasons.');\n    }\n\n    if (appsDir === sharedDir) {\n        throw new Error(\"Apps directory (appsDir) and shared directory (sharedDir) cannot be the same.\");\n    }\n\n    if (srcDir === outDir) {\n        throw new Error(\"Source directory (srcDir) and destination directory (outputDir) cannot be the same.\");\n    }\n\n    if (srcDir === \".\") {\n        throw new Error('Source directory cannot be the root directory (\".\") for security reasons.');\n    }\n\n    if (publicDir === \".\" || [srcDir, outDir, appSrcDir].includes(publicDir)) {\n        throw new Error(\n            'Public directory cannot be the root directory (\".\") or intersect with other root directories for security reasons.'\n        );\n    }\n\n    return config;\n};\n\nconst updateLocalDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, app, browser, manifestVersion} = config;\n\n    const localVars: DotenvParseOutput = {\n        APP: app,\n        BROWSER: browser,\n        MODE: mode,\n        MANIFEST_VERSION: String(manifestVersion),\n    };\n\n    Object.assign(process.env, localVars);\n\n    return localVars;\n};\n\nconst loadDotenv = (config: ReadonlyConfig): DotenvParseOutput => {\n    const {mode, browser, debug} = config;\n\n    const preset = [\n        `.env.${mode}.${browser}.local`,\n        `.env.${mode}.${browser}`,\n        `.env.${browser}.local`,\n        `.env.${browser}`,\n        `.env.${mode}.local`,\n        `.env.${mode}`,\n        `.env.local`,\n        `.env`,\n    ];\n\n    const appSourcePaths = preset.map(file => getAppSourcePath(config, file));\n    const appPaths = preset.map(file => getAppPath(config, file));\n    const rootPaths = preset.map(file => fromRootPath(config, file));\n\n    const paths = [...appSourcePaths, ...appPaths, ...rootPaths];\n\n    const {parsed: fileVars = {}} = dotenv.config({path: paths, quiet: !debug});\n\n    return {...fileVars, ...updateLocalDotenv(config)};\n};\n\nexport default async (config: OptionalConfig): Promise<Config> => {\n    let {\n        command = Command.Build,\n        debug = false,\n        configFile = \"adnbn.config.ts\",\n        browser = Browser.Chrome,\n        app = \"myapp\",\n        name = app,\n        description,\n        shortName,\n        version = \"VERSION\",\n        minimumVersion = \"MINIMUM_VERSION\",\n        author = undefined,\n        homepage = \"HOMEPAGE\",\n        icon = DefaultIconGroupName,\n        lang = Language.English,\n        incognito,\n        specific,\n        workspace = Workspace.Single,\n        rootDir = \".\",\n        outDir = \"dist\",\n        srcDir = \"src\",\n        sharedDir = \"shared\",\n        appsDir = \"apps\",\n        appSrcDir = \".\",\n        localeDir = \"locales\",\n        iconSrcDir = \"icons\",\n        iconOutDir = \"icons\",\n        jsDir = \"js\",\n        cssDir = \"css\",\n        assetsDir = \"assets\",\n        publicDir = \"public\",\n        htmlDir = \".\",\n        html = [],\n        bundler = {},\n        env = {},\n        manifest,\n        manifestVersion = (new Set<Browser>([Browser.Safari]).has(browser) ? 2 : 3) as ManifestVersion,\n        mode = Mode.Development,\n        analyze = false,\n        plugins = [],\n        mergeBackground = false,\n        mergeCommands = false,\n        mergeContentScripts = false,\n        concatContentScripts = true,\n        mergeStyles = true,\n        mergeIcons = false,\n        mergeLocales = true,\n        mergePages = false,\n        mergePopup = false,\n        mergePublic = false,\n        multiplePopup = false,\n        mergeSidebar = false,\n        multipleSidebar = false,\n        mergeRelay = false,\n        mergeService = false,\n        mergeOffscreen = false,\n        mergeSandbox = false,\n        commonChunks = true,\n        artifactName = \"[name]-[browser]-[mv]\",\n        assetsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:4][ext]\"\n            : \"[name]-[contenthash:4][ext]\",\n        jsFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].js\"\n            : \"[name].js\",\n        cssFilename = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[contenthash:5].css\"\n            : \"[name].css\",\n        cssIdentName = mode === Mode.Production && command === Command.Build && !debug\n            ? \"[app]-[hash:base64:5]\"\n            : \"[local]-[hash:base64:5]\",\n    } = config;\n\n    let resolvedConfig: Config = {\n        command,\n        debug,\n        mode,\n        browser,\n        app,\n        name,\n        description,\n        shortName,\n        version,\n        minimumVersion,\n        author,\n        homepage,\n        lang: resolveLanguage(lang),\n        icon,\n        incognito,\n        specific,\n        manifest,\n        manifestVersion,\n        workspace: resolveWorkspace(workspace),\n        rootDir,\n        outDir,\n        srcDir,\n        sharedDir,\n        appsDir,\n        appSrcDir,\n        jsDir,\n        cssDir,\n        assetsDir,\n        publicDir,\n        htmlDir,\n        localeDir,\n        iconSrcDir,\n        iconOutDir,\n        html,\n        bundler,\n        env,\n        plugins,\n        analyze,\n        configFile,\n        mergeBackground,\n        mergeCommands,\n        mergeContentScripts,\n        concatContentScripts,\n        mergeStyles,\n        mergeIcons,\n        mergeLocales,\n        mergePages,\n        mergePopup,\n        mergePublic,\n        multiplePopup,\n        mergeSidebar,\n        multipleSidebar,\n        mergeRelay,\n        mergeService,\n        mergeOffscreen,\n        mergeSandbox,\n        commonChunks,\n        artifactName,\n        assetsFilename,\n        jsFilename,\n        cssFilename,\n        cssIdentName,\n    };\n\n    let vars = loadDotenv(resolvedConfig);\n\n    const {\n        plugins: userPlugins = [],\n        lang: userLang,\n        workspace: userWorkspace,\n        ...userConfig\n    } = await getUserConfig(resolvedConfig);\n\n    resolvedConfig = {\n        ...resolvedConfig,\n        ...userConfig,\n        lang: resolveLanguage(userLang ?? resolvedConfig.lang),\n        workspace: resolveWorkspace(userWorkspace ?? resolvedConfig.workspace),\n    };\n\n    resolvedConfig.sharedDir = resolveSharedDir(resolvedConfig.workspace, resolvedConfig.sharedDir);\n\n    resolvedConfig = validateConfig(resolvedConfig);\n\n    vars = {...vars, ...loadDotenv(resolvedConfig)};\n\n    /**\n     * IMPORTANT: the order of plugins matters. Early plugins prepare the environment and artifacts for the following ones\n     * (e.g., environment variables/output/transpilation/assets → page/version generation → bundling).\n     * Reordering may result in missing artifacts, incorrect configuration, or build failures.\n     */\n    const corePlugins: Plugin[] = [\n        pluginDotenv(vars),\n        pluginOutput(),\n        pluginOptimization(),\n        pluginTypescript(),\n        pluginReact(),\n        pluginIcon(),\n        pluginAsset(),\n        pluginStyle(),\n        pluginLocale(),\n        pluginMeta(),\n        pluginContent(),\n        pluginBackground(),\n        pluginOptions(),\n        pluginOverride(),\n        pluginPopup(),\n        pluginPublic(),\n        pluginSidebar(),\n        pluginOffscreen(),\n        pluginSandbox(),\n        pluginPage(),\n        pluginView(),\n        pluginHtml(),\n        pluginVersion(),\n        pluginBundler(),\n        pluginManifest(),\n    ];\n\n    return {\n        ...resolvedConfig,\n        plugins: [...plugins, ...userPlugins, ...corePlugins],\n    };\n};\n"],"mappings":"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","names":[]}

package/dist/cli/virtual/index.js

@@ -1,17 +1,14 @@
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/background.ts?raw
-var background_default = 'import type {BackgroundDefinition} from "adnbn";\nimport background, {isValidBackgroundDefinition, isValidBackgroundMainHandler} from "adnbn/entry/background";\n\nimport * as module from "virtual:background-entrypoint";\n\ntry {\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: BackgroundDefinition = otherDefinition;\n\n    if (isValidBackgroundDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidBackgroundMainHandler(defaultDefinition)) {\n        definition = {...definition, main: defaultDefinition};\n    }\n\n    const {main, ...options} = definition;\n\n    background({main, ...options});\n} catch (e) {\n    console.error("The background crashed on startup:", e);\n}\n';
+var background_default = 'import background, {resolveDefinition} from "adnbn/entry/background";\n\nimport * as module from "virtual:background-entrypoint";\n\ntry {\n    background(resolveDefinition(module));\n} catch (e) {\n    console.error("The background crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/command.ts?raw
-var command_default = 'import type {CommandUnresolvedDefinition} from "adnbn";\nimport command, {isValidCommandDefinition, isValidCommandExecuteFunction} from "adnbn/entry/command";\n\nimport * as module from "virtual:command-entrypoint";\n\ntry {\n    const commandName = "virtual:command-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: CommandUnresolvedDefinition = otherDefinition;\n\n    if (isValidCommandDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidCommandExecuteFunction(defaultDefinition)) {\n        definition = {...definition, execute: defaultDefinition};\n    }\n\n    const {execute, name = commandName, ...options} = definition;\n\n    command({\n        name,\n        execute,\n        ...options,\n    });\n} catch (e) {\n    console.error("The command crashed on startup:", e);\n}\n';
+var command_default = 'import command, {resolveDefinition} from "adnbn/entry/command";\n\nimport * as module from "virtual:command-entrypoint";\n\ntry {\n    command(resolveDefinition(module, "virtual:command-name"));\n} catch (e) {\n    console.error("The command crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/content.ts?raw
 var content_default = 'import contentScript, {resolveDefinition} from "virtual:content-builder";\n\nimport * as module from "virtual:content-entrypoint";\n\ntry {\n    contentScript(resolveDefinition(module));\n} catch (e) {\n    console.error("The content script crashed on startup:", e);\n}\n';
 
-// raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/transport.ts?raw
-var transport_default = 'import type {TransportOptions, TransportType, TransportUnresolvedDefinition} from "adnbn/transport";\nimport {isValidTransportDefinition, isValidTransportInitFunction} from "adnbn/entry/transport";\n\n//@ts-ignore\nimport transport from "adnbn/entry/:entry";\n\nimport * as module from "virtual:transport-entrypoint";\n\ntry {\n    const transportName = "virtual:transport-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: TransportUnresolvedDefinition<TransportOptions, TransportType> = otherDefinition;\n\n    if (isValidTransportDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidTransportInitFunction(defaultDefinition)) {\n        definition = {...definition, init: defaultDefinition};\n    }\n\n    const {init, name, ...options} = definition;\n\n    transport({name: transportName, init, ...options});\n} catch (e) {\n    console.error("The :entry crashed on startup:", e);\n}\n';
-
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/offscreen.ts?raw
-var offscreen_default = 'import type {OffscreenUnresolvedDefinition} from "adnbn";\nimport type {TransportType} from "adnbn/transport";\nimport {isValidTransportDefinition, isValidTransportInitFunction} from "adnbn/entry/transport";\nimport {Builder as OffscreenBuilder} from "adnbn/entry/offscreen";\n\nimport {Builder as ViewBuilder} from "virtual:view-framework";\n\nimport * as module from "virtual:offscreen-entrypoint";\n\ntry {\n    const offscreenName = "virtual:offscreen-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: OffscreenUnresolvedDefinition<TransportType> = otherDefinition;\n\n    if (isValidTransportDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidTransportInitFunction(defaultDefinition)) {\n        definition = {...definition, init: defaultDefinition};\n    }\n\n    const {init, main, name, ...options} = definition;\n\n    new OffscreenBuilder({\n        name: offscreenName,\n        init,\n        main,\n        ...options,\n    })\n        .view(new ViewBuilder(options))\n        .build()\n        .catch(e => {\n            console.error("Failed to build offscreen: ", e);\n        });\n} catch (e) {\n    console.error("The offscreen crashed on startup:", e);\n}\n';
+var offscreen_default = 'import offscreen, {resolveDefinition} from "adnbn/entry/offscreen";\n\nimport {Builder as ViewBuilder} from "virtual:view-builder";\n\nimport * as module from "virtual:offscreen-entrypoint";\n\ntry {\n    offscreen(resolveDefinition(module, "virtual:offscreen-name"), ViewBuilder);\n} catch (e) {\n    console.error("The offscreen crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/offscreen.background.ts?raw
 var offscreen_background_default = 'import {OffscreenBackground} from "adnbn/offscreen";\n\ntry {\n    new OffscreenBackground().build();\n} catch (e) {\n    console.error("Failed to build offscreen layer on background:", e);\n}\n';
@@ -20,10 +17,13 @@ var offscreen_background_default = 'import {OffscreenBackground} from "adnbn/off
 var relay_default = 'import relay, {resolveDefinition} from "adnbn/entry/relay";\n\nimport {Builder as ContentBuilder} from "virtual:content-builder";\n\nimport * as module from "virtual:relay-entrypoint";\n\ntry {\n    relay(resolveDefinition(module, "virtual:relay-name"), ContentBuilder);\n} catch (error) {\n    console.error("The relay crashed on startup:", error);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/sandbox.ts?raw
-var sandbox_default = 'import type {SandboxUnresolvedDefinition} from "adnbn";\nimport type {TransportType} from "adnbn/transport";\nimport {isValidTransportDefinition, isValidTransportInitFunction} from "adnbn/entry/transport";\nimport {Builder as SandboxBuilder} from "adnbn/entry/sandbox";\n\nimport {Builder as ViewBuilder} from "virtual:view-framework";\n\nimport * as module from "virtual:sandbox-entrypoint";\n\ntry {\n    const sandboxName = "virtual:sandbox-name";\n\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: SandboxUnresolvedDefinition<TransportType> = otherDefinition;\n\n    if (isValidTransportDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidTransportInitFunction(defaultDefinition)) {\n        definition = {...definition, init: defaultDefinition};\n    }\n\n    const {init, main, name, ...options} = definition;\n\n    new SandboxBuilder({\n        name: sandboxName,\n        init,\n        main,\n        ...options,\n    })\n        .view(new ViewBuilder(options))\n        .build()\n        .catch(e => {\n            console.error("Failed to build sandbox: ", e);\n        });\n} catch (e) {\n    console.error("The sandbox crashed on startup:", e);\n}\n';
+var sandbox_default = 'import sandbox, {resolveDefinition} from "adnbn/entry/sandbox";\n\nimport {Builder as ViewBuilder} from "virtual:view-builder";\n\nimport * as module from "virtual:sandbox-entrypoint";\n\ntry {\n    sandbox(resolveDefinition(module, "virtual:sandbox-name"), ViewBuilder);\n} catch (e) {\n    console.error("The sandbox crashed on startup:", e);\n}\n';
+
+// raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/service.ts?raw
+var service_default = 'import service, {resolveDefinition} from "adnbn/entry/service";\n\nimport * as module from "virtual:service-entrypoint";\n\ntry {\n    service(resolveDefinition(module, "virtual:service-name"));\n} catch (e) {\n    console.error("The service crashed on startup:", e);\n}\n';
 
 // raw-loader:/home/runner/work/addon-bone/addon-bone/src/cli/virtual/view.ts?raw
-var view_default = 'import type {ViewDefinition, ViewOptions} from "adnbn";\nimport {isViewDefinition, isValidViewDefinitionRenderValue} from "adnbn/entry/view";\n\nimport view from "virtual:view-framework";\n\nimport * as module from "virtual:view-entrypoint";\n\ntry {\n    const {default: defaultDefinition, ...otherDefinition} = module;\n\n    let definition: ViewDefinition<ViewOptions> = otherDefinition;\n\n    if (isViewDefinition(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidViewDefinitionRenderValue(defaultDefinition)) {\n        definition = {...definition, render: defaultDefinition};\n    }\n\n    view(definition);\n} catch (e) {\n    console.error("The view crashed on startup:", e);\n}\n';
+var view_default = 'import view, {resolveDefinition} from "virtual:view-builder";\n\nimport * as module from "virtual:view-entrypoint";\n\ntry {\n    view(resolveDefinition(module));\n} catch (e) {\n    console.error("The view crashed on startup:", e);\n}\n';
 
 // src/cli/virtual/index.ts
 import { inferEntrypointFramework } from "../entrypoint/index.js";
@@ -32,15 +32,12 @@ import { inferEntrypointFramework } from "../entrypoint/index.js";
 var PackageName = "adnbn";
 
 // src/cli/virtual/index.ts
-var templates = { background: background_default, command: command_default, content: content_default, offscreen: offscreen_default, relay: relay_default, sandbox: sandbox_default, view: view_default, transport: transport_default };
+var templates = { background: background_default, command: command_default, content: content_default, offscreen: offscreen_default, relay: relay_default, sandbox: sandbox_default, service: service_default, view: view_default };
 var getEntryFramework = (file, entry) => {
   return `${PackageName}/entry/${entry}/${inferEntrypointFramework(file)}`;
 };
 var getVirtualModule = (file, template) => {
-  return templates[template].replaceAll("//@ts-ignore", "").replace(`virtual:${template}-entrypoint`, file.import);
-};
-var getTransportModule = (file, name, layer) => {
-  return getVirtualModule(file, "transport").replace("virtual:transport-name", name).replaceAll(":entry", layer);
+  return templates[template].replace(`virtual:${template}-entrypoint`, file.import);
 };
 var virtualBackgroundModule = (file) => {
   return getVirtualModule(file, "background");
@@ -52,7 +49,7 @@ var virtualContentScriptModule = (file, navigation = false) => {
   return getVirtualModule(file, "content").replace(`virtual:content-builder`, navigation ? `${PackageName}/entry/content` : getEntryFramework(file, "content"));
 };
 var virtualOffscreenModule = (file, name) => {
-  return getVirtualModule(file, "offscreen").replace("virtual:offscreen-name", name).replace(`virtual:view-framework`, getEntryFramework(file, "view"));
+  return getVirtualModule(file, "offscreen").replace("virtual:offscreen-name", name).replace(`virtual:view-builder`, getEntryFramework(file, "view"));
 };
 var virtualOffscreenBackgroundModule = () => {
   return offscreen_background_default;
@@ -64,13 +61,13 @@ var virtualRelayModule = (file, name, navigation = false) => {
   );
 };
 var virtualSandboxModule = (file, name) => {
-  return getVirtualModule(file, "sandbox").replace("virtual:sandbox-name", name).replace(`virtual:view-framework`, getEntryFramework(file, "view"));
+  return getVirtualModule(file, "sandbox").replace("virtual:sandbox-name", name).replace(`virtual:view-builder`, getEntryFramework(file, "view"));
 };
 var virtualServiceModule = (file, name) => {
-  return getTransportModule(file, name, "service");
+  return getVirtualModule(file, "service").replace("virtual:service-name", name);
 };
 var virtualViewModule = (file) => {
-  return getVirtualModule(file, "view").replace(`virtual:view-framework`, getEntryFramework(file, "view"));
+  return getVirtualModule(file, "view").replace(`virtual:view-builder`, getEntryFramework(file, "view"));
 };
 export {
   virtualBackgroundModule,

package/dist/cli/virtual/virtual.d.ts

@@ -1,34 +1,6 @@
-declare module "virtual:background-entrypoint" {
-    type BackgroundDefinition = import("../../types/background.js").BackgroundDefinition;
-
-    interface ModuleType extends BackgroundDefinition {
-        default: BackgroundDefinition | BackgroundDefinition["main"] | undefined;
-    }
-
-    const module: ModuleType;
-    export = module;
-}
-
-declare module "virtual:command-entrypoint" {
-    type CommandDefinition = import("../../types/command.js").CommandDefinition;
-
-    interface ModuleType extends CommandDefinition {
-        default: CommandDefinition | CommandDefinition["execute"] | undefined;
-    }
-
-    const module: ModuleType;
-    export = module;
-}
-
-declare module "virtual:content-entrypoint" {
-    type ContentScriptDefinition = import("../../types/content/index.js").ContentScriptDefinition;
-
-    interface ModuleType {
-        [name: string]: unknown;
-        default: ContentScriptDefinition | ContentScriptDefinition["render"] | undefined;
-    }
-
-    const module: ModuleType;
+/** Generated modules import the entrypoint as a namespace and pass it to their runtime resolveDefinition(). */
+declare module "virtual:*-entrypoint" {
+    const module: {readonly [name: string]: unknown};
     export = module;
 }
 
@@ -47,85 +19,11 @@ declare module "virtual:content-builder" {
     export default content;
 }
 
-declare module "virtual:offscreen-entrypoint" {
-    type OffscreenDefinition = import("../../types/offscreen.js").OffscreenDefinition<
-        import("../../types/transport.js").TransportType
-    >;
-
-    interface ModuleType extends OffscreenDefinition {
-        default: OffscreenDefinition | OffscreenDefinition["init"] | undefined;
-    }
-
-    const module: ModuleType;
-    export = module;
-}
-
-declare module "virtual:relay-entrypoint" {
-    type RelayDefinition = import("../../types/relay.js").RelayDefinition<import("../../types/transport.js").TransportType>;
-
-    export const {
-        init,
-        main,
-        name,
-        method,
-        isolation,
-        allFrames,
-        matches,
-        excludeMatches,
-        includeGlobs,
-        excludeGlobs,
-        runAt,
-        world,
-        matchAboutBlank,
-        matchOriginAsFallback,
-        declarative,
-        marker,
-        anchor,
-        mount,
-        prepare,
-        render,
-        container,
-        boundary,
-        target,
-        watch,
-        includeBrowser,
-        excludeBrowser,
-        includeApp,
-        excludeApp,
-        mode,
-        manifestVersion,
-        debug,
-    }: Partial<RelayDefinition>;
-
-    const definition: RelayDefinition | RelayDefinition["init"] | undefined;
-    export default definition;
-}
+declare module "virtual:view-builder" {
+    export const resolveDefinition: (
+        module: object
+    ) => import("../../types/view/index.js").ViewDefinition<import("../../types/view/index.js").ViewConfig>;
 
-declare module "virtual:sandbox-entrypoint" {
-    type SandboxDefinition = import("../../types/sandbox.js").SandboxDefinition<any>;
-
-    interface ModuleType extends SandboxDefinition {
-        default: SandboxDefinition | SandboxDefinition["init"] | undefined;
-    }
-
-    const module: ModuleType;
-    export = module;
-}
-
-declare module "virtual:view-entrypoint" {
-    import {ViewOptions} from "../../types/view.js";
-
-    type ViewDefinition = import("../../types/view.js").ViewDefinition<ViewOptions>;
-
-    interface ModuleType extends ViewDefinition {
-        default: ViewDefinition | ViewDefinition["render"] | undefined;
-    }
-
-    const module: ModuleType;
-    export = module;
-}
-
-declare module "virtual:view-framework" {
     export const Builder:
         | typeof import("../../entry/view/adapters/vanilla/index.js").Builder
         | typeof import("../../entry/view/adapters/react/index.js").Builder;
@@ -135,21 +33,3 @@ declare module "virtual:view-framework" {
         | typeof import("../../entry/view/adapters/react/index.js").default;
     export default view;
 }
-
-declare module "virtual:transport-entrypoint" {
-    type TransportDefinition = import("../../types/transport.js").TransportDefinition<any, any>;
-
-    interface ModuleType extends TransportDefinition {
-        default: TransportDefinition | TransportDefinition["init"] | undefined;
-    }
-
-    const module: ModuleType;
-    export = module;
-}
-
-declare module "adnbn/entry/:entry" {
-    import type {TransportUnresolvedDefinition, TransportOptions, TransportType} from "../../types/transport.js";
-
-    const transport: (definition: TransportUnresolvedDefinition<TransportOptions, TransportType>) => void;
-    export default transport;
-}

package/dist/entry/background/Builder.js

@@ -1,5 +1,5 @@
 import Builder from "./../../entry/core/Builder.js";
-import { isValidBackgroundMainHandler } from "./resolvers/index.js";
+import { isValidBackgroundMainHandler } from "./resolvers/definition.js";
 class Builder_default extends Builder {
   constructor(definition) {
     super();

package/dist/entry/background/Builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/entry/background/Builder.ts"],"sourcesContent":["import Builder from \"@entry/core/Builder\";\n\nimport {isValidBackgroundMainHandler} from \"./resolvers\";\n\nimport {BackgroundBuilder, BackgroundDefinition} from \"@typing/background\";\n\nexport default class extends Builder implements BackgroundBuilder {\n    constructor(private readonly definition: BackgroundDefinition) {\n        super();\n    }\n\n    public async build(): Promise<void> {\n        await this.destroy();\n\n        const {main, ...options} = this.definition;\n\n        if (isValidBackgroundMainHandler(main)) {\n            await main(options);\n        }\n    }\n\n    public async destroy(): Promise<void> {\n        // Nothing to do\n    }\n}\n"],"mappings":"AAAA,OAAO,aAAa;AAEpB,SAAQ,oCAAmC;AAI3C,MAAO,wBAAsB,QAAqC;AAAA,EAC9D,YAA6B,YAAkC;AAC3D,UAAM;AADmB;AAAA,EAE7B;AAAA,EAF6B;AAAA,EAI7B,MAAa,QAAuB;AAChC,UAAM,KAAK,QAAQ;AAEnB,UAAM,EAAC,MAAM,GAAG,QAAO,IAAI,KAAK;AAEhC,QAAI,6BAA6B,IAAI,GAAG;AACpC,YAAM,KAAK,OAAO;AAAA,IACtB;AAAA,EACJ;AAAA,EAEA,MAAa,UAAyB;AAAA,EAEtC;AACJ;","names":[]}
+{"version":3,"sources":["../../../src/entry/background/Builder.ts"],"sourcesContent":["import Builder from \"@entry/core/Builder\";\n\nimport {isValidBackgroundMainHandler} from \"./resolvers/definition\";\n\nimport {BackgroundBuilder, BackgroundDefinition} from \"@typing/background\";\n\nexport default class extends Builder implements BackgroundBuilder {\n    constructor(private readonly definition: BackgroundDefinition) {\n        super();\n    }\n\n    public async build(): Promise<void> {\n        await this.destroy();\n\n        const {main, ...options} = this.definition;\n\n        if (isValidBackgroundMainHandler(main)) {\n            await main(options);\n        }\n    }\n\n    public async destroy(): Promise<void> {\n        // Nothing to do\n    }\n}\n"],"mappings":"AAAA,OAAO,aAAa;AAEpB,SAAQ,oCAAmC;AAI3C,MAAO,wBAAsB,QAAqC;AAAA,EAC9D,YAA6B,YAAkC;AAC3D,UAAM;AADmB;AAAA,EAE7B;AAAA,EAF6B;AAAA,EAI7B,MAAa,QAAuB;AAChC,UAAM,KAAK,QAAQ;AAEnB,UAAM,EAAC,MAAM,GAAG,QAAO,IAAI,KAAK;AAEhC,QAAI,6BAA6B,IAAI,GAAG;AACpC,YAAM,KAAK,OAAO;AAAA,IACtB;AAAA,EACJ;AAAA,EAEA,MAAa,UAAyB;AAAA,EAEtC;AACJ;","names":[]}

package/dist/entry/background/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./resolvers/index.js";
+export { resolveDefinition } from "./resolvers/definition.js";
 declare const _default: (definition: import("../../index.js").BackgroundDefinition) => void;
 export default _default;

package/dist/entry/background/index.js

@@ -1,7 +1,8 @@
 import Builder from "./Builder.js";
-export * from "./resolvers/index.js";
+import { resolveDefinition } from "./resolvers/definition.js";
 var background_default = Builder.resolver();
 export {
-  background_default as default
+  background_default as default,
+  resolveDefinition
 };
 //# sourceMappingURL=index.js.map

package/dist/entry/background/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/entry/background/index.ts"],"sourcesContent":["import Builder from \"./Builder\";\n\nexport * from \"./resolvers\";\n\nexport default Builder.resolver();\n"],"mappings":"AAAA,OAAO,aAAa;AAEpB,cAAc;AAEd,IAAO,qBAAQ,QAAQ,SAAS;","names":[]}
+{"version":3,"sources":["../../../src/entry/background/index.ts"],"sourcesContent":["import Builder from \"./Builder\";\n\nexport {resolveDefinition} from \"./resolvers/definition\";\n\nexport default Builder.resolver();\n"],"mappings":"AAAA,OAAO,aAAa;AAEpB,SAAQ,yBAAwB;AAEhC,IAAO,qBAAQ,QAAQ,SAAS;","names":[]}

package/dist/entry/background/resolvers/definition.d.ts

@@ -1,3 +1,7 @@
 import { BackgroundDefinition, BackgroundMainHandler } from "../../../types/background.js";
-export declare const isValidBackgroundDefinition: (definition: any) => definition is BackgroundDefinition;
 export declare const isValidBackgroundMainHandler: (main: unknown) => main is BackgroundMainHandler;
+/**
+ * Merge background exports without executing main: default options override named exports,
+ * and a default function is the main handler. Any other default value is ignored.
+ */
+export declare const resolveDefinition: (module: object) => BackgroundDefinition;

package/dist/entry/background/resolvers/definition.js

@@ -1,11 +1,22 @@
-const isValidBackgroundDefinition = (definition) => {
-  return definition && typeof definition === "object" && definition.constructor === Object;
+const isDefinitionObject = (value) => {
+  return value !== null && typeof value === "object" && value.constructor === Object;
 };
 const isValidBackgroundMainHandler = (main) => {
   return typeof main === "function";
 };
+const resolveDefinition = (module) => {
+  const { default: defaultDefinition, ...namedDefinition } = module;
+  const definition = namedDefinition;
+  if (isDefinitionObject(defaultDefinition)) {
+    return { ...definition, ...defaultDefinition };
+  }
+  if (isValidBackgroundMainHandler(defaultDefinition)) {
+    return { ...definition, main: defaultDefinition };
+  }
+  return definition;
+};
 export {
-  isValidBackgroundDefinition,
-  isValidBackgroundMainHandler
+  isValidBackgroundMainHandler,
+  resolveDefinition
 };
 //# sourceMappingURL=definition.js.map

package/dist/entry/background/resolvers/definition.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/entry/background/resolvers/definition.ts"],"sourcesContent":["import {BackgroundDefinition, BackgroundMainHandler} from \"@typing/background\";\n\nexport const isValidBackgroundDefinition = (definition: any): definition is BackgroundDefinition => {\n    return definition && typeof definition === \"object\" && definition.constructor === Object;\n};\n\nexport const isValidBackgroundMainHandler = (main: unknown): main is BackgroundMainHandler => {\n    return typeof main === \"function\";\n};\n"],"mappings":"AAEO,MAAM,8BAA8B,CAAC,eAAwD;AAChG,SAAO,cAAc,OAAO,eAAe,YAAY,WAAW,gBAAgB;AACtF;AAEO,MAAM,+BAA+B,CAAC,SAAiD;AAC1F,SAAO,OAAO,SAAS;AAC3B;","names":[]}
+{"version":3,"sources":["../../../../src/entry/background/resolvers/definition.ts"],"sourcesContent":["import {BackgroundDefinition, BackgroundMainHandler} from \"@typing/background\";\n\nconst isDefinitionObject = (value: unknown): value is BackgroundDefinition => {\n    return value !== null && typeof value === \"object\" && value.constructor === Object;\n};\n\nexport const isValidBackgroundMainHandler = (main: unknown): main is BackgroundMainHandler => {\n    return typeof main === \"function\";\n};\n\n/**\n * Merge background exports without executing main: default options override named exports,\n * and a default function is the main handler. Any other default value is ignored.\n */\nexport const resolveDefinition = (module: object): BackgroundDefinition => {\n    const {default: defaultDefinition, ...namedDefinition} = module as Record<string, unknown>;\n    const definition = namedDefinition as BackgroundDefinition;\n\n    if (isDefinitionObject(defaultDefinition)) {\n        return {...definition, ...defaultDefinition};\n    }\n\n    if (isValidBackgroundMainHandler(defaultDefinition)) {\n        return {...definition, main: defaultDefinition};\n    }\n\n    return definition;\n};\n"],"mappings":"AAEA,MAAM,qBAAqB,CAAC,UAAkD;AAC1E,SAAO,UAAU,QAAQ,OAAO,UAAU,YAAY,MAAM,gBAAgB;AAChF;AAEO,MAAM,+BAA+B,CAAC,SAAiD;AAC1F,SAAO,OAAO,SAAS;AAC3B;AAMO,MAAM,oBAAoB,CAAC,WAAyC;AACvE,QAAM,EAAC,SAAS,mBAAmB,GAAG,gBAAe,IAAI;AACzD,QAAM,aAAa;AAEnB,MAAI,mBAAmB,iBAAiB,GAAG;AACvC,WAAO,EAAC,GAAG,YAAY,GAAG,kBAAiB;AAAA,EAC/C;AAEA,MAAI,6BAA6B,iBAAiB,GAAG;AACjD,WAAO,EAAC,GAAG,YAAY,MAAM,kBAAiB;AAAA,EAClD;AAEA,SAAO;AACX;","names":[]}

package/dist/entry/command/Builder.js

@@ -1,6 +1,6 @@
 import { onActionClicked, onSpecificCommand } from "@addon-core/browser";
 import Builder from "./../../entry/core/Builder.js";
-import { isValidCommandExecuteFunction, isValidCommandName } from "./resolvers/index.js";
+import { isValidCommandExecuteFunction, isValidCommandName } from "./resolvers/definition.js";
 import {
   CommandExecuteActionName
 } from "./../../types/command.js";

package/dist/entry/command/Builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/entry/command/Builder.ts"],"sourcesContent":["import {onActionClicked, onSpecificCommand} from \"@addon-core/browser\";\n\nimport Builder from \"@entry/core/Builder\";\n\nimport {isValidCommandExecuteFunction, isValidCommandName} from \"./resolvers\";\n\nimport {\n    CommandBuilder,\n    CommandExecuteActionName,\n    CommandResolvedDefinition,\n    CommandUnresolvedDefinition,\n} from \"@typing/command\";\n\ntype Tab = chrome.tabs.Tab;\n\nexport default class extends Builder implements CommandBuilder {\n    protected readonly definition: CommandResolvedDefinition;\n\n    protected unsubscribe?: () => void;\n\n    public constructor(definition: CommandUnresolvedDefinition) {\n        super();\n\n        const {name, execute} = definition;\n\n        if (!isValidCommandExecuteFunction(execute)) {\n            throw new Error(\"The command entrypoint must export a execute function\");\n        }\n\n        if (!isValidCommandName(name)) {\n            throw new Error(\"The command entrypoint must export a name string\");\n        }\n\n        this.definition = {\n            ...definition,\n            name,\n            execute,\n        };\n    }\n\n    public async build(): Promise<void> {\n        await this.destroy();\n\n        const {name} = this.definition;\n\n        if (name == CommandExecuteActionName) {\n            this.unsubscribe = onActionClicked(tab => {\n                this.handle(tab);\n            });\n\n            return;\n        }\n\n        this.unsubscribe = onSpecificCommand(name, tab => {\n            this.handle(tab);\n        });\n    }\n\n    public async destroy(): Promise<void> {\n        this.unsubscribe?.();\n    }\n\n    protected handle(tab?: Tab): void {\n        const {name, execute, ...options} = this.definition;\n\n        try {\n            Promise.resolve(execute(tab, {name, ...options})).catch(e => {\n                console.error(\"The command execute async function crashed:\", e);\n            });\n        } catch (e) {\n            console.error(\"The command execute function crashed:\", e);\n        }\n    }\n}\n"],"mappings":"AAAA,SAAQ,iBAAiB,yBAAwB;AAEjD,OAAO,aAAa;AAEpB,SAAQ,+BAA+B,0BAAyB;AAEhE;AAAA,EAEI;AAAA,OAGG;AAIP,MAAO,wBAAsB,QAAkC;AAAA,EACxC;AAAA,EAET;AAAA,EAEH,YAAY,YAAyC;AACxD,UAAM;AAEN,UAAM,EAAC,MAAM,QAAO,IAAI;AAExB,QAAI,CAAC,8BAA8B,OAAO,GAAG;AACzC,YAAM,IAAI,MAAM,uDAAuD;AAAA,IAC3E;AAEA,QAAI,CAAC,mBAAmB,IAAI,GAAG;AAC3B,YAAM,IAAI,MAAM,kDAAkD;AAAA,IACtE;AAEA,SAAK,aAAa;AAAA,MACd,GAAG;AAAA,MACH;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,MAAa,QAAuB;AAChC,UAAM,KAAK,QAAQ;AAEnB,UAAM,EAAC,KAAI,IAAI,KAAK;AAEpB,QAAI,QAAQ,0BAA0B;AAClC,WAAK,cAAc,gBAAgB,SAAO;AACtC,aAAK,OAAO,GAAG;AAAA,MACnB,CAAC;AAED;AAAA,IACJ;AAEA,SAAK,cAAc,kBAAkB,MAAM,SAAO;AAC9C,WAAK,OAAO,GAAG;AAAA,IACnB,CAAC;AAAA,EACL;AAAA,EAEA,MAAa,UAAyB;AA1D1C;AA2DQ,eAAK,gBAAL;AAAA,EACJ;AAAA,EAEU,OAAO,KAAiB;AAC9B,UAAM,EAAC,MAAM,SAAS,GAAG,QAAO,IAAI,KAAK;AAEzC,QAAI;AACA,cAAQ,QAAQ,QAAQ,KAAK,EAAC,MAAM,GAAG,QAAO,CAAC,CAAC,EAAE,MAAM,OAAK;AACzD,gBAAQ,MAAM,+CAA+C,CAAC;AAAA,MAClE,CAAC;AAAA,IACL,SAAS,GAAG;AACR,cAAQ,MAAM,yCAAyC,CAAC;AAAA,IAC5D;AAAA,EACJ;AACJ;","names":[]}
+{"version":3,"sources":["../../../src/entry/command/Builder.ts"],"sourcesContent":["import {onActionClicked, onSpecificCommand} from \"@addon-core/browser\";\n\nimport Builder from \"@entry/core/Builder\";\n\nimport {isValidCommandExecuteFunction, isValidCommandName} from \"./resolvers/definition\";\n\nimport {\n    CommandBuilder,\n    CommandExecuteActionName,\n    CommandResolvedDefinition,\n    CommandUnresolvedDefinition,\n} from \"@typing/command\";\n\ntype Tab = chrome.tabs.Tab;\n\nexport default class extends Builder implements CommandBuilder {\n    protected readonly definition: CommandResolvedDefinition;\n\n    protected unsubscribe?: () => void;\n\n    public constructor(definition: CommandUnresolvedDefinition) {\n        super();\n\n        const {name, execute} = definition;\n\n        if (!isValidCommandExecuteFunction(execute)) {\n            throw new Error(\"The command entrypoint must export a execute function\");\n        }\n\n        if (!isValidCommandName(name)) {\n            throw new Error(\"The command entrypoint must export a name string\");\n        }\n\n        this.definition = {\n            ...definition,\n            name,\n            execute,\n        };\n    }\n\n    public async build(): Promise<void> {\n        await this.destroy();\n\n        const {name} = this.definition;\n\n        if (name == CommandExecuteActionName) {\n            this.unsubscribe = onActionClicked(tab => {\n                this.handle(tab);\n            });\n\n            return;\n        }\n\n        this.unsubscribe = onSpecificCommand(name, tab => {\n            this.handle(tab);\n        });\n    }\n\n    public async destroy(): Promise<void> {\n        this.unsubscribe?.();\n    }\n\n    protected handle(tab?: Tab): void {\n        const {name, execute, ...options} = this.definition;\n\n        try {\n            Promise.resolve(execute(tab, {name, ...options})).catch(e => {\n                console.error(\"The command execute async function crashed:\", e);\n            });\n        } catch (e) {\n            console.error(\"The command execute function crashed:\", e);\n        }\n    }\n}\n"],"mappings":"AAAA,SAAQ,iBAAiB,yBAAwB;AAEjD,OAAO,aAAa;AAEpB,SAAQ,+BAA+B,0BAAyB;AAEhE;AAAA,EAEI;AAAA,OAGG;AAIP,MAAO,wBAAsB,QAAkC;AAAA,EACxC;AAAA,EAET;AAAA,EAEH,YAAY,YAAyC;AACxD,UAAM;AAEN,UAAM,EAAC,MAAM,QAAO,IAAI;AAExB,QAAI,CAAC,8BAA8B,OAAO,GAAG;AACzC,YAAM,IAAI,MAAM,uDAAuD;AAAA,IAC3E;AAEA,QAAI,CAAC,mBAAmB,IAAI,GAAG;AAC3B,YAAM,IAAI,MAAM,kDAAkD;AAAA,IACtE;AAEA,SAAK,aAAa;AAAA,MACd,GAAG;AAAA,MACH;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,MAAa,QAAuB;AAChC,UAAM,KAAK,QAAQ;AAEnB,UAAM,EAAC,KAAI,IAAI,KAAK;AAEpB,QAAI,QAAQ,0BAA0B;AAClC,WAAK,cAAc,gBAAgB,SAAO;AACtC,aAAK,OAAO,GAAG;AAAA,MACnB,CAAC;AAED;AAAA,IACJ;AAEA,SAAK,cAAc,kBAAkB,MAAM,SAAO;AAC9C,WAAK,OAAO,GAAG;AAAA,IACnB,CAAC;AAAA,EACL;AAAA,EAEA,MAAa,UAAyB;AA1D1C;AA2DQ,eAAK,gBAAL;AAAA,EACJ;AAAA,EAEU,OAAO,KAAiB;AAC9B,UAAM,EAAC,MAAM,SAAS,GAAG,QAAO,IAAI,KAAK;AAEzC,QAAI;AACA,cAAQ,QAAQ,QAAQ,KAAK,EAAC,MAAM,GAAG,QAAO,CAAC,CAAC,EAAE,MAAM,OAAK;AACzD,gBAAQ,MAAM,+CAA+C,CAAC;AAAA,MAClE,CAAC;AAAA,IACL,SAAS,GAAG;AACR,cAAQ,MAAM,yCAAyC,CAAC;AAAA,IAC5D;AAAA,EACJ;AACJ;","names":[]}

package/dist/entry/command/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./resolvers/index.js";
+export { resolveDefinition } from "./resolvers/definition.js";
 declare const _default: (definition: Partial<import("../../index.js").CommandDefinition>) => void;
 export default _default;

package/dist/entry/command/index.js

@@ -1,7 +1,8 @@
 import Builder from "./Builder.js";
-export * from "./resolvers/index.js";
+import { resolveDefinition } from "./resolvers/definition.js";
 var command_default = Builder.resolver();
 export {
-  command_default as default
+  command_default as default,
+  resolveDefinition
 };
 //# sourceMappingURL=index.js.map

package/dist/entry/command/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/entry/command/index.ts"],"sourcesContent":["import Builder from \"./Builder\";\n\nexport * from \"./resolvers\";\n\nexport default Builder.resolver();\n"],"mappings":"AAAA,OAAO,aAAa;AAEpB,cAAc;AAEd,IAAO,kBAAQ,QAAQ,SAAS;","names":[]}
+{"version":3,"sources":["../../../src/entry/command/index.ts"],"sourcesContent":["import Builder from \"./Builder\";\n\nexport {resolveDefinition} from \"./resolvers/definition\";\n\nexport default Builder.resolver();\n"],"mappings":"AAAA,OAAO,aAAa;AAEpB,SAAQ,yBAAwB;AAEhC,IAAO,kBAAQ,QAAQ,SAAS;","names":[]}

package/dist/entry/command/resolvers/definition.d.ts

@@ -1,4 +1,8 @@
-import { CommandDefinition, CommandExecute } from "../../../types/command.js";
-export declare const isValidCommandDefinition: (definition: any) => definition is CommandDefinition;
+import { CommandExecute, CommandUnresolvedDefinition } from "../../../types/command.js";
 export declare const isValidCommandExecuteFunction: (execute: any) => execute is CommandExecute;
 export declare const isValidCommandName: (name: any) => name is string;
+/**
+ * Merge command exports without executing them: default options override named exports,
+ * and a default function is the execute handler. The build supplies the authoritative name.
+ */
+export declare const resolveDefinition: (module: object, name: string) => CommandUnresolvedDefinition;

package/dist/entry/command/resolvers/definition.js

@@ -1,5 +1,5 @@
-const isValidCommandDefinition = (definition) => {
-  return definition && typeof definition === "object" && definition.constructor === Object;
+const isDefinitionObject = (value) => {
+  return value !== null && typeof value === "object" && value.constructor === Object;
 };
 const isValidCommandExecuteFunction = (execute) => {
   return execute && typeof execute === "function";
@@ -7,9 +7,19 @@ const isValidCommandExecuteFunction = (execute) => {
 const isValidCommandName = (name) => {
   return name && typeof name === "string" && name.trim().length > 0;
 };
+const resolveDefinition = (module, name) => {
+  const { default: defaultDefinition, ...namedDefinition } = module;
+  let definition = namedDefinition;
+  if (isDefinitionObject(defaultDefinition)) {
+    definition = { ...definition, ...defaultDefinition };
+  } else if (isValidCommandExecuteFunction(defaultDefinition)) {
+    definition = { ...definition, execute: defaultDefinition };
+  }
+  return { ...definition, name };
+};
 export {
-  isValidCommandDefinition,
   isValidCommandExecuteFunction,
-  isValidCommandName
+  isValidCommandName,
+  resolveDefinition
 };
 //# sourceMappingURL=definition.js.map

package/dist/entry/command/resolvers/definition.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/entry/command/resolvers/definition.ts"],"sourcesContent":["import {CommandDefinition, CommandExecute} from \"@typing/command\";\n\nexport const isValidCommandDefinition = (definition: any): definition is CommandDefinition => {\n    return definition && typeof definition === \"object\" && definition.constructor === Object;\n};\n\nexport const isValidCommandExecuteFunction = (execute: any): execute is CommandExecute => {\n    return execute && typeof execute === \"function\";\n};\n\nexport const isValidCommandName = (name: any): name is string => {\n    return name && typeof name === \"string\" && name.trim().length > 0;\n};\n"],"mappings":"AAEO,MAAM,2BAA2B,CAAC,eAAqD;AAC1F,SAAO,cAAc,OAAO,eAAe,YAAY,WAAW,gBAAgB;AACtF;AAEO,MAAM,gCAAgC,CAAC,YAA4C;AACtF,SAAO,WAAW,OAAO,YAAY;AACzC;AAEO,MAAM,qBAAqB,CAAC,SAA8B;AAC7D,SAAO,QAAQ,OAAO,SAAS,YAAY,KAAK,KAAK,EAAE,SAAS;AACpE;","names":[]}
+{"version":3,"sources":["../../../../src/entry/command/resolvers/definition.ts"],"sourcesContent":["import {CommandDefinition, CommandExecute, CommandUnresolvedDefinition} from \"@typing/command\";\n\nconst isDefinitionObject = (value: unknown): value is CommandDefinition => {\n    return value !== null && typeof value === \"object\" && value.constructor === Object;\n};\n\nexport const isValidCommandExecuteFunction = (execute: any): execute is CommandExecute => {\n    return execute && typeof execute === \"function\";\n};\n\nexport const isValidCommandName = (name: any): name is string => {\n    return name && typeof name === \"string\" && name.trim().length > 0;\n};\n\n/**\n * Merge command exports without executing them: default options override named exports,\n * and a default function is the execute handler. The build supplies the authoritative name.\n */\nexport const resolveDefinition = (module: object, name: string): CommandUnresolvedDefinition => {\n    const {default: defaultDefinition, ...namedDefinition} = module as Record<string, unknown>;\n\n    let definition = namedDefinition as CommandUnresolvedDefinition;\n\n    if (isDefinitionObject(defaultDefinition)) {\n        definition = {...definition, ...defaultDefinition};\n    } else if (isValidCommandExecuteFunction(defaultDefinition)) {\n        definition = {...definition, execute: defaultDefinition};\n    }\n\n    return {...definition, name};\n};\n"],"mappings":"AAEA,MAAM,qBAAqB,CAAC,UAA+C;AACvE,SAAO,UAAU,QAAQ,OAAO,UAAU,YAAY,MAAM,gBAAgB;AAChF;AAEO,MAAM,gCAAgC,CAAC,YAA4C;AACtF,SAAO,WAAW,OAAO,YAAY;AACzC;AAEO,MAAM,qBAAqB,CAAC,SAA8B;AAC7D,SAAO,QAAQ,OAAO,SAAS,YAAY,KAAK,KAAK,EAAE,SAAS;AACpE;AAMO,MAAM,oBAAoB,CAAC,QAAgB,SAA8C;AAC5F,QAAM,EAAC,SAAS,mBAAmB,GAAG,gBAAe,IAAI;AAEzD,MAAI,aAAa;AAEjB,MAAI,mBAAmB,iBAAiB,GAAG;AACvC,iBAAa,EAAC,GAAG,YAAY,GAAG,kBAAiB;AAAA,EACrD,WAAW,8BAA8B,iBAAiB,GAAG;AACzD,iBAAa,EAAC,GAAG,YAAY,SAAS,kBAAiB;AAAA,EAC3D;AAEA,SAAO,EAAC,GAAG,YAAY,KAAI;AAC/B;","names":[]}

package/dist/entry/content/adapters/react/Builder.js

@@ -1,4 +1,6 @@
-import { createElement, isValidElement } from "react";
+import { createElement } from "react";
+import { isDomRenderValue } from "./../../../../entry/core/render.js";
+import { isReactRenderValue } from "./../../../../entry/core/react.js";
 import ReactNode from "./Node.js";
 import MountBuilder from "../../lifecycle/MountBuilder.js";
 class Builder extends MountBuilder {
@@ -8,7 +10,7 @@ class Builder extends MountBuilder {
     }
     return (props) => {
       const value = typeof render === "function" ? createElement(render, props) : render;
-      return isValidElement(value) ? value : void 0;
+      return isDomRenderValue(value) || isReactRenderValue(value) ? value : void 0;
     };
   }
   createRenderer(node, render, props, options) {

package/dist/entry/content/adapters/react/Builder.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/entry/content/adapters/react/Builder.ts"],"sourcesContent":["import {createElement, isValidElement} from \"react\";\n\nimport ReactNode from \"./Node\";\n\nimport MountBuilder from \"../../lifecycle/MountBuilder\";\nimport type {ContentScriptRenderOptions} from \"../../lifecycle/types\";\n\nimport type {\n    ContentScriptNode,\n    ContentScriptIsolation,\n    ContentScriptProps,\n    ContentScriptRenderHandler,\n    ContentScriptRenderReactComponent,\n    ContentScriptRenderValue,\n} from \"@typing/content\";\n\nexport default class Builder<\n    Data = unknown,\n    Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`,\n> extends MountBuilder<Data, Isolation> {\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        return props => {\n            // Functions in React entrypoints are components; React owns their invocation and hooks.\n            const value =\n                typeof render === \"function\"\n                    ? createElement(render as ContentScriptRenderReactComponent<Data>, props)\n                    : render;\n\n            return isValidElement(value) ? value : undefined;\n        };\n    }\n\n    protected createRenderer(\n        node: ContentScriptNode,\n        render: ContentScriptRenderHandler<Data>,\n        props: () => ContentScriptProps<Data>,\n        options: ContentScriptRenderOptions\n    ): ReactNode<Data> {\n        return new ReactNode(node, render, props, options);\n    }\n}\n"],"mappings":"AAAA,SAAQ,eAAe,sBAAqB;AAE5C,OAAO,eAAe;AAEtB,OAAO,kBAAkB;AAYzB,MAAO,gBAGG,aAA8B;AAAA,EAC1B,cACN,QACmD;AACnD,QAAI,WAAW,QAAQ,WAAW,QAAW;AACzC,aAAO;AAAA,IACX;AAEA,WAAO,WAAS;AAEZ,YAAM,QACF,OAAO,WAAW,aACZ,cAAc,QAAmD,KAAK,IACtE;AAEV,aAAO,eAAe,KAAK,IAAI,QAAQ;AAAA,IAC3C;AAAA,EACJ;AAAA,EAEU,eACN,MACA,QACA,OACA,SACe;AACf,WAAO,IAAI,UAAU,MAAM,QAAQ,OAAO,OAAO;AAAA,EACrD;AACJ;","names":[]}
+{"version":3,"sources":["../../../../../src/entry/content/adapters/react/Builder.ts"],"sourcesContent":["import {createElement} from \"react\";\n\nimport {isDomRenderValue} from \"@entry/core/render\";\nimport {isReactRenderValue} from \"@entry/core/react\";\n\nimport ReactNode from \"./Node\";\n\nimport MountBuilder from \"../../lifecycle/MountBuilder\";\nimport type {ContentScriptRenderOptions} from \"../../lifecycle/types\";\n\nimport type {\n    ContentScriptNode,\n    ContentScriptIsolation,\n    ContentScriptProps,\n    ContentScriptRenderHandler,\n    ContentScriptRenderReactComponent,\n    ContentScriptRenderValue,\n} from \"@typing/content\";\n\nexport default class Builder<\n    Data = unknown,\n    Isolation extends `${ContentScriptIsolation}` = `${ContentScriptIsolation}`,\n> extends MountBuilder<Data, Isolation> {\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        return props => {\n            // Functions in React entrypoints are components; React owns their invocation and hooks.\n            const value =\n                typeof render === \"function\"\n                    ? createElement(render as ContentScriptRenderReactComponent<Data>, props)\n                    : render;\n\n            return isDomRenderValue(value) || isReactRenderValue(value) ? value : undefined;\n        };\n    }\n\n    protected createRenderer(\n        node: ContentScriptNode,\n        render: ContentScriptRenderHandler<Data>,\n        props: () => ContentScriptProps<Data>,\n        options: ContentScriptRenderOptions\n    ): ReactNode<Data> {\n        return new ReactNode(node, render, props, options);\n    }\n}\n"],"mappings":"AAAA,SAAQ,qBAAoB;AAE5B,SAAQ,wBAAuB;AAC/B,SAAQ,0BAAyB;AAEjC,OAAO,eAAe;AAEtB,OAAO,kBAAkB;AAYzB,MAAO,gBAGG,aAA8B;AAAA,EAC1B,cACN,QACmD;AACnD,QAAI,WAAW,QAAQ,WAAW,QAAW;AACzC,aAAO;AAAA,IACX;AAEA,WAAO,WAAS;AAEZ,YAAM,QACF,OAAO,WAAW,aACZ,cAAc,QAAmD,KAAK,IACtE;AAEV,aAAO,iBAAiB,KAAK,KAAK,mBAAmB,KAAK,IAAI,QAAQ;AAAA,IAC1E;AAAA,EACJ;AAAA,EAEU,eACN,MACA,QACA,OACA,SACe;AACf,WAAO,IAAI,UAAU,MAAM,QAAQ,OAAO,OAAO;AAAA,EACrD;AACJ;","names":[]}

package/dist/entry/content/adapters/react/Node.js

@@ -1,15 +1,20 @@
-import { isValidElement } from "react";
 import { createRoot } from "react-dom/client";
+import { isDomRenderValue, renderDomValue } from "./../../../../entry/core/render.js";
+import { isReactRenderValue } from "./../../../../entry/core/react.js";
 import { RenderNode } from "../../lifecycle/nodes/index.js";
 class Node extends RenderNode {
   root;
   render(value, target) {
-    if (!isValidElement(value)) {
-      return false;
+    if (isDomRenderValue(value)) {
+      renderDomValue(target, value);
+      return true;
     }
-    this.root = createRoot(target);
-    this.root.render(value);
-    return true;
+    if (isReactRenderValue(value)) {
+      this.root = createRoot(target);
+      this.root.render(value);
+      return true;
+    }
+    return false;
   }
   clear() {
     const root = this.root;