reset-framework-cli 1.1.5 → 1.2.1

package/src/lib/output.js

@@ -8,93 +8,93 @@ import {
   resolveFrameworkRuntimeBinary,
   resolveFrameworkRuntimeOutputDir
 } from "./project.js"
-
-function escapePlistString(value) {
-  return value
-    .replaceAll("&", "&")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;")
-}
-
-function serializePlistValue(value, indentLevel = 1) {
-  const indent = "  ".repeat(indentLevel)
-
-  if (Array.isArray(value)) {
-    if (value.length === 0) {
-      return `${indent}<array/>\n`
-    }
-
-    return (
-      `${indent}<array>\n` +
-      value.map((entry) => serializePlistValue(entry, indentLevel + 1)).join("") +
-      `${indent}</array>\n`
-    )
-  }
-
-  if (typeof value === "object" && value !== null) {
-    const entries = Object.entries(value)
-    if (entries.length === 0) {
-      return `${indent}<dict/>\n`
-    }
-
-    return (
-      `${indent}<dict>\n` +
-      entries
-        .map(
-          ([key, entryValue]) =>
-            `${"  ".repeat(indentLevel + 1)}<key>${escapePlistString(key)}</key>\n${serializePlistValue(entryValue, indentLevel + 1)}`
-        )
-        .join("") +
-      `${indent}</dict>\n`
-    )
-  }
-
-  if (typeof value === "boolean") {
-    return `${indent}<${value ? "true" : "false"}/>\n`
-  }
-
-  if (typeof value === "number") {
-    return `${indent}<integer>${value}</integer>\n`
-  }
-
-  return `${indent}<string>${escapePlistString(String(value))}</string>\n`
-}
-
+
+function escapePlistString(value) {
+  return value
+    .replaceAll("&", "&amp;")
+    .replaceAll("<", "&lt;")
+    .replaceAll(">", "&gt;")
+}
+
+function serializePlistValue(value, indentLevel = 1) {
+  const indent = "  ".repeat(indentLevel)
+
+  if (Array.isArray(value)) {
+    if (value.length === 0) {
+      return `${indent}<array/>\n`
+    }
+
+    return (
+      `${indent}<array>\n` +
+      value.map((entry) => serializePlistValue(entry, indentLevel + 1)).join("") +
+      `${indent}</array>\n`
+    )
+  }
+
+  if (typeof value === "object" && value !== null) {
+    const entries = Object.entries(value)
+    if (entries.length === 0) {
+      return `${indent}<dict/>\n`
+    }
+
+    return (
+      `${indent}<dict>\n` +
+      entries
+        .map(
+          ([key, entryValue]) =>
+            `${"  ".repeat(indentLevel + 1)}<key>${escapePlistString(key)}</key>\n${serializePlistValue(entryValue, indentLevel + 1)}`
+        )
+        .join("") +
+      `${indent}</dict>\n`
+    )
+  }
+
+  if (typeof value === "boolean") {
+    return `${indent}<${value ? "true" : "false"}/>\n`
+  }
+
+  if (typeof value === "number") {
+    return `${indent}<integer>${value}</integer>\n`
+  }
+
+  return `${indent}<string>${escapePlistString(String(value))}</string>\n`
+}
+
 function buildMacOSInfoPlist(config) {
-  const urlTypes = Array.isArray(config.protocols?.schemes)
-    ? config.protocols.schemes.map((schemeConfig) => ({
-        CFBundleTypeRole: schemeConfig.role ?? "Viewer",
-        CFBundleURLName:
-          typeof schemeConfig.name === "string" && schemeConfig.name.trim() !== ""
-            ? schemeConfig.name
-            : `${config.appId}.${schemeConfig.scheme}`,
-        CFBundleURLSchemes: [schemeConfig.scheme]
-      }))
-    : []
-
-  const plist = {
-    CFBundleDevelopmentRegion: "English",
-    CFBundleDisplayName: config.productName,
-    CFBundleExecutable: "reset-framework",
-    CFBundleIdentifier: config.appId,
-    CFBundleInfoDictionaryVersion: "6.0",
-    CFBundleName: config.productName,
-    CFBundlePackageType: "APPL",
-    CFBundleShortVersionString: config.version,
-    CFBundleVersion: config.version,
-    CSResourcesFileMapped: true
-  }
-
-  if (urlTypes.length > 0) {
-    plist.CFBundleURLTypes = urlTypes
-  }
-
-  return (
-    `<?xml version="1.0" encoding="UTF-8"?>\n` +
-    `<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n` +
-    `<plist version="1.0">\n` +
-    serializePlistValue(plist, 0) +
-    `</plist>\n`
+  const urlTypes = Array.isArray(config.protocols?.schemes)
+    ? config.protocols.schemes.map((schemeConfig) => ({
+        CFBundleTypeRole: schemeConfig.role ?? "Viewer",
+        CFBundleURLName:
+          typeof schemeConfig.name === "string" && schemeConfig.name.trim() !== ""
+            ? schemeConfig.name
+            : `${config.appId}.${schemeConfig.scheme}`,
+        CFBundleURLSchemes: [schemeConfig.scheme]
+      }))
+    : []
+
+  const plist = {
+    CFBundleDevelopmentRegion: "English",
+    CFBundleDisplayName: config.productName,
+    CFBundleExecutable: "reset-framework",
+    CFBundleIdentifier: config.appId,
+    CFBundleInfoDictionaryVersion: "6.0",
+    CFBundleName: config.productName,
+    CFBundlePackageType: "APPL",
+    CFBundleShortVersionString: config.version,
+    CFBundleVersion: config.version,
+    CSResourcesFileMapped: true
+  }
+
+  if (urlTypes.length > 0) {
+    plist.CFBundleURLTypes = urlTypes
+  }
+
+  return (
+    `<?xml version="1.0" encoding="UTF-8"?>\n` +
+    `<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n` +
+    `<plist version="1.0">\n` +
+    serializePlistValue(plist, 0) +
+    `</plist>\n`
   )
 }
 
@@ -116,59 +116,59 @@ function shouldCopyWindowsRuntimeArtifact(entryName) {
 function escapePowerShellLiteral(value) {
   return String(value).replaceAll("'", "''")
 }
-
-export async function stageMacOSAppBundle(frameworkBuildPaths, appPaths, config, options = {}) {
-  const { dryRun = false, outputPaths, configPath } = options
-
-  if (!outputPaths) {
-    throw new Error("stageMacOSAppBundle requires resolved output paths")
-  }
-
-  if (!existsSync(frameworkBuildPaths.releaseAppTemplate) && !dryRun) {
-    throw new Error(
-      `Missing runtime app bundle at ${frameworkBuildPaths.releaseAppTemplate}. Run reset-framework-cli build first.`
-    )
-  }
-
-  if (!existsSync(outputPaths.frontendEntryFile) && !dryRun) {
-    throw new Error(
-      `Missing frontend build output at ${outputPaths.frontendEntryFile}. Run the frontend build first.`
-    )
-  }
-
-  logger.info(`Staging app bundle into ${outputPaths.appBundlePath}`)
-
-  if (dryRun) {
-    logger.info(`- copy ${frameworkBuildPaths.releaseAppTemplate} -> ${outputPaths.appBundlePath}`)
-    logger.info(`- copy ${configPath} -> ${outputPaths.bundledConfigPath}`)
-    logger.info(`- copy ${outputPaths.frontendDistDir} -> ${outputPaths.bundledFrontendDir}`)
-    return outputPaths
-  }
-
-  await mkdir(outputPaths.macosDir, { recursive: true })
-  await rm(outputPaths.appBundlePath, { recursive: true, force: true })
-  await cp(frameworkBuildPaths.releaseAppTemplate, outputPaths.appBundlePath, { recursive: true })
-
-  await mkdir(outputPaths.resourcesDir, { recursive: true })
-  await cp(configPath, outputPaths.bundledConfigPath, { force: true })
-  await rm(outputPaths.bundledFrontendDir, { recursive: true, force: true })
-  await cp(outputPaths.frontendDistDir, outputPaths.bundledFrontendDir, { recursive: true })
-  await writeFile(
-    path.join(outputPaths.appBundlePath, "Contents", "Info.plist"),
-    buildMacOSInfoPlist(config),
-    "utf8"
-  )
-
+
+export async function stageMacOSAppBundle(frameworkPaths, frameworkBuildPaths, config, options = {}) {
+  const { dryRun = false, outputPaths, configPath, preferSource = false } = options
+  const runtimeSourceBundle = resolveFrameworkRuntimeOutputDir(frameworkPaths, frameworkBuildPaths, "release", {
+    mustExist: !dryRun,
+    preferSource
+  })
+
+  if (!outputPaths) {
+    throw new Error("stageMacOSAppBundle requires resolved output paths")
+  }
+
+  if (!existsSync(outputPaths.frontendEntryFile) && !dryRun) {
+    throw new Error(
+      `Missing frontend build output at ${outputPaths.frontendEntryFile}. Run the frontend build first.`
+    )
+  }
+
+  logger.info(`Staging app bundle into ${outputPaths.appBundlePath}`)
+
+  if (dryRun) {
+    logger.info(`- copy ${runtimeSourceBundle} -> ${outputPaths.appBundlePath}`)
+    logger.info(`- copy ${configPath} -> ${outputPaths.bundledConfigPath}`)
+    logger.info(`- copy ${outputPaths.frontendDistDir} -> ${outputPaths.bundledFrontendDir}`)
+    return outputPaths
+  }
+
+  await mkdir(outputPaths.macosDir, { recursive: true })
+  await rm(outputPaths.appBundlePath, { recursive: true, force: true })
+  await cp(runtimeSourceBundle, outputPaths.appBundlePath, { recursive: true })
+
+  await mkdir(outputPaths.resourcesDir, { recursive: true })
+  await cp(configPath, outputPaths.bundledConfigPath, { force: true })
+  await rm(outputPaths.bundledFrontendDir, { recursive: true, force: true })
+  await cp(outputPaths.frontendDistDir, outputPaths.bundledFrontendDir, { recursive: true })
+  await writeFile(
+    path.join(outputPaths.appBundlePath, "Contents", "Info.plist"),
+    buildMacOSInfoPlist(config),
+    "utf8"
+  )
+
   return outputPaths
 }
 
-export async function stageWindowsAppBundle(frameworkBuildPaths, appPaths, config, options = {}) {
-  const { dryRun = false, outputPaths, configPath } = options
-  const runtimeSourceBinary = resolveFrameworkRuntimeBinary(frameworkBuildPaths, "release", {
-    mustExist: !dryRun
+export async function stageWindowsAppBundle(frameworkPaths, frameworkBuildPaths, config, options = {}) {
+  const { dryRun = false, outputPaths, configPath, preferSource = false } = options
+  const runtimeSourceBinary = resolveFrameworkRuntimeBinary(frameworkPaths, frameworkBuildPaths, "release", {
+    mustExist: !dryRun,
+    preferSource
   })
-  const runtimeSourceDir = resolveFrameworkRuntimeOutputDir(frameworkBuildPaths, "release", {
-    mustExist: !dryRun
+  const runtimeSourceDir = resolveFrameworkRuntimeOutputDir(frameworkPaths, frameworkBuildPaths, "release", {
+    mustExist: !dryRun,
+    preferSource
   })
 
   if (!outputPaths) {
@@ -218,20 +218,20 @@ export async function stageWindowsAppBundle(frameworkBuildPaths, appPaths, confi
 
   return outputPaths
 }
-
+
 export async function createMacOSZipArchive(outputPaths, options = {}) {
   const { dryRun = false } = options
-
-  logger.info(`Packaging ${outputPaths.appBundlePath} -> ${outputPaths.zipPath}`)
-
-  if (process.platform !== "darwin") {
-    throw new Error("Packaging is only implemented for macOS right now")
-  }
-
-  if (!dryRun) {
-    await mkdir(outputPaths.packagesDir, { recursive: true })
-  }
-
+
+  logger.info(`Packaging ${outputPaths.appBundlePath} -> ${outputPaths.zipPath}`)
+
+  if (process.platform !== "darwin") {
+    throw new Error("Packaging is only implemented for macOS right now")
+  }
+
+  if (!dryRun) {
+    await mkdir(outputPaths.packagesDir, { recursive: true })
+  }
+
   await runCommand(
     "ditto",
     ["-c", "-k", "--sequesterRsrc", "--keepParent", outputPaths.appBundlePath, outputPaths.zipPath],

package/src/lib/process.js

@@ -1,49 +1,49 @@
 import { spawn, spawnSync } from "node:child_process"
-
-import { logger } from "./logger.js"
-
-function sleep(ms) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms)
-  })
-}
-
-export function resolveNpmCommand() {
-  return process.platform === "win32" ? "npm.cmd" : "npm"
-}
-
-export function resolvePackageManagerCommand(packageManager = "npm") {
-  if (packageManager === "npm") {
-    return resolveNpmCommand()
-  }
-
-  if (packageManager === "yarn") {
-    return process.platform === "win32" ? "yarn.cmd" : "yarn"
-  }
-
-  if (packageManager === "pnpm") {
-    return process.platform === "win32" ? "pnpm.cmd" : "pnpm"
-  }
-
-  if (packageManager === "bun") {
-    return process.platform === "win32" ? "bun.exe" : "bun"
-  }
-
-  throw new Error(`Unsupported package manager: ${packageManager}`)
-}
-
-export function getInstallCommandArgs(packageManager = "npm") {
-  if (packageManager === "npm") {
-    return ["install", "--include=optional"]
-  }
-
-  if (packageManager === "yarn") {
-    return ["install"]
-  }
-
-  return ["install"]
-}
-
+
+import { logger } from "./logger.js"
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms)
+  })
+}
+
+export function resolveNpmCommand() {
+  return process.platform === "win32" ? "npm.cmd" : "npm"
+}
+
+export function resolvePackageManagerCommand(packageManager = "npm") {
+  if (packageManager === "npm") {
+    return resolveNpmCommand()
+  }
+
+  if (packageManager === "yarn") {
+    return process.platform === "win32" ? "yarn.cmd" : "yarn"
+  }
+
+  if (packageManager === "pnpm") {
+    return process.platform === "win32" ? "pnpm.cmd" : "pnpm"
+  }
+
+  if (packageManager === "bun") {
+    return process.platform === "win32" ? "bun.exe" : "bun"
+  }
+
+  throw new Error(`Unsupported package manager: ${packageManager}`)
+}
+
+export function getInstallCommandArgs(packageManager = "npm") {
+  if (packageManager === "npm") {
+    return ["install", "--include=optional"]
+  }
+
+  if (packageManager === "yarn") {
+    return ["install"]
+  }
+
+  return ["install"]
+}
+
 export function formatCommand(command, args = []) {
   return [command, ...args].join(" ")
 }
@@ -56,11 +56,11 @@ export async function runCommand(command, args = [], options = {}) {
   const { cwd, dryRun = false, env } = options
 
   logger.info(`$ ${formatCommand(command, args)}`)
-
-  if (dryRun) {
-    return
-  }
-
+
+  if (dryRun) {
+    return
+  }
+
   await new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       cwd,
@@ -70,28 +70,28 @@ export async function runCommand(command, args = [], options = {}) {
     })
 
     child.once("error", reject)
-    child.once("exit", (code, signal) => {
-      if (code === 0) {
-        resolve(undefined)
-        return
-      }
-
-      reject(
-        new Error(
-          signal
-            ? `Command terminated by signal: ${signal}`
-            : `Command exited with code ${code}`
-        )
-      )
-    })
-  })
-}
-
-export async function captureCommandOutput(command, args = [], options = {}) {
-  const { cwd, env } = options
-
-  await Promise.resolve()
-
+    child.once("exit", (code, signal) => {
+      if (code === 0) {
+        resolve(undefined)
+        return
+      }
+
+      reject(
+        new Error(
+          signal
+            ? `Command terminated by signal: ${signal}`
+            : `Command exited with code ${code}`
+        )
+      )
+    })
+  })
+}
+
+export async function captureCommandOutput(command, args = [], options = {}) {
+  const { cwd, env } = options
+
+  await Promise.resolve()
+
   return await new Promise((resolve, reject) => {
     const child = spawn(command, args, {
       cwd,
@@ -99,45 +99,45 @@ export async function captureCommandOutput(command, args = [], options = {}) {
       stdio: ["ignore", "pipe", "pipe"],
       shell: shouldUseShell(command)
     })
-
-    let stdout = ""
-    let stderr = ""
-
-    child.stdout?.on("data", (chunk) => {
-      stdout += String(chunk)
-    })
-
-    child.stderr?.on("data", (chunk) => {
-      stderr += String(chunk)
-    })
-
-    child.once("error", reject)
-    child.once("exit", (code, signal) => {
-      if (code === 0) {
-        resolve(stdout.trim())
-        return
-      }
-
-      reject(
-        new Error(
-          signal
-            ? `Command terminated by signal: ${signal}`
-            : (stderr.trim() || stdout.trim() || `Command exited with code ${code}`)
-        )
-      )
-    })
-  })
-}
-
+
+    let stdout = ""
+    let stderr = ""
+
+    child.stdout?.on("data", (chunk) => {
+      stdout += String(chunk)
+    })
+
+    child.stderr?.on("data", (chunk) => {
+      stderr += String(chunk)
+    })
+
+    child.once("error", reject)
+    child.once("exit", (code, signal) => {
+      if (code === 0) {
+        resolve(stdout.trim())
+        return
+      }
+
+      reject(
+        new Error(
+          signal
+            ? `Command terminated by signal: ${signal}`
+            : (stderr.trim() || stdout.trim() || `Command exited with code ${code}`)
+        )
+      )
+    })
+  })
+}
+
 export function spawnCommand(command, args = [], options = {}) {
   const { cwd, dryRun = false, env } = options
 
   logger.info(`$ ${formatCommand(command, args)}`)
-
-  if (dryRun) {
-    return null
-  }
-
+
+  if (dryRun) {
+    return null
+  }
+
   return spawn(command, args, {
     cwd,
     env: env ? { ...process.env, ...env } : process.env,
@@ -146,27 +146,27 @@ export function spawnCommand(command, args = [], options = {}) {
     shell: shouldUseShell(command)
   })
 }
-
-export function waitForProcessExit(child, label) {
-  return new Promise((resolve, reject) => {
-    child.once("error", reject)
-    child.once("exit", (code, signal) => {
-      if (code === 0 || signal === "SIGINT" || signal === "SIGTERM") {
-        resolve(undefined)
-        return
-      }
-
-      reject(
-        new Error(
-          signal
-            ? `${label} terminated by signal: ${signal}`
-            : `${label} exited with code ${code}`
-        )
-      )
-    })
-  })
-}
-
+
+export function waitForProcessExit(child, label) {
+  return new Promise((resolve, reject) => {
+    child.once("error", reject)
+    child.once("exit", (code, signal) => {
+      if (code === 0 || signal === "SIGINT" || signal === "SIGTERM") {
+        resolve(undefined)
+        return
+      }
+
+      reject(
+        new Error(
+          signal
+            ? `${label} terminated by signal: ${signal}`
+            : `${label} exited with code ${code}`
+        )
+      )
+    })
+  })
+}
+
 export function registerChildCleanup(children) {
   const activeChildren = children.filter(Boolean)
   let cleanupPromise = null
@@ -281,23 +281,23 @@ export function registerChildCleanup(children) {
     await cleanup()
   }
 }
-
-export async function waitForUrl(url, options = {}) {
-  const { intervalMs = 250, timeoutMs = 15000 } = options
-  const deadline = Date.now() + timeoutMs
-
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetch(url)
-      if (response.status < 500) {
-        return
-      }
-    } catch {
-      // Retry until timeout.
-    }
-
-    await sleep(intervalMs)
-  }
-
-  throw new Error(`Timed out waiting for ${url}`)
-}
+
+export async function waitForUrl(url, options = {}) {
+  const { intervalMs = 250, timeoutMs = 15000 } = options
+  const deadline = Date.now() + timeoutMs
+
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(url)
+      if (response.status < 500) {
+        return
+      }
+    } catch {
+      // Retry until timeout.
+    }
+
+    await sleep(intervalMs)
+  }
+
+  throw new Error(`Timed out waiting for ${url}`)
+}