trustci 0.2.1 → 0.2.2

package/README.md

@@ -32,7 +32,7 @@ npx trustci list
 | ---------- | ---------------------------------------------------------------------------------------------- | --------------- |
 | `github`   | `--repo <owner/repo>` `--file <workflow>`                                                       | `--env <name>`  |
 | `gitlab`   | `--project <group/project>` (or `--repo`) `--file <workflow>`                                   | `--env <name>`  |
-| `circleci` | `--org-id` `--project-id` `--pipeline-definition-id` `--vcs-origin <url>`                        | `--context-id` (repeatable) |
+| `circleci` | `--org-id` `--project-id` `--pipeline-definition-id` `--vcs-origin <host/owner/repo>`                      | `--context-id` (repeatable) |
 
 At least one of `--allow-publish` / `--allow-stage-publish` is required.
 
@@ -40,10 +40,10 @@ At least one of `--allow-publish` / `--allow-stage-publish` is required.
 # GitLab
 npx trustci --provider gitlab --project me/repo --file .gitlab-ci.yml --allow-publish -y
 
-# CircleCI (vcs-origin must include the protocol)
+# CircleCI (vcs-origin is host/owner/repo; a leading https:// is stripped automatically)
 npx trustci --provider circleci \
   --org-id <uuid> --project-id <uuid> --pipeline-definition-id <uuid> \
-  --vcs-origin https://github.com/me/repo \
+  --vcs-origin github.com/me/repo \
   --context-id <uuid> \
   --allow-publish
 ```

package/dist/cli.js

@@ -7,6 +7,72 @@ import { createInterface } from "node:readline/promises";
 // src/args.ts
 import { parseArgs } from "node:util";
 
+// src/circleci.ts
+var BASE_URL = "https://circleci.com/api/v2";
+function vcsTypeFromUrl(url) {
+  const { hostname } = new URL(url);
+  if (hostname === "github.com" || hostname.endsWith(".github.com"))
+    return "github";
+  if (hostname === "gitlab.com" || hostname.endsWith(".gitlab.com"))
+    return "gitlab";
+  if (hostname === "bitbucket.org" || hostname.endsWith(".bitbucket.org"))
+    return "bitbucket";
+  throw new Error(`Cannot determine VCS type from URL: ${url}`);
+}
+function normalizeVcsOrigin(value) {
+  const v = value.trim().replace(/^[a-z][a-z0-9+.-]*:\/\//i, "").replace(/\/+$/, "");
+  const parts = v.split("/");
+  if (parts.length < 3 || parts.some((p) => !p)) {
+    throw new Error(`vcs-origin must be in the form host/owner/repo, e.g. github.com/org/repo (got "${value}").`);
+  }
+  return v;
+}
+function projectSlugFromVcsOrigin(origin) {
+  const url = origin.includes("://") ? origin : `https://${origin}`;
+  const vcsType = vcsTypeFromUrl(url);
+  const { pathname } = new URL(url);
+  const parts = pathname.replace(/^\//, "").replace(/\.git$/, "").split("/");
+  if (parts.length < 2 || !parts[0] || !parts[1]) {
+    throw new Error(`Cannot extract org/repo from URL: ${url}`);
+  }
+  return `${vcsType}/${parts[0]}/${parts[1]}`;
+}
+async function circleGet(token, path) {
+  const response = await fetch(`${BASE_URL}${path}`, {
+    headers: { "Circle-Token": token, Accept: "application/json" }
+  });
+  if (!response.ok) {
+    const body = await response.text();
+    throw new Error(`CircleCI API error (${response.status}) for ${path}: ${body}`);
+  }
+  return response.json();
+}
+async function resolveOrgAndProjectId(token, vcsOrigin) {
+  const slug = projectSlugFromVcsOrigin(vcsOrigin);
+  const project = await circleGet(token, `/project/${slug}`);
+  return { orgId: project.organization_id, projectId: project.id };
+}
+async function resolvePipelineDefinitionId(token, projectId, file) {
+  const data = await circleGet(token, `/projects/${encodeURIComponent(projectId)}/pipeline-definitions`);
+  if (data.items.length === 0) {
+    throw new Error(`No pipeline definitions found for project "${projectId}".`);
+  }
+  if (file) {
+    const match = data.items.find((d) => d.config_source?.file_path === file || d.name === file);
+    if (!match) {
+      const available2 = data.items.map((d) => d.config_source?.file_path ?? d.name ?? d.id).join(", ");
+      throw new Error(`No pipeline definition found matching "${file}". Available: ${available2}`);
+    }
+    return match.id;
+  }
+  const [only] = data.items;
+  if (data.items.length === 1 && only) {
+    return only.id;
+  }
+  const available = data.items.map((d) => d.config_source?.file_path ?? d.name ?? d.id).join(", ");
+  throw new Error(`Multiple pipeline definitions found for project "${projectId}". Specify --file to select one: ${available}`);
+}
+
 // src/types.ts
 var PROVIDERS = ["github", "gitlab", "circleci"];
 
@@ -102,9 +168,13 @@ function parseCliArgs(argv) {
       break;
     }
     case "circleci": {
-      const vcsOrigin = require_(values["vcs-origin"], "vcs-origin", "circleci");
-      if (!vcsOrigin.includes("://")) {
-        throw new ArgError(`--vcs-origin must include a protocol, e.g. https://github.com/org/repo (got "${vcsOrigin}").`);
+      let vcsOrigin;
+      try {
+        vcsOrigin = normalizeVcsOrigin(require_(values["vcs-origin"], "vcs-origin", "circleci"));
+      } catch (e) {
+        if (e instanceof ArgError)
+          throw e;
+        throw new ArgError(`--${e.message}`);
       }
       const circleToken = values["circle-token"];
       const orgId = values["org-id"];
@@ -141,63 +211,6 @@ function parseCliArgs(argv) {
   };
 }
 
-// src/circleci.ts
-var BASE_URL = "https://circleci.com/api/v2";
-function vcsTypeFromUrl(url) {
-  const { hostname } = new URL(url);
-  if (hostname === "github.com" || hostname.endsWith(".github.com"))
-    return "github";
-  if (hostname === "gitlab.com" || hostname.endsWith(".gitlab.com"))
-    return "gitlab";
-  if (hostname === "bitbucket.org" || hostname.endsWith(".bitbucket.org"))
-    return "bitbucket";
-  throw new Error(`Cannot determine VCS type from URL: ${url}`);
-}
-function projectSlugFromVcsOrigin(url) {
-  const vcsType = vcsTypeFromUrl(url);
-  const { pathname } = new URL(url);
-  const parts = pathname.replace(/^\//, "").replace(/\.git$/, "").split("/");
-  if (parts.length < 2 || !parts[0] || !parts[1]) {
-    throw new Error(`Cannot extract org/repo from URL: ${url}`);
-  }
-  return `${vcsType}/${parts[0]}/${parts[1]}`;
-}
-async function circleGet(token, path) {
-  const response = await fetch(`${BASE_URL}${path}`, {
-    headers: { "Circle-Token": token, Accept: "application/json" }
-  });
-  if (!response.ok) {
-    const body = await response.text();
-    throw new Error(`CircleCI API error (${response.status}) for ${path}: ${body}`);
-  }
-  return response.json();
-}
-async function resolveOrgAndProjectId(token, vcsOrigin) {
-  const slug = projectSlugFromVcsOrigin(vcsOrigin);
-  const project = await circleGet(token, `/project/${slug}`);
-  return { orgId: project.organization_id, projectId: project.id };
-}
-async function resolvePipelineDefinitionId(token, projectId, file) {
-  const data = await circleGet(token, `/pipeline-definitions?project_id=${encodeURIComponent(projectId)}`);
-  if (data.items.length === 0) {
-    throw new Error(`No pipeline definitions found for project "${projectId}".`);
-  }
-  if (file) {
-    const match = data.items.find((d) => d.config_file_path === file || d.name === file);
-    if (!match) {
-      const available2 = data.items.map((d) => d.config_file_path ?? d.name ?? d.id).join(", ");
-      throw new Error(`No pipeline definition found matching "${file}". Available: ${available2}`);
-    }
-    return match.id;
-  }
-  const [only] = data.items;
-  if (data.items.length === 1 && only) {
-    return only.id;
-  }
-  const available = data.items.map((d) => d.config_file_path ?? d.name ?? d.id).join(", ");
-  throw new Error(`Multiple pipeline definitions found for project "${projectId}". Specify --file to select one: ${available}`);
-}
-
 // src/exec.ts
 import { spawnSync } from "node:child_process";
 function run(cmd, args) {
@@ -213,6 +226,30 @@ function runInherit(cmd, args) {
   return res.status ?? (res.error || res.signal ? 1 : 0);
 }
 
+// src/resolve.ts
+var defaultResolveDeps = {
+  resolveOrgAndProjectId,
+  resolvePipelineDefinitionId,
+  log: (message) => console.error(message)
+};
+async function resolveCircleciOptions(parsed, deps = defaultResolveDeps) {
+  const opts = parsed.options;
+  if (opts.provider !== "circleci")
+    return;
+  if (!opts.circleToken)
+    return;
+  if (!opts.orgId || !opts.projectId) {
+    deps.log("Resolving org-id and project-id via CircleCI API...");
+    const resolved = await deps.resolveOrgAndProjectId(opts.circleToken, opts.vcsOrigin);
+    opts.orgId ??= resolved.orgId;
+    opts.projectId ??= resolved.projectId;
+  }
+  if (!opts.pipelineDefinitionId) {
+    deps.log("Resolving pipeline-definition-id via CircleCI API...");
+    opts.pipelineDefinitionId = await deps.resolvePipelineDefinitionId(opts.circleToken, opts.projectId, opts.file);
+  }
+}
+
 // src/npm.ts
 var MIN_NODE = "22.14.0";
 var MIN_NPM = "11.5.1";
@@ -526,9 +563,11 @@ function filterPackages(all, only, exclude) {
     return true;
   });
 }
+// package.json
+var version = "0.2.2";
 
 // src/cli.ts
-var VERSION = "0.1.0";
+var VERSION = version;
 var HELP = `trustci — bulk-register npm Trusted Publishers across a monorepo
 
 Usage:
@@ -539,7 +578,7 @@ Providers:
   github     --repo <owner/repo> --file <workflow> [--env <name>]
   gitlab     --project <group/project> --file <workflow> [--env <name>]
              (--repo is accepted as an alias for --project)
-  circleci   --vcs-origin <url> --circle-token <token> [--file <config>]
+  circleci   --vcs-origin <host/owner/repo> --circle-token <token> [--file <config>]
              [--org-id <uuid>] [--project-id <uuid>] [--pipeline-definition-id <uuid>]
              [--context-id <uuid> ...]
              UUIDs are auto-resolved via CircleCI API v2 when --circle-token is provided.
@@ -564,10 +603,10 @@ as a single-package fallback. Private packages ("private": true) are always excl
 Examples:
   trustci --dry-run --provider github --repo me/repo --file release.yml --allow-publish
   trustci --provider gitlab --project me/repo --file .gitlab-ci.yml --allow-publish -y
-  trustci --provider circleci --vcs-origin https://github.com/me/repo \\
+  trustci --provider circleci --vcs-origin github.com/me/repo \\
     --circle-token $CIRCLECI_TOKEN --allow-publish
   trustci --provider circleci --org-id <uuid> --project-id <uuid> \\
-    --pipeline-definition-id <uuid> --vcs-origin https://github.com/me/repo --allow-publish
+    --pipeline-definition-id <uuid> --vcs-origin github.com/me/repo --allow-publish
   trustci list
 `;
 async function confirm(question) {
@@ -712,25 +751,11 @@ async function main() {
   }
   if (parsed.kind === "list")
     return runList(parsed.pkg, parsed.dryRun);
-  if (parsed.options.provider === "circleci" && !parsed.dryRun) {
-    const opts = parsed.options;
-    if (opts.circleToken) {
-      try {
-        if (!opts.orgId || !opts.projectId) {
-          console.error("Resolving org-id and project-id via CircleCI API...");
-          const resolved = await resolveOrgAndProjectId(opts.circleToken, opts.vcsOrigin);
-          opts.orgId ??= resolved.orgId;
-          opts.projectId ??= resolved.projectId;
-        }
-        if (!opts.pipelineDefinitionId) {
-          console.error("Resolving pipeline-definition-id via CircleCI API...");
-          opts.pipelineDefinitionId = await resolvePipelineDefinitionId(opts.circleToken, opts.projectId, opts.file);
-        }
-      } catch (err) {
-        console.error(`error: ${err.message}`);
-        return 1;
-      }
-    }
+  try {
+    await resolveCircleciOptions(parsed);
+  } catch (err) {
+    console.error(`error: ${err.message}`);
+    return 1;
   }
   return runTrust(parsed);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trustci",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Bulk-register npm Trusted Publishers (npm trust) across all public packages in a monorepo. Supports GitHub, GitLab and CircleCI.",
   "type": "module",
   "bin": {