fix: remove accidental duplication of params in source

Author: spanishpear

packages/acceptance-tests/pkg-tests-specs/sources/commands/patchCommit.test.ts

@@ -233,7 +233,7 @@ describe(`Commands`, () => {
         const manifest = await xfs.readJsonPromise(ppath.join(path, Filename.manifest));
 
         expect(manifest.dependencies).toEqual({
-          [`unconventional-tarball`]: expect.stringMatching(/^patch:unconventional-tarball@npm%3A1\.0\.0#.*::__archiveUrl=https%3A%2F%2Fregistry\.example\.org/),
+          [`unconventional-tarball`]: expect.stringMatching(/^patch:unconventional-tarball@npm%3A1\.0\.0#.*\.patch::__archiveUrl=/),
         });
 
         // Ensure the patch URL format is correct (not malformed)

packages/plugin-patch/sources/patchUtils.ts

@@ -103,15 +103,24 @@ function makeSpec<T>({parentLocator, sourceItem, patchPaths, sourceVersion, patc
     ? {hash: patchHash}
     : {} as {};
 
+  // Parse the source to separate base range from existing bindings
   const sourceString = sourceStringifier(sourceItem);
-  const {params: sourceParams} = structUtils.parseRange(sourceString);
+  const {protocol, source, selector, params: sourceParams} = structUtils.parseRange(sourceString);
+
+  // Reconstruct the source without existing bindings
+  const baseSource = structUtils.makeRange({
+    protocol,
+    source,
+    selector,
+    params: null,  // Remove existing bindings from source
+  });
 
   return structUtils.makeRange({
     protocol: `patch:`,
-    source: sourceString,
+    source: baseSource,
     selector: patchPaths.join(`&`),
     params: {
-      ...normalizeParams(sourceParams),
+      ...normalizeParams(sourceParams),  // Preserve original bindings (like __archiveUrl)
       ...sourceVersionSpread,
       ...patchHashSpread,
       ...parentLocatorSpread,
@@ -375,7 +384,11 @@ export function normalizeParams(params: ReturnType<typeof structUtils.parseRange
 
   for (const [key, value] of Object.entries(params)) {
     if (value !== undefined) {
-      result[key] = Array.isArray(value) ? value.join(`,`) : String(value);
+      if (Array.isArray(value) && value.length > 0) {
+        result[key] = value.join(`,`);
+      } else {
+        result[key] = String(value);
+      }
     }
   }