@hot-updater/cli-tools 1.0.2 → 1.0.4

package/dist/index.mjs

@@ -44704,7 +44704,7 @@ const mergeHotUpdaterConfigText = (existingText, scaffold) => {
 			if (MANAGED_IMPORT_PACKAGES.has(pkg) && !(nextObject.keptBuild && BUILD_IMPORT_PACKAGES.has(pkg)) && keptReferences && !keptReferences.has(specifier.local.name)) continue;
 			const scaffoldImport = scaffoldNames.get(specifier.local.name);
 			const imported = specifier.type === "ImportSpecifier" && specifier.imported.type === "Identifier" ? specifier.imported.name : null;
-			if (scaffoldImport !== void 0 && (scaffoldImport.imported !== imported || scaffoldImport.pkg !== pkg && !(scaffoldImport.pkg === "hot-updater/plugins" && pkg === "@hot-updater/server/plugins"))) return { reason: `The import of ${specifier.local.name} from "${pkg}" takes the name init imports from "${scaffoldImport.pkg}".` };
+			if (scaffoldImport !== void 0 && (scaffoldImport.imported !== imported || scaffoldImport.pkg !== pkg && !MANAGED_IMPORT_PACKAGES.has(pkg))) return { reason: `The import of ${specifier.local.name} from "${pkg}" takes the name init imports from "${scaffoldImport.pkg}".` };
 		}
 	}
 	return { text: applyTextEdits(existingText, [
@@ -45048,64 +45048,72 @@ function isUnsafeProperty(key) {
 	return key === "__proto__";
 }
 //#endregion
-//#region ../../node_modules/.pnpm/es-toolkit@1.47.0/node_modules/es-toolkit/dist/object/merge.mjs
+//#region ../../node_modules/.pnpm/es-toolkit@1.47.0/node_modules/es-toolkit/dist/object/mergeWith.mjs
 /**
 * Merges the properties of the source object into the target object.
 *
-* This function performs a deep merge, meaning nested objects and arrays are merged recursively.
-* If a property in the source object is an array or an object and the corresponding property in the target object is also an array or object, they will be merged.
-* If a property in the source object is undefined, it will not overwrite a defined property in the target object.
+* You can provide a custom `merge` function to control how properties are merged. It should return the value to be set in the target object.
+*
+* If it returns `undefined`, a default deep merge will be applied for arrays and objects:
+*
+* - If a property in the source object is an array or an object and the corresponding property in the target object is also an array or object, they will be merged.
+* - If a property in the source object is undefined, it will not overwrite a defined property in the target object.
 *
 * Note that this function mutates the target object.
 *
 * @param {T} target - The target object into which the source object properties will be merged. This object is modified in place.
 * @param {S} source - The source object whose properties will be merged into the target object.
+* @param {(targetValue: any, sourceValue: any, key: string, target: T, source: S) => any} merge - A custom merge function that defines how properties should be combined. It receives the following arguments:
+*   - `targetValue`: The current value of the property in the target object.
+*   - `sourceValue`: The value of the property in the source object.
+*   - `key`: The key of the property being merged.
+*   - `target`: The target object.
+*   - `source`: The source object.
+*
 * @returns {T & S} The updated target object with properties from the source object merged in.
 *
 * @template T - Type of the target object.
 * @template S - Type of the source object.
 *
 * @example
-* const target = { a: 1, b: { x: 1, y: 2 } };
-* const source = { b: { y: 3, z: 4 }, c: 5 };
-*
-* const result = merge(target, source);
-* console.log(result);
-* // Output: { a: 1, b: { x: 1, y: 3, z: 4 }, c: 5 }
+* const target = { a: 1, b: 2 };
+* const source = { b: 3, c: 4 };
 *
+* mergeWith(target, source, (targetValue, sourceValue) => {
+*   if (typeof targetValue === 'number' && typeof sourceValue === 'number') {
+*     return targetValue + sourceValue;
+*   }
+* });
+* // Returns { a: 1, b: 5, c: 4 }
 * @example
-* const target = { a: [1, 2], b: { x: 1 } };
-* const source = { a: [3], b: { y: 2 } };
+* const target = { a: [1], b: [2] };
+* const source = { a: [3], b: [4] };
 *
-* const result = merge(target, source);
-* console.log(result);
-* // Output: { a: [3, 2], b: { x: 1, y: 2 } }
+* const result = mergeWith(target, source, (objValue, srcValue) => {
+*   if (Array.isArray(objValue)) {
+*     return objValue.concat(srcValue);
+*   }
+* });
 *
-* @example
-* const target = { a: null };
-* const source = { a: [1, 2, 3] };
-*
-* const result = merge(target, source);
-* console.log(result);
-* // Output: { a: [1, 2, 3] }
+* expect(result).toEqual({ a: [1, 3], b: [2, 4] });
 */
-function merge(target, source) {
+function mergeWith(target, source, merge) {
 	const sourceKeys = Object.keys(source);
 	for (let i = 0; i < sourceKeys.length; i++) {
 		const key = sourceKeys[i];
 		if (isUnsafeProperty(key)) continue;
 		const sourceValue = source[key];
 		const targetValue = target[key];
-		if (isMergeableValue(sourceValue) && isMergeableValue(targetValue)) target[key] = merge(targetValue, sourceValue);
-		else if (Array.isArray(sourceValue)) target[key] = merge([], sourceValue);
-		else if (isPlainObject(sourceValue)) target[key] = merge({}, sourceValue);
+		const merged = merge(targetValue, sourceValue, key, target, source);
+		if (merged !== void 0) target[key] = merged;
+		else if (Array.isArray(sourceValue)) if (Array.isArray(targetValue)) target[key] = mergeWith(targetValue, sourceValue, merge);
+		else target[key] = mergeWith([], sourceValue, merge);
+		else if (isPlainObject(sourceValue)) if (isPlainObject(targetValue)) target[key] = mergeWith(targetValue, sourceValue, merge);
+		else target[key] = mergeWith({}, sourceValue, merge);
 		else if (targetValue === void 0 || sourceValue !== void 0) target[key] = sourceValue;
 	}
 	return target;
 }
-function isMergeableValue(value) {
-	return isPlainObject(value) || Array.isArray(value);
-}
 //#endregion
 //#region src/loadConfig.ts
 var import_out = /* @__PURE__ */ __toESM(require_out(), 1);
@@ -45162,8 +45170,15 @@ const getDefaultConfig = () => {
 		plugins: []
 	};
 };
+/**
+* An array in the config replaces the default one. A plain deep merge goes
+* index by index, so `infoPlistPaths: ["ios/App/Info.plist"]` over three
+* discovered Info.plist files only overwrote the first and kept the others.
+* The array is still copied deeply, as `merge` copied it.
+*/
+const replaceArrays = (_targetValue, sourceValue) => Array.isArray(sourceValue) ? mergeWith([], sourceValue, replaceArrays) : void 0;
 const mergeConfigSources = (...sources) => {
-	const mergedConfig = sources.reduceRight((mergedConfig, source) => merge(mergedConfig, source ?? {}), {});
+	const mergedConfig = sources.reduceRight((mergedConfig, source) => mergeWith(mergedConfig, source ?? {}, replaceArrays), {});
 	const database = sources.find((source) => source?.database)?.database;
 	const plugins = sources.find((source) => source?.plugins)?.plugins;
 	const signing = sources.find((source) => source?.signing)?.signing;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/cli-tools",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "engines": {
     "node": ">=20.19.0"
@@ -49,9 +49,9 @@
     "oxc-parser": "0.141.0",
     "oxc-transform": "0.141.0",
     "unconfig": "7.5.0",
-    "@hot-updater/server": "1.0.2",
-    "@hot-updater/plugin-core": "1.0.2",
-    "@hot-updater/protocol": "1.0.2"
+    "@hot-updater/protocol": "1.0.4",
+    "@hot-updater/plugin-core": "1.0.4",
+    "@hot-updater/server": "1.0.4"
   },
   "devDependencies": {
     "@clack/prompts": "1.7.0",
@@ -65,7 +65,7 @@
     "tar": "^7.5.16",
     "verkit": "0.4.0",
     "workspace-tools": "^0.41.7",
-    "@hot-updater/test-utils": "1.0.2"
+    "@hot-updater/test-utils": "1.0.4"
   },
   "inlinedDependencies": {
     "@babel/code-frame": "7.29.0",