@highstate/cli 0.20.0 → 0.26.0

package/src/commands/update.ts

@@ -1,15 +1,17 @@
 import { readFile } from "node:fs/promises"
 import { Command, Option } from "clipanion"
-import { detectPackageManager } from "nypm"
+import { readPackageJSON, resolvePackageJSON } from "pkg-types"
 import semver from "semver"
 import {
   applyOverrides,
   buildOverrides,
   fetchManifest,
+  fetchNpmPackument,
   getDependencyRange,
   getProjectPlatformVersion,
   logger,
   resolveVersionBundle,
+  writeJsonFile,
 } from "../shared"
 
 export class UpdateCommand extends Command {
@@ -42,7 +44,7 @@ export class UpdateCommand extends Command {
   async execute(): Promise<void> {
     const projectRoot = process.cwd()
 
-    const packageManager = await resolveProjectPackageManager(projectRoot)
+    await assertPackageJsonExists(projectRoot)
 
     if (this.platformOnly && this.stdlibOnly) {
       throw new Error('Flags "--platform" and "--stdlib" cannot be used together')
@@ -51,55 +53,36 @@ export class UpdateCommand extends Command {
     const updatePlatform = this.platformOnly || !this.stdlibOnly
     const updateStdlib = this.stdlibOnly || !this.platformOnly
 
+    let currentPlatformVersion: string | undefined
+    let resolvedStdlibVersion = this.stdlibVersion
+
     if (this.stdlibOnly) {
-      const currentPlatformVersion = await getProjectPlatformVersion(projectRoot, {
-        packageManager,
-      })
-      if (!currentPlatformVersion) {
+      const projectPlatformVersion = await getProjectPlatformVersion(projectRoot)
+      if (!projectPlatformVersion) {
         throw new Error('Current platform version is not set in overrides for "@highstate/pulumi"')
       }
 
-      const targetStdlibVersion = (this.stdlibVersion ?? "").trim()
-      if (targetStdlibVersion.length === 0) {
-        throw new Error('Flag "--stdlib-version" must be provided when using "--stdlib"')
-      }
-
-      const stdlibManifest = await fetchManifest("@highstate/library", targetStdlibVersion)
-      const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi")
-      if (!supportedPlatformRange) {
-        throw new Error(
-          `Unable to infer "@highstate/pulumi" version from "@highstate/library@${targetStdlibVersion}"`,
-        )
-      }
-
-      const validPlatform = semver.valid(currentPlatformVersion)
-      if (!validPlatform) {
-        throw new Error(
-          `Current platform version is not a valid semver "${currentPlatformVersion}"`,
-        )
-      }
-
-      const ok = semver.satisfies(validPlatform, supportedPlatformRange, {
-        includePrerelease: true,
+      currentPlatformVersion = projectPlatformVersion
+      resolvedStdlibVersion = await resolveCompatibleStdlibVersion({
+        currentPlatformVersion: projectPlatformVersion,
+        stdlibVersion: this.stdlibVersion,
       })
-      if (!ok) {
-        throw new Error(
-          `Current platform version "${currentPlatformVersion}" does not satisfy requirement "${supportedPlatformRange}"`,
-        )
-      }
     }
 
     const bundle = await resolveVersionBundle({
-      platformVersion: updatePlatform ? this.platformVersion : undefined,
-      stdlibVersion: updateStdlib ? this.stdlibVersion : undefined,
+      platformVersion: updatePlatform ? this.platformVersion : currentPlatformVersion,
+      stdlibVersion: updateStdlib ? resolvedStdlibVersion : undefined,
     })
 
     const overrides = buildOverrides(bundle)
     await applyOverrides({
       projectRoot,
-      packageManager,
       overrides,
     })
+    await syncRootPulumiDependency({
+      projectRoot,
+      pulumiVersion: bundle.pulumiVersion,
+    })
 
     logger.info(
       "updated overrides: platform=%s stdlib=%s pulumi=%s",
@@ -111,11 +94,11 @@ export class UpdateCommand extends Command {
     if (this.install) {
       const { installDependencies } = await import("nypm")
 
-      logger.info("installing dependencies using %s...", packageManager)
+      logger.info("installing dependencies using bun...")
 
       await installDependencies({
         cwd: projectRoot,
-        packageManager,
+        packageManager: "bun",
         silent: false,
       })
     }
@@ -124,27 +107,78 @@ export class UpdateCommand extends Command {
   }
 }
 
-async function resolveProjectPackageManager(projectRoot: string) {
-  const detected = await detectPackageManager(projectRoot)
-  if (!detected?.name) {
-    throw new Error("Unable to detect package manager for this project")
-  }
+type ResolveCompatibleStdlibVersionArgs = {
+  currentPlatformVersion: string
+  stdlibVersion?: string
+}
 
-  if (detected.name === "bun") {
-    throw new Error('Package manager "bun" is not supported')
+async function resolveCompatibleStdlibVersion(
+  args: ResolveCompatibleStdlibVersionArgs,
+): Promise<string> {
+  const validPlatform = semver.valid(args.currentPlatformVersion)
+  if (!validPlatform) {
+    throw new Error(
+      `Current platform version is not a valid semver "${args.currentPlatformVersion}"`,
+    )
   }
 
-  if (detected.name === "deno") {
-    throw new Error('Package manager "deno" is not supported')
+  const targetStdlibVersion = args.stdlibVersion?.trim()
+  if (targetStdlibVersion) {
+    await assertStdlibSupportsPlatform({
+      currentPlatformVersion: validPlatform,
+      stdlibVersion: targetStdlibVersion,
+    })
+
+    return targetStdlibVersion
   }
 
-  if (detected.name !== "npm" && detected.name !== "pnpm" && detected.name !== "yarn") {
-    throw new Error(`Unsupported package manager: "${detected.name}"`)
+  const packument = await fetchNpmPackument("@highstate/library")
+  const sortedVersions = Object.entries(packument.versions ?? {})
+    .filter(([version]) => semver.valid(version))
+    .sort(([a], [b]) => semver.rcompare(a, b))
+
+  for (const [stdlibVersion, stdlibManifest] of sortedVersions) {
+    const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi")
+    if (!supportedPlatformRange) {
+      continue
+    }
+
+    const ok = semver.satisfies(validPlatform, supportedPlatformRange, {
+      includePrerelease: true,
+    })
+
+    if (ok) {
+      return stdlibVersion
+    }
   }
 
-  await assertPackageJsonExists(projectRoot)
+  throw new Error(
+    `Unable to find "@highstate/library" version compatible with platform "${validPlatform}"`,
+  )
+}
 
-  return detected.name
+type StdlibPlatformCompatibilityArgs = {
+  currentPlatformVersion: string
+  stdlibVersion: string
+}
+
+async function assertStdlibSupportsPlatform(args: StdlibPlatformCompatibilityArgs): Promise<void> {
+  const stdlibManifest = await fetchManifest("@highstate/library", args.stdlibVersion)
+  const supportedPlatformRange = getDependencyRange(stdlibManifest, "@highstate/pulumi")
+  if (!supportedPlatformRange) {
+    throw new Error(
+      `Unable to infer "@highstate/pulumi" version from "@highstate/library@${args.stdlibVersion}"`,
+    )
+  }
+
+  const ok = semver.satisfies(args.currentPlatformVersion, supportedPlatformRange, {
+    includePrerelease: true,
+  })
+  if (!ok) {
+    throw new Error(
+      `Current platform version "${args.currentPlatformVersion}" does not satisfy requirement "${supportedPlatformRange}"`,
+    )
+  }
 }
 
 async function assertPackageJsonExists(projectRoot: string): Promise<void> {
@@ -154,3 +188,19 @@ async function assertPackageJsonExists(projectRoot: string): Promise<void> {
     throw new Error(`File "package.json" not found in "${projectRoot}"`)
   }
 }
+
+async function syncRootPulumiDependency(args: {
+  projectRoot: string
+  pulumiVersion: string
+}): Promise<void> {
+  const packageJsonPath = await resolvePackageJSON(args.projectRoot)
+  const packageJson = await readPackageJSON(packageJsonPath)
+
+  await writeJsonFile(packageJsonPath, {
+    ...packageJson,
+    dependencies: {
+      ...(packageJson.dependencies ?? {}),
+      "@pulumi/pulumi": args.pulumiVersion,
+    },
+  })
+}

package/src/shared/bin-transformer.ts

@@ -1,8 +1,7 @@
-import type { Plugin } from "esbuild"
 import { readFile } from "node:fs/promises"
 import { logger } from "./logger"
 
-export function createBinTransformerPlugin(sourceFilePaths: string[]): Plugin {
+export function createBinTransformerPlugin(sourceFilePaths: string[]): Bun.BunPlugin {
   const filter = new RegExp(`(${sourceFilePaths.join("|")})$`)
 
   logger.debug("created bin transformer plugin with filter: %s", filter)
@@ -14,7 +13,7 @@ export function createBinTransformerPlugin(sourceFilePaths: string[]): Plugin {
         const content = await readFile(args.path, "utf-8")
 
         return {
-          contents: `#!/usr/bin/env node\n\n${content}`,
+          contents: `#!/usr/bin/env bun\n\n${content}`,
           loader: "ts",
         }
       })

package/src/shared/index.ts

@@ -5,7 +5,6 @@ export * from "./logger"
 export * from "./npm-registry"
 export * from "./overrides"
 export * from "./package-json"
-export * from "./pnpm-workspace"
 export * from "./project-versions"
 export * from "./pulumi-cli"
 export * from "./schema-transformer"

package/src/shared/overrides.ts

@@ -1,9 +1,6 @@
-import type { PackageManagerName } from "nypm"
 import type { VersionBundle } from "./version-bundle"
-import { access } from "node:fs/promises"
 import { readPackageJSON, resolvePackageJSON } from "pkg-types"
 import { writeJsonFile } from "./package-json"
-import { readPnpmWorkspace, resolvePnpmWorkspacePath, writePnpmWorkspace } from "./pnpm-workspace"
 import { PLATFORM_PACKAGES, PULUMI_PACKAGES, STDLIB_PACKAGES } from "./version-sets"
 
 export type Overrides = Record<string, string>
@@ -23,51 +20,18 @@ export function buildOverrides(bundle: VersionBundle): Overrides {
 }
 
 export type ApplyOverridesArgs = {
-  packageManager: PackageManagerName
   overrides: Overrides
   projectRoot: string
 }
 
 export async function applyOverrides(args: ApplyOverridesArgs): Promise<void> {
-  const { packageManager, overrides, projectRoot } = args
-
-  if (packageManager === "pnpm") {
-    const pnpmWorkspacePath = resolvePnpmWorkspacePath(projectRoot)
-
-    try {
-      await access(pnpmWorkspacePath)
-    } catch {
-      throw new Error(`PNPM workspace file is missing: "${pnpmWorkspacePath}"`)
-    }
-
-    const workspace = await readPnpmWorkspace(pnpmWorkspacePath)
-    const nextWorkspace = {
-      ...workspace,
-      overrides,
-    }
-
-    await writePnpmWorkspace(pnpmWorkspacePath, nextWorkspace)
-    return
-  }
+  const { overrides, projectRoot } = args
 
   const packageJsonPath = await resolvePackageJSON(projectRoot)
   const packageJson = await readPackageJSON(projectRoot)
 
-  if (packageManager === "npm") {
-    await writeJsonFile(packageJsonPath, {
-      ...packageJson,
-      overrides,
-    })
-    return
-  }
-
-  if (packageManager === "yarn") {
-    await writeJsonFile(packageJsonPath, {
-      ...packageJson,
-      resolutions: overrides,
-    })
-    return
-  }
-
-  await writeJsonFile(packageJsonPath, packageJson)
+  await writeJsonFile(packageJsonPath, {
+    ...packageJson,
+    overrides,
+  })
 }

package/src/shared/project-versions.ts

@@ -1,54 +1,29 @@
-import type { PackageManagerName } from "nypm"
 import type { PackageJson } from "pkg-types"
 import { readFile } from "node:fs/promises"
 import { resolvePackageJSON } from "pkg-types"
-import { readPnpmWorkspace, resolvePnpmWorkspacePath } from "./pnpm-workspace"
 
 export async function getProjectOverrideVersion(
   projectRoot: string,
-  args: { packageManager: PackageManagerName; packageName: string },
+  args: { packageName: string },
 ): Promise<string | null> {
-  const { packageManager, packageName } = args
-
-  if (packageManager === "pnpm") {
-    const path = resolvePnpmWorkspacePath(projectRoot)
-    const workspace = await readPnpmWorkspace(path)
-    return workspace.overrides?.[packageName] ?? null
-  }
+  const { packageName } = args
 
   const packageJsonPath = await resolvePackageJSON(projectRoot)
   const rawPackageJson = await readFile(packageJsonPath, "utf8")
   const packageJson = JSON.parse(rawPackageJson) as PackageJson
 
-  if (packageManager === "npm") {
-    const overrides = packageJson.overrides as Record<string, string> | undefined
-    return overrides?.[packageName] ?? null
-  }
-
-  if (packageManager === "yarn") {
-    const resolutions = packageJson.resolutions as Record<string, string> | undefined
-    return resolutions?.[packageName] ?? null
-  }
-
-  return null
+  const overrides = packageJson.overrides as Record<string, string> | undefined
+  return overrides?.[packageName] ?? null
 }
 
-export async function getProjectPlatformVersion(
-  projectRoot: string,
-  args: { packageManager: PackageManagerName },
-): Promise<string | null> {
+export async function getProjectPlatformVersion(projectRoot: string): Promise<string | null> {
   return await getProjectOverrideVersion(projectRoot, {
-    packageManager: args.packageManager,
     packageName: "@highstate/pulumi",
   })
 }
 
-export async function getProjectPulumiSdkVersion(
-  projectRoot: string,
-  args: { packageManager: PackageManagerName },
-): Promise<string | null> {
+export async function getProjectPulumiSdkVersion(projectRoot: string): Promise<string | null> {
   return await getProjectOverrideVersion(projectRoot, {
-    packageManager: args.packageManager,
     packageName: "@pulumi/pulumi",
   })
 }

package/src/shared/pulumi-cli.ts

@@ -3,9 +3,12 @@ import { promisify } from "node:util"
 
 const execFileAsync = promisify(execFile)
 
-export async function getPulumiCliVersion(cwd: string): Promise<string | null> {
+export async function getPulumiCliVersion(
+  cwd: string,
+  commandPath = "pulumi",
+): Promise<string | null> {
   try {
-    const { stdout } = await execFileAsync("pulumi", ["version"], {
+    const { stdout } = await execFileAsync(commandPath, ["version"], {
       cwd,
     })
 

package/src/shared/schema-transformer.ts

@@ -1,4 +1,3 @@
-import type { Plugin } from "esbuild"
 import { readFile } from "node:fs/promises"
 import MagicString from "magic-string"
 import {
@@ -10,7 +9,7 @@ import {
 } from "oxc-parser"
 import { type Node, walk } from "oxc-walker"
 
-export const schemaTransformerPlugin: Plugin = {
+export const schemaTransformerPlugin: Bun.BunPlugin = {
   name: "schema-transformer",
   setup(build) {
     build.onLoad({ filter: /src\/.*\.ts$/ }, async args => {

package/src/shared/source-hash-calculator.ts

@@ -1,6 +1,7 @@
 import type { Logger } from "pino"
 import { readFile, writeFile } from "node:fs/promises"
-import { dirname, relative, resolve } from "node:path"
+import { builtinModules } from "node:module"
+import { dirname, isAbsolute, relative, resolve } from "node:path"
 import { fileURLToPath, pathToFileURL } from "node:url"
 import { crc32 } from "@aws-crypto/crc32"
 import { resolve as importMetaResolve } from "import-meta-resolve"
@@ -53,6 +54,19 @@ export function parseFileDependencies(filePath: string, content: string): FileDe
         fullPath,
       })
     } else if (npmPackage) {
+      const normalizedPackageName = npmPackage.startsWith("node:")
+        ? npmPackage.slice("node:".length)
+        : npmPackage
+      const builtinName = normalizedPackageName.split("/")[0]
+      if (
+        builtinModules.includes(normalizedPackageName) ||
+        builtinModules.includes(builtinName) ||
+        builtinModules.includes(`node:${normalizedPackageName}`) ||
+        builtinModules.includes(`node:${builtinName}`)
+      ) {
+        continue
+      }
+
       dependencies.push({
         type: "npm",
         id: `npm:${npmPackage}`,
@@ -255,7 +269,17 @@ export class SourceHashCalculator {
         //   throw new Error(`"${dependency.package}" imported without "node:" prefix`)
         // }
 
-        const resolvedPath = fileURLToPath(resolvedUrl)
+        const resolvedPath = this.resolveDependencyPath(dependency.package, resolvedUrl)
+        if (!resolvedPath) {
+          this.logger.debug(
+            `using package version as a fallback hash for "%s" due to unsupported resolver output "%s"`,
+            dependency.package,
+            resolvedUrl,
+          )
+
+          const [, depPackageJson] = await this.getPackageJsonFromPackageName(dependency.package)
+          return this.hashString(depPackageJson.version ?? "0.0.0")
+        }
 
         const [depPackageJsonPath, depPackageJson] = await this.getPackageJson(resolvedPath)
         const packageName = depPackageJson.name!
@@ -310,6 +334,35 @@ export class SourceHashCalculator {
     }
   }
 
+  private resolveDependencyPath(packageName: string, resolvedUrl: string): string | null {
+    if (resolvedUrl.startsWith("file:")) {
+      return fileURLToPath(resolvedUrl)
+    }
+
+    if (isAbsolute(resolvedUrl)) {
+      return resolvedUrl
+    }
+
+    if (resolvedUrl.startsWith("node:")) {
+      return null
+    }
+
+    // Bun resolver may return non-file URL schemes for certain modules.
+    if (resolvedUrl.includes(":")) {
+      return null
+    }
+
+    const baseDir = dirname(this.packageJsonPath)
+    return resolve(baseDir, "node_modules", packageName)
+  }
+
+  private async getPackageJsonFromPackageName(packageName: string): Promise<[string, PackageJson]> {
+    const baseDir = dirname(this.packageJsonPath)
+    const packagePath = resolve(baseDir, "node_modules", packageName)
+
+    return await this.getPackageJson(packagePath)
+  }
+
   private async getPackageJson(basePath: string): Promise<[string, PackageJson]> {
     while (true) {
       const packageJson = await readPackageJSON(basePath)

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Exeteres
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/assets/template/pnpm-workspace.tpl.yaml

@@ -1,4 +0,0 @@
-{{#if isPnpm}}
-packages:
-  - "packages/*"
-{{/if}}

package/dist/chunk-CMECLVT7.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/shared/utils.ts"],"names":[],"mappings":";AAAO,SAAS,aAAa,KAAA,EAA2B;AACtD,EAAA,MAAM,MAAA,GAAS,IAAI,WAAA,CAAY,CAAC,CAAA;AAChC,EAAA,MAAM,IAAA,GAAO,IAAI,QAAA,CAAS,MAAM,CAAA;AAChC,EAAA,IAAA,CAAK,QAAA,CAAS,CAAA,EAAG,KAAA,EAAO,IAAI,CAAA;AAC5B,EAAA,OAAO,IAAI,WAAW,MAAM,CAAA;AAC9B","file":"chunk-CMECLVT7.js","sourcesContent":["export function int32ToBytes(value: number): Uint8Array {\n  const buffer = new ArrayBuffer(4)\n  const view = new DataView(buffer)\n  view.setInt32(0, value, true) // true for little-endian\n  return new Uint8Array(buffer)\n}\n"]}