@anja.codes/vitakit 0.1.0 → 0.2.0

package/dist/shared/vitakit.BerUaxtF.mjs

@@ -0,0 +1,121 @@
+import { z } from 'zod';
+import { f as fail } from './vitakit.DbSeENVS.mjs';
+import { i as isSitePath, s as sitePathMarker, P as PATH_KEY } from './vitakit.D10HyDhF.mjs';
+
+const MARKER_KEY = "__vitakitRich";
+function isRichMarker(value) {
+  return typeof value === "object" && value !== null && MARKER_KEY in value;
+}
+function richMarker(value) {
+  return { [MARKER_KEY]: value };
+}
+function renderRichFields(value, renderer, path, where) {
+  if (isRichMarker(value)) {
+    try {
+      return { text: value[MARKER_KEY], html: renderer.inline(value[MARKER_KEY]) };
+    } catch (error) {
+      fail(where, `${path}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  }
+  if (Array.isArray(value)) {
+    return value.map((item, index) => renderRichFields(item, renderer, `${path}[${index}]`, where));
+  }
+  if (typeof value === "object" && value !== null) {
+    return Object.fromEntries(Object.entries(value).map(
+      ([key, item]) => [key, renderRichFields(item, renderer, path ? `${path}.${key}` : key, where)]
+    ));
+  }
+  return value;
+}
+
+const text = z.string().trim().min(1);
+const richText = text.transform((value) => richMarker(value));
+const absoluteUrl = z.string().trim().refine(
+  // One check, not `.url().refine(...)`: zod runs a refinement even after
+  // `.url()` failed, and `new URL()` then throws instead of reporting.
+  (value) => URL.canParse(value) && ["http:", "https:", "mailto:"].includes(new URL(value).protocol),
+  "expected an http(s) or mailto URL"
+);
+const url = z.string().trim().transform((value, context) => {
+  if (isSitePath(value) && !/\s/.test(value)) return sitePathMarker(value);
+  const parsed = absoluteUrl.safeParse(value);
+  if (parsed.success) return parsed.data;
+  context.addIssue({ code: "custom", message: "expected an http(s) or mailto URL, or a path on the site such as /slides/talk.pdf" });
+  return z.NEVER;
+});
+const DATE = /^(\d{4})(?:-(\d{2}))?(?:-(\d{2}))?$/;
+function parseDatePoint(value, context) {
+  const match = DATE.exec(value);
+  if (!match) {
+    context.addIssue({ code: "custom", message: `expected a date like 2024, 2024-03 or 2024-03-15, got "${value}"` });
+    return void 0;
+  }
+  const [, y, m, d] = match;
+  const year = Number(y);
+  const month = m === void 0 ? void 0 : Number(m);
+  const day = d === void 0 ? void 0 : Number(d);
+  if (month !== void 0 && (month < 1 || month > 12)) {
+    context.addIssue({ code: "custom", message: `month out of range in "${value}"` });
+    return void 0;
+  }
+  if (day !== void 0) {
+    const date = new Date(Date.UTC(year, month - 1, day));
+    if (date.getUTCMonth() !== month - 1 || date.getUTCDate() !== day) {
+      context.addIssue({ code: "custom", message: `"${value}" is not a real date` });
+      return void 0;
+    }
+  }
+  return {
+    raw: value,
+    year,
+    month,
+    day,
+    // Pad missing parts so that 2024 < 2024-03 < 2024-03-15 sorts correctly.
+    sortKey: `${String(year).padStart(4, "0")}-${String(month ?? 1).padStart(2, "0")}-${String(day ?? 1).padStart(2, "0")}`
+  };
+}
+const datePoint = z.union([z.string(), z.number().int()]).transform((value) => String(value));
+const dateRange = z.union([
+  datePoint,
+  z.strictObject({
+    from: datePoint,
+    to: z.union([datePoint, z.literal("present")]).optional()
+  })
+]).transform((value, context) => {
+  const source = typeof value === "string" ? { from: value, to: void 0 } : value;
+  const from = parseDatePoint(source.from, context);
+  const ongoing = source.to === "present";
+  const to = source.to === void 0 || ongoing ? void 0 : parseDatePoint(source.to, context);
+  if (!from || source.to !== void 0 && !ongoing && !to) return z.NEVER;
+  if (to && to.sortKey < from.sortKey) {
+    context.addIssue({ code: "custom", message: `range ends (${to.raw}) before it starts (${from.raw})` });
+    return z.NEVER;
+  }
+  return { from, to, ongoing, point: typeof value === "string" };
+});
+function urlLabel(value) {
+  return typeof value === "string" ? value.replace(/^(?:https?:\/\/|mailto:)/, "").replace(/\/$/, "") : value[PATH_KEY];
+}
+const linked = z.union([
+  url.transform((value) => ({ label: urlLabel(value), url: value })),
+  text.transform((label) => ({ label })),
+  z.strictObject({ label: text, url: url.optional() }),
+  z.strictObject({ name: text, url: url.optional() }).transform(({ name, url: url2 }) => ({ label: name, url: url2 }))
+]).transform((value) => {
+  const target = "url" in value ? value.url : void 0;
+  return target === void 0 ? { label: value.label } : { label: value.label, url: target };
+});
+const requiredLink = linked.transform((value, context) => {
+  if (value.url !== void 0) return value;
+  context.addIssue({ code: "custom", message: "expected a URL, or { label, url }" });
+  return z.NEVER;
+});
+const visibility = z.enum(["public", "cv", "private"]).default("public");
+function entry(shape) {
+  return z.strictObject({ visibility, ...shape });
+}
+function section(shape) {
+  return z.array(entry(shape));
+}
+
+export { MARKER_KEY as M, richText as a, absoluteUrl as b, renderRichFields as c, dateRange as d, entry as e, linked as l, requiredLink as r, section as s, text as t, url as u, visibility as v };

package/dist/shared/{vitakit.D8WRg_Xx.d.mts → vitakit.BfpxDtz1.d.mts}

@@ -31,7 +31,7 @@ interface DateRange {
  * Intermediate form of a `richText` field, before rendering.
  *
  * Internal: it exists only between validation and `renderRichFields`, never in
- * a `VitakitContent`. `vitakit-check` fails the build if one reaches the output.
+ * a `VitakitContent`. `vitakit verify` fails the build if one reaches the output.
  * Read rich fields with `richSource` / `richHtml` instead of inspecting shapes.
  */
 interface RichTextMarker {
@@ -44,14 +44,15 @@ interface RichText {
     /** Rendered inline HTML; use with `v-html`. */
     html: string;
 }
-interface Link {
+/** A label that may link: an institution, a funder, a person. See `linked`. */
+interface Linked {
     label: string;
-    url: string;
-}
-interface Institution {
-    name: string;
     url?: string;
 }
+/** A label that always links. */
+interface Link extends Linked {
+    url: string;
+}
 /** Fields every section entry has, whatever else its schema adds. */
 interface EntryBase {
     /** Stable identity for `v-for` keys: the source file plus the index. */
@@ -117,7 +118,7 @@ interface Page {
 interface Profile {
     name: string;
     title?: string;
-    affiliation?: Institution;
+    affiliation?: Linked;
     email?: string;
     links: Link[];
     /** Short plain-text description used for page metadata, not rendered. */
@@ -150,4 +151,4 @@ interface VitakitContent {
     issues: ContentIssue[];
 }
 
-export type { ContentIssue as C, DateRange as D, Entry as E, Institution as I, Link as L, Page as P, RichTextMarker as R, Visibility as V, VitakitContent as a, DatePoint as b, EntryBase as c, Profile as d, Publication as e, PublicationBadge as f, PublicationGroup as g, RichText as h };
+export type { ContentIssue as C, DateRange as D, Entry as E, Link as L, Page as P, RichTextMarker as R, Visibility as V, VitakitContent as a, DatePoint as b, EntryBase as c, Linked as d, Profile as e, Publication as f, PublicationBadge as g, PublicationGroup as h, RichText as i };

package/dist/shared/{vitakit.CypCF-4Q.mjs → vitakit.By5VWQ1n.mjs}

@@ -11,12 +11,16 @@ import rehypeKatex from 'rehype-katex';
 import rehypeRaw from 'rehype-raw';
 import rehypeStringify from 'rehype-stringify';
 import { visit } from 'unist-util-visit';
-import { m as fail, p as formatZodIssues, o as resolveAsset, q as importProjectModule, s as schemas, k as atMost, w as renderRichFields, x as resolveSitePaths, I as Issues, y as profile, z as absoluteSitePath, A as whereOf, B as messageOf, C as page } from './vitakit.BxcnlFGP.mjs';
+import { r as resolveSitePaths, a as absoluteSitePath } from './vitakit.D10HyDhF.mjs';
 import { existsSync } from 'node:fs';
+import { r as resolveAsset } from './vitakit.DQ6PmGoL.mjs';
 import { badgePresets, Bibliography } from '@behackl/citation-js-extras';
 import rehypeParse from 'rehype-parse';
 import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
+import { f as fail, a as formatZodIssues, i as importProjectModule, I as Issues, w as whereOf, m as messageOf } from './vitakit.DbSeENVS.mjs';
 import { z } from 'zod';
+import { findSectionFiles, loadSection, resolveSectionSchema } from '../chunks/sections.mjs';
+import { profile, page } from '../chunks/schemas.mjs';
 
 const URL_PROPERTIES = ["href", "src", "poster", "data", "action", "formAction"];
 const isRootRelative = (value) => value.startsWith("/") && !value.startsWith("//");
@@ -81,7 +85,7 @@ ${details}`);
   }
   function inline(source) {
     const html = markdown(source);
-    const unwrapped = /^<p>([\s\S]*)<\/p>$/.exec(html);
+    const unwrapped = /^<p>((?:(?!<\/p>)[\s\S])*)<\/p>$/.exec(html);
     if (!unwrapped) throw new Error(`expected a single paragraph, got: ${html}`);
     return unwrapped[1];
   }
@@ -305,77 +309,6 @@ async function loadPublications(bibPath, renderer, schema = defaultPublications,
   return result;
 }
 
-const RESERVED = /* @__PURE__ */ new Set(["site", "profile"]);
-async function exists(path) {
-  return stat(path).then(() => true, () => false);
-}
-async function loadRepoSchema(path, id) {
-  const { mtimeMs } = await stat(path);
-  const module = await importProjectModule(path, mtimeMs, `schemas/${id}.ts`);
-  const schema = module.default ?? module.schema;
-  if (!schema || typeof schema.safeParse !== "function") {
-    fail(`schemas/${id}.ts`, "must export a Zod schema as its default export");
-  }
-  return schema;
-}
-const STARTER = (id) => `create schemas/${id}.ts, for example:
-
-  import { z, section, dateRange } from '@anja.codes/vitakit'
-
-  export default section({
-    date: dateRange,
-    title: z.string(),
-  })`;
-async function discoverSections(rootDir) {
-  const contentDir = join(rootDir, "content");
-  const schemaDir = join(rootDir, "schemas");
-  const files = (await readdir(contentDir).catch(() => fail("content/", "directory is missing"))).filter((name) => name.endsWith(".yml") || name.endsWith(".yaml")).sort();
-  const sources = [];
-  for (const file of files) {
-    const id = file.replace(/\.ya?ml$/, "");
-    if (RESERVED.has(id)) continue;
-    if (!/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(id)) {
-      fail(`content/${file}`, "file name must be lowercase kebab-case, e.g. `research-stays.yml`");
-    }
-    const override = join(schemaDir, `${id}.ts`);
-    if (await exists(override)) {
-      sources.push({ id, file: join(contentDir, file), schemaOrigin: "repo", schema: await loadRepoSchema(override, id) });
-      continue;
-    }
-    const builtin = schemas[id];
-    if (!builtin) fail(`content/${file}`, `no schema for this file; ${STARTER(id)}`);
-    sources.push({ id, file: join(contentDir, file), schemaOrigin: "built-in", schema: builtin });
-  }
-  return sources;
-}
-function byDateDesc(a, b) {
-  const left = a.date?.from?.sortKey;
-  const right = b.date?.from?.sortKey;
-  if (left === right) return 0;
-  if (!left) return 1;
-  if (!right) return -1;
-  return right.localeCompare(left);
-}
-async function loadSection(source, options) {
-  const where = `content/${source.id}.yml`;
-  const raw = await readFile(source.file, "utf8");
-  let data;
-  try {
-    data = parse(raw);
-  } catch (error) {
-    fail(where, error instanceof Error ? error.message : String(error));
-  }
-  if (data === null) return [];
-  if (!Array.isArray(data)) fail(where, "expected a list of entries");
-  const parsed = source.schema.safeParse(data);
-  if (!parsed.success) {
-    const origin = source.schemaOrigin === "repo" ? ` (schema: schemas/${source.id}.ts)` : "";
-    fail(where, `invalid${origin}
-${formatZodIssues(parsed.error)}`);
-  }
-  return parsed.data.map((item, index) => ({ ...item, id: `${source.id}-${index}` })).filter((item) => atMost(item.visibility, options.maxVisibility)).map((item, index) => renderRichFields(item, options.renderer, String(index), where)).map((item) => resolveSitePaths(item, options.resolvePath ?? ((path) => path))).sort(byDateDesc);
-}
-
 const FALLBACK_PROFILE = { name: "Your Name", links: [], nav: [], footerHtml: "" };
 async function loadYaml(file, where) {
   const raw = await readFile(file, "utf8").catch(() => fail(where, "missing"));
@@ -462,12 +395,13 @@ async function loadPages(contentDir, renderer, issues) {
   return pages.sort((a, b) => a.order - b.order || a.route.localeCompare(b.route));
 }
 async function loadSections(rootDir, maxVisibility, renderer, resolvePath, issues) {
-  const sources = await issues.attempt("content/", () => discoverSections(rootDir), []);
+  const { files, problems } = await issues.attempt("content/", () => findSectionFiles(rootDir), { files: [], problems: [] });
+  for (const problem of problems) issues.record(problem.where, problem.message);
   const sections = {};
-  for (const source of sources) {
-    sections[source.id] = await issues.attempt(
-      `content/${source.id}.yml`,
-      () => loadSection(source, { maxVisibility, renderer, resolvePath }),
+  for (const file of files) {
+    sections[file.id] = await issues.attempt(
+      file.where,
+      async () => loadSection(await resolveSectionSchema(rootDir, file), { maxVisibility, renderer, resolvePath }),
       []
     );
   }

package/dist/shared/vitakit.CfB3hMHl.mjs

@@ -0,0 +1,60 @@
+function formatPoint(point, { locale = "en", precision = "auto" }) {
+  if (precision === "year" || point.month === void 0) return String(point.year);
+  const date = new Date(Date.UTC(point.year, point.month - 1, point.day ?? 1));
+  return new Intl.DateTimeFormat(locale, {
+    year: "numeric",
+    month: "short",
+    ...point.day === void 0 ? {} : { day: "numeric" },
+    timeZone: "UTC"
+  }).format(date);
+}
+function formatDateRange(range, options = {}) {
+  if (!range) return "";
+  const { presentLabel = "present" } = options;
+  const from = formatPoint(range.from, options);
+  if (range.point) return from;
+  if (range.ongoing) return `${from}\u2013${presentLabel}`;
+  if (!range.to) return from;
+  const to = formatPoint(range.to, options);
+  return from === to ? from : `${from}\u2013${to}`;
+}
+function dateSortKey(range) {
+  return range?.from.sortKey ?? "";
+}
+
+const TITLE_FIELDS = ["title", "position", "degree", "role", "student"];
+const SECONDARY_FIELDS = ["student", "role", "event", "term", "degree"];
+const LINKED_FIELDS = ["institution", "issuer", "organisation"];
+function entryTitleField(entry, fields = TITLE_FIELDS) {
+  return fields.find((field) => {
+    const value = entry[field];
+    if (typeof value === "string") return value.length > 0;
+    return typeof value === "object" && value !== null && "html" in value;
+  });
+}
+function entrySecondaryParts(entry, titleField) {
+  const parts = [];
+  for (const field of SECONDARY_FIELDS) {
+    if (field === titleField) continue;
+    const value = entry[field];
+    if (typeof value === "string" && value.length > 0) parts.push({ kind: "text", text: value });
+  }
+  for (const field of LINKED_FIELDS) {
+    const value = entry[field];
+    if (value?.label) {
+      parts.push({ kind: "linked", linked: value });
+      break;
+    }
+  }
+  if (typeof entry.location === "string" && entry.location.length > 0) {
+    parts.push({ kind: "text", text: entry.location });
+  }
+  return parts;
+}
+function asLinkedList(value) {
+  const isLinked = (item) => typeof item === "object" && item !== null && typeof item.label === "string";
+  if (Array.isArray(value)) return value.filter(isLinked);
+  return isLinked(value) ? [value] : [];
+}
+
+export { LINKED_FIELDS as L, SECONDARY_FIELDS as S, TITLE_FIELDS as T, asLinkedList as a, entryTitleField as b, dateSortKey as d, entrySecondaryParts as e, formatDateRange as f };