fix: fix parsing of Visual studio generators

Author: aminya

package.json

@@ -88,6 +88,7 @@
     "@types/which": "3.0.4",
     "@types/escape-quotes": "1.0.0",
     "@upleveled/babel-plugin-remove-node-prefix": "1.0.5",
+    "@types/memoizee": "0.4.7",
     "turbo": "2.5.0",
     "cross-env": "7.0.3",
     "eslint": "^8",
@@ -116,9 +117,10 @@
     "node-downloader-helper": "^2.1.9",
     "escape-quotes": "^1.0.2",
     "commander": "^13.1.0",
-    "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd"
+    "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd",
+    "memoizee": "0.4.17"
   },
-  "packageManager": "pnpm@10.7.1",
+  "packageManager": "pnpm@10.8.0",
   "$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/package.json",
   "pnpm": {
     "onlyBuiltDependencies": ["@biomejs/biome", "core-js", "esbuild"]

pnpm-lock.yaml

@@ -17,12 +17,10 @@ export class ArgumentBuilder {
     const defines = await this.buildDefines()
     baseCommand += ` ${defines.map((d) => `-D${d[0]}="${d[1]}"`).join(" ")}`
     if (this.config.generatorToUse !== "native") {
-      let generatorString = ` -G"${this.config.generatorToUse}"`
-      if (generatorString.match(/Visual\s+Studio\s+\d+\s+\d+\s-A/)) {
-        generatorString = generatorString.replace(/\s-A/, "")
-        generatorString += ` -A ${this.config.arch}`
+      baseCommand += ` -G"${this.config.generatorToUse}"`
+      if (this.config.generatorFlags !== undefined) {
+        baseCommand += ` ${this.config.generatorFlags.map((f) => `"${f}"`).join(" ")}`
       }
-      baseCommand += generatorString
     }
     logger.debug(baseCommand)
     return baseCommand
@@ -140,7 +138,7 @@ export class ArgumentBuilder {
  *
  * @note Based on https://stackoverflow.com/a/70498851/7910299
  */
-function getCMakeArchitecture(arch: NodeJS.Architecture, os: NodeJS.Platform) {
+export function getCMakeArchitecture(arch: NodeJS.Architecture, os: NodeJS.Platform) {
   return os in cmakeArchMap && arch in cmakeArchMap[os]
     ? cmakeArchMap[os][arch]
     : os === "win32"