@anyday/sanity-workspace-manager 0.6.0 → 0.7.1

package/README.md

@@ -65,7 +65,7 @@ workspace-manager.json linguist-generated=true
 | `organizationId` | The Sanity organisation new workspaces are created in                                                       |
 | `vercelTeamId`   | The client's own Vercel team; left out for Anyday's                                                         |
 | `site`           | The GitHub repo and branch each new site deploys from                                                       |
-| `studioOrigins`  | The Studios that open new workspaces                                                                        |
+| `studioOrigins`  | The Studios that open new workspaces, incl. a site's `/studio`; picked from the live project on first run   |
 | `sections`       | Each content type with its label in the Copy picker, or `false` to leave it out                             |
 | `colorRoles`     | Each theme colour with a short description of where it's used, shown to whoever sets up a brand             |
 | `themeFiles`     | Theme fields with uploaded files (fonts) to copy into new sites; fonts are often licensed per brand         |
@@ -106,12 +106,12 @@ A renamed field reads as one removed and one added, so `generate` asks rather th
 
 ### What it reads
 
-| Source                        | Used for                                                                                     |
-| ----------------------------- | -------------------------------------------------------------------------------------------- |
-| git remote and default branch | `site`, the suggested id and name                                                            |
-| `.env.example`, names only    | `siteEnv`, the variables each new site needs                                                 |
-| `sanity.schema.json`          | copy sections, singletons, home page, language documents, settings fields, colours and fonts |
-| the live project              | organisation, Studio, theme colours and defaults, fonts named in `themeFiles`, starter pages |
+| Source                        | Used for                                                                                                                    |
+| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
+| git remote and default branch | `site`, the suggested id and name                                                                                           |
+| `.env.example`, names only    | `siteEnv`, the variables each new site needs (`*_WORKSPACES_API_URL` if the site has one)                                   |
+| `sanity.schema.json`          | copy sections, singletons, home page, language documents, settings fields, colours and fonts                                |
+| the live project              | organisation, Studios and CORS origins to pick from, theme colours and defaults, fonts named in `themeFiles`, starter pages |
 
 `sanity.schema.json` is looked for in the repo root, `frontend`, `web`, `site`, `studio`, `apps`
 and each folder in `apps`.

package/dist/cli.mjs

@@ -233,6 +233,10 @@ var workspace_manager_schema_default = {
         },
         baseUrl: {
           $ref: "#/definitions/name"
+        },
+        workspacesApiUrl: {
+          description: "Set to the Workspaces API's address, so the site's own /studio lists every workspace.",
+          $ref: "#/definitions/name"
         }
       }
     },
@@ -583,6 +587,9 @@ function draftManifest(repo, answers, live = {}, choices) {
       return [key, found ?? ENV_DEFAULTS[key]];
     })
   );
+  const apiUrlNames = repo.envNames.filter((name) => /WORKSPACES_API_URL$/.test(name));
+  const apiUrl = apiUrlNames.find((name) => name.startsWith("NEXT_PUBLIC_")) ?? apiUrlNames[0];
+  if (apiUrl) siteEnv.workspacesApiUrl = apiUrl;
   if (!repo.repo) note("No GitHub remote found: set site.repo to owner/name");
   if (!repo.hasRevalidateRoute) note("No /api/revalidate route found: check site.revalidatePath");
   if (answers.vercelTeamId)
@@ -1201,9 +1208,65 @@ function configFromManifest(manifest, schema) {
   };
 }
 
+// src/generate/starter.ts
+var StarterError = class extends Error {
+};
+function resolveStarter(entries, pages, homeId) {
+  const home = pages.find((page) => page._id === homeId);
+  return entries.map((entry) => {
+    if (entry === "home") {
+      if (!homeId)
+        throw new StarterError("The live settings name no home page: pass its slug instead");
+      return homeId;
+    }
+    if (pages.some((page) => page._id === entry)) return entry;
+    let matches = pages.filter((page) => page.slug === entry);
+    if (matches.length > 1 && home?.language)
+      matches = matches.filter((page) => page.language === home.language);
+    if (matches.length === 1) return matches[0]._id;
+    if (!matches.length) throw new StarterError(`No page with the slug or id "${entry}"`);
+    throw new StarterError(
+      `Several pages have the slug "${entry}": pass one of ${matches.map((page) => page._id).join(", ")}`
+    );
+  });
+}
+function pickable(pages, homeId) {
+  const home = pages.find((page) => page._id === homeId);
+  const shown = home?.language ? pages.filter((page) => page.language === home.language) : pages;
+  return [...shown].sort(
+    (a, b) => a._id === homeId ? -1 : b._id === homeId ? 1 : (a.title ?? "").localeCompare(b.title ?? "")
+  );
+}
+function parsePick(answer, count) {
+  const picked = answer.split(/[\s,]+/).filter(Boolean).map((part) => Number(part));
+  const wrong = picked.filter((n) => !Number.isInteger(n) || n < 1 || n > count);
+  if (wrong.length) throw new Error(`Pick numbers from 1 to ${count}`);
+  return [...new Set(picked)].map((n) => n - 1);
+}
+
 // src/generate/resolve.ts
 var yes = (answer) => /^y(es)?$/i.test(answer.trim());
 var ROLE_NAMES = { siteName: "site name", domain: "domain", logo: "logo", favicon: "favicon" };
+async function pickStudioOrigins(ask, saved, found) {
+  const candidates = [.../* @__PURE__ */ new Set([...saved, ...found.studios, ...found.cors])];
+  if (!candidates.length) return [];
+  const chosen = saved.length ? saved : found.studios;
+  const label = (origin) => saved.includes(origin) ? "saved" : found.studios.includes(origin) ? "Studio" : "CORS list";
+  const list = candidates.map((origin, index) => `  ${index + 1}. ${origin}  \u2190 ${label(origin)}`);
+  const suggestion = candidates.flatMap((origin, index) => chosen.includes(origin) ? [index + 1] : []).join(",");
+  let text = `Addresses that run this project's Studio, e.g. a site's /studio:
+${list.join("\n")}
+By number`;
+  for (; ; ) {
+    try {
+      return parsePick(await ask({ text, suggestion }), candidates.length).map(
+        (index) => candidates[index]
+      );
+    } catch (error) {
+      text = `${error.message}. ${text}`;
+    }
+  }
+}
 async function resolveIdentity(options) {
   const { saved, flags, repo, ask, lookups, note } = options;
   const known = { ...saved, ...flags };
@@ -1233,9 +1296,11 @@ async function resolveIdentity(options) {
   };
   if (!site.repo) throw new Error("No GitHub remote found: add one, or set site.repo in the config");
   let studioOrigins = known.studioOrigins;
-  if (!studioOrigins?.length || options.askAgain) {
-    const found = await lookups.studioOriginsOf?.(project).catch(() => void 0);
-    studioOrigins = found?.length ? found : studioOrigins;
+  if (!flags.studioOrigins && (!studioOrigins?.length || options.askAgain)) {
+    studioOrigins = await pickStudioOrigins(ask, saved.studioOrigins ?? [], {
+      studios: await lookups.studioOriginsOf?.(project).catch(() => []) ?? [],
+      cors: await lookups.corsOriginsOf?.(project).catch(() => []) ?? []
+    });
   }
   if (!studioOrigins?.length)
     note(`No Studio found: add studioOrigins to the config, e.g. ["https://acme.sanity.studio"]`);
@@ -1494,6 +1559,16 @@ async function studioOriginsOf(projectId, token) {
   if (studioHost) origins.push(`https://${studioHost}.sanity.studio`);
   return [...new Set(origins)];
 }
+async function corsOriginsOf(projectId, token) {
+  const response = await fetch(`https://api.sanity.io/v2021-06-07/projects/${projectId}/cors`, {
+    headers: { Authorization: `Bearer ${token}` }
+  });
+  if (!response.ok) throw new Error(`Couldn't list ${projectId}'s CORS origins: ${response.status}`);
+  const entries = await response.json();
+  return entries.filter(
+    ({ origin, allowCredentials }) => allowCredentials && origin.startsWith("https://") && !origin.includes("*") && !/^https:\/\/(localhost|127\.0\.0\.1)(:|$)/.test(origin)
+  ).map(({ origin }) => origin.replace(/\/+$/, ""));
+}
 var liveClient = ({ projectId, dataset, token }) => createClient({
   projectId,
   dataset,
@@ -1575,42 +1650,6 @@ function readRepo(root) {
   };
 }
 
-// src/generate/starter.ts
-var StarterError = class extends Error {
-};
-function resolveStarter(entries, pages, homeId) {
-  const home = pages.find((page) => page._id === homeId);
-  return entries.map((entry) => {
-    if (entry === "home") {
-      if (!homeId)
-        throw new StarterError("The live settings name no home page: pass its slug instead");
-      return homeId;
-    }
-    if (pages.some((page) => page._id === entry)) return entry;
-    let matches = pages.filter((page) => page.slug === entry);
-    if (matches.length > 1 && home?.language)
-      matches = matches.filter((page) => page.language === home.language);
-    if (matches.length === 1) return matches[0]._id;
-    if (!matches.length) throw new StarterError(`No page with the slug or id "${entry}"`);
-    throw new StarterError(
-      `Several pages have the slug "${entry}": pass one of ${matches.map((page) => page._id).join(", ")}`
-    );
-  });
-}
-function pickable(pages, homeId) {
-  const home = pages.find((page) => page._id === homeId);
-  const shown = home?.language ? pages.filter((page) => page.language === home.language) : pages;
-  return [...shown].sort(
-    (a, b) => a._id === homeId ? -1 : b._id === homeId ? 1 : (a.title ?? "").localeCompare(b.title ?? "")
-  );
-}
-function parsePick(answer, count) {
-  const picked = answer.split(/[\s,]+/).filter(Boolean).map((part) => Number(part));
-  const wrong = picked.filter((n) => !Number.isInteger(n) || n < 1 || n > count);
-  if (wrong.length) throw new Error(`Pick numbers from 1 to ${count}`);
-  return [...new Set(picked)].map((n) => n - 1);
-}
-
 // src/register.ts
 import { readFileSync as readFileSync4 } from "node:fs";
 import { join as join3 } from "node:path";
@@ -1758,7 +1797,8 @@ async function generate(argv) {
       note,
       lookups: token ? {
         organizationOf: (projectId) => organizationOf(projectId, token),
-        studioOriginsOf: (projectId) => studioOriginsOf(projectId, token)
+        studioOriginsOf: (projectId) => studioOriginsOf(projectId, token),
+        corsOriginsOf: (projectId) => corsOriginsOf(projectId, token)
       } : {}
     });
     const choices = await resolveChoices({ saved, schema, ask, askAgain, note });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anyday/sanity-workspace-manager",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "Generates and checks a site repo's workspace-manager.json for the Anyday workspace manager",
   "repository": {
     "type": "git",