@unitninety/site-kit 1.6.3 → 1.6.4

package/README.md

@@ -5,7 +5,7 @@ The library a UnitNinety site is built on. It reads the site's content from Unit
 You do not usually add it by hand. The `u90` tool adds it when it converts a Next.js App Router site, at the one version that release of the tool works with:
 
 ```bash
-npx --yes @unitninety/u90@1.0.3 --version
+npx --yes @unitninety/u90@1.0.4 --version
 ```
 
 UnitNinety imports packages made for that version only, so keep the version the tool names.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unitninety/site-kit",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "The client-site half of the UnitNinety platform contract: schema authoring, content fetching, the editing bridge and the pairing CLI.",
   "type": "module",
   "exports": {

package/src/components/Link.tsx

@@ -20,5 +20,5 @@ export function Link({ value, children, ...rest }: { value: LinkRead | null | un
   // element's props pass through). The href is always the value's.
   const tab: Record<string, unknown> = value.newTab ? { target: '_blank', rel: 'noopener' } : {}
   for (const key of ['target', 'rel'] as const) if (rest[key] !== undefined) tab[key] = rest[key]
-  return isInternal(value.href) ? createElement(NextLink, { ...attrs, href: value.href, ...tab } as never, label) : createElement('a', { ...attrs, href: value.href, ...tab }, label)
+  return isInternal(value.href) && !(value.to && 'file' in value.to) ? createElement(NextLink, { ...attrs, href: value.href, ...tab } as never, label) : createElement('a', { ...attrs, href: value.href, ...tab }, label)
 }

package/src/elements/leaves/link.ts

@@ -3,12 +3,13 @@ import { Id, TEL_RE, URL_RE, defineElement, requiredIssue, type ExpandCtx, type
 import { isDocumentId } from '../ids'
 
 const ANCHOR = z.string().regex(/^[A-Za-z][\w-]*$/)
-const KINDS = ['page', 'entry', 'url', 'email', 'tel'] as const
+const KINDS = ['page', 'entry', 'file', 'url', 'email', 'tel'] as const
 export type LinkKind = (typeof KINDS)[number]
 
 export const LinkTo = z.union([
   z.strictObject({ page: Id, anchor: ANCHOR.optional() }),
   z.strictObject({ entry: z.strictObject({ collection: z.string().min(1), id: Id }) }),
+  z.strictObject({ file: Id }),
   z.strictObject({ url: z.string().regex(URL_RE, 'Expected an absolute URL or a root-relative path.') }),
   z.strictObject({ email: z.email() }),
   z.strictObject({ tel: z.string().regex(TEL_RE, 'Expected a phone number.') }),
@@ -19,6 +20,7 @@ const LinkToSeed = z.union([
   z.strictObject({ page: z.union([Id, z.string().min(1)]), anchor: ANCHOR.optional() }),
   z.strictObject({ entry: z.strictObject({ collection: z.string().min(1), key: z.string().min(1) }) }),
   z.strictObject({ entry: z.strictObject({ collection: z.string().min(1), id: Id }) }),
+  z.strictObject({ file: z.union([Id, z.strictObject({ source: z.string().trim().min(1) })]) }),
   z.strictObject({ url: z.string().regex(URL_RE) }),
   z.strictObject({ email: z.email() }),
   z.strictObject({ tel: z.string().regex(TEL_RE) }),
@@ -71,7 +73,7 @@ export const withDraftLocale = (href: string, locale: string): string => {
 /** In draft with a `draftLocale`, an internal href keeps the language; every other href, and every href outside draft, is unchanged. */
 export const hrefOf = (to: LinkTo | null, ctx: ExpandCtx): { href: string | null; status: 'ready' | 'missing' } => {
   const r = targetOf(to, ctx)
-  return ctx.draftLocale && r.href && internal(r.href) ? { ...r, href: withDraftLocale(r.href, ctx.draftLocale) } : r
+  return ctx.draftLocale && r.href && !(to && 'file' in to) && internal(r.href) ? { ...r, href: withDraftLocale(r.href, ctx.draftLocale) } : r
 }
 const targetOf = (to: LinkTo | null, ctx: ExpandCtx): { href: string | null; status: 'ready' | 'missing' } => {
   if (!to) return { href: null, status: 'ready' }
@@ -83,6 +85,13 @@ const targetOf = (to: LinkTo | null, ctx: ExpandCtx): { href: string | null; sta
     const e = ctx.entry(to.entry.collection, to.entry.id, 0)
     return e.status === 'ready' && e.route ? { href: e.route, status: 'ready' } : { href: null, status: 'missing' }
   }
+  if ('file' in to) {
+    const media = ctx.media(to.file)
+    // Visibility is enforced by the platform's reference checks and media route. A resolver
+    // carrying additional visibility metadata must never turn a private file into a link.
+    const privateFile = media && 'visibility' in media && media.visibility === 'private'
+    return media?.url && !privateFile ? { href: media.url, status: 'ready' } : { href: null, status: 'missing' }
+  }
   if ('url' in to) return { href: to.url, status: 'ready' }
   if ('email' in to) return { href: `mailto:${to.email}`, status: 'ready' }
   return { href: `tel:${to.tel.replace(/[^+\d]/g, '')}`, status: 'ready' }
@@ -100,6 +109,10 @@ const isUnresolvedSeedRef = (to: SeedTo | null): boolean =>
 
 const expandSeed = (s: SeedValue, o: O, ctx: ExpandCtx): LinkRead => {
   if (s === null) return null
+  if (s.to && 'file' in s.to && typeof s.to.file === 'object') {
+    const source = s.to.file.source
+    return { label: s.label, href: source, newTab: s.newTab, to: { file: source }, status: 'ready', ...(ctx.draft ? { $path: ctx.at } : {}) }
+  }
   if (isUnresolvedSeedRef(s.to)) return { label: s.label, href: null, newTab: s.newTab, to: null, status: 'missing', ...(ctx.draft ? { $path: ctx.at } : {}) }
   return expand({ label: s.label, to: s.to as LinkTo | null, newTab: s.newTab }, o, ctx)
 }
@@ -124,6 +137,7 @@ export const link = defineElement({
     if (!v?.to) return []
     if ('page' in v.to) return [{ kind: 'page', id: v.to.page }]
     if ('entry' in v.to) return [{ kind: 'entry', collection: v.to.entry.collection, id: v.to.entry.id, depth: 0 }]
+    if ('file' in v.to) return [{ kind: 'media', id: v.to.file }]
     return []
   },
   toStored: async (s, _o, ctx: SeedCtx) => {
@@ -131,6 +145,7 @@ export const link = defineElement({
     let to: LinkTo | null = null
     if (s.to && 'page' in s.to) to = { page: typeof s.to.page === 'string' && !isDocumentId(s.to.page) ? ctx.resolvePage(s.to.page) : s.to.page, ...(s.to.anchor ? { anchor: s.to.anchor } : {}) }
     else if (s.to && 'entry' in s.to) to = { entry: { collection: s.to.entry.collection, id: 'key' in s.to.entry ? ctx.resolveEntry(s.to.entry.collection, s.to.entry.key) : s.to.entry.id } }
+    else if (s.to && 'file' in s.to) to = { file: typeof s.to.file === 'object' ? await ctx.importAsset(s.to.file.source) : s.to.file }
     else to = s.to
     return { label: s.label, to, newTab: s.newTab }
   },

package/src/elements/leaves/rich-text.ts

@@ -20,15 +20,16 @@ type O = z.infer<typeof RichTextOptions>
 const common = { direction: z.enum(['ltr', 'rtl']).nullable().default('ltr'), format: z.string().default(''), indent: z.int().default(0), version: z.int().default(1) }
 const TextNode = z.object({ type: z.literal('text'), text: z.string(), format: z.int().nonnegative().default(0), detail: z.int().default(0), mode: z.string().default('normal'), style: z.string().default('') , version: z.int().default(1) })
 const LineBreak = z.object({ type: z.literal('linebreak'), version: z.int().default(1) })
-const LinkNode = z.object({ type: z.literal('link'), fields: z.object({ to: LinkTo, newTab: z.boolean().default(false) }), children: z.array(z.union([TextNode, LineBreak])), ...common })
-const inlines = (o: O) => z.array(o.marks.includes('link') ? z.union([TextNode, LineBreak, LinkNode]) : z.union([TextNode, LineBreak]))
-const Paragraph = (o: O) => z.object({ type: z.literal('paragraph'), children: inlines(o), textFormat: z.int().default(0), ...common })
-const Heading = (o: O) => z.object({ type: z.literal('heading'), tag: z.enum(o.headings as [string, ...string[]]), children: inlines(o), ...common })
-const Quote = (o: O) => z.object({ type: z.literal('quote'), children: inlines(o), ...common })
-const ListItem = (o: O) => z.object({ type: z.literal('listitem'), children: inlines(o), value: z.int().default(1), ...common })
-const List = (o: O) => z.object({ type: z.literal('list'), listType: z.enum(['bullet', 'number']), tag: z.enum(['ul', 'ol']), start: z.int().default(1), children: z.array(ListItem(o)), ...common })
-const blockSchemas = (o: O) => {
-  const by = { paragraph: Paragraph(o), heading: Heading(o), list: List(o), quote: Quote(o) }
+const FileSeedTo = z.strictObject({ file: z.strictObject({ source: z.string().trim().min(1) }) })
+const LinkNode = (seed = false) => z.object({ type: z.literal('link'), fields: z.object({ to: seed ? z.union([LinkTo, FileSeedTo]) : LinkTo, newTab: z.boolean().default(false) }), children: z.array(z.union([TextNode, LineBreak])), ...common })
+const inlines = (o: O, seed = false) => z.array(o.marks.includes('link') ? z.union([TextNode, LineBreak, LinkNode(seed)]) : z.union([TextNode, LineBreak]))
+const Paragraph = (o: O, seed = false) => z.object({ type: z.literal('paragraph'), children: inlines(o, seed), textFormat: z.int().default(0), ...common })
+const Heading = (o: O, seed = false) => z.object({ type: z.literal('heading'), tag: z.enum(o.headings as [string, ...string[]]), children: inlines(o, seed), ...common })
+const Quote = (o: O, seed = false) => z.object({ type: z.literal('quote'), children: inlines(o, seed), ...common })
+const ListItem = (o: O, seed = false) => z.object({ type: z.literal('listitem'), children: inlines(o, seed), value: z.int().default(1), ...common })
+const List = (o: O, seed = false) => z.object({ type: z.literal('list'), listType: z.enum(['bullet', 'number']), tag: z.enum(['ul', 'ol']), start: z.int().default(1), children: z.array(ListItem(o, seed)), ...common })
+const blockSchemas = (o: O, seed = false) => {
+  const by = { paragraph: Paragraph(o, seed), heading: Heading(o, seed), list: List(o, seed), quote: Quote(o, seed) }
   const chosen = o.blocks.map((b) => by[b])
   return chosen.length === 1 ? chosen[0] : z.union(chosen as z.ZodTypeAny[] as [z.ZodTypeAny, z.ZodTypeAny, ...z.ZodTypeAny[]])
 }
@@ -44,9 +45,9 @@ const eachLink = (node: Node, f: (n: Node) => void) => {
   node.children?.forEach((c) => eachLink(c, f))
 }
 
-const stored = (o: O) =>
+const stored = (o: O, seed = false) =>
   z
-    .object({ root: z.object({ type: z.literal('root'), children: z.array(blockSchemas(o)), ...common }) })
+    .object({ root: z.object({ type: z.literal('root'), children: z.array(blockSchemas(o, seed)), ...common }) })
     .superRefine((v, ctx) => {
       const root = v.root as unknown as Node
       if (o.inline && (root.children!.length !== 1 || root.children![0].type !== 'paragraph'))
@@ -70,10 +71,16 @@ export const richTextToPlain = (v: Stored): string =>
   v ? (v.root.children as unknown as Node[]).map((b) => { const parts: string[] = []; eachText(b, [], (n) => parts.push(n.text ?? '')); return parts.join('') }).join('\n') : ''
 
 export type RichTextRead = ({ root: unknown; $path?: string }) | null
-const expand = (v: Stored, o: O, ctx: ExpandCtx): RichTextRead => {
+const expand = (v: Stored, o: O, ctx: ExpandCtx, seed = false): RichTextRead => {
   if (v === null) return null
   const root = structuredClone(v.root) as unknown as Node
-  eachLink(root, (n) => { const fields = n.fields as { to: z.infer<typeof LinkTo> }; Object.assign(fields, hrefOf(fields.to, ctx)) })
+  eachLink(root, (n) => {
+    const fields = n.fields as { to: z.infer<typeof LinkTo> | z.infer<typeof FileSeedTo> }
+    if (seed && 'file' in fields.to && typeof fields.to.file === 'object') {
+      const source = fields.to.file.source
+      Object.assign(fields, { to: { file: source }, href: source, status: 'ready' })
+    } else Object.assign(fields, hrefOf(fields.to as z.infer<typeof LinkTo>, ctx))
+  })
   const split = (node: Node) => {
     if (!node.children) return
     node.children.forEach(split)
@@ -118,7 +125,7 @@ export const richText = defineElement({
   label: 'Rich text',
   placement: 'any',
   options: RichTextOptions,
-  seed: stored,
+  seed: (o) => stored(o, true),
   stored,
   shape: () => SHAPE,
   read: () => z.object({ root: z.unknown(), $path: z.string().optional() }).nullable(),
@@ -132,12 +139,21 @@ export const richText = defineElement({
       const to = (n.fields as { to: z.infer<typeof LinkTo> }).to
       if ('page' in to) refs.push({ kind: 'page', id: to.page })
       else if ('entry' in to) refs.push({ kind: 'entry', collection: to.entry.collection, id: to.entry.id, depth: 0 })
+      else if ('file' in to) refs.push({ kind: 'media', id: to.file })
     })
     return refs
   },
-  toStored: async (seed) => seed,
+  toStored: async (seed, _o, ctx) => {
+    if (seed === null) return null
+    const copy = structuredClone(seed)
+    await Promise.all(linkNodes(copy).map(async (node) => {
+      const fields = node.fields as { to: z.infer<typeof LinkTo> | z.infer<typeof FileSeedTo> }
+      if ('file' in fields.to && typeof fields.to.file === 'object') fields.to = { file: await ctx.importAsset(fields.to.file.source) }
+    }))
+    return copy
+  },
   expand,
-  expandSeed: expand,
+  expandSeed: (s, o, ctx) => expand(s, o, ctx, true),
   toText: richTextToPlain,
   translatable: (v) => {
     const out: { path: (string | number)[]; value: string }[] = []

package/src/legacy/cli.mjs

@@ -2,7 +2,7 @@
 import { readFile, writeFile } from 'node:fs/promises'
 
 /**
- * `npx --yes @unitninety/u90@1.0.3 pair <code>` — the one command an operator hands over. The u90 tool
+ * `npx --yes @unitninety/u90@1.0.4 pair <code>` — the one command an operator hands over. The u90 tool
  * runs this file for `u90 pair`. The command is scoped and pinned because an unscoped name, run in a
  * repository with no local bin, fetches whatever package npm holds under that name.
  *
@@ -115,7 +115,7 @@ const run = async () => {
   const args = process.argv.slice(2)
 
   if (args[0] !== 'pair' || !args[1]) {
-    fail('Usage: npx --yes @unitninety/u90@1.0.3 pair <code> --site https://example.com [--platform https://cms…]')
+    fail('Usage: npx --yes @unitninety/u90@1.0.4 pair <code> --site https://example.com [--platform https://cms…]')
   }
 
   const code = args[1]

package/src/legacy/content.ts

@@ -360,7 +360,7 @@ export const createContentClient = ({
             : !platformUrl
               ? 'PLATFORM_URL is unset'
               : 'PAYLOAD_API_KEY is unset'
-        }. Every page will render its committed fallback copy, and every collection route will 404. Set it in the site's environment — \`npx --yes @unitninety/u90@1.0.3 pair\` writes both.`,
+        }. Every page will render its committed fallback copy, and every collection route will 404. Set it in the site's environment — \`npx --yes @unitninety/u90@1.0.4 pair\` writes both.`,
       )
     }
     return true

package/src/site/fields.ts

@@ -19,7 +19,7 @@ export const image = (o: Common & { default?: unknown; constraints?: unknown; va
   leaf<ImageRead>('u90/image', o, { constraints: o.constraints, variants: o.variants })
 export const video = (o: Common & { default?: unknown; poster?: unknown } = {}) => leaf<VideoRead>('u90/video', o, { poster: o.poster })
 export const file = (o: Common & { default?: unknown; mimeTypes?: string[]; maxBytes?: number } = {}) => leaf<FileRead>('u90/file', o, { mimeTypes: o.mimeTypes, maxBytes: o.maxBytes })
-export const link = (o: Common & { default?: unknown; allow?: Array<'page' | 'entry' | 'url' | 'email' | 'tel'> } = {}) => leaf<LinkRead>('u90/link', o, { allow: o.allow })
+export const link = (o: Common & { default?: unknown; allow?: Array<'page' | 'entry' | 'file' | 'url' | 'email' | 'tel'> } = {}) => leaf<LinkRead>('u90/link', o, { allow: o.allow })
 export const date = (o: Common & { default?: string; min?: string; max?: string } = {}) => leaf<DateRead>('u90/date', o, { min: o.min, max: o.max })
 export const number = (o: Common & { default?: number; integer?: boolean; min?: number; max?: number; step?: number } = {}) => leaf<NumberRead>('u90/number', o, { integer: o.integer, min: o.min, max: o.max, step: o.step })
 export const boolean = (o: Common & { default?: boolean } = {}) => leaf<BooleanRead>('u90/boolean', o, {})

package/src/site/version.ts

@@ -1 +1 @@
-export const SITE_KIT_VERSION = '1.6.3'
+export const SITE_KIT_VERSION = '1.6.4'