@canra/cli 0.5.0 → 0.6.0

package/README.md

@@ -34,6 +34,8 @@ canra search json
 | `canra logout` | Remove saved credentials |
 | `canra version` / `canra help` | Version and usage |
 
+`<owner>` is a user or organization name in any case: `Canra/json` and `canra/json` are the same spec, saved under the lowercase owner in `.canra/specs/`.
+
 ## Vendoring specs
 
 Commit `.canra/` to source control. The saved specs are the record of which spec versions your project implemented (a version is exact and immutable). After `canra update`, `git diff .canra/` shows what changed in each spec.

package/canra.js

@@ -89,11 +89,11 @@ async function fetchRegistry(url, opts) {
 
 // --- Spec references ---
 
-// Mirror the server's naming rules (route-utils.js USERNAME_RE, specs-api.js
+// Mirror the server's naming rules (username.js USERNAME_RE and grandfathered names, specs-api.js
 // NAME_RE). Owner and name become local path segments under .canra/specs/, so
 // anything path-like ("..", ".", backslashes) must be rejected here — the CLI is
 // meant to be driven by agents whose arguments may come from untrusted content.
-const OWNER_RE = /^[a-z][a-z0-9_-]{1,38}[a-z0-9]$/;
+const OWNER_RE = /^(?:(?=.{1,39}$)[a-z0-9]+(?:-[a-z0-9]+)*|[a-z][a-z0-9_-]{1,38}[a-z0-9])$/i;
 const NAME_RE = /^[a-z][a-z0-9-]*$/;
 const SUGGESTION_ID_RE = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
 
@@ -197,7 +197,7 @@ function refuseSymlinks(paths) {
 
 function localSpecPaths(owner, name) {
   const specsDir = path.join(LOCAL_DIR, "specs");
-  const ownerDir = path.join(specsDir, owner);
+  const ownerDir = path.join(specsDir, owner.toLowerCase());
   return [LOCAL_DIR, specsDir, ownerDir, path.join(ownerDir, name)];
 }
 
@@ -207,8 +207,10 @@ function frontmatterFunctionCount(text) {
   return list ? (list[1].match(/"(?:[^"\\]|\\.)*"/g) || []).length : 0;
 }
 
+// Owner directories are lowercased everywhere (here, localSpecPaths, deleteLocalSpec) so Canra/json and
+// canra/json are one local spec on case-sensitive and case-insensitive filesystems alike.
 function localSpecDir(owner, name) {
-  return path.join(LOCAL_DIR, "specs", owner, name);
+  return path.join(LOCAL_DIR, "specs", owner.toLowerCase(), name);
 }
 
 async function downloadSpec(registry, { owner, name, version }) {
@@ -674,7 +676,7 @@ function deleteLocalSpec(owner, name) {
   if (!dir.startsWith(specsRoot + path.sep)) throw new Error(`unexpected local path for ${owner}/${name}`);
   refuseSymlinks(localSpecPaths(owner, name));
   fs.rmSync(dir, { recursive: true, force: true });
-  const ownerDir = path.join(LOCAL_DIR, "specs", owner);
+  const ownerDir = path.join(LOCAL_DIR, "specs", owner.toLowerCase());
   if (fs.readdirSync(ownerDir).length === 0) fs.rmdirSync(ownerDir);
 }
 
@@ -710,7 +712,7 @@ async function cmdUpdate(specArg) {
 
   let refs = scanLocalSpecs();
   if (only) {
-    refs = refs.filter((r) => r.owner === only.owner && r.name === only.name);
+    refs = refs.filter((r) => r.owner.toLowerCase() === only.owner.toLowerCase() && r.name === only.name);
     if (refs.length === 0) {
       console.error(`Error: ${only.owner}/${only.name} is not fetched locally. Run \`canra fetch\` first.`);
       process.exit(1);
@@ -741,7 +743,7 @@ async function cmdUpdate(specArg) {
       if (!OWNER_RE.test(toOwner) || (target && target[2] !== row.name)) {
         throw new Error(`unexpected move target '${printable(row.moved_to)}'`);
       }
-      const moving = toOwner !== row.owner;
+      const moving = toOwner.toLowerCase() !== row.owner.toLowerCase();
       if (moving && fs.existsSync(localSpecDir(toOwner, row.name))) {
         throw new Error(`${toOwner}/${row.name} is already fetched locally; remove one of the two copies`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canra/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "CLI for Canra, the registry of machine-readable specs: fetch, search, and publish specs.",
   "keywords": [
     "canra",