@choochmeque/tauri-windows-bundle 0.1.12 → 0.1.14

package/README.md

@@ -73,6 +73,8 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 }
 ```
 
+`publisher` and `publisherDisplayName` are optional in `bundle.config.json`. If omitted, `publisher` falls back to `bundle.publisher` from `tauri.conf.json` or `tauri.windows.conf.json`. If `publisherDisplayName` is omitted, it defaults to the resolved `publisher` value.
+
 **Capabilities** are validated at build time. Three types are supported:
 
 ```json
@@ -91,14 +93,17 @@ Edit `src-tauri/gen/windows/bundle.config.json`:
 
 Note: `runFullTrust` is always auto-added (required for Tauri apps).
 
-**Auto-read from tauri.conf.json:**
+**Auto-read from tauri.conf.json / tauri.windows.conf.json:**
 - `displayName` ← `productName`
 - `version` ← `version` (auto-converted to 4-part: `1.0.0` → `1.0.0.0`)
 - `description` ← `bundle.shortDescription`
+- `publisher` ← `bundle.publisher` (fallback when not in bundle.config.json)
 - `icons` ← `bundle.icon`
 - `resources` ← `bundle.resources`
 - `signing` ← `bundle.windows.certificateThumbprint`
 
+**Platform-specific config:** Values in `tauri.windows.conf.json` override `tauri.conf.json` using [JSON Merge Patch (RFC 7396)](https://datatracker.ietf.org/doc/html/rfc7396). This lets you define Windows-specific settings like `identifier`, `productName`, or `bundle.publisher` separately.
+
 ### Build
 
 ```bash

package/dist/cli.js

@@ -43,6 +43,19 @@ function readTauriConfig(projectRoot) {
         throw new Error(`Failed to parse tauri.conf.json: ${error instanceof Error ? error.message : error}`);
     }
 }
+function readTauriWindowsConfig(projectRoot) {
+    const configPath = path.join(projectRoot, 'src-tauri', 'tauri.windows.conf.json');
+    if (!fs.existsSync(configPath)) {
+        return null;
+    }
+    try {
+        const content = fs.readFileSync(configPath, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch (error) {
+        throw new Error(`Failed to parse tauri.windows.conf.json: ${error instanceof Error ? error.message : error}`);
+    }
+}
 function readBundleConfig$1(windowsDir) {
     const configPath = path.join(windowsDir, 'bundle.config.json');
     if (!fs.existsSync(configPath)) {
@@ -59,6 +72,26 @@ function readBundleConfig$1(windowsDir) {
 function getWindowsDir(projectRoot) {
     return path.join(projectRoot, 'src-tauri', 'gen', 'windows');
 }
+function resolveVersion(version, tauriConfigDir) {
+    const resolvedPath = path.resolve(tauriConfigDir, version);
+    if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) {
+        try {
+            const content = fs.readFileSync(resolvedPath, 'utf-8');
+            const json = JSON.parse(content);
+            if (!json.version || typeof json.version !== 'string') {
+                throw new Error(`File ${version} does not contain a valid "version" field`);
+            }
+            return json.version;
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                throw new Error(`Failed to parse ${version} as JSON: ${error.message}`);
+            }
+            throw error;
+        }
+    }
+    return version;
+}
 function toFourPartVersion(version) {
     const parts = version.split('.');
     while (parts.length < 4)
@@ -382,7 +415,7 @@ function generateManifestTemplate(windowsDir) {
 }
 function generateManifest(config, arch, minVersion) {
     const variables = {
-        PACKAGE_NAME: config.identifier.replace(/\./g, ''),
+        PACKAGE_NAME: config.identifier,
         PUBLISHER: config.publisher,
         VERSION: config.version,
         ARCH: arch,
@@ -654,6 +687,25 @@ function updatePackageJson(projectRoot) {
     }
 }
 
+function isObject(val) {
+    return val !== null && typeof val === 'object' && !Array.isArray(val);
+}
+function jsonMergePatch(target, patch) {
+    if (!isObject(patch)) {
+        return patch;
+    }
+    const result = isObject(target) ? { ...target } : {};
+    for (const [key, value] of Object.entries(patch)) {
+        if (value === null) {
+            delete result[key];
+        }
+        else {
+            result[key] = jsonMergePatch(result[key], value);
+        }
+    }
+    return result;
+}
+
 function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion) {
     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
     const srcTauriDir = path.join(projectRoot, 'src-tauri');
@@ -890,7 +942,11 @@ async function build(options) {
     const projectRoot = findProjectRoot();
     const windowsDir = getWindowsDir(projectRoot);
     // Read configs
-    const tauriConfig = readTauriConfig(projectRoot);
+    let tauriConfig = readTauriConfig(projectRoot);
+    const windowsConfig = readTauriWindowsConfig(projectRoot);
+    if (windowsConfig) {
+        tauriConfig = jsonMergePatch(tauriConfig, windowsConfig);
+    }
     const bundleConfig = readBundleConfig$1(windowsDir);
     // Validate capabilities
     if (bundleConfig.capabilities) {
@@ -903,13 +959,22 @@ async function build(options) {
             process.exit(1);
         }
     }
+    // Resolve publisher with fallback to tauriConfig
+    const publisher = bundleConfig.publisher || tauriConfig.bundle?.publisher;
+    if (!publisher) {
+        console.error('Publisher is required. Set it in bundle.config.json or in tauri.conf.json / tauri.windows.conf.json under bundle.publisher');
+        process.exit(1);
+    }
+    const publisherDisplayName = bundleConfig.publisherDisplayName || publisher;
     // Merge config
     const config = {
         displayName: tauriConfig.productName || 'App',
-        version: toFourPartVersion(tauriConfig.version || '1.0.0'),
+        version: toFourPartVersion(resolveVersion(tauriConfig.version || '1.0.0', path.join(projectRoot, 'src-tauri'))),
         description: tauriConfig.bundle?.shortDescription || '',
         identifier: tauriConfig.identifier || 'com.example.app',
         ...bundleConfig,
+        publisher,
+        publisherDisplayName,
     };
     // Architectures from CLI flag
     const architectures = options.arch?.split(',') || ['x64'];

package/dist/core/project-discovery.d.ts

@@ -1,6 +1,8 @@
 import type { TauriConfig, BundleConfig } from '../types.js';
 export declare function findProjectRoot(startDir?: string): string;
 export declare function readTauriConfig(projectRoot: string): TauriConfig;
+export declare function readTauriWindowsConfig(projectRoot: string): TauriConfig | null;
 export declare function readBundleConfig(windowsDir: string): BundleConfig;
 export declare function getWindowsDir(projectRoot: string): string;
+export declare function resolveVersion(version: string, tauriConfigDir: string): string;
 export declare function toFourPartVersion(version: string): string;

package/dist/index.js

@@ -124,6 +124,19 @@ function readTauriConfig(projectRoot) {
         throw new Error(`Failed to parse tauri.conf.json: ${error instanceof Error ? error.message : error}`);
     }
 }
+function readTauriWindowsConfig(projectRoot) {
+    const configPath = path.join(projectRoot, 'src-tauri', 'tauri.windows.conf.json');
+    if (!fs.existsSync(configPath)) {
+        return null;
+    }
+    try {
+        const content = fs.readFileSync(configPath, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch (error) {
+        throw new Error(`Failed to parse tauri.windows.conf.json: ${error instanceof Error ? error.message : error}`);
+    }
+}
 function readBundleConfig$1(windowsDir) {
     const configPath = path.join(windowsDir, 'bundle.config.json');
     if (!fs.existsSync(configPath)) {
@@ -140,6 +153,26 @@ function readBundleConfig$1(windowsDir) {
 function getWindowsDir(projectRoot) {
     return path.join(projectRoot, 'src-tauri', 'gen', 'windows');
 }
+function resolveVersion(version, tauriConfigDir) {
+    const resolvedPath = path.resolve(tauriConfigDir, version);
+    if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) {
+        try {
+            const content = fs.readFileSync(resolvedPath, 'utf-8');
+            const json = JSON.parse(content);
+            if (!json.version || typeof json.version !== 'string') {
+                throw new Error(`File ${version} does not contain a valid "version" field`);
+            }
+            return json.version;
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                throw new Error(`Failed to parse ${version} as JSON: ${error.message}`);
+            }
+            throw error;
+        }
+    }
+    return version;
+}
 function toFourPartVersion(version) {
     const parts = version.split('.');
     while (parts.length < 4)
@@ -379,7 +412,7 @@ function generateManifestTemplate(windowsDir) {
 }
 function generateManifest(config, arch, minVersion) {
     const variables = {
-        PACKAGE_NAME: config.identifier.replace(/\./g, ''),
+        PACKAGE_NAME: config.identifier,
         PUBLISHER: config.publisher,
         VERSION: config.version,
         ARCH: arch,
@@ -651,6 +684,25 @@ function updatePackageJson(projectRoot) {
     }
 }
 
+function isObject(val) {
+    return val !== null && typeof val === 'object' && !Array.isArray(val);
+}
+function jsonMergePatch(target, patch) {
+    if (!isObject(patch)) {
+        return patch;
+    }
+    const result = isObject(target) ? { ...target } : {};
+    for (const [key, value] of Object.entries(patch)) {
+        if (value === null) {
+            delete result[key];
+        }
+        else {
+            result[key] = jsonMergePatch(result[key], value);
+        }
+    }
+    return result;
+}
+
 function prepareAppxContent(projectRoot, arch, config, tauriConfig, minVersion) {
     const target = arch === 'x64' ? 'x86_64-pc-windows-msvc' : 'aarch64-pc-windows-msvc';
     const srcTauriDir = path.join(projectRoot, 'src-tauri');
@@ -887,7 +939,11 @@ async function build(options) {
     const projectRoot = findProjectRoot();
     const windowsDir = getWindowsDir(projectRoot);
     // Read configs
-    const tauriConfig = readTauriConfig(projectRoot);
+    let tauriConfig = readTauriConfig(projectRoot);
+    const windowsConfig = readTauriWindowsConfig(projectRoot);
+    if (windowsConfig) {
+        tauriConfig = jsonMergePatch(tauriConfig, windowsConfig);
+    }
     const bundleConfig = readBundleConfig$1(windowsDir);
     // Validate capabilities
     if (bundleConfig.capabilities) {
@@ -900,13 +956,22 @@ async function build(options) {
             process.exit(1);
         }
     }
+    // Resolve publisher with fallback to tauriConfig
+    const publisher = bundleConfig.publisher || tauriConfig.bundle?.publisher;
+    if (!publisher) {
+        console.error('Publisher is required. Set it in bundle.config.json or in tauri.conf.json / tauri.windows.conf.json under bundle.publisher');
+        process.exit(1);
+    }
+    const publisherDisplayName = bundleConfig.publisherDisplayName || publisher;
     // Merge config
     const config = {
         displayName: tauriConfig.productName || 'App',
-        version: toFourPartVersion(tauriConfig.version || '1.0.0'),
+        version: toFourPartVersion(resolveVersion(tauriConfig.version || '1.0.0', path.join(projectRoot, 'src-tauri'))),
         description: tauriConfig.bundle?.shortDescription || '',
         identifier: tauriConfig.identifier || 'com.example.app',
         ...bundleConfig,
+        publisher,
+        publisherDisplayName,
     };
     // Architectures from CLI flag
     const architectures = options.arch?.split(',') || ['x64'];
@@ -1687,4 +1752,4 @@ async function extensionRemove(type, name, options) {
     }
 }
 
-export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, DEVICE_CAPABILITIES, GENERAL_CAPABILITIES, MSIX_ASSETS, RESTRICTED_CAPABILITIES, build, extensionAddAppExecutionAlias, extensionAddAppService, extensionAddAutoplay, extensionAddBackgroundTask, extensionAddContextMenu, extensionAddFileAssociation, extensionAddPreviewHandler, extensionAddProtocol, extensionAddThumbnailHandler, extensionDisablePrintTaskSettings, extensionDisableShareTarget, extensionDisableStartupTask, extensionDisableToastActivation, extensionEnablePrintTaskSettings, extensionEnableShareTarget, extensionEnableStartupTask, extensionEnableToastActivation, extensionList, extensionRemove, findProjectRoot, generateManifest, generateManifestTemplate, getPackageVersion, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, toFourPartVersion, validateCapabilities };
+export { DEFAULT_CAPABILITIES, DEFAULT_MIN_WINDOWS_VERSION, DEFAULT_RUNNER, DEVICE_CAPABILITIES, GENERAL_CAPABILITIES, MSIX_ASSETS, RESTRICTED_CAPABILITIES, build, extensionAddAppExecutionAlias, extensionAddAppService, extensionAddAutoplay, extensionAddBackgroundTask, extensionAddContextMenu, extensionAddFileAssociation, extensionAddPreviewHandler, extensionAddProtocol, extensionAddThumbnailHandler, extensionDisablePrintTaskSettings, extensionDisableShareTarget, extensionDisableStartupTask, extensionDisableToastActivation, extensionEnablePrintTaskSettings, extensionEnableShareTarget, extensionEnableStartupTask, extensionEnableToastActivation, extensionList, extensionRemove, findProjectRoot, generateManifest, generateManifestTemplate, getPackageVersion, getWindowsDir, init, prepareAppxContent, readBundleConfig$1 as readBundleConfig, readTauriConfig, readTauriWindowsConfig, resolveVersion, toFourPartVersion, validateCapabilities };

package/dist/types.d.ts

@@ -6,6 +6,7 @@ export interface TauriConfig {
         icon?: string[];
         shortDescription?: string;
         longDescription?: string;
+        publisher?: string;
         resources?: (string | {
             src: string;
             target: string;
@@ -21,8 +22,8 @@ export interface CapabilitiesConfig {
     restricted?: string[];
 }
 export interface BundleConfig {
-    publisher: string;
-    publisherDisplayName: string;
+    publisher?: string;
+    publisherDisplayName?: string;
     capabilities?: CapabilitiesConfig;
     extensions?: {
         shareTarget?: boolean;
@@ -95,6 +96,8 @@ export interface PreviewHandler {
     fileTypes: string[];
 }
 export interface MergedConfig extends BundleConfig {
+    publisher: string;
+    publisherDisplayName: string;
     displayName: string;
     version: string;
     description: string;

package/dist/utils/merge.d.ts

@@ -0,0 +1 @@
+export declare function jsonMergePatch<T>(target: T, patch: unknown): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choochmeque/tauri-windows-bundle",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "MSIX packaging tool for Tauri apps - Windows Store ready bundles",
   "type": "module",
   "bin": {
@@ -36,14 +36,14 @@
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@rollup/plugin-typescript": "^12.0.0",
     "@types/node": "^25.0.3",
-    "@vitest/coverage-v8": "^2.0.0",
+    "@vitest/coverage-v8": "^4.0.0",
     "eslint": "^9.0.0",
     "prettier": "^3.0.0",
     "rollup": "^4.0.0",
     "tslib": "^2.6.0",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.0.0",
-    "vitest": "^2.0.0"
+    "vitest": "^4.0.0"
   },
   "scripts": {
     "build": "rollup -c",