Skip to content

[Refactor] Use lookup map for architecture in platformAndArch #8059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gonzaloriestra wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −8
Open

[Refactor] Use lookup map for architecture in platformAndArch #8059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions packages/cli-kit/src/public/node/os.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ export async function username(platform: typeof process.platform = process.platf

type PlatformArch = Exclude<typeof process.arch, 'x64' | 'ia32'> | 'amd64' | '386'
type PlatformStrings = Exclude<typeof process.platform, 'win32'> | 'windows'

const ARCH_MAP: {[key: string]: PlatformArch} = {
x64: 'amd64',
ia32: '386',
}

/**
* Returns the platform and architecture.
* @returns Returns the current platform and architecture.
Expand All @@ -57,14 +63,7 @@ export function platformAndArch(
platform: PlatformStrings
arch: PlatformArch
} {
let archString: PlatformArch
if (arch === 'x64') {
archString = 'amd64'
} else if (arch === 'ia32') {
archString = '386'
} else {
archString = arch
}
const archString = ARCH_MAP[arch] ?? (arch as PlatformArch)
const platformString = (platform.match(/^win.+/) ? 'windows' : platform) as PlatformStrings
return {platform: platformString, arch: archString}
}
Expand Down
Loading