fix: Appx name changed

Close #1650

Author: develar

docs/api/electron-builder-http.md

@@ -7,6 +7,8 @@
 <dd></dd>
 <dt><a href="#module_electron-builder-http/out/ProgressCallbackTransform">electron-builder-http/out/ProgressCallbackTransform</a></dt>
 <dd></dd>
+<dt><a href="#module_electron-builder-http/out/rfc2253Parser">electron-builder-http/out/rfc2253Parser</a></dt>
+<dd></dd>
 <dt><a href="#module_electron-builder-http">electron-builder-http</a></dt>
 <dd></dd>
 </dl>
@@ -220,6 +222,18 @@
 | encoding | <code>String</code> | 
 | callback | <code>function</code> | 
 
+<a name="module_electron-builder-http/out/rfc2253Parser"></a>
+
+## electron-builder-http/out/rfc2253Parser
+<a name="module_electron-builder-http/out/rfc2253Parser.parseDn"></a>
+
+### `electron-builder-http/out/rfc2253Parser.parseDn(seq)` ⇒ <code>Map&lt;String \| String&gt;</code>
+**Kind**: method of [<code>electron-builder-http/out/rfc2253Parser</code>](#module_electron-builder-http/out/rfc2253Parser)  
+
+| Param | Type |
+| --- | --- |
+| seq | <code>String</code> | 
+
 <a name="module_electron-builder-http"></a>
 
 ## electron-builder-http

docs/api/electron-builder.md

@@ -20,6 +20,12 @@ function renderTypeNames(types, delimiter, root, isTypeAsCode, isSkipNull) {
   const tagOpen = isTypeAsCode ? "<code>" : ""
   const tagClose = isTypeAsCode ? "</code>" : ""
 
+  for (let obj of types) {
+    if (obj.includes("CancellationToken")) {
+      break
+    }
+  }
+
   if (isSkipNull) {
     types = types.filter(it => !isSkipNull || it !== "null")
   }
@@ -173,18 +179,7 @@ function _link(input, options) {
     }
   }
   else {
-    let pageUrl = ""
-    for (const page of exports.pages) {
-      if (page.dataMap.has(linked.id)) {
-        const a = page.data
-        const b = options.data.root
-        if (a.length !== b.length && a[a.length - 1] !== b[a.length - 1]) {
-          pageUrl = page.pageUrl
-        }
-        break
-      }
-    }
-    output.url = `${pageUrl}#${anchorName.call(linked, options)}`
+    output.url = fullLink(linked, options.data.root)
   }
   return output
 }
@@ -258,19 +253,23 @@ function identifierToLink(id, root) {
     }
     return output
   }
+  return `[${linked.name}](${fullLink(linked, root)})`
+}
 
+function fullLink(linked, root) {
+  const relativeName = anchorName.call(linked)
   let pageUrl = ""
   for (const page of exports.pages) {
     if (page.dataMap.has(linked.id)) {
       const a = page.data
       const b = root
-      if (a.length !== b.length && a[a.length - 1] !== b[a.length - 1]) {
+      if (a.length !== b.length || a[a.length - 1] !== b[a.length - 1]) {
         pageUrl = page.pageUrl
       }
       break
     }
   }
-  return `[${linked.name}](${pageUrl}#${anchorName.call(linked)})`
+  return `${pageUrl}#${relativeName}`
 }
 
 function resolveById(id) {

jsdoc/helpers.js

@@ -40,7 +40,7 @@
     "electron-download-tf": "4.3.1",
     "electron-is-dev": "^0.1.2",
     "electron-osx-sign": "0.4.6",
-    "fcopy-pre-bundled": "^0.1.2",
+    "fcopy-pre-bundled": "0.2.0",
     "fs-extra-p": "^4.3.0",
     "hosted-git-info": "^2.4.2",
     "ini": "^1.3.4",

package.json

@@ -12,7 +12,7 @@
   ],
   "dependencies": {
     "fs-extra-p": "^4.3.0",
-    "fcopy-pre-bundled": "^0.1.2",
+    "fcopy-pre-bundled": "0.2.0",
     "is-ci": "^1.0.10",
     "stat-mode": "^0.2.2",
     "bluebird-lst": "^1.0.2",

packages/electron-builder-util/package.json

@@ -236,7 +236,7 @@ export default class MacPackager extends PlatformPackager<MacOptions> {
 
       const pkg = path.join(outDir!, this.expandArtifactNamePattern(masOptions, "pkg"))
       await this.doFlat(appPath, pkg, masInstallerIdentity, keychainName)
-      this.dispatchArtifactCreated(pkg, null, Arch.x64, `${this.appInfo.name}-${this.appInfo.version}.pkg`)
+      this.dispatchArtifactCreated(pkg, null, Arch.x64, this.computeSafeArtifactName("pkg"))
     }
   }
 

packages/electron-builder/src/macPackager.ts

@@ -341,12 +341,19 @@ export abstract class PlatformPackager<DC extends PlatformSpecificBuildOptions>
     await this.checkFileInPackage(resourcesDir, "package.json", "Application", isAsar)
   }
 
-  expandArtifactNamePattern(targetSpecificOptions: TargetSpecificOptions | n, ext: string, arch?: Arch | null, defaultPattern?: string): string {
+  computeSafeArtifactName(ext: string, arch?: Arch | null, skipArchIfX64 = true) {
+    return this.computeArtifactName("${name}-${version}-${arch}.${ext}", ext, skipArchIfX64 && arch === Arch.x64 ? null : arch)
+  }
+
+  expandArtifactNamePattern(targetSpecificOptions: TargetSpecificOptions | n, ext: string, arch?: Arch | null, defaultPattern?: string, skipArchIfX64 = true): string {
     let pattern = targetSpecificOptions == null ? null : targetSpecificOptions.artifactName
     if (pattern == null) {
-      pattern = this.platformSpecificBuildOptions.artifactName || this.config.artifactName || defaultPattern || "${productName}-${version}.${ext}"
+      pattern = this.platformSpecificBuildOptions.artifactName || this.config.artifactName || defaultPattern || "${productName}-${version}-${arch}.${ext}"
     }
+    return this.computeArtifactName(pattern, ext, skipArchIfX64 && arch === Arch.x64 ? null : arch)
+  }
 
+  private computeArtifactName(pattern: any, ext: string, arch: Arch | null | undefined) {
     let archName: string | null = arch == null ? null : Arch[arch]
     if (arch === Arch.x64) {
       if (ext === "AppImage" || ext === "rpm") {

packages/electron-builder/src/platformPackager.ts

@@ -18,7 +18,7 @@ export class ArchiveTarget extends Target {
     log(`Building ${isMac ? "macOS " : ""}${format}`)
 
     // do not specify arch if x64
-    const outFile = path.join(this.outDir, packager.expandArtifactNamePattern(this.options, format, arch === Arch.x64 ? null : arch, packager.platform === Platform.LINUX ? "${name}-${version}-${arch}.${ext}" : "${productName}-${version}-${arch}-${os}.${ext}"))
+    const outFile = path.join(this.outDir, packager.expandArtifactNamePattern(this.options, format, arch, packager.platform === Platform.LINUX ? "${name}-${version}-${arch}.${ext}" : "${productName}-${version}-${arch}-${os}.${ext}"))
     if (format.startsWith("tar.")) {
       await tar(packager.config.compression, format, outFile, appOutDir, isMac)
     }

packages/electron-builder/src/targets/ArchiveTarget.ts

@@ -38,7 +38,7 @@ export default class AppImageTarget extends Target {
     const packager = this.packager
 
     // https://github.com/electron-userland/electron-builder/issues/775
-    const resultFile = path.join(this.outDir, packager.expandArtifactNamePattern(this.options, "AppImage", arch, "${name}-${version}-${arch}.${ext}"))
+    const resultFile = path.join(this.outDir, packager.computeSafeArtifactName("AppImage", arch, false))
     await unlinkIfExists(resultFile)
 
     const appImagePath = await appImagePathPromise

packages/electron-builder/src/targets/appImage.ts

@@ -72,7 +72,7 @@ export default class AppXTarget extends Target {
     await spawn(path.join(vendorPath, "windows-10", arch === Arch.ia32 ? "ia32" : "x64", "makeappx.exe"), args)
 
     await packager.sign(destination)
-    packager.dispatchArtifactCreated(destination, this, arch, packager.expandArtifactNamePattern(this.options, "appx", arch, "${name}-${version}-${arch}.${ext}"))
+    packager.dispatchArtifactCreated(destination, this, arch, packager.computeSafeArtifactName("appx"))
   }
 
   private async writeManifest(templatePath: string, preAppx: string, safeName: string, arch: Arch, publisher: string) {