@threadlabs/markupkit 0.2.1 → 0.2.2

package/components/breadcrumbs.html

@@ -1,4 +1,4 @@
-<template component="hk-breadcrumbs">
+<template component="mk-breadcrumbs">
   <defs>
     <prop name="items" type="list(object({ href: string, label: string, current: string, depth: number, pageName: string, group?: string, ... }))" required>Pages from the top of the trail to the current page.</prop>
     <prop name="label" type="string" default="Breadcrumb">Accessible navigation name.</prop>

package/components/nav.html

@@ -1,4 +1,4 @@
-<template component="hk-nav-items">
+<template component="mk-nav-items">
   <defs>
     <prop name="items" type="list(object({ label: string, current: string, depth: number, href?: string, group?: string, open?: boolean, children?: list(object({ label: string, ... })), ... }))" required>Navigation items, each with its nested items.</prop>
   </defs>
@@ -7,15 +7,15 @@
     <li from:data-depth="$item.depth">
       <template $match><details $when="$item.children" from:open="$item.open">
         <summary><template $match><a $when="$item.href" from:href="$item.href" from:aria-current="$item.current">{$item.label}</a><span $else>{$item.label}</span></template></summary>
-        <hk-nav-items from:items="$item.children"></hk-nav-items>
+        <mk-nav-items from:items="$item.children"></mk-nav-items>
       </details>
       <a $else from:href="$item.href" from:aria-current="$item.current">{$item.label}</a></template>
     </li>
   </template></ul>
 </template>
-<!-- The first three levels of items render inline, each as <hk-nav-items> renders a level, so a tree up to
-  three levels deep is one instance and the page carries its items once. Each deeper level is an <hk-nav-items>. -->
-<template component="hk-nav">
+<!-- The first three levels of items render inline, each as <mk-nav-items> renders a level, so a tree up to
+  three levels deep is one instance and the page carries its items once. Each deeper level is an <mk-nav-items>. -->
+<template component="mk-nav">
   <defs>
     <prop name="items" type="list(object({ label: string, current: string, depth: number, href?: string, group?: string, open?: boolean, children?: list(object({ label: string, ... })), ... }))" required>Ordered page links: navigation() items, or navigationTree() nodes.</prop>
     <prop name="label" type="string" default="Navigation">Accessible navigation name.</prop>
@@ -35,7 +35,7 @@
                 <li from:data-depth="$c.depth">
                   <template $match><details $when="$c.children" from:open="$c.open">
                     <summary><template $match><a $when="$c.href" from:href="$c.href" from:aria-current="$c.current">{$c.label}</a><span $else>{$c.label}</span></template></summary>
-                    <hk-nav-items from:items="$c.children"></hk-nav-items>
+                    <mk-nav-items from:items="$c.children"></mk-nav-items>
                   </details>
                   <a $else from:href="$c.href" from:aria-current="$c.current">{$c.label}</a></template>
                 </li>

package/components/pager.html

@@ -1,4 +1,4 @@
-<template component="hk-pager">
+<template component="mk-pager">
   <defs>
     <prop name="previous" type="object({ href: string, label: string, current: string, depth: number, pageName: string, group?: string, ... })">The page before this one.</prop>
     <prop name="next" type="object({ href: string, label: string, current: string, depth: number, pageName: string, group?: string, ... })">The page after this one.</prop>

package/dist/application.js

@@ -17,8 +17,8 @@ import { privateReadResponse } from "./private-api.js";
 import { createNavigation, failurePage, mime, pageAction, pageResponse, prerenderedActions, renderRoute, requestReadContext, respond, serverFailure } from "./server.js";
 // Built-in components need no link: a resource that uses one gets it added after its content, so
 // diagnostics keep their line numbers. The import map below resolves it from this package.
-const builtins = [["hk-nav", "@threadlabs/markupkit/components/nav.html"], ["hk-breadcrumbs", "@threadlabs/markupkit/components/breadcrumbs.html"],
-    ["hk-pager", "@threadlabs/markupkit/components/pager.html"]];
+const builtins = [["mk-nav", "@threadlabs/markupkit/components/nav.html"], ["mk-breadcrumbs", "@threadlabs/markupkit/components/breadcrumbs.html"],
+    ["mk-pager", "@threadlabs/markupkit/components/pager.html"]];
 /** MarkupKit's import map: @/ is the project root, as in Nuxt, and built-ins resolve from this package. */
 function importMap(root) {
     return { imports: { "@/": pathToFileURL(root).href + "/", "@threadlabs/markupkit/components/": new URL("../components/", import.meta.url).href } };
@@ -126,7 +126,7 @@ export async function createApplicationInternals(input = {}, moduleServer, asset
                     throw new MarkupKitError(`Static route collision at ${path}.`, route.component);
                 const page = pageRedirects.get(path);
                 if (page !== undefined)
-                    throw new MarkupKitError(`The page redirect hk:redirect-from ${page.from} is the URL of ${route.component}.`, page.component);
+                    throw new MarkupKitError(`The page redirect mk:redirect-from ${page.from} is the URL of ${route.component}.`, page.component);
                 if (redirects.has(path))
                     throw new MarkupKitError(`The redirects option also redirects ${path}, which is this page's URL.`, route.component);
                 const matched = matchRoute(routes, path, config.base);

package/dist/client.js

@@ -54,9 +54,9 @@ export function page(runtime, options, pageComponents) {
     // Safari 26.2), which carries the per-link opt-outs; earlier Navigation API versions would skip them.
     if ("navigation" in window && "sourceElement" in NavigateEvent.prototype)
         navigate(runtime, options);
-    document.dispatchEvent(new Event("hk:ready"));
+    document.dispatchEvent(new Event("mk:ready"));
 }
-const layer = (root, index) => root.querySelector(`[data-hk-layer="${index}"]`) ?? root.getElementById(`hk-layer-${index}`);
+const layer = (root, index) => root.querySelector(`[data-mk-layer="${index}"]`) ?? root.getElementById(`mk-layer-${index}`);
 const fresh = (time) => performance.now() - time < 30_000;
 const loaded = async (url, signal) => {
     const response = await fetch(url, signal === undefined ? {} : { signal });
@@ -108,7 +108,7 @@ async function render(runtime, payload) {
         const component = components.get(tag);
         if (component === undefined)
             throw new Error(`MarkupKit cannot render <${tag}>: no page module defines it.`);
-        const attributes = { id: `hk-layer-${index}`, "data-hk-layer": String(index), ...index === 0 ? {} : { slot: "page" } };
+        const attributes = { id: `mk-layer-${index}`, "data-mk-layer": String(index), ...index === 0 ? {} : { slot: "page" } };
         const html = {};
         for (const [name, value] of Object.entries(authored)) {
             const prop = component[1][name];
@@ -147,7 +147,7 @@ function navigate(runtime, { base, prefetch: policy, manifest }) {
     const shell = (head) => [...head.querySelectorAll("link:not([data-component-head])")];
     let owned = shell(document.head);
     const announcer = document.createElement("div");
-    announcer.id = "hk-announcer";
+    announcer.id = "mk-announcer";
     announcer.setAttribute("aria-live", "polite");
     announcer.setAttribute("aria-atomic", "true");
     announcer.style.cssText = "position:absolute;width:1px;height:1px;margin:-1px;overflow:hidden;clip-path:inset(50%);white-space:nowrap";
@@ -157,7 +157,7 @@ function navigate(runtime, { base, prefetch: policy, manifest }) {
      * Firefox 155 follows a download link's navigate event with a second one that has no downloadRequest.
      */
     const local = (url, source) => url.origin === location.origin && url.pathname.startsWith(base) &&
-        url.pathname.endsWith("/") && !source?.closest("[data-hk-reload]") && !source?.hasAttribute("download");
+        url.pathname.endsWith("/") && !source?.closest("[data-mk-reload]") && !source?.hasAttribute("download");
     const payloadURL = (url) => `${base}_markupkit/pages/${url.pathname.slice(base.length)}payload.json${url.search}`;
     // Prefetching never runs anything: payloads are data, and modules and stylesheets are only hinted.
     const hinted = new Set();
@@ -202,9 +202,9 @@ function navigate(runtime, { base, prefetch: policy, manifest }) {
         void chunks.then(map => { for (const src of map.get(url.pathname) ?? [])
             hint("modulepreload", src); });
     };
-    /** A link's policy: its own or an ancestor's data-hk-prefetch, else the site's. */
+    /** A link's policy: its own or an ancestor's data-mk-prefetch, else the site's. */
     const mode = (anchor) => {
-        const value = anchor.closest("[data-hk-prefetch]")?.getAttribute("data-hk-prefetch");
+        const value = anchor.closest("[data-mk-prefetch]")?.getAttribute("data-mk-prefetch");
         return value === "interaction" || value === "visible" || value === "none" ? value : policy;
     };
     // Intent: touch at once; a link that keeps the pointer or focus briefly, so sweeping across a menu
@@ -391,8 +391,8 @@ function navigate(runtime, { base, prefetch: policy, manifest }) {
     // ponytail: WebKit 26.6 sometimes restores no position for an intercepted back or forward
     // navigation, so MarkupKit records where each entry was left. Other scrolling stays native.
     const positions = new Map();
-    // While a navigation renders in place: data-hk-navigating on <html>, and on a submitting form,
-    // data-hk-submitting and aria-busy. Only the latest navigation clears <html>'s.
+    // While a navigation renders in place: data-mk-navigating on <html>, and on a submitting form,
+    // data-mk-submitting and aria-busy. Only the latest navigation clears <html>'s.
     let latest = 0;
     navigation.addEventListener("navigate", event => {
         if (navigation.currentEntry !== null)
@@ -410,17 +410,17 @@ function navigate(runtime, { base, prefetch: policy, manifest }) {
         // where the entry was left, and focus resets as after a document load.
         event.intercept({ scroll: "manual", async handler() {
                 const id = ++latest;
-                document.documentElement.setAttribute("data-hk-navigating", "");
-                form?.setAttribute("data-hk-submitting", "");
+                document.documentElement.setAttribute("data-mk-navigating", "");
+                form?.setAttribute("data-mk-submitting", "");
                 form?.setAttribute("aria-busy", "true");
                 try {
                     await visit(url, event, form);
                 }
                 finally {
-                    form?.removeAttribute("data-hk-submitting");
+                    form?.removeAttribute("data-mk-submitting");
                     form?.removeAttribute("aria-busy");
                     if (id === latest)
-                        document.documentElement.removeAttribute("data-hk-navigating");
+                        document.documentElement.removeAttribute("data-mk-navigating");
                 }
             } });
     });

package/dist/resource.d.ts

@@ -2,14 +2,14 @@ import { type ComponentDefinition } from "@nextwebwg/html-next";
 interface ComponentMetadata {
     readonly layout?: string;
     readonly label?: string;
-    /** hk:order, the page's place among its neighbours, as a number-and-dot prefix gives it. */
+    /** mk:order, the page's place among its neighbours, as a number-and-dot prefix gives it. */
     readonly order?: string;
     readonly hidden?: boolean;
-    /** hk:render: "server" renders the page on each request; "prerender", the default, at build time. */
+    /** mk:render: "server" renders the page on each request; "prerender", the default, at build time. */
     readonly render?: "prerender" | "server";
     /** Extra route patterns for a page, relative to its page directory's prefix. */
     readonly aliases: readonly string[];
-    /** hk:redirect-from: old route paths, relative to its page directory's prefix, that redirect to the page. */
+    /** mk:redirect-from: old route paths, relative to its page directory's prefix, that redirect to the page. */
     readonly redirectsFrom: readonly string[];
     /** The text of a <title> without expressions. */
     readonly title?: string;
@@ -23,7 +23,7 @@ export declare function applicationResource(source: string, file: string): {
 };
 export declare function pageDefinition(resource: ReturnType<typeof applicationResource>, file: string): ComponentDefinition;
 /**
- * A definition without its hk: settings, which MarkupKit reads as configuration, so the runtime never
+ * A definition without its mk: settings, which MarkupKit reads as configuration, so the runtime never
  * adds them to the document head.
  */
 export declare function withoutSettings(definition: ComponentDefinition): ComponentDefinition;

package/dist/resource.js

@@ -3,8 +3,8 @@ import { parseFragment } from "parse5";
 import { MarkupKitError } from "./config.js";
 // MarkupKit metadata was spelled htmlkit:*; name the new spelling rather than ignore it.
 function renamed(name, file) {
-    if (name?.startsWith("htmlkit:"))
-        throw new MarkupKitError(`MarkupKit metadata uses the hk: prefix; write ${"hk:" + name.slice(name.indexOf(":") + 1)} instead of ${name}.`, file);
+    if (name?.startsWith("htmlkit:") || name?.startsWith("hk:"))
+        throw new MarkupKitError(`MarkupKit metadata uses the mk: prefix; write ${"mk:" + name.slice(name.indexOf(":") + 1)} instead of ${name}.`, file);
 }
 /** Native HTML parsing determines resource nodes; HTML Next owns component syntax. */
 export function applicationResource(source, file) {
@@ -16,14 +16,14 @@ export function applicationResource(source, file) {
             continue;
         const name = node.attrs.find(attribute => attribute.name === "name")?.value;
         renamed(name, file);
-        if (node.tagName === "meta" && name === "hk:page") {
+        if (node.tagName === "meta" && name === "mk:page") {
             const content = node.attrs.find(attribute => attribute.name === "content")?.value;
             if (!content || configuration.has(name))
                 throw new MarkupKitError(`Declare ${name} once with nonempty content.`, file);
             configuration.set(name, content);
         }
         else if (node.tagName !== "link" || !node.attrs.find(attribute => attribute.name === "rel")?.value.toLowerCase().split(/\s+/).includes("component")) {
-            throw new MarkupKitError("Page and layout metadata belongs in its <template component>'s <defs>; only hk:page, which selects the file's page, is outside it.", file);
+            throw new MarkupKitError("Page and layout metadata belongs in its <template component>'s <defs>; only mk:page, which selects the file's page, is outside it.", file);
         }
     }
     for (const node of fragment.childNodes) {
@@ -37,14 +37,14 @@ export function applicationResource(source, file) {
         const aliases = [], redirectsFrom = [];
         for (const child of children) {
             if ("tagName" in child && ["meta", "title", "link"].includes(child.tagName)) {
-                throw new MarkupKitError(`<${child.tagName}> belongs in <${tag}>'s <defs>, where head content and hk: settings are declared.`, file);
+                throw new MarkupKitError(`<${child.tagName}> belongs in <${tag}>'s <defs>, where head content and mk: settings are declared.`, file);
             }
         }
         const defs = children.find(child => "tagName" in child && child.tagName === "defs");
         for (const child of defs !== undefined && "childNodes" in defs ? defs.childNodes : []) {
             if (!("tagName" in child))
                 continue;
-            // A static <title> labels the page's folder in navigation trees when hk:label doesn't.
+            // A static <title> labels the page's folder in navigation trees when mk:label doesn't.
             if (child.tagName === "title") {
                 const text = child.childNodes.map(text => "value" in text ? text.value : "").join("").trim();
                 if (text !== "" && !text.includes("{"))
@@ -55,30 +55,30 @@ export function applicationResource(source, file) {
                 continue;
             const name = child.attrs.find(attribute => attribute.name === "name")?.value;
             renamed(name, file);
-            if (!name?.startsWith("hk:"))
+            if (!name?.startsWith("mk:"))
                 continue;
             const content = child.attrs.find(attribute => attribute.name === "content")?.value;
             if (!content)
                 throw new MarkupKitError(`Declare ${name} with nonempty content.`, file);
-            if (name === "hk:alias") {
+            if (name === "mk:alias") {
                 aliases.push(content);
                 continue;
             }
-            if (name === "hk:redirect-from") {
+            if (name === "mk:redirect-from") {
                 redirectsFrom.push(content);
                 continue;
             }
-            const key = { "hk:layout": "layout", "hk:label": "label", "hk:order": "order", "hk:navigation": "hidden", "hk:render": "render" }[name];
+            const key = { "mk:layout": "layout", "mk:label": "label", "mk:order": "order", "mk:navigation": "hidden", "mk:render": "render" }[name];
             if (key === undefined)
-                throw new MarkupKitError(`Component configuration is hk:layout, hk:label, hk:order, hk:navigation, hk:render, hk:alias, or hk:redirect-from; hk:page belongs outside the carrier (${name}).`, file);
+                throw new MarkupKitError(`Component configuration is mk:layout, mk:label, mk:order, mk:navigation, mk:render, mk:alias, or mk:redirect-from; mk:page belongs outside the carrier (${name}).`, file);
             if (configuration[key] !== undefined)
                 throw new MarkupKitError(`Declare ${name} once per component.`, file);
             if (key === "hidden" && content !== "hidden")
-                throw new MarkupKitError('hk:navigation accepts only content="hidden".', file);
+                throw new MarkupKitError('mk:navigation accepts only content="hidden".', file);
             if (key === "order" && !/^\d+$/.test(content))
-                throw new MarkupKitError("hk:order needs a whole number, such as content=\"3\".", file);
+                throw new MarkupKitError("mk:order needs a whole number, such as content=\"3\".", file);
             if (key === "render" && content !== "prerender" && content !== "server")
-                throw new MarkupKitError('hk:render accepts content="prerender" or content="server".', file);
+                throw new MarkupKitError('mk:render accepts content="prerender" or content="server".', file);
             if (key === "hidden")
                 configuration.hidden = true;
             else if (key === "render")
@@ -93,9 +93,9 @@ export function applicationResource(source, file) {
     return { definitions: parsed.definitions.map(withoutSettings), dependencies: parsed.dependencies, configuration, components };
 }
 export function pageDefinition(resource, file) {
-    const selected = resource.configuration.get("hk:page");
+    const selected = resource.configuration.get("mk:page");
     if (selected === undefined && resource.definitions.length !== 1) {
-        throw new MarkupKitError("Multiple components require <meta name=\"hk:page\" content=\"page-name\">.", file);
+        throw new MarkupKitError("Multiple components require <meta name=\"mk:page\" content=\"page-name\">.", file);
     }
     const definition = selected === undefined ? resource.definitions[0] : resource.definitions.find(value => value.contract.tag === selected);
     if (definition === undefined)
@@ -103,12 +103,12 @@ export function pageDefinition(resource, file) {
     return definition;
 }
 /**
- * A definition without its hk: settings, which MarkupKit reads as configuration, so the runtime never
+ * A definition without its mk: settings, which MarkupKit reads as configuration, so the runtime never
  * adds them to the document head.
  */
 export function withoutSettings(definition) {
     const head = definition.head?.filter(declaration => declaration.kind !== "meta" ||
-        !declaration.attributes.some(attribute => attribute.kind === "literal" && attribute.name === "name" && attribute.value.startsWith("hk:")));
+        !declaration.attributes.some(attribute => attribute.kind === "literal" && attribute.name === "name" && attribute.value.startsWith("mk:")));
     if (head === undefined || head.length === definition.head.length)
         return definition;
     const { head: _head, ...rest } = definition;

package/dist/resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resource.js","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"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"}

package/dist/routes.js

@@ -260,15 +260,15 @@ export async function discover(root, options) {
         const metadata = resource.components.get(pageDefinition(resource, route.component).contract.tag);
         for (const from of metadata.redirectsFrom) {
             if (!/^\/(?:[^/]+\/)*$/.test(from) || !from.slice(1, -1).split("/").filter(Boolean).every(validSegment)) {
-                throw new MarkupKitError("hk:redirect-from needs a route path with leading and trailing slashes.", route.component);
+                throw new MarkupKitError("mk:redirect-from needs a route path with leading and trailing slashes.", route.component);
             }
             if (route.params.length > 0)
-                throw new MarkupKitError(`hk:redirect-from redirects to one URL, and ${route.pattern} has parameters.`, route.component);
+                throw new MarkupKitError(`mk:redirect-from redirects to one URL, and ${route.pattern} has parameters.`, route.component);
             redirects.push({ from: route.prefix + from.slice(1), to: route.pattern, component: route.component });
         }
         for (const alias of metadata.aliases) {
             if (!/^\/(?:[^/]+\/)*$/.test(alias))
-                throw new MarkupKitError("hk:alias needs a route path with leading and trailing slashes.", route.component);
+                throw new MarkupKitError("mk:alias needs a route path with leading and trailing slashes.", route.component);
             add({ component: route.component, ...(route.server === undefined ? {} : { server: route.server }), layouts: route.layouts,
                 pattern: route.prefix + alias.slice(1), canonical: route.pattern, ...(route.aliasOf === undefined ? {} : { aliasOf: route.aliasOf }) }, route.prefix, undefined, route.directoryLayout, route.folderLayouts);
         }
@@ -290,10 +290,10 @@ export async function discover(root, options) {
     for (const { from, component } of redirects) {
         const page = routes.find(route => !route.error && !route.notFound && route.pattern.toLowerCase() === from.toLowerCase());
         if (page !== undefined)
-            throw new MarkupKitError(`hk:redirect-from ${from} is ${page.component === component ? "this page's own URL" : `the URL of ${page.component}`}.`, component);
+            throw new MarkupKitError(`mk:redirect-from ${from} is ${page.component === component ? "this page's own URL" : `the URL of ${page.component}`}.`, component);
         const other = redirected.get(from);
         if (other !== undefined)
-            throw new MarkupKitError(`hk:redirect-from ${from} is declared by ${other} and ${component}.`, component);
+            throw new MarkupKitError(`mk:redirect-from ${from} is declared by ${other} and ${component}.`, component);
         redirected.set(from, component);
     }
     const pageNames = new Map();
@@ -370,22 +370,22 @@ export async function discover(root, options) {
         // The selected layout is outermost and folder layouts nest inside it; none drops them all.
         if (selected !== false && selected !== "none")
             layouts = [...layouts, ...folderLayouts];
-        // hk:order takes the place of the number-and-dot prefix on the page's own last segment.
-        // hk:order takes the place of the number-and-dot prefix on the page's own last segment; on a
+        // mk:order takes the place of the number-and-dot prefix on the page's own last segment.
+        // mk:order takes the place of the number-and-dot prefix on the page's own last segment; on a
         // folder's index page, that segment is the folder's, so it orders the folder (below).
         let order = route.order;
         if (metadata.order !== undefined && route.canonical === undefined && !isNotFound && !isError) {
             if (route.segments.length === 0)
-                throw new MarkupKitError("hk:order on the site's home page has no folder to order; it orders a page among its folder's pages.", route.component);
+                throw new MarkupKitError("mk:order on the site's home page has no folder to order; it orders a page among its folder's pages.", route.component);
             order = [...route.segments.slice(0, -1).map((_, i) => route.order?.[i] ?? null), metadata.order];
             if (index)
                 folderOrders.push({ segments: route.segments, rank: metadata.order });
         }
-        // A static <title> labels the page's folder in navigation trees when hk:label doesn't.
+        // A static <title> labels the page's folder in navigation trees when mk:label doesn't.
         const title = metadata.title;
-        // The not-found page is prerendered as 404.html, and the error page renders as a build would; neither takes hk:render.
+        // The not-found page is prerendered as 404.html, and the error page renders as a build would; neither takes mk:render.
         if ((isNotFound || isError) && metadata.render !== undefined)
-            throw new MarkupKitError(`The ${isNotFound ? "not-found" : "error"} page takes no hk:render.`, route.component);
+            throw new MarkupKitError(`The ${isNotFound ? "not-found" : "error"} page takes no mk:render.`, route.component);
         const discoveredRoute = { ...route, layouts, pageName, ...(order === undefined ? {} : { order }), ...(metadata.label === undefined ? {} : { label: metadata.label }),
             ...(title ? { title } : {}), ...(metadata.hidden ? { hidden: true } : {}), ...(metadata.render === "server" ? { render: "server" } : {}) };
         if (isNotFound)
@@ -395,7 +395,7 @@ export async function discover(root, options) {
         else
             discovered.push(discoveredRoute);
     }
-    // Every page in a folder whose index page sets hk:order takes that rank for the folder's segment.
+    // Every page in a folder whose index page sets mk:order takes that rank for the folder's segment.
     for (const { segments, rank } of folderOrders) {
         for (const [i, route] of discovered.entries()) {
             if (route.canonical !== undefined || route.segments.length < segments.length || segments.some((segment, j) => route.segments[j] !== segment))
@@ -513,14 +513,14 @@ export async function discoverApplication(input = {}) {
     const option = redirectTable(config.base, options.redirects);
     const discovery = await discover(config.root, { ...options, base: config.base });
     const { routes, redirects: declared } = discovery;
-    // Pages' hk:redirect-from entries join the redirects option's, rediscovered with the pages.
+    // Pages' mk:redirect-from entries join the redirects option's, rediscovered with the pages.
     const redirects = new Map(option);
     // Each page redirect's deployment path, for the declaring page's diagnostics.
     const pageRedirects = new Map();
     for (const { from, to, component } of declared) {
         const path = new URL(config.base + from.slice(1), "http://localhost").pathname;
         if (option.has(path))
-            throw new MarkupKitError(`hk:redirect-from ${from} is also a key of the redirects option.`, component);
+            throw new MarkupKitError(`mk:redirect-from ${from} is also a key of the redirects option.`, component);
         redirects.set(path, config.base + to.slice(1));
         pageRedirects.set(path, { from, component });
     }

package/dist/server.js

@@ -122,7 +122,7 @@ export function createNavigation(base, routes, concrete) {
         const finish = (draft, depth) => {
             const children = draft.children.map(child => finish(child, depth + 1));
             const { item, route } = draft;
-            // A folder's index page labels the folder, by hk:label, then its <title>.
+            // A folder's index page labels the folder, by mk:label, then its <title>.
             const label = item === undefined ? draft.label : children.length > 0 && route.label === undefined ? route.title ?? draft.label : item.label;
             const current = item?.current ?? "false";
             return Object.freeze({ label, ...(item === undefined ? {} : { href: item.href, pageName: item.pageName }), current,
@@ -177,7 +177,7 @@ function invocationAttributes(definition, result, deferred) {
 }
 /** The browser builds the same invocation from a page payload (client.ts). */
 function invocation(tag, attributes, index, child, nested) {
-    return `<${tag}${Object.hasOwn(attributes, "id") ? "" : ` id="hk-layer-${index}"`} data-hk-layer="${index}"${nested ? ' slot="page"' : ""}${Object.entries(attributes).map(([name, value]) => ` ${name}="${escapeHTML(value)}"`).join("")}>${child}</${tag}>`;
+    return `<${tag}${Object.hasOwn(attributes, "id") ? "" : ` id="mk-layer-${index}"`} data-mk-layer="${index}"${nested ? ' slot="page"' : ""}${Object.entries(attributes).map(([name, value]) => ` ${name}="${escapeHTML(value)}"`).join("")}>${child}</${tag}>`;
 }
 /** The request's cookies by name; the first of a repeated name wins, as the most specific path comes first. */
 function parseCookies(header) {
@@ -228,7 +228,7 @@ export async function renderRoute(input) {
     const current = route.canonical === undefined ? url.pathname : at(route.canonical);
     const contextOf = (layer) => {
         const prerendering = (name) => {
-            throw new MarkupKitError(`${name} is unavailable while prerendering; <meta name="hk:render" content="server"> renders the page on each request.`, layer.origin);
+            throw new MarkupKitError(`${name} is unavailable while prerendering; <meta name="mk:render" content="server"> renders the page on each request.`, layer.origin);
         };
         return { phase: request === undefined ? "prerender" : "request", url: new URL(url), base, params, parent,
             propNames: Object.freeze(Object.keys(layer.definition.contract.props)),
@@ -310,7 +310,7 @@ export async function renderRoute(input) {
         const names = input.providers?.[layer.definition.contract.tag] === undefined && !client ? undefined : [];
         attributes.push(invocationAttributes(layer.definition, result, names));
         if (!client && names !== undefined && names.length > 0)
-            required.push({ tag: layer.definition.contract.tag, selector: `[data-hk-layer="${index}"]`, names });
+            required.push({ tag: layer.definition.contract.tag, selector: `[data-mk-layer="${index}"]`, names });
     }
     const state = {};
     const props = {};
@@ -319,7 +319,7 @@ export async function renderRoute(input) {
         ...(results[i].state === undefined ? {} : { state: results[i].state }) }));
     let body = "";
     for (let i = layers.length - 1; i >= 0; i--) {
-        const selector = `[data-hk-layer="${i}"]`;
+        const selector = `[data-mk-layer="${i}"]`;
         const layer = rendered[i];
         if (layer.state !== undefined)
             state[selector] = layer.state;
@@ -462,7 +462,7 @@ export function pageAction(module, url) {
 }
 /** The build error for actions on a page that prerenders. */
 export function prerenderedActions(pattern, origin) {
-    return new MarkupKitError(`The page ${pattern} has actions, which answer requests; <meta name="hk:render" content="server"> renders it on each request.`, origin);
+    return new MarkupKitError(`The page ${pattern} has actions, which answer requests; <meta name="mk:render" content="server"> renders it on each request.`, origin);
 }
 async function answerEndpoint(app, endpoint, params, request) {
     const module = await app.endpoint(endpoint);

package/dist/types.d.ts

@@ -17,7 +17,7 @@ export interface ApplicationOptions {
     /** Named layout, or a layout a plugin supplies; default.html is automatic when present. false disables it. */
     readonly layout?: string | false | RouteLayer;
     /**
-     * Named layouts beside app/layouts, such as { home: { component, server: { load } } }. hk:layout,
+     * Named layouts beside app/layouts, such as { home: { component, server: { load } } }. mk:layout,
      * layout, layoutDefaults, and a page directory's layout name them. A name resolves to an entry here,
      * then app/layouts/<name>.html, then a plugin's layouts entry, earliest plugin first.
      */
@@ -27,7 +27,7 @@ export interface ApplicationOptions {
     readonly plugins?: readonly MarkupKitPlugin[];
     /**
      * Global stylesheets on every page, relative to the root or starting with @/. Unlike component
-     * styles they are not scoped, so they can style built-in components such as <hk-nav>.
+     * styles they are not scoped, so they can style built-in components such as <mk-nav>.
      */
     readonly css?: readonly string[];
     /** A classic script inlined with app/head.js, before it, so it runs before first paint; plugins may set it. */
@@ -35,7 +35,7 @@ export interface ApplicationOptions {
     /**
      * What links prefetch before a click: "interaction" (default) fetches a page's payload and module
      * when its link is hovered, focused, or touched; "visible" also does so for links on screen; "none"
-     * prefetches nothing. A link or its ancestor overrides it with data-hk-prefetch.
+     * prefetches nothing. A link or its ancestor overrides it with data-mk-prefetch.
      */
     readonly prefetch?: PrefetchPolicy;
     /**
@@ -219,7 +219,7 @@ export interface LoaderResult {
     readonly head?: PageHead;
 }
 export interface LoadContext {
-    /** "request" for a page with hk:render="server", which renders on each request; "prerender" at build time. */
+    /** "request" for a page with mk:render="server", which renders on each request; "prerender" at build time. */
     readonly phase: "prerender" | "request";
     /** The page URL: the request's, query included, or for prerendering, the page path under the configured origin. */
     readonly url: URL;
@@ -233,11 +233,11 @@ export interface LoadContext {
     readonly signal: AbortSignal;
     /** Ordered concrete routes. from is an application-relative directory prefix. */
     readonly navigation: (options?: NavigationQuery) => Promise<readonly NavigationItem[]>;
-    /** The same pages as navigation(), nested by folder and (group) folder, for <hk-nav>. */
+    /** The same pages as navigation(), nested by folder and (group) folder, for <mk-nav>. */
     readonly navigationTree: (options?: NavigationQuery) => Promise<readonly NavigationNode[]>;
-    /** Each existing page from `from` (default /) down to the current page, for <hk-breadcrumbs>. */
+    /** Each existing page from `from` (default /) down to the current page, for <mk-breadcrumbs>. */
     readonly breadcrumbs: (options?: NavigationQuery) => Promise<readonly NavigationItem[]>;
-    /** The pages before and after the current one in navigation order, for <hk-pager>. */
+    /** The pages before and after the current one in navigation order, for <mk-pager>. */
     readonly pager: (options?: NavigationQuery) => Promise<PagerLinks>;
     /**
      * Stop loading and redirect to an application path or an http(s) URL, with status 303 unless
@@ -323,13 +323,13 @@ export interface ApplicationRoute extends RouteLayer {
     readonly segments: readonly string[];
     readonly params: readonly string[];
     readonly layouts: readonly RouteLayer[];
-    /** From the page's hk:label metadata; navigation otherwise labels the last URL segment. */
+    /** From the page's mk:label metadata; navigation otherwise labels the last URL segment. */
     readonly label?: string;
-    /** The page's static <title>, which labels its folder in a navigation tree when hk:label is absent. */
+    /** The page's static <title>, which labels its folder in a navigation tree when mk:label is absent. */
     readonly title?: string;
-    /** hk:navigation="hidden" metadata leaves the page out of navigation. */
+    /** mk:navigation="hidden" metadata leaves the page out of navigation. */
     readonly hidden?: boolean;
-    /** For an hk:alias route, the pattern of the page's own route, which navigation marks current. */
+    /** For an mk:alias route, the pattern of the page's own route, which navigation marks current. */
     readonly canonical?: string;
     /** For a page in an alias page directory, the pattern of the same page under its directory's own prefix, which its canonical link names. */
     readonly aliasOf?: string;
@@ -337,7 +337,7 @@ export interface ApplicationRoute extends RouteLayer {
     readonly order?: readonly (string | null)[];
     /** The (group) folders the page is in, outermost first. */
     readonly groups?: readonly RouteGroup[];
-    /** From the page's hk:render metadata: "server" renders it on each request instead of at build time. */
+    /** From the page's mk:render metadata: "server" renders it on each request instead of at build time. */
     readonly render?: "server";
 }
 /** A (group) folder: it orders and labels its pages and adds no URL segment. */
@@ -373,7 +373,7 @@ export interface NavigationItem {
  * an index page is that page's node, with the folder's pages as children.
  */
 export interface NavigationNode {
-    /** A page's label; a folder's index page's hk:label, then its <title>, then the folder name; a group's parentheses. */
+    /** A page's label; a folder's index page's mk:label, then its <title>, then the folder name; a group's parentheses. */
     readonly label: string;
     /** The page URL, for a page or a folder with an index page. */
     readonly href?: string;
@@ -383,7 +383,7 @@ export interface NavigationNode {
     readonly open: boolean;
     /** The nesting level, 0 at the top of the tree. */
     readonly depth: number;
-    /** The number-and-dot or hk:order rank, or null when the node has none. */
+    /** The number-and-dot or mk:order rank, or null when the node has none. */
     readonly order: string | null;
     readonly children: readonly NavigationNode[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threadlabs/markupkit",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Build applications with HTML, CSS, and JavaScript, powered by HTML Next.",
   "license": "MIT",
   "type": "module",