@highstate/cli 0.26.0 → 0.28.0

package/dist/commands/index.js

@@ -12,7 +12,8 @@ import {
   PackageRemoveCommand,
   PackageUpdateReferencesCommand,
   UpdateCommand
-} from "../chunk-2s546hay.js";
+} from "../chunk-pa6gpwe5.js";
+import"../chunk-hjrkeh0y.js";
 import"../chunk-vcev74he.js";
 export {
   UpdateCommand,

package/dist/highstate.manifest.json

@@ -1,6 +1,7 @@
 {
   "sourceHashes": {
-    "./dist/commands/index.js": 4100963334,
-    "./dist/main.js": 527856276
+    "./dist/shared/index.js": 1332764379,
+    "./dist/commands/index.js": 875626205,
+    "./dist/main.js": 3132220889
   }
 }

package/dist/main.js

@@ -13,14 +13,19 @@ import {
   PackageRemoveCommand,
   PackageUpdateReferencesCommand,
   UpdateCommand
-} from "./chunk-2s546hay.js";
+} from "./chunk-pa6gpwe5.js";
+import {
+  readCurrentPackageVersion
+} from "./chunk-hjrkeh0y.js";
 import"./chunk-vcev74he.js";
 
 // src/main.ts
 import { Builtins, Cli } from "clipanion";
+var version = await readCurrentPackageVersion(import.meta.url);
 var cli = new Cli({
   binaryName: "highstate",
-  binaryLabel: "Highstate"
+  binaryLabel: "Highstate",
+  binaryVersion: version
 });
 cli.register(BuildCommand);
 cli.register(DesignerCommand);

package/dist/shared/index.js

@@ -0,0 +1,72 @@
+// @bun
+import {
+  PLATFORM_PACKAGES,
+  PULUMI_PACKAGES,
+  STDLIB_PACKAGES,
+  SourceHashCalculator,
+  applyOverrides,
+  applySchemaTransformations,
+  buildOverrides,
+  createBinTransformerPlugin,
+  createPackage,
+  disposeServices,
+  extractEntryPoints,
+  fetchLatestVersion,
+  fetchManifest,
+  fetchNpmPackument,
+  findWorkspaceRoot,
+  generateFromTemplate,
+  getBackendServices,
+  getDependencyRange,
+  getProjectOverrideVersion,
+  getProjectPlatformVersion,
+  getProjectPulumiSdkVersion,
+  getPulumiCliVersion,
+  highstateConfigSchema,
+  highstateManifestSchema,
+  logger,
+  parseFileDependencies,
+  readCurrentPackageVersion,
+  resolveVersionBundle,
+  scanWorkspacePackages,
+  schemaTransformerPlugin,
+  sourceHashConfigSchema,
+  updateTsconfigReferences,
+  writeJsonFile
+} from "../chunk-hjrkeh0y.js";
+import"../chunk-vcev74he.js";
+export {
+  writeJsonFile,
+  updateTsconfigReferences,
+  sourceHashConfigSchema,
+  schemaTransformerPlugin,
+  scanWorkspacePackages,
+  resolveVersionBundle,
+  readCurrentPackageVersion,
+  parseFileDependencies,
+  logger,
+  highstateManifestSchema,
+  highstateConfigSchema,
+  getPulumiCliVersion,
+  getProjectPulumiSdkVersion,
+  getProjectPlatformVersion,
+  getProjectOverrideVersion,
+  getDependencyRange,
+  getBackendServices,
+  generateFromTemplate,
+  findWorkspaceRoot,
+  fetchNpmPackument,
+  fetchManifest,
+  fetchLatestVersion,
+  extractEntryPoints,
+  disposeServices,
+  createPackage,
+  createBinTransformerPlugin,
+  buildOverrides,
+  applySchemaTransformations,
+  applyOverrides,
+  SourceHashCalculator,
+  STDLIB_PACKAGES,
+  PULUMI_PACKAGES,
+  PLATFORM_PACKAGES
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/cli",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "description": "The CLI for the Highstate project.",
   "type": "module",
   "files": [
@@ -9,6 +9,10 @@
     "src"
   ],
   "exports": {
+    "./shared": {
+      "types": "./src/shared/index.ts",
+      "default": "./dist/shared/index.js"
+    },
     "./commands": {
       "types": "./src/commands/index.ts",
       "default": "./dist/commands/index.js"
@@ -34,8 +38,8 @@
   },
   "dependencies": {
     "@aws-crypto/crc32": "^5.2.0",
-    "@highstate/backend": "0.25.0",
-    "@highstate/contract": "0.25.0",
+    "@highstate/backend": "0.27.0",
+    "@highstate/contract": "0.27.0",
     "@inquirer/prompts": "^7.8.6",
     "@msgpack/msgpack": "^3.1.2",
     "@pulumi/pulumi": "3.232.0",
@@ -69,7 +73,7 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.0",
+    "@biomejs/biome": "2.5.0",
     "@types/semver": "^7.7.1",
     "@typescript/native-preview": "^7.0.0-dev.20250920.1",
     "esbuild": "^0.25.11",

package/src/commands/designer.ts

@@ -6,7 +6,7 @@ import { checkPort, getPort } from "get-port-please"
 import { resolve as importMetaResolve } from "import-meta-resolve"
 import { addDevDependency } from "nypm"
 import { readPackageJSON, resolvePackageJSON } from "pkg-types"
-import { getBackendServices, logger } from "../shared"
+import { getBackendServices, logger, readCurrentPackageVersion } from "../shared"
 
 let shuttingDown = false
 
@@ -62,16 +62,13 @@ export class DesignerCommand extends Command {
 
     const eventsPort = await getPort({ random: true, host })
 
-    const designerPackageJsonPath = importMetaResolve(
-      "@highstate/designer/package.json",
-      packageJsonUrl,
-    )
-    const designerPackageJson = await readPackageJSON(designerPackageJsonPath)
+    const designerServerPath = importMetaResolve("@highstate/designer/server", packageJsonUrl)
+    const designerVersion = await readCurrentPackageVersion(designerServerPath)
 
     process.env.NITRO_PORT = port.toString()
     process.env.NITRO_HOST = host
     process.env.NITRO_BUN_IDLE_TIMEOUT ??= "255"
-    process.env.NUXT_PUBLIC_VERSION = designerPackageJson.version
+    process.env.NUXT_PUBLIC_VERSION = designerVersion
     process.env.NUXT_PUBLIC_EVENTS_PORT = eventsPort.toString()
 
     try {
@@ -87,8 +84,7 @@ export class DesignerCommand extends Command {
           }
         }
 
-        const serverPath = importMetaResolve("@highstate/designer/server", packageJsonUrl)
-        void import(serverPath).catch(reject)
+        void import(designerServerPath).catch(reject)
       })
     } finally {
       console.log = oldConsoleLog

package/src/main.ts

@@ -13,13 +13,14 @@ import {
   PackageUpdateReferencesCommand,
   UpdateCommand,
 } from "./commands"
+import { readCurrentPackageVersion } from "./shared"
 
-// const { version } = await import("@highstate/cli/package.json")
+const version = await readCurrentPackageVersion(import.meta.url)
 
 const cli = new Cli({
   binaryName: "highstate",
   binaryLabel: "Highstate",
-  // binaryVersion: version,
+  binaryVersion: version,
 })
 
 cli.register(BuildCommand)

package/src/shared/index.ts

@@ -11,6 +11,7 @@ export * from "./schema-transformer"
 export * from "./schemas"
 export * from "./services"
 export * from "./source-hash-calculator"
+export * from "./version"
 export * from "./version-bundle"
 export * from "./version-sets"
 export * from "./workspace"

package/src/shared/schema-transformer.ts

@@ -316,7 +316,7 @@ function findFirstReturnArgument(node: ObjectProperty): Node | null {
   }
 
   const body = node.value.body
-  if (!body || body.type !== "BlockStatement") {
+  if (body?.type !== "BlockStatement") {
     return null
   }
 
@@ -423,7 +423,7 @@ function getHelperFunctionForProperty(
   }
 
   const objectExpression = parentStack[parentStack.length - 2]
-  if (!objectExpression || objectExpression.type !== "ObjectExpression") {
+  if (objectExpression?.type !== "ObjectExpression") {
     return null
   }
 
@@ -536,7 +536,7 @@ function isZodObjectCall(memberExpression: Node): boolean {
 }
 
 function startsWithZodCall(callExpression: CallExpression): boolean {
-  if (!callExpression || callExpression.type !== "CallExpression") {
+  if (callExpression?.type !== "CallExpression") {
     return false
   }
 

package/src/shared/version.ts

@@ -0,0 +1,42 @@
+import { readFile } from "node:fs/promises"
+import { dirname, isAbsolute, join } from "node:path"
+import { fileURLToPath } from "node:url"
+
+type PackageManifest = {
+  version?: string
+}
+
+export async function readCurrentPackageVersion(moduleUrl: string): Promise<string> {
+  let directory = dirname(
+    moduleUrl.startsWith("file:")
+      ? fileURLToPath(moduleUrl)
+      : isAbsolute(moduleUrl)
+        ? moduleUrl
+        : process.cwd(),
+  )
+
+  while (true) {
+    const packageJsonPath = join(directory, "package.json")
+
+    try {
+      const packageJson = JSON.parse(await readFile(packageJsonPath, "utf8")) as PackageManifest
+
+      if (!packageJson.version) {
+        throw new Error(`Package version is missing from "${packageJsonPath}"`)
+      }
+
+      return packageJson.version
+    } catch (error) {
+      if (!(error instanceof Error) || !("code" in error && error.code === "ENOENT")) {
+        throw error
+      }
+    }
+
+    const parentDirectory = dirname(directory)
+    if (parentDirectory === directory) {
+      throw new Error(`Package manifest not found above "${directory}"`)
+    }
+
+    directory = parentDirectory
+  }
+}