@highstate/cli 0.7.3 → 0.7.6

package/dist/main.js

@@ -10,14 +10,14 @@ import pino, { levels } from 'pino';
 import { readFile, writeFile } from 'node:fs/promises';
 import { parseAsync } from 'oxc-parser';
 import { walk } from 'oxc-walker';
-import { resolve, relative, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { resolve, dirname, relative } from 'node:path';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import { sha256 } from 'crypto-hash';
 import { resolve as resolve$1 } from 'import-meta-resolve';
 import { pipe, mapValues, mapKeys } from 'remeda';
 import { build } from 'tsup';
 
-var version = "0.7.2";
+var version = "0.7.5";
 
 const logger = pino(
   {
@@ -1185,7 +1185,8 @@ function cleanJsdoc(str) {
 }
 
 class SourceHashCalculator {
-  constructor(packageJson, logger) {
+  constructor(packageJsonPath, packageJson, logger) {
+    this.packageJsonPath = packageJsonPath;
     this.packageJson = packageJson;
     this.logger = logger;
   }
@@ -1247,7 +1248,8 @@ class SourceHashCalculator {
       case "npm": {
         let resolvedUrl;
         try {
-          resolvedUrl = resolve$1(dependency.package, import.meta.url);
+          const baseUrl = pathToFileURL(dirname(this.packageJsonPath));
+          resolvedUrl = resolve$1(dependency.package, baseUrl.toString());
         } catch (error) {
           this.logger.error(`failed to resolve package "%s"`, dependency.package);
           throw error;
@@ -1329,6 +1331,25 @@ class SourceHashCalculator {
   }
 }
 
+function createBinTransformerPlugin(sourceFilePaths) {
+  const filter = new RegExp(`(${sourceFilePaths.join("|")})$`);
+  logger.debug("created bin transformer plugin with filter: %s", filter);
+  return {
+    name: "bin-transformer",
+    setup(build) {
+      build.onLoad({ filter }, async (args) => {
+        const content = await readFile(args.path, "utf-8");
+        return {
+          contents: `#!/usr/bin/env node
+
+${content}`,
+          loader: "ts"
+        };
+      });
+    }
+  };
+}
+
 class DesignerCommand extends Command {
   static paths = [["designer"]];
   static usage = Command.Usage({
@@ -1391,16 +1412,26 @@ class BuildCommand extends Command {
   async execute() {
     const packageJson = await readPackageJSON();
     const exports = packageJson.exports;
-    if (!exports) {
-      logger.warn("no exports found in package.json");
+    let bin = packageJson.bin;
+    if (!packageJson.name) {
+      throw new Error("package.json must have a name field");
+    }
+    if (!exports && !bin) {
+      logger.warn("no exports or bin found in package.json");
       return;
     }
-    if (typeof exports !== "object" || Array.isArray(exports)) {
+    if (exports !== void 0 && (typeof exports !== "object" || Array.isArray(exports))) {
       throw new Error("Exports field in package.json must be an object");
     }
+    if (bin !== void 0 && typeof bin !== "object") {
+      bin = { [packageJson.name]: bin };
+    }
     const entry = pipe(
-      exports,
-      mapValues((value, key) => {
+      {
+        ...mapValues(exports ?? {}, (value) => ({ value, isBin: false })),
+        ...mapValues(bin ?? {}, (value) => ({ value, isBin: true }))
+      },
+      mapValues(({ value, isBin }, key) => {
         let distPath;
         if (typeof value === "string") {
           distPath = value;
@@ -1429,11 +1460,20 @@ class BuildCommand extends Command {
         return {
           entryPoint: `./src/${targetName}.ts`,
           targetName,
-          distPath
+          distPath,
+          isBin
         };
       }),
       mapKeys((_, value) => value.targetName)
     );
+    const esbuildPlugins = [];
+    const binSourceFilePaths = Object.values(entry).filter((value) => value.isBin).map((value) => value.entryPoint.slice(2));
+    if (this.library) {
+      esbuildPlugins.push(schemaTransformerPlugin);
+    }
+    if (binSourceFilePaths.length > 0) {
+      esbuildPlugins.push(createBinTransformerPlugin(binSourceFilePaths));
+    }
     await build({
       entry: mapValues(entry, (value) => value.entryPoint),
       outDir: "dist",
@@ -1443,10 +1483,16 @@ class BuildCommand extends Command {
       format: "esm",
       target: "esnext",
       external: ["@pulumi/pulumi"],
-      esbuildPlugins: this.library ? [schemaTransformerPlugin] : []
+      esbuildPlugins,
+      silent: ["warn", "error", "fatal"].includes(logger.level)
     });
+    const packageJsonPath = await resolvePackageJSON();
     const upToDatePackageJson = await readPackageJSON();
-    const sourceHashCalculator = new SourceHashCalculator(upToDatePackageJson, logger);
+    const sourceHashCalculator = new SourceHashCalculator(
+      packageJsonPath,
+      upToDatePackageJson,
+      logger
+    );
     const distPaths = Object.values(entry).map((value) => value.distPath);
     await sourceHashCalculator.writeHighstateManifest("./dist", distPaths);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/cli",
-  "version": "0.7.3",
+  "version": "0.7.6",
   "description": "The CLI for the Highstate project.",
   "type": "module",
   "files": [
@@ -18,6 +18,7 @@
     "build": "pkgroll --clean --tsconfig=tsconfig.build.json"
   },
   "dependencies": {
+    "@highstate/backend": "^0.7.6",
     "clipanion": "^4.0.0-rc.4",
     "consola": "^3.4.0",
     "crypto-hash": "^3.1.0",
@@ -32,10 +33,8 @@
     "tsup": "^8.4.0"
   },
   "devDependencies": {
+    "highstate-cli-bootstrap": "npm:@highstate/cli@0.7.4",
     "pkgroll": "^2.5.1"
   },
-  "peerDependencies": {
-    "@highstate/backend": "workspace:^0.7.2"
-  },
-  "gitHead": "5cf7cec27262c8fa1d96f6478833b94841459d64"
+  "gitHead": "5acce7f9d8a57bdd1220e381d5b76d7b484b98c2"
 }

package/src/commands/build.ts

@@ -1,8 +1,14 @@
+import type { Plugin } from "esbuild"
 import { Command, Option } from "clipanion"
-import { readPackageJSON } from "pkg-types"
+import { readPackageJSON, resolvePackageJSON } from "pkg-types"
 import { mapKeys, mapValues, pipe } from "remeda"
 import { build } from "tsup"
-import { logger, schemaTransformerPlugin, SourceHashCalculator } from "../shared"
+import {
+  createBinTransformerPlugin,
+  logger,
+  schemaTransformerPlugin,
+  SourceHashCalculator,
+} from "../shared"
 
 export class BuildCommand extends Command {
   static paths = [["build"]]
@@ -18,19 +24,31 @@ export class BuildCommand extends Command {
   async execute(): Promise<void> {
     const packageJson = await readPackageJSON()
     const exports = packageJson.exports
+    let bin = packageJson.bin
 
-    if (!exports) {
-      logger.warn("no exports found in package.json")
+    if (!packageJson.name) {
+      throw new Error("package.json must have a name field")
+    }
+
+    if (!exports && !bin) {
+      logger.warn("no exports or bin found in package.json")
       return
     }
 
-    if (typeof exports !== "object" || Array.isArray(exports)) {
+    if (exports !== undefined && (typeof exports !== "object" || Array.isArray(exports))) {
       throw new Error("Exports field in package.json must be an object")
     }
 
+    if (bin !== undefined && typeof bin !== "object") {
+      bin = { [packageJson.name]: bin }
+    }
+
     const entry = pipe(
-      exports,
-      mapValues((value, key) => {
+      {
+        ...mapValues(exports ?? {}, value => ({ value, isBin: false })),
+        ...mapValues(bin ?? {}, value => ({ value, isBin: true })),
+      },
+      mapValues(({ value, isBin }, key) => {
         let distPath
 
         if (typeof value === "string") {
@@ -67,11 +85,26 @@ export class BuildCommand extends Command {
           entryPoint: `./src/${targetName}.ts`,
           targetName,
           distPath,
+          isBin,
         }
       }),
       mapKeys((_, value) => value.targetName),
     )
 
+    const esbuildPlugins: Plugin[] = []
+
+    const binSourceFilePaths = Object.values(entry)
+      .filter(value => value.isBin)
+      .map(value => value.entryPoint.slice(2)) // remove "./"
+
+    if (this.library) {
+      esbuildPlugins.push(schemaTransformerPlugin)
+    }
+
+    if (binSourceFilePaths.length > 0) {
+      esbuildPlugins.push(createBinTransformerPlugin(binSourceFilePaths))
+    }
+
     await build({
       entry: mapValues(entry, value => value.entryPoint),
       outDir: "dist",
@@ -81,12 +114,18 @@ export class BuildCommand extends Command {
       format: "esm",
       target: "esnext",
       external: ["@pulumi/pulumi"],
-      esbuildPlugins: this.library ? [schemaTransformerPlugin] : [],
+      esbuildPlugins,
+      silent: ["warn", "error", "fatal"].includes(logger.level),
     })
 
+    const packageJsonPath = await resolvePackageJSON()
     const upToDatePackageJson = await readPackageJSON()
 
-    const sourceHashCalculator = new SourceHashCalculator(upToDatePackageJson, logger)
+    const sourceHashCalculator = new SourceHashCalculator(
+      packageJsonPath,
+      upToDatePackageJson,
+      logger,
+    )
     const distPaths = Object.values(entry).map(value => value.distPath)
 
     await sourceHashCalculator.writeHighstateManifest("./dist", distPaths)

package/src/shared/bin-transformer.ts

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

package/src/shared/index.ts

@@ -2,3 +2,4 @@ export * from "./services"
 export * from "./logger"
 export * from "./schema-transformer"
 export * from "./source-hash-calculator"
+export * from "./bin-transformer"

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

@@ -1,7 +1,7 @@
 import type { Logger } from "pino"
 import { dirname, relative, resolve } from "node:path"
 import { readFile, writeFile } from "node:fs/promises"
-import { fileURLToPath } from "node:url"
+import { fileURLToPath, pathToFileURL } from "node:url"
 import { readPackageJSON, resolvePackageJSON, type PackageJson } from "pkg-types"
 import { sha256 } from "crypto-hash"
 import { resolve as importMetaResolve } from "import-meta-resolve"
@@ -27,6 +27,7 @@ export class SourceHashCalculator {
   private readonly fileHashes = new Map<string, Promise<string>>()
 
   constructor(
+    private readonly packageJsonPath: string,
     private readonly packageJson: PackageJson,
     private readonly logger: Logger,
   ) {}
@@ -102,7 +103,9 @@ export class SourceHashCalculator {
       case "npm": {
         let resolvedUrl
         try {
-          resolvedUrl = importMetaResolve(dependency.package, import.meta.url)
+          const baseUrl = pathToFileURL(dirname(this.packageJsonPath))
+
+          resolvedUrl = importMetaResolve(dependency.package, baseUrl.toString())
         } catch (error) {
           this.logger.error(`failed to resolve package "%s"`, dependency.package)
           throw error