@rigxyz/tapd 0.5.2 → 0.6.0

package/dist/bin.js

@@ -6,6 +6,7 @@ import {
   ImportValidationFailed,
   InvalidInviteUrlError,
   NotInitializedError,
+  OrgForbiddenError,
   RelayClient,
   STATE_KEY_CONFLICT_COUNT,
   addImport,
@@ -23,11 +24,12 @@ import {
   readBindingConfig,
   removeImport,
   revoke,
+  safeResolveRigPath,
   start
-} from "./chunk-LQWX63LP.js";
+} from "./chunk-GIL4KPR7.js";
 
 // src/bin.ts
-import { join as pathJoin, resolve as resolve2 } from "path";
+import { join as pathJoin, resolve } from "path";
 import kleur from "kleur";
 
 // src/defaults.ts
@@ -187,7 +189,7 @@ async function history(opts) {
 // src/restore.ts
 import { createHash } from "crypto";
 import { existsSync as existsSync3, mkdirSync as mkdirSync2, renameSync, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname2, join as join3, resolve } from "path";
+import { dirname as dirname2, join as join3 } from "path";
 var PathNeverExistedError = class extends Error {
   constructor(path) {
     super(`No events for path "${path}" \u2014 never written through this binding.`);
@@ -234,6 +236,7 @@ function sha256Hex(bytes) {
   return createHash("sha256").update(bytes).digest("hex");
 }
 async function restore(opts) {
+  const targetAbs = safeResolveRigPath(opts.rootDir, opts.path);
   const events = await history({
     rootDir: opts.rootDir,
     path: opts.path,
@@ -257,7 +260,6 @@ async function restore(opts) {
   if (actualHash !== writeEvent.hash) {
     throw new HashMismatchError(opts.path, writeEvent.hash, actualHash);
   }
-  const targetAbs = resolve(opts.rootDir, opts.path);
   const overwrote = existsSync3(targetAbs);
   mkdirSync2(dirname2(targetAbs), { recursive: true });
   const tmp = `${targetAbs}.tap-restore-tmp.${Date.now().toString(36)}`;
@@ -278,7 +280,7 @@ import { existsSync as existsSync4 } from "fs";
 import { join as join4 } from "path";
 
 // src/version.ts
-var TAPD_VERSION = "0.5.1";
+var TAPD_VERSION = "0.6.0";
 
 // src/status.ts
 var STATE_KEY_LAST_APPLY_ERROR = "last_apply_error";
@@ -587,6 +589,7 @@ ${C.bold().cyan("tapd init OPTIONS")}
   ${C.dim("--name <n>")}              binding display name (required)
   ${C.dim("--relay <url>")}           override (defaults to the logged-in relay)
   ${C.dim("--device-label <l>")}      default 'owner'
+  ${C.dim("--org <slug>")}            create this binding under an org you belong to
   ${C.dim("--dir <path>")}            default cwd
 
 ${C.bold().cyan("tapd join OPTIONS")}
@@ -663,7 +666,7 @@ function collectPathGlobs(flags2) {
 async function runMembers(positional2, flags2) {
   const json = flags2.get("json") === true;
   const sub = positional2[0];
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const VALID_ROLES2 = /* @__PURE__ */ new Set(["owner", "editor", "viewer"]);
   try {
     if (sub === void 0 || sub === "list") {
@@ -759,7 +762,7 @@ async function runMembers(positional2, flags2) {
 async function runInvite(positional2, flags2) {
   const json = flags2.get("json") === true;
   const sub = positional2[0];
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   try {
     if (sub === void 0 || sub === "create") {
       const ops = parseOps(flags2.get("ops"));
@@ -911,7 +914,7 @@ async function runJoin(positional2, flags2) {
       throw err;
     }
   }
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const deviceLabel = flags2.get("device-label");
   let result;
   try {
@@ -956,7 +959,7 @@ async function runJoin(positional2, flags2) {
 }
 async function runImport(positional2, flags2) {
   const json = flags2.get("json") === true;
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const sub = positional2[0];
   if (sub === "remove") {
     const name = positional2[1];
@@ -1079,7 +1082,7 @@ async function runImport(positional2, flags2) {
 }
 async function runStatus(flags2) {
   const json = flags2.get("json") === true;
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   let report;
   try {
     report = await status({ rootDir });
@@ -1143,7 +1146,7 @@ async function runStatus(flags2) {
 async function runUninit(flags2) {
   const json = flags2.get("json") === true;
   const purge = flags2.get("purge") === true;
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   let result;
   try {
     result = uninit({ rootDir, purge });
@@ -1200,7 +1203,7 @@ async function runUninit(flags2) {
   }
 }
 async function runStart(flags2) {
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const pollSeconds = flags2.has("poll-seconds") ? Number(flags2.get("poll-seconds")) : void 0;
   const pidfilePath = flags2.get("no-pidfile") === true ? null : pathJoin(rootDir, DAEMON_PIDFILE_REL3);
   let handle = null;
@@ -1246,7 +1249,7 @@ async function runStart(flags2) {
 }
 async function runHistory(flags2) {
   const json = flags2.get("json") === true;
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const path = flags2.get("path");
   const asOf = flags2.get("as-of");
   if (!path) {
@@ -1294,7 +1297,7 @@ async function runHistory(flags2) {
 }
 async function runRestore(flags2) {
   const json = flags2.get("json") === true;
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const path = flags2.get("path");
   const asOf = flags2.get("as-of");
   if (!path) {
@@ -1369,11 +1372,19 @@ async function runInit(flags2) {
     throw err;
   }
   const relayUrl = flags2.get("relay") ?? process.env.RIG_RELAY_URL ?? DEFAULT_RELAY_URL;
-  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const rootDir = resolve(flags2.get("dir") ?? process.cwd());
   const deviceLabel = flags2.get("device-label");
+  const orgRaw = flags2.get("org");
+  if (orgRaw !== void 0 && (typeof orgRaw !== "string" || !orgRaw.trim() || orgRaw.startsWith("-"))) {
+    const msg = "--org requires a slug (e.g. --org acme-labs)";
+    if (json) printJsonError("invalid_flag", msg);
+    else console.error(kleur.red("error:"), msg);
+    process.exit(2);
+  }
+  const org = orgRaw;
   let result;
   try {
-    result = await init({ rootDir, relayUrl, accessToken, bindingName: name, deviceLabel });
+    result = await init({ rootDir, relayUrl, accessToken, bindingName: name, deviceLabel, org });
   } catch (err) {
     if (err instanceof AlreadyInitializedError) {
       if (json) printJsonError("already_initialized", err.message);
@@ -1383,6 +1394,11 @@ async function runInit(flags2) {
       }
       process.exit(1);
     }
+    if (err instanceof OrgForbiddenError) {
+      if (json) printJsonError("org_forbidden", err.message);
+      else console.error(kleur.red("error:"), err.message);
+      process.exit(1);
+    }
     throw err;
   }
   if (json) {