@sanoma-ai/workflows 0.10.0 → 0.10.1

package/src/sites.ts

@@ -7,6 +7,7 @@ import type { ConfigDescription, SiteCall, SiteEntry, SitePage } from "./descrip
 import { stringValue, unwrap } from "./outline.ts";
 import { exportsOf, loadModules } from "./load.ts";
 import { APPS_DIR, appFolders, filesUnder, isDirectory, relPath, SITE_ENTRIES } from "./paths.ts";
+import { isObject } from "./resource.ts";
 import type { ResourceProblem } from "./resources.ts";
 import { START } from "./schema.ts";
 import {
@@ -428,6 +429,9 @@ const SiteDefinitionSchema = z.strictObject({
   locales: z.array(z.string()).optional(),
 });
 
+/** What `site.ts` says of who may see a site: read together or not at all. */
+const ACCESS = ["public", "login", "locales"];
+
 /**
  * What the site in `dir` (relative to `root`) says of itself in its `site.ts`, loaded
  * (`loadModules`, `defineSite` served from `sanoma/site`), and what is wrong there: its default
@@ -452,13 +456,25 @@ function siteDefinitionOf(
   const value = loaded.exports.find(([name]) => name === "default")?.[1];
   if (value === undefined) return { problems: [] };
   const problem = (message: string) => ({ file, export: "default", message });
-  const parsed = SiteDefinitionSchema.safeParse(value);
+  const problems: (ResourceProblem & { file: string })[] = [];
+  let parsed = SiteDefinitionSchema.safeParse(value);
   if (!parsed.success) {
     const why = z.prettifyError(parsed.error).replaceAll(/\s*\n\s*/g, " ");
-    return { problems: [problem(`its default export is \`defineSite({ … })\` from "sanoma/site": ${why}`)] };
+    problems.push(problem(`its default export is \`defineSite({ … })\` from "sanoma/site": ${why}`));
+    // The fields it names wrongly (and the keys it does not know) left out, the rest still read:
+    // a bad icon keeps a site's `public`, `login` and `locales`. Those three say who may see it,
+    // so a wrong one leaves out all three: never a site read as public without its login.
+    const wrong = new Set(
+      parsed.error.issues.flatMap((i) => (i.code === "unrecognized_keys" ? i.keys : i.path.slice(0, 1))),
+    );
+    if (ACCESS.some((key) => wrong.has(key))) for (const key of ACCESS) wrong.add(key);
+    if (!isObject(value) || !wrong.size) return { problems };
+    parsed = SiteDefinitionSchema.safeParse(
+      Object.fromEntries(Object.entries(value).filter(([key]) => !wrong.has(key))),
+    );
+    if (!parsed.success) return { problems };
   }
   const { title, icon, public: isPublic, login, locales } = parsed.data;
-  const problems: (ResourceProblem & { file: string })[] = [];
   const loginProblem = (): string | undefined => {
     if (!isPublic) return "a login is for a public site: add `public: true`, or remove `login`";
     if (!connectors.vendors.has(login!)) return `login names "${login}", which is not a connector in sanoma.config.ts`;

package/src/steps.ts

@@ -1,5 +1,6 @@
 import type { LedgerRecord } from "./ledger.ts";
 import type { Op } from "./op.ts";
+import type { ConnectionRef } from "./connection.ts";
 
 /*
  * Steps a connector (or a company) ships for its Gherkin tests, as plain data: expressions and
@@ -19,8 +20,8 @@ type AnyOp<I = any, O = any> = Op<string, string, string, I, O>;
  * seed's name (else the type's) as the export.
  */
 export type Seed =
-  | { op: AnyOp; input: Record<string, unknown>; as?: string }
-  | { op: AnyOp; fault: "failNext" | "rateLimit" | "loseReply" };
+  | { op: AnyOp; input: Record<string, unknown>; as?: string; connection?: ConnectionRef }
+  | { op: AnyOp; fault: "failNext" | "rateLimit" | "loseReply"; connection?: ConnectionRef };
 
 /** A call through an operation: what it was given, and what it returned. */
 export interface Call<I, O> {