@choochmeque/tauri-windows-bundle 0.1.12 → 0.1.13

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)) {
@@ -382,7 +395,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 +667,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 +922,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) {

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

@@ -1,6 +1,7 @@
 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 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)) {
@@ -379,7 +392,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 +664,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 +919,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) {
@@ -1687,4 +1723,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, toFourPartVersion, validateCapabilities };

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.13",
   "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",