@shortlink-org/portolan 0.2.2 → 0.2.3

package/src/merge.test.ts

@@ -181,6 +181,52 @@ describe("mergeCatalogs", () => {
     expect(service?.provides.map((p) => p.id)).toEqual(["auth.v1.Users"]);
   });
 
+  it("retains and unions vendored proto descriptors across service fragments", () => {
+    const first = context("shop", ["shop.oms"]);
+    first.services[0]!.copies = [
+      {
+        id: "pricing.v1.Pricing",
+        source: "pricing.proto",
+        methods: [{ name: "GetQuote" }],
+        enums: [
+          {
+            name: "Status",
+            values: [{ name: "STATUS_UNSPECIFIED", number: 0 }],
+          },
+        ],
+      },
+    ];
+    const second = context("shop", ["shop.oms"]);
+    second.services[0]!.copies = [
+      {
+        id: "pricing.v1.Pricing",
+        source: "pricing.proto",
+        methods: [{ name: "WatchPrices" }],
+        enums: [
+          {
+            name: "Status",
+            values: [{ name: "STATUS_READY", number: 1 }],
+          },
+        ],
+      },
+    ];
+
+    const merged = mergeCatalogs([
+      source("a.json", { contexts: [first] }),
+      source("b.json", { contexts: [second] }),
+    ]);
+    const copy = merged.catalog.contexts[0]?.services[0]?.copies?.[0];
+
+    expect(copy?.methods.map((method) => method.name)).toEqual([
+      "GetQuote",
+      "WatchPrices",
+    ]);
+    expect(copy?.enums?.[0]?.values.map((value) => value.name)).toEqual([
+      "STATUS_UNSPECIFIED",
+      "STATUS_READY",
+    ]);
+  });
+
   it("unions a service's commands by the line to type", () => {
     const domain = context("shop", ["shop.cart"]);
     domain.services = domain.services.map((s) => ({

package/src/merge.ts

@@ -473,8 +473,11 @@ function mergeService(
   if (!existing) {
     services.set(incoming.id, {
       ...incoming,
-      provides: [...incoming.provides],
+      provides: incoming.provides.map(copyInterface),
       consumes: [...incoming.consumes],
+      ...(incoming.copies
+        ? { copies: incoming.copies.map(copyInterface) }
+        : {}),
       aggregates: incoming.aggregates.map(copyAggregate),
       ...(incoming.stores ? { stores: [...incoming.stores] } : {}),
       ...(incoming.modules ? { modules: [...incoming.modules] } : {}),
@@ -534,6 +537,11 @@ function mergeService(
 
   mergeInterfaces(existing.provides, incoming.provides);
   appendNew(existing.consumes, incoming.consumes, (c) => c.id, raise);
+  if (incoming.copies?.length) {
+    const copies = existing.copies ?? [];
+    mergeInterfaces(copies, incoming.copies);
+    existing.copies = copies;
+  }
   mergeAggregates(existing.aggregates, incoming.aggregates);
 
   if (incoming.stores?.length) {
@@ -713,6 +721,24 @@ function mergeInterfaces(target: RpcService[], incoming: RpcService[]): void {
       }
     }
     if (messages.length > 0) mine.messages = messages;
+
+    const enums = mine.enums ?? [];
+    for (const item of theirs.enums ?? []) {
+      const existing = enums.find((candidate) => candidate.name === item.name);
+      if (!existing) {
+        enums.push({
+          ...item,
+          values: item.values.map((value) => ({ ...value })),
+        });
+        continue;
+      }
+      appendNew(
+        existing.values,
+        item.values.map((value) => ({ ...value })),
+        (value) => value.name,
+      );
+    }
+    if (enums.length > 0) mine.enums = enums;
   }
 }
 
@@ -736,6 +762,14 @@ function copyInterface(provided: RpcService): RpcService {
           })),
         }
       : {}),
+    ...(provided.enums
+      ? {
+          enums: provided.enums.map((item) => ({
+            ...item,
+            values: item.values.map((value) => ({ ...value })),
+          })),
+        }
+      : {}),
   };
 }
 

package/src/pages/Settings.tsx

@@ -3,13 +3,10 @@ import { createContext, useCallback, useContext, useEffect, useState } from "rea
 import { Link, Navigate, NavLink, Route, Routes, useLocation } from "react-router";
 import {
   ArrowLeft,
-  ArrowRight,
-  BookOpen,
   Box,
   Check,
   ChevronDown,
   CircleAlert,
-  CircleDot,
   FolderGit2,
   GitBranch,
   KeyRound,
@@ -21,7 +18,6 @@ import {
   Trash2,
   X,
 } from "lucide-react";
-import type { Variants } from "motion/react";
 import { catalog, catalogSources } from "../data";
 import { useToastStore } from "../app/toast";
 import { absoluteTime, plural, relativeTime } from "../lib/format";
@@ -59,15 +55,9 @@ import { Modal } from "../components/Overlay";
 import { MachineDocs } from "../components/MachineDocs";
 import { DeliverySettings } from "./settings/DeliverySettings";
 import { PreferencesSettings } from "./settings/PreferencesSettings";
+import { AboutSettings } from "./settings/AboutSettings";
 import { CatEmptyState, CatIllustration } from "../components/CatIllustration";
 import { CommitLink } from "../components/CommitLink";
-import { m, transitions } from "../lib/motion";
-import {
-  PRODUCT_ISSUES,
-  PRODUCT_LICENSE,
-  PRODUCT_README,
-  PRODUCT_REPOSITORY,
-} from "../lib/product";
 
 type Health = "healthy" | "changed" | "failed" | "unchecked";
 type ProjectSource = ProjectDraft["source"];
@@ -1117,121 +1107,6 @@ function PipelineSettings() {
   );
 }
 
-const ABOUT_CARD_MOTION: Variants = {
-  hidden: { opacity: 0, y: 8 },
-  shown: {
-    opacity: 1,
-    y: 0,
-    transition: { ...transitions.page, staggerChildren: 0.05 },
-  },
-  hover: {},
-};
-
-const ABOUT_COPY_MOTION: Variants = {
-  hidden: { opacity: 0, y: 6 },
-  shown: { opacity: 1, y: 0, transition: transitions.panel },
-};
-
-const ABOUT_CAT_MOTION: Variants = {
-  hidden: { opacity: 0, x: 18, rotate: 3 },
-  shown: {
-    opacity: 1,
-    x: 0,
-    rotate: 0,
-    transition: transitions.narrative,
-  },
-  hover: {
-    y: -7,
-    rotate: -2,
-    scale: 1.035,
-    transition: transitions.settle,
-  },
-};
-
-function AboutSettings() {
-  return (
-    <section>
-      <div className="grid gap-grid lg:grid-cols-[minmax(0,1.25fr)_minmax(17rem,0.75fr)]">
-        <m.div
-          data-about-card
-          className="card grid items-center gap-4 sm:grid-cols-[minmax(0,1fr)_180px]"
-          variants={ABOUT_CARD_MOTION}
-          initial="hidden"
-          animate="shown"
-          whileHover="hover"
-        >
-          <m.div
-            className="flex flex-col items-start"
-            variants={ABOUT_COPY_MOTION}
-          >
-            <p className="max-w-prose text-muted">
-              Architecture from code and evidence. Product source,
-              documentation, releases and issue tracking live in the public
-              GitHub repository.
-            </p>
-            <div className="mt-5 flex flex-wrap gap-2">
-              <Link to={paths.landing()} className="product-primary">
-                Product page <ArrowRight size={15} aria-hidden />
-              </Link>
-              <a
-                href={PRODUCT_REPOSITORY}
-                target="_blank"
-                rel="noreferrer"
-                className="tbtn text-ink"
-              >
-                <GitBranch size={15} aria-hidden /> View product on GitHub
-              </a>
-            </div>
-          </m.div>
-          <m.div
-            data-about-cat
-            className="h-44 w-full justify-self-center sm:h-52"
-            variants={ABOUT_CAT_MOTION}
-          >
-            <CatIllustration scene="about" className="h-full w-full" />
-          </m.div>
-        </m.div>
-        <m.div
-          className="card"
-          initial={{ opacity: 0, y: 8 }}
-          animate={{ opacity: 1, y: 0 }}
-          transition={{ ...transitions.page, delay: 0.06 }}
-        >
-          <div className="label mb-2">resources</div>
-          <div className="divide-y divide-line">
-            <a
-              href={PRODUCT_README}
-              target="_blank"
-              rel="noreferrer"
-              className="flex items-center gap-2 py-2.5 text-muted transition-colors hover:text-ink"
-            >
-              <BookOpen size={15} aria-hidden className="shrink-0" />
-              Documentation
-            </a>
-            <a
-              href={PRODUCT_ISSUES}
-              target="_blank"
-              rel="noreferrer"
-              className="flex items-center gap-2 py-2.5 text-muted transition-colors hover:text-ink"
-            >
-              <CircleDot size={15} aria-hidden className="shrink-0" />
-              Issues and feedback
-            </a>
-            <a
-              href={PRODUCT_LICENSE}
-              target="_blank"
-              rel="noreferrer"
-              className="flex items-center gap-2 py-2.5 text-muted transition-colors hover:text-ink"
-            >
-              <ShieldCheck size={15} aria-hidden className="shrink-0" />
-              MIT License
-            </a>
-          </div>
-        </m.div>
-      </div>
-    </section>
-  );
-}
 
 function SettingsContent({ local, onAdd, onRemove, onGenerate }: { local: boolean; onAdd: (source: ProjectSource) => void; onRemove: (project: SetupProject) => void; onGenerate: () => void }) {
   const pathname = useLocation().pathname.replace(/\/$/, "");

package/src/pages/settings/AboutSettings.tsx

@@ -0,0 +1,129 @@
+import { ArrowRight, BookOpen, CircleDot, GitBranch, ShieldCheck } from "lucide-react";
+import type { Variants } from "motion/react";
+import { Link } from "react-router";
+
+import { CatIllustration } from "../../components/CatIllustration";
+import { m, transitions } from "../../lib/motion";
+import {
+  PRODUCT_ISSUES,
+  PRODUCT_LICENSE,
+  PRODUCT_README,
+  PRODUCT_REPOSITORY,
+} from "../../lib/product";
+import { paths } from "../../routes";
+
+const ABOUT_CARD_MOTION: Variants = {
+  hidden: { opacity: 0, y: 8 },
+  shown: {
+    opacity: 1,
+    y: 0,
+    transition: { ...transitions.page, staggerChildren: 0.05 },
+  },
+  hover: {},
+};
+
+const ABOUT_COPY_MOTION: Variants = {
+  hidden: { opacity: 0, y: 6 },
+  shown: { opacity: 1, y: 0, transition: transitions.panel },
+};
+
+const ABOUT_CAT_MOTION: Variants = {
+  hidden: { opacity: 0, x: 18, rotate: 3 },
+  shown: {
+    opacity: 1,
+    x: 0,
+    rotate: 0,
+    transition: transitions.narrative,
+  },
+  hover: {
+    y: -7,
+    rotate: -2,
+    scale: 1.035,
+    transition: transitions.settle,
+  },
+};
+
+export function AboutSettings() {
+  return (
+    <section>
+      <div className="grid gap-grid lg:grid-cols-[minmax(0,1.25fr)_minmax(17rem,0.75fr)]">
+        <m.div
+          data-about-card
+          className="card grid items-center gap-4 sm:grid-cols-[minmax(0,1fr)_180px]"
+          variants={ABOUT_CARD_MOTION}
+          initial="hidden"
+          animate="shown"
+          whileHover="hover"
+        >
+          <m.div
+            className="flex flex-col items-start"
+            variants={ABOUT_COPY_MOTION}
+          >
+            <p className="max-w-prose text-muted">
+              Architecture from code and evidence. Product source,
+              documentation, releases and issue tracking live in the public
+              GitHub repository.
+            </p>
+            <div className="mt-5 flex flex-wrap gap-2">
+              <Link to={paths.landing()} className="product-primary">
+                Product page <ArrowRight size={15} aria-hidden />
+              </Link>
+              <a
+                href={PRODUCT_REPOSITORY}
+                target="_blank"
+                rel="noreferrer"
+                className="tbtn text-ink"
+              >
+                <GitBranch size={15} aria-hidden /> View product on GitHub
+              </a>
+            </div>
+          </m.div>
+          <m.div
+            data-about-cat
+            className="h-44 w-full justify-self-center sm:h-52"
+            variants={ABOUT_CAT_MOTION}
+          >
+            <CatIllustration scene="about" className="h-full w-full" />
+          </m.div>
+        </m.div>
+        <m.div
+          className="card"
+          initial={{ opacity: 0, y: 8 }}
+          animate={{ opacity: 1, y: 0 }}
+          transition={{ ...transitions.page, delay: 0.06 }}
+        >
+          <div className="label mb-2">resources</div>
+          <div className="divide-y divide-line">
+            <a
+              href={PRODUCT_README}
+              target="_blank"
+              rel="noreferrer"
+              className="flex items-center gap-2 py-2.5 text-muted transition-colors hover:text-ink"
+            >
+              <BookOpen size={15} aria-hidden className="shrink-0" />
+              Documentation
+            </a>
+            <a
+              href={PRODUCT_ISSUES}
+              target="_blank"
+              rel="noreferrer"
+              className="flex items-center gap-2 py-2.5 text-muted transition-colors hover:text-ink"
+            >
+              <CircleDot size={15} aria-hidden className="shrink-0" />
+              Issues and feedback
+            </a>
+            <a
+              href={PRODUCT_LICENSE}
+              target="_blank"
+              rel="noreferrer"
+              className="flex items-center gap-2 py-2.5 text-muted transition-colors hover:text-ink"
+            >
+              <ShieldCheck size={15} aria-hidden className="shrink-0" />
+              MIT License
+            </a>
+          </div>
+        </m.div>
+      </div>
+    </section>
+  );
+}

package/src/pages/settings/DeliverySettings.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from "react";
+import { Switch } from "@headlessui/react";
 import {
-  Check,
   ChevronDown,
   CircleAlert,
   FolderGit2,
@@ -14,6 +14,7 @@ import {
   previewDeliveryPreset,
 } from "../../lib/local-api";
 import type {
+  DeliveryFeatureId,
   DeliveryPreset,
   DeliveryProvider,
 } from "../../lib/local-api";
@@ -24,6 +25,7 @@ const STATUS_CLASS: Record<
 > = {
   added: "status-verified",
   changed: "status-declared",
+  removed: "status-unresolved",
   unchanged: "status-verified",
   conflict: "status-unresolved",
 };
@@ -35,12 +37,12 @@ export function DeliverySettings({ local }: { local: boolean }) {
   const [error, setError] = useState("");
   const say = useToastStore((state) => state.say);
 
-  const load = useCallback(async (provider?: DeliveryProvider) => {
+  const load = useCallback(async (provider?: DeliveryProvider, features?: DeliveryFeatureId[]) => {
     if (!local) return;
     setLoading(true);
     setError("");
     try {
-      setPlan(await previewDeliveryPreset(provider));
+      setPlan(await previewDeliveryPreset(provider, features));
     } catch (cause) {
       setError(cause instanceof Error ? cause.message : String(cause));
     } finally {
@@ -60,6 +62,7 @@ export function DeliverySettings({ local }: { local: boolean }) {
       const installed = await installDeliveryPreset(
         plan.provider,
         plan.revision,
+        plan.features.filter((feature) => feature.selected).map((feature) => feature.id),
       );
       setPlan(installed);
       say(
@@ -76,6 +79,23 @@ export function DeliverySettings({ local }: { local: boolean }) {
     }
   }
 
+  function selectFeature(id: DeliveryFeatureId) {
+    if (!plan) return;
+    const feature = plan.features.find((item) => item.id === id);
+    if (!feature?.available) return;
+    const selected = new Set(
+      plan.features.filter((item) => item.selected).map((item) => item.id),
+    );
+    if (selected.has(id)) {
+      selected.delete(id);
+      if (id === "diff") selected.delete("sarif");
+    } else {
+      selected.add(id);
+      for (const required of feature.requires) selected.add(required);
+    }
+    void load(plan.provider, [...selected]);
+  }
+
   if (!local) {
     return (
       <div className="empty">
@@ -96,8 +116,8 @@ export function DeliverySettings({ local }: { local: boolean }) {
             <FolderGit2 size={16} className="text-accent" /> Delivery automation
           </div>
           <p className="mt-1 max-w-prose text-muted">
-            Install review checks and static catalog publishing directly into
-            this repository.
+            Choose the automation this repository needs, preview the generated
+            jobs, then install them together.
           </p>
         </div>
         <div
@@ -111,7 +131,12 @@ export function DeliverySettings({ local }: { local: boolean }) {
               type="button"
               disabled={loading || installing}
               aria-pressed={plan?.provider === provider}
-              onClick={() => void load(provider)}
+              onClick={() => void load(
+                provider,
+                plan?.features
+                  .filter((feature) => feature.selected && (feature.id !== "sarif" || provider === "github"))
+                  .map((feature) => feature.id),
+              )}
               className={`capitalize ${plan?.provider === provider ? "is-on" : ""}`}
             >
               {provider === "github" ? "GitHub" : "GitLab"}
@@ -157,15 +182,46 @@ export function DeliverySettings({ local }: { local: boolean }) {
             )}
           </div>
 
-          <ul className="mt-4 grid gap-2 text-muted sm:grid-cols-2">
+          <div className="mt-4 grid gap-2 sm:grid-cols-2">
             {plan.features.map((feature) => (
-              <li key={feature} className="flex items-center gap-2">
-                <Check size={14} className="shrink-0 text-verified" /> {feature}
-              </li>
+              <div
+                key={feature.id}
+                className={`flex items-start gap-3 rounded-control border px-3 py-3 transition-colors ${
+                  feature.available
+                    ? feature.selected
+                      ? "border-accent bg-surface"
+                      : "border-line hover:bg-surface"
+                    : "border-line opacity-60"
+                }`}
+              >
+                <span className="min-w-0 flex-1">
+                  <span className="block font-medium text-ink">{feature.label}</span>
+                  <span className="mt-0.5 block text-muted">{feature.description}</span>
+                  {!feature.available ? (
+                    <span className="mt-1 block text-faint">Available for GitHub only.</span>
+                  ) : feature.requires.length > 0 ? (
+                    <span className="mt-1 block text-faint">
+                      Enables {feature.requires.map((required) => plan.features.find((item) => item.id === required)?.label).join(", ")}.
+                    </span>
+                  ) : null}
+                </span>
+                <Switch
+                  checked={feature.selected}
+                  disabled={!feature.available || loading || installing}
+                  onChange={() => selectFeature(feature.id)}
+                  aria-label={feature.label}
+                  className="group mt-0.5 inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border border-line-strong bg-surface transition-colors outline-none data-checked:border-accent data-checked:bg-accent focus-visible:ring-2 focus-visible:ring-accent/40 disabled:cursor-not-allowed"
+                >
+                  <span
+                    aria-hidden
+                    className="size-3.5 translate-x-0.5 rounded-full bg-muted shadow-xs transition-transform group-data-checked:translate-x-[18px] group-data-checked:bg-canvas"
+                  />
+                </Switch>
+              </div>
             ))}
-          </ul>
+          </div>
 
-          <div className="mt-4 divide-y divide-line overflow-hidden rounded-control border border-line">
+          {plan.files.length > 0 ? <div className="mt-4 divide-y divide-line overflow-hidden rounded-control border border-line">
             {plan.files.map((file) => (
               <details
                 key={file.path}
@@ -194,7 +250,7 @@ export function DeliverySettings({ local }: { local: boolean }) {
                 </div>
               </details>
             ))}
-          </div>
+          </div> : <div className="empty mt-4">No delivery jobs selected.</div>}
 
           {error ? <p className="mt-3 text-unresolved">{error}</p> : null}
           <div className="mt-4 flex flex-wrap items-center justify-between gap-3">
@@ -204,12 +260,12 @@ export function DeliverySettings({ local }: { local: boolean }) {
             </p>
             {plan.status === "installed" ? (
               <span className="flex items-center gap-1.5 text-verified">
-                <ShieldCheck size={15} /> Preset installed
+                <ShieldCheck size={15} /> Selection installed
               </span>
             ) : (
               <button
                 type="button"
-                className="btn-accent"
+                className="product-primary"
                 disabled={installing || conflicts.length > 0}
                 onClick={() => void install()}
               >

package/src/selection/pages.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { pageContains, selectionPath } from "./pages";
+import { pageContains, selectionPath, selectsInPlace } from "./pages";
 import { selectionFor } from "./model";
 
 const dispatched = selectionFor("delivery.core.shipment.ShipmentDispatched");
@@ -44,6 +44,19 @@ describe("selectionPath", () => {
   });
 });
 
+describe("selectsInPlace", () => {
+  const flow = "/flows/cart-checkout";
+  const shop = selectionFor("shop");
+
+  it("selects a flow context on the flow the first time", () => {
+    expect(selectsInPlace(flow, shop, null)).toBe(true);
+  });
+
+  it("lets a repeated selection follow its link to the context page", () => {
+    expect(selectsInPlace(flow, shop, shop)).toBe(false);
+  });
+});
+
 // Navigation keeps a selection only when the page it lands on can point at it.
 // These are the cases that decide whether the palette moves the reader.
 describe("pageContains across pages", () => {

package/src/selection/pages.ts

@@ -9,7 +9,7 @@ import { walkSteps } from "../catalog";
 import { catalog, index } from "../data";
 import { paths } from "../routes";
 import type { Selection } from "./model";
-import { parseFlowStepId, resolveSelection } from "./model";
+import { parseFlowStepId, resolveSelection, sameSelection } from "./model";
 
 /** The page that owns a selection, or null when it has no page of its own. */
 export function selectionPath(selection: Selection): string | null {
@@ -257,12 +257,18 @@ export function pageContains(pathname: string, selection: Selection): boolean {
  * and only for something that flow actually draws. That is the one place where
  * leaving is the wrong answer — picking an event there is a question about
  * *this* sequence ("where does it appear?"), and the flow page answers it by
- * lighting the matching steps.
+ * lighting the matching steps. Clicking the highlighted selection again is an
+ * explicit request to follow the tree link to its own page.
  */
 export function selectsInPlace(
   pathname: string,
   selection: Selection,
+  current: Selection | null,
 ): boolean {
   const route = parseRoute(pathname);
-  return route.kind === "flow" && pageContains(pathname, selection);
+  return (
+    !sameSelection(current, selection) &&
+    route.kind === "flow" &&
+    pageContains(pathname, selection)
+  );
 }

package/vite.config.ts

@@ -7,6 +7,8 @@ import react from "@vitejs/plugin-react";
 import tailwindcss from "@tailwindcss/vite";
 import { nodePolyfills } from "vite-plugin-node-polyfills";
 import { publicSetupFrom } from "./src/lib/setup-info.ts";
+// @ts-expect-error plain JavaScript module intentionally has no browser types
+import { readManifest } from "./scripts/manifest.mjs";
 // The local control plane is a Node-only Vite plugin kept as plain ESM so its
 // pure discovery functions can also be tested directly.
 // @ts-expect-error plain JavaScript module intentionally has no browser types
@@ -121,7 +123,7 @@ try {
   // A clean checkout has no run to report yet. Settings says so explicitly.
 }
 const setupInfo = publicSetupFrom(
-  JSON.parse(manifestText) as unknown,
+  readManifest(resolve(workspace, "portolan.json")) as unknown,
   buildReport,
   createHash("sha256").update(manifestText).digest("hex"),
 );