@hitch42/cli 0.1.1-beta.5 → 0.1.1-beta.8

package/dist/hitch.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
-import { registerHooks } from "node:module";
+import { createRequire, registerHooks } from "node:module";
 import { access, chmod, mkdir, readFile, readdir, realpath, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { spawn } from "node:child_process";
 import { homedir } from "node:os";
+import { existsSync } from "node:fs";
 import { os } from "@orpc/server";
 import { createCli } from "trpc-cli";
 import { createInterface } from "node:readline/promises";
@@ -13,7 +14,6 @@ import { isContractProcedure } from "@orpc/contract";
 import { OpenAPILink } from "@orpc/openapi-client/fetch";
 import { z } from "zod";
 import { createClient } from "@hey-api/openapi-ts";
-import { readFileSync } from "node:fs";
 //#region ../shared/auth/src/store.mts
 const DEFAULT_INSTANCE_URL = "https://app.hitch42.com";
 var AuthenticationError = class extends Error {};
@@ -187,7 +187,7 @@ async function resolveAuth(instanceUrl, options = {}, orgCode) {
 	const soleOrg = orgCodes.at(0);
 	if (soleOrg === void 0) return void 0;
 	if (orgCodes.length === 1) return resolvedStoredAuth(credentialsByOrg[soleOrg]);
-	throw new AuthenticationError(`Multiple organizations are stored for ${normalizedUrl}: ${orgCodes.join(", ")}. Use --org, a workspace hitch.org, or HITCH_DEFAULT_ORG to choose one.`);
+	throw new AuthenticationError(`Multiple organizations are stored for ${normalizedUrl}: ${orgCodes.join(", ")}. Use --org, the workspace hitch.config.ts, or HITCH_DEFAULT_ORG to choose one.`);
 }
 function rejectEnvironmentKey(response, auth) {
 	if (auth.source === "environment" && response.status === 401) throw new AuthenticationError("HITCH_API_KEY was rejected.");
@@ -402,6 +402,33 @@ async function loginWithDevice(instanceUrl, options = {}) {
 	};
 }
 //#endregion
+//#region ../shared/auth/src/workspace.mts
+const ORG_CODE_PATTERN = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
+const require = createRequire(import.meta.url);
+function readWorkspaceConfig(dir) {
+	const path = resolve(dir, "hitch.config.ts");
+	if (!existsSync(path)) return void 0;
+	let module;
+	try {
+		module = require(path);
+	} catch (error) {
+		throw new Error(`Failed to load ${path}.`, { cause: error });
+	}
+	const config = module !== null && typeof module === "object" && "default" in module ? module.default : module;
+	if (config === null || typeof config !== "object" || !("sdk" in config) || typeof config.sdk !== "string" || config.sdk.length === 0 || !("org" in config) || typeof config.org !== "string" || !ORG_CODE_PATTERN.test(config.org)) throw new Error(`Invalid Hitch config in ${path}: "sdk" must be a package spec and "org" an organization code.`);
+	const githubWorkflow = "githubWorkflow" in config ? config.githubWorkflow : void 0;
+	if (githubWorkflow !== void 0 && typeof githubWorkflow !== "boolean") throw new Error(`Invalid Hitch config in ${path}: "githubWorkflow" must be a boolean.`);
+	return {
+		sdk: config.sdk,
+		org: config.org,
+		githubWorkflow
+	};
+}
+function findWorkspaceConfig(cwd) {
+	const appletsDir = dirname(cwd);
+	return readWorkspaceConfig(cwd) ?? (basename(appletsDir) === "applets" ? readWorkspaceConfig(dirname(appletsDir)) : void 0);
+}
+//#endregion
 //#region src/bridge.ts
 async function defaultPrompt$1(message) {
 	const readline = createInterface({
@@ -968,40 +995,13 @@ function createStaticRouter(activeInstanceUrl, dependencies = {}, selectedOrg) {
 }
 //#endregion
 //#region src/organization.ts
-const ORG_CODE_PATTERN = /^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/;
-function readOrg(dir) {
-	const path = resolve(dir, "package.json");
-	let source;
-	try {
-		source = readFileSync(path, "utf8");
-	} catch (error) {
-		if (error instanceof Error && "code" in error && error.code === "ENOENT") return void 0;
-		throw error;
-	}
-	let packageJson;
-	try {
-		packageJson = JSON.parse(source);
-	} catch (error) {
-		throw new Error(`Invalid JSON in ${path}.`, { cause: error });
-	}
-	if (packageJson === null || typeof packageJson !== "object" || !("hitch" in packageJson)) return;
-	const hitch = packageJson.hitch;
-	if (hitch === null || typeof hitch !== "object" || !("org" in hitch) || typeof hitch.org !== "string" || !ORG_CODE_PATTERN.test(hitch.org)) throw new Error(`Invalid "hitch.org" in ${path}.`);
-	return hitch.org;
-}
-function readWorkspaceOrg(cwd) {
-	const localOrg = readOrg(cwd);
-	if (localOrg !== void 0) return localOrg;
-	const appletsDir = dirname(cwd);
-	return basename(appletsDir) === "applets" ? readOrg(dirname(appletsDir)) : void 0;
-}
 function validateOrg(orgCode, source) {
 	if (!ORG_CODE_PATTERN.test(orgCode)) throw new Error(`Invalid organization in ${source}.`);
 	return orgCode;
 }
 function resolveOrganization(explicitOrg, cwd, env) {
 	const cliOrg = explicitOrg === void 0 ? void 0 : validateOrg(explicitOrg, "--org");
-	const workspaceOrg = readWorkspaceOrg(cwd);
+	const workspaceOrg = findWorkspaceConfig(cwd)?.org;
 	if (cliOrg !== void 0 && workspaceOrg !== void 0 && cliOrg !== workspaceOrg) throw new Error(`--org "${cliOrg}" does not match workspace organization "${workspaceOrg}".`);
 	if (cliOrg !== void 0 || workspaceOrg !== void 0) return cliOrg ?? workspaceOrg;
 	const defaultOrg = env.HITCH_DEFAULT_ORG;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hitch42/cli",
-  "version": "0.1.1-beta.5",
+  "version": "0.1.1-beta.8",
   "license": "MIT",
   "bin": {
     "hitch": "./dist/hitch.js"
@@ -19,7 +19,7 @@
     "zod": "^4.4.3"
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=22.18"
   },
   "repository": {
     "type": "git",