reset-framework-cli 1.1.5 → 1.2.1

package/src/lib/context.js

@@ -1,66 +1,66 @@
-import path from "node:path"
-
-const shortFlagAliases = {
-  h: "help",
-  y: "yes"
-}
-
-function parseArgv(argv) {
-  const [command = "help", ...rest] = argv
-  const args = []
-  const flags = {}
-
-  for (let index = 0; index < rest.length; index += 1) {
-    const token = rest[index]
-
-    if (!token.startsWith("-")) {
-      args.push(token)
-      continue
-    }
-
-    if (token.startsWith("--")) {
-      const body = token.slice(2)
-      const separatorIndex = body.indexOf("=")
-      const key = separatorIndex === -1 ? body : body.slice(0, separatorIndex)
-      const inlineValue = separatorIndex === -1 ? undefined : body.slice(separatorIndex + 1)
-      const next = rest[index + 1]
-
-      if (inlineValue !== undefined) {
-        flags[key] = inlineValue
-        continue
-      }
-
-      if (!next || next.startsWith("-")) {
-        flags[key] = true
-        continue
-      }
-
-      flags[key] = next
-      index += 1
-      continue
-    }
-
-    const shortFlags = token.slice(1).split("")
-    for (const flag of shortFlags) {
-      const alias = shortFlagAliases[flag]
-      if (!alias) {
-        flags[flag] = true
-        continue
-      }
-
-      flags[alias] = true
-    }
-  }
-
-  return { command, args, flags }
-}
-
-export function createCommandContext(argv, cwd = process.cwd()) {
-  const parsed = parseArgv(argv)
-
-  return {
-    ...parsed,
-    cwd,
-    projectRoot: path.resolve(cwd)
-  }
-}
+import path from "node:path"
+
+const shortFlagAliases = {
+  h: "help",
+  y: "yes"
+}
+
+function parseArgv(argv) {
+  const [command = "help", ...rest] = argv
+  const args = []
+  const flags = {}
+
+  for (let index = 0; index < rest.length; index += 1) {
+    const token = rest[index]
+
+    if (!token.startsWith("-")) {
+      args.push(token)
+      continue
+    }
+
+    if (token.startsWith("--")) {
+      const body = token.slice(2)
+      const separatorIndex = body.indexOf("=")
+      const key = separatorIndex === -1 ? body : body.slice(0, separatorIndex)
+      const inlineValue = separatorIndex === -1 ? undefined : body.slice(separatorIndex + 1)
+      const next = rest[index + 1]
+
+      if (inlineValue !== undefined) {
+        flags[key] = inlineValue
+        continue
+      }
+
+      if (!next || next.startsWith("-")) {
+        flags[key] = true
+        continue
+      }
+
+      flags[key] = next
+      index += 1
+      continue
+    }
+
+    const shortFlags = token.slice(1).split("")
+    for (const flag of shortFlags) {
+      const alias = shortFlagAliases[flag]
+      if (!alias) {
+        flags[flag] = true
+        continue
+      }
+
+      flags[alias] = true
+    }
+  }
+
+  return { command, args, flags }
+}
+
+export function createCommandContext(argv, cwd = process.cwd()) {
+  const parsed = parseArgv(argv)
+
+  return {
+    ...parsed,
+    cwd,
+    projectRoot: path.resolve(cwd)
+  }
+}

package/src/lib/framework.js

@@ -3,19 +3,25 @@ import { rm } from "node:fs/promises"
 import { readFile } from "node:fs/promises"
 import path from "node:path"
 
-import { captureCommandOutput, runCommand } from "./process.js"
+import { assertFrameworkSourceInstall, resolveFrameworkRuntimeStrategy } from "./project.js"
+import { runCommand } from "./process.js"
 import { ensureVcpkgToolchain } from "./toolchain.js"
-
-function getBuildDirectory(frameworkBuildPaths, mode) {
-  return mode === "release"
-    ? frameworkBuildPaths.releaseBuildDir
-    : frameworkBuildPaths.devBuildDir
-}
-
+
+function getBuildDirectory(frameworkBuildPaths, mode) {
+  return mode === "release"
+    ? frameworkBuildPaths.releaseBuildDir
+    : frameworkBuildPaths.devBuildDir
+}
+
 function getBuildType(mode) {
   return mode === "release" ? "Release" : "Debug"
 }
 
+function readCmakeCacheValue(cacheContents, key) {
+  const match = cacheContents.match(new RegExp(`^${key}:[^=]+=(.+)$`, "m"))
+  return match ? match[1].trim() : null
+}
+
 function getVsWherePath() {
   const candidates = [
     path.join(process.env["ProgramFiles(x86)"] ?? "", "Microsoft Visual Studio", "Installer", "vswhere.exe"),
@@ -25,36 +31,100 @@ function getVsWherePath() {
   return candidates.find((candidate) => candidate && existsSync(candidate)) ?? null
 }
 
+function getVisualStudioInstanceCandidates() {
+  const roots = [
+    path.join(process.env.ProgramFiles ?? "", "Microsoft Visual Studio", "2022"),
+    path.join(process.env["ProgramFiles(x86)"] ?? "", "Microsoft Visual Studio", "2022"),
+    path.join(process.env.ProgramFiles ?? "", "Microsoft Visual Studio", "2019"),
+    path.join(process.env["ProgramFiles(x86)"] ?? "", "Microsoft Visual Studio", "2019")
+  ]
+  const editions = ["BuildTools", "Community", "Professional", "Enterprise", "Preview"]
+  const candidates = []
+
+  for (const root of roots) {
+    if (!root || !existsSync(root)) {
+      continue
+    }
+
+    for (const edition of editions) {
+      const candidate = path.join(root, edition)
+      if (existsSync(candidate)) {
+        candidates.push(candidate)
+      }
+    }
+  }
+
+  return candidates
+}
+
 async function findVisualStudioGenerator() {
+  const instanceCandidates = getVisualStudioInstanceCandidates()
+
+  if (instanceCandidates.some((candidate) => candidate.includes(`${path.sep}2022${path.sep}`))) {
+    return {
+      generator: "Visual Studio 17 2022",
+      instance: instanceCandidates.find((candidate) => candidate.includes(`${path.sep}2022${path.sep}`))
+    }
+  }
+
+  if (instanceCandidates.some((candidate) => candidate.includes(`${path.sep}2019${path.sep}`))) {
+    return {
+      generator: "Visual Studio 16 2019",
+      instance: instanceCandidates.find((candidate) => candidate.includes(`${path.sep}2019${path.sep}`))
+    }
+  }
+
   const vswherePath = getVsWherePath()
   if (!vswherePath) {
     return null
   }
 
-  try {
-    const version = await captureCommandOutput(vswherePath, [
+  const { captureCommandOutput } = await import("./process.js")
+  const version = await captureCommandOutput(vswherePath, [
+    "-latest",
+    "-products",
+    "*",
+    "-requires",
+    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+    "-property",
+    "catalog_productLineVersion"
+  ]).catch(() => "")
+
+  if (version === "2022") {
+    const instance = await captureCommandOutput(vswherePath, [
       "-latest",
       "-products",
       "*",
       "-requires",
       "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
       "-property",
-      "catalog_productLineVersion"
-    ])
+      "installationPath"
+    ]).catch(() => "")
 
-    const normalized = String(version).trim()
-    if (normalized === "2022") {
-      return "Visual Studio 17 2022"
+    return {
+      generator: "Visual Studio 17 2022",
+      instance: instance || null
     }
+  }
+
+  if (version === "2019") {
+    const instance = await captureCommandOutput(vswherePath, [
+      "-latest",
+      "-products",
+      "*",
+      "-requires",
+      "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
+      "-property",
+      "installationPath"
+    ]).catch(() => "")
 
-    if (normalized === "2019") {
-      return "Visual Studio 16 2019"
+    return {
+      generator: "Visual Studio 16 2019",
+      instance: instance || null
     }
-  } catch {
-    // Fall through to the default Windows generator if detection fails.
   }
 
-  return "Visual Studio 17 2022"
+  return null
 }
 
 async function resolveCmakeGenerator() {
@@ -79,18 +149,19 @@ async function resolveCmakeGenerator() {
   }
 
   if (process.platform === "win32") {
-    const generator = await findVisualStudioGenerator()
-    if (!generator) {
-      throw new Error(
-        "Could not find a supported Visual Studio C++ installation. Install Visual Studio Build Tools or set CMAKE_GENERATOR manually."
-      )
-    }
+    const visualStudio = await findVisualStudioGenerator()
+    if (visualStudio) {
+      const configureArgs = ["-G", visualStudio.generator, "-A", "x64"]
+      if (visualStudio.instance) {
+        configureArgs.push(`-DCMAKE_GENERATOR_INSTANCE=${visualStudio.instance}`)
+      }
 
-    return {
-      name: generator,
-      configureArgs: ["-G", generator, "-A", "x64"],
-      buildArgs: ["--config"],
-      multiConfig: true
+      return {
+        name: visualStudio.generator,
+        configureArgs,
+        buildArgs: ["--config"],
+        multiConfig: true
+      }
     }
   }
 
@@ -102,7 +173,7 @@ async function resolveCmakeGenerator() {
   }
 }
 
-async function ensureMatchingCmakeSource(buildDir, frameworkRoot) {
+async function ensureCompatibleCmakeBuild(buildDir, frameworkRoot, generatorName) {
   const cachePath = path.join(buildDir, "CMakeCache.txt")
   if (!existsSync(cachePath)) {
     return
@@ -115,26 +186,31 @@ async function ensureMatchingCmakeSource(buildDir, frameworkRoot) {
     return
   }
 
-  const match = cache.match(/^CMAKE_HOME_DIRECTORY:INTERNAL=(.+)$/m)
-  if (!match) {
+  const cachedRootValue = readCmakeCacheValue(cache, "CMAKE_HOME_DIRECTORY")
+  const cachedGenerator = readCmakeCacheValue(cache, "CMAKE_GENERATOR")
+  if (!cachedRootValue) {
     return
   }
 
-  const cachedRoot = path.resolve(match[1].trim())
+  const cachedRoot = path.resolve(cachedRootValue)
   const currentRoot = path.resolve(frameworkRoot)
+  const generatorChanged =
+    typeof cachedGenerator === "string" &&
+    cachedGenerator !== generatorName
 
-  if (cachedRoot !== currentRoot) {
+  if (cachedRoot !== currentRoot || generatorChanged) {
     await rm(buildDir, { recursive: true, force: true })
   }
 }
 
 export async function configureFrameworkBuild(frameworkPaths, frameworkBuildPaths, mode, options = {}) {
   const { dryRun = false, cwd } = options
+  assertFrameworkSourceInstall(frameworkPaths)
   const toolchainFile = await ensureVcpkgToolchain({ dryRun })
   const buildDir = getBuildDirectory(frameworkBuildPaths, mode)
   const generator = await resolveCmakeGenerator()
   if (!dryRun) {
-    await ensureMatchingCmakeSource(buildDir, frameworkPaths.frameworkRoot)
+    await ensureCompatibleCmakeBuild(buildDir, frameworkPaths.frameworkRoot, generator.name)
   }
   const configureArgs = [
     "-S",
@@ -159,8 +235,8 @@ export async function configureFrameworkBuild(frameworkPaths, frameworkBuildPath
     throw error
   }
 }
-
-export async function buildFrameworkRuntime(frameworkPaths, frameworkBuildPaths, mode, options = {}) {
+
+async function buildFrameworkRuntimeFromSource(frameworkPaths, frameworkBuildPaths, mode, options = {}) {
   const { dryRun = false, cwd } = options
   const buildDir = getBuildDirectory(frameworkBuildPaths, mode)
   const generator = await resolveCmakeGenerator()
@@ -175,3 +251,14 @@ export async function buildFrameworkRuntime(frameworkPaths, frameworkBuildPaths,
     dryRun
   })
 }
+
+export async function prepareFrameworkRuntime(frameworkPaths, frameworkBuildPaths, mode, options = {}) {
+  const strategy = resolveFrameworkRuntimeStrategy(frameworkPaths, options)
+
+  if (strategy.kind === "prebuilt") {
+    return strategy
+  }
+
+  await buildFrameworkRuntimeFromSource(frameworkPaths, frameworkBuildPaths, mode, options)
+  return strategy
+}

package/src/lib/logger.js

@@ -1,11 +1,11 @@
-export const logger = {
-  info(message) {
-    console.log(message)
-  },
-  warn(message) {
-    console.warn(message)
-  },
-  error(message) {
-    console.error(message)
-  }
-}
+export const logger = {
+  info(message) {
+    console.log(message)
+  },
+  warn(message) {
+    console.warn(message)
+  },
+  error(message) {
+    console.error(message)
+  }
+}