@kirchdev/duxt 0.5.0 → 0.6.0

package/{sections-bruno.ts → build/sections/sections-bruno.ts}

@@ -29,16 +29,16 @@
  * in Bruno" clone of today's HEAD can offer.
  */
 import { stringify as stringifyYaml } from 'yaml';
-import { frontmatterBlock } from './frontmatter';
+import { frontmatterBlock } from '../content/frontmatter';
 import { firstLine, pageOrder, urlSegment } from './section-markdown';
 import type {
   DuxtBrunoCollection,
   DuxtBrunoEntry,
   DuxtBrunoFolder,
   DuxtBrunoRequest
-} from './bruno-model';
-import { parseBrunoCollection } from './bruno-parse';
-import { brunoZipPath } from './bruno-zip';
+} from '../bruno/bruno-model';
+import { parseBrunoCollection } from '../bruno/bruno-parse';
+import { brunoZipPath } from '../bruno/bruno-zip';
 import type {
   DuxtSectionContext,
   DuxtSectionInput,

package/{sections-changelog.ts → build/sections/sections-changelog.ts}

@@ -32,12 +32,12 @@
  * two components this file writes calls to.
  */
 import { stringify as stringifyYaml } from 'yaml';
-import { frontmatterBlock } from './frontmatter';
-import type { DuxtContributor } from './git-contributors';
+import { frontmatterBlock } from '../content/frontmatter';
+import type { DuxtContributor } from '../git/git-contributors';
 import {
   contributorsForVersion,
   releaseContributors
-} from './git-contributors';
+} from '../git/git-contributors';
 import type {
   DuxtSectionContext,
   DuxtSectionInput,
@@ -45,7 +45,7 @@ import type {
   DuxtSectionPage,
   DuxtSectionType
 } from './sections-resolve';
-import { slugify } from './sources-resolve';
+import { slugify } from '../sources/sources-resolve';
 
 /**
  * The names this type binds — PUBLIC SURFACE, so renaming one is a `feat!:`.

package/{sections-openapi.ts → build/sections/sections-openapi.ts}

@@ -24,7 +24,7 @@
  * responses, the try-it client — travels as props.
  */
 import { stringify as stringifyYaml } from 'yaml';
-import { frontmatterBlock } from './frontmatter';
+import { frontmatterBlock } from '../content/frontmatter';
 import { firstLine, pageOrder, urlSegment } from './section-markdown';
 import type {
   DuxtOpenApiOperation,
@@ -32,8 +32,8 @@ import type {
   DuxtOpenApiServer,
   DuxtOpenApiSpec,
   DuxtOpenApiTag
-} from './openapi-model';
-import { compactOpenApi, parseOpenApiDocument } from './openapi-parse';
+} from '../openapi/openapi-model';
+import { compactOpenApi, parseOpenApiDocument } from '../openapi/openapi-parse';
 import type {
   DuxtSectionContext,
   DuxtSectionInput,

package/{sections-resolve.ts → build/sections/sections-resolve.ts}

@@ -20,14 +20,14 @@ import type {
   DuxtSource,
   DuxtSourceStatus,
   DuxtSourcesOptions
-} from './sources-resolve';
+} from '../sources/sources-resolve';
 import {
   assertCollectionIdentities,
   expandSources,
   identifier,
   resolveSources,
   slugify
-} from './sources-resolve';
+} from '../sources/sources-resolve';
 import { brunoSectionType } from './sections-bruno';
 import { changelogSectionType } from './sections-changelog';
 import { openapiSectionType } from './sections-openapi';

package/{sections.ts → build/sections/sections.ts}

@@ -23,7 +23,7 @@ import type {
   DuxtResolvedSource,
   DuxtSource,
   DuxtSourcesOptions
-} from './sources-resolve';
+} from '../sources/sources-resolve';
 import type {
   DuxtSectionPage,
   DuxtSectionType,
@@ -41,9 +41,9 @@ import {
   sectionArtefactExists,
   sectionInputKind
 } from './section-input';
-import { resolveLatestRefs } from './sources-git';
-import { localHistoryFor } from './git-contributors';
-import { pageSchema, repositoryRoot } from './sources';
+import { resolveLatestRefs } from '../sources/sources-git';
+import { localHistoryFor } from '../git/git-contributors';
+import { pageSchema, repositoryRoot } from '../sources/sources';
 
 /**
  * One collection per declared section.

package/{sources-cache.ts → build/sources/sources-cache.ts}

@@ -1,6 +1,6 @@
 import { createHash } from 'node:crypto';
 import { join, relative, resolve } from 'node:path';
-import { readDuxtBuildConfig } from './duxt-app-config';
+import { readDuxtBuildConfig } from '../config/duxt-app-config';
 import { resolveLatestRefs } from './sources-git';
 import type { DuxtSource, DuxtSourcesOptions } from './sources-resolve';
 import {
@@ -296,7 +296,7 @@ export function duxtSourcesCache(
   options: DuxtSourcesCacheOptions = {}
 ): DuxtSourcesCacheKey {
   // ABSOLUTE, always. `readDuxtBuildConfig` hands the path to a module loader,
-  // which resolves a bare `www/app/app.config.ts` as a PACKAGE specifier and
+  // which resolves a bare `apps/www/app/app.config.ts` as a PACKAGE specifier and
   // reports a missing module — a site whose config was found reads identically
   // to one whose sources are all local, and the cache silently never fires.
   const rootDir = resolve(options.rootDir ?? process.cwd());

package/{sources-git.ts → build/sources/sources-git.ts}

@@ -2,16 +2,19 @@ import { execFileSync } from 'node:child_process';
 import type {
   DuxtRef,
   DuxtSource,
-  DuxtSourceReleases
+  DuxtSourceReleases,
+  DuxtVersionTag
 } from './sources-resolve';
 import {
   compareVersionTags,
   expandSources,
   isLatestRef,
   newestTag,
+  parseVersionTag,
   refIsTag,
   refName,
-  repoUrl
+  repoUrl,
+  tagBelongsTo
 } from './sources-resolve';
 
 /**
@@ -153,32 +156,34 @@ function tagsFor(source: DuxtSource, what: string): string[] {
   return found.tags;
 }
 
-interface ParsedTag {
-  major: number;
-  minor: number;
-  prerelease: boolean;
+/**
+ * The version tags a source may publish from: every tag that reads as a
+ * version and belongs to the source's `tagComponent`, when it names one.
+ */
+function versionTags(
+  tags: string[],
+  component: string | undefined
+): { tag: string; version: DuxtVersionTag }[] {
+  return tags
+    .map((tag) => ({ tag, version: parseVersionTag(tag) }))
+    .filter(
+      (entry): entry is { tag: string; version: DuxtVersionTag } =>
+        Boolean(entry.version) && tagBelongsTo(entry.version!, component)
+    );
 }
 
-function parseTag(tag: string): ParsedTag | undefined {
-  const match = /^v?(\d+)\.(\d+)\.\d+(?:-(.+))?$/.exec(tag.trim());
-  if (!match) return undefined;
-
-  return {
-    major: Number(match[1]),
-    minor: Number(match[2]),
-    prerelease: Boolean(match[3])
-  };
-}
+/** How a source's tag restriction reads in an error, or nothing without one. */
+const componentClause = (source: DuxtSource) =>
+  source.tagComponent ? ` for the component "${source.tagComponent}"` : '';
 
 /** Tags selected by a source's explicit release policy, newest first. */
-function releaseTags(tags: string[], releases: DuxtSourceReleases): string[] {
-  const parsed = tags
-    .map((tag) => ({ tag, version: parseTag(tag) }))
-    .filter(
-      (entry): entry is { tag: string; version: ParsedTag } =>
-        Boolean(entry.version) &&
-        (releases.prereleases || !entry.version!.prerelease)
-    )
+function releaseTags(
+  tags: string[],
+  releases: DuxtSourceReleases,
+  component: string | undefined
+): string[] {
+  const parsed = versionTags(tags, component)
+    .filter((entry) => releases.prereleases || !entry.version.pre)
     .sort((left, right) => compareVersionTags(left.tag, right.tag));
 
   if (releases.select === 'all') return parsed.map((entry) => entry.tag);
@@ -186,10 +191,9 @@ function releaseTags(tags: string[], releases: DuxtSourceReleases): string[] {
   const selected = new Set<string>();
   const result: string[] = [];
   for (const entry of parsed) {
+    const [major, minor] = entry.version.numbers;
     const line =
-      releases.select === 'major'
-        ? String(entry.version.major)
-        : `${entry.version.major}.${entry.version.minor}`;
+      releases.select === 'major' ? String(major) : `${major}.${minor}`;
     if (selected.has(line)) continue;
     selected.add(line);
     result.push(entry.tag);
@@ -206,12 +210,14 @@ function resolveReleaseRefs(source: DuxtSource): DuxtSource {
 
   const tags = releaseTags(
     tagsFor(source, `releases selection "${source.releases.select}"`),
-    source.releases
+    source.releases,
+    source.tagComponent
   );
   if (!tags.length) {
     throw new Error(
       `duxt: releases selection "${source.releases.select}" on ` +
-        `${source.repo ?? 'this repository'} found no SemVer tags to publish.`
+        `${source.repo ?? 'this repository'} found no SemVer tags to publish` +
+        `${componentClause(source)}.`
     );
   }
 
@@ -248,12 +254,21 @@ export function resolveLatestRefs(sources: DuxtSource[]): DuxtSource[] {
   return discovered.map((source) => {
     if (!source.refs?.some(isLatestRef)) return source;
 
-    const newest = newestTag(tagsFor(source, "refs: ['latest']"));
+    const tags = tagsFor(source, "refs: ['latest']");
+
+    // Restricted only when a component is named: an unrestricted source keeps
+    // choosing among every tag, exactly as before component tags existed.
+    const newest = newestTag(
+      source.tagComponent
+        ? versionTags(tags, source.tagComponent).map((entry) => entry.tag)
+        : tags
+    );
 
     if (!newest) {
       throw new Error(
         `duxt: refs: ['latest'] on ${source.repo ?? 'this repository'} found ` +
-          'no tags to choose from. Name a tag explicitly, or drop the entry.'
+          `no tags to choose from${componentClause(source)}. Name a tag ` +
+          'explicitly, or drop the entry.'
       );
     }
 

package/{sources-resolve.ts → build/sources/sources-resolve.ts}

@@ -3,7 +3,7 @@
 import type {
   DuxtGeneratedMeta,
   DuxtGeneratedSection
-} from './sections-resolve';
+} from '../sections/sections-resolve';
 
 /**
  * A documentation source: a folder, in this repository or another, at the
@@ -49,6 +49,19 @@ export interface DuxtSource {
    * label, lifecycle, default and locales.
    */
   releases?: DuxtSourceReleases;
+  /**
+   * The one package whose tags this source publishes from.
+   *
+   * A release-please monorepo tags every published package on its own —
+   * `duxt@v0.4.0` beside `duxt-typesense@v0.1.0` — so "the newest tag" means
+   * nothing until it says whose. Naming a component restricts `latest` and
+   * `releases` to that package's `<component>@…` tags. Plain `vX.Y.Z` tags
+   * still count: they are the history from before the repository adopted
+   * component tags, and dropping them would unpublish every earlier release.
+   *
+   * Unset, every tag that reads as a version is a candidate, prefixed or not.
+   */
+  tagComponent?: string;
   /**
    * Languages this source is available in, beyond the one written in `path`.
    *
@@ -655,7 +668,15 @@ export function resolveSources(
       (ref && typeof ref === 'object' ? ref.label : undefined) ?? source.label;
     const code = locale ? localeCode(locale) : defaultLocale;
     const isDefaultLocale = !code || code === defaultLocale;
-    const version = name ? slugify(label ?? name) : undefined;
+    // A component-prefixed tag is shown and addressed by its version:
+    // `duxt@v0.4.0` reads `v0.4.0` in the switcher and the URL, while `ref`
+    // below keeps the full tag git knows. A branch's name is never touched —
+    // `release@1.0.0` as a BRANCH is a name, not a release.
+    const shown =
+      effectiveRef && refIsTag(effectiveRef) && name
+        ? versionTagName(name)
+        : name;
+    const version = name ? slugify(label ?? shown!) : undefined;
     const isDefault =
       !name ||
       (ref && typeof ref === 'object' && Boolean(ref.default)) ||
@@ -816,6 +837,85 @@ export function duxtSourceManifest(
   return resolveSources(sources, options);
 }
 
+/** A version tag, taken apart. */
+export interface DuxtVersionTag {
+  /**
+   * The package a monorepo release tool named in front of the version —
+   * `duxt` in `duxt@v0.4.0`. Absent on a plain `v0.4.0`.
+   */
+  component?: string;
+  /** The version itself, as written: `v0.4.0`, `1.2.0-rc.1`. */
+  version: string;
+  numbers: [number, number, number];
+  pre?: string;
+}
+
+/**
+ * Read a tag as a version, or answer `undefined` for anything that is not one.
+ *
+ * TWO SHAPES, because release tooling writes two. A single-package repository
+ * tags `v1.2.3`; a release-please monorepo tags `<component>@v1.2.3`, one
+ * component per published package. Everything that orders or selects releases
+ * reads a tag through this one function, so `latest`, release discovery and
+ * the switcher's order cannot disagree about which tags are versions — the
+ * drift that would let a site's `latest` stay on the last plain tag, silently,
+ * after the first component tag was cut.
+ *
+ * The component is everything before the LAST `@`, so a scoped package name
+ * (`@acme/sdk@v1.0.0`) keeps its own.
+ *
+ * SPLIT BY INDEX, NOT BY ONE PATTERN. A tag name is input from whatever
+ * repository a site points at, and a single expression with a component and a
+ * pre-release that could each take the other's `@` gave the engine overlapping
+ * ways to split one string — CodeQL's js/polynomial-redos. Cutting at the last
+ * `@` first leaves the pattern nothing to choose between, and the pre-release
+ * keeps to semver's own characters, so an `@` after the version makes the tag
+ * not a version rather than part of its pre-release.
+ */
+export function parseVersionTag(value: string): DuxtVersionTag | undefined {
+  const tag = value.trim();
+  const at = tag.lastIndexOf('@');
+  if (at === 0) return undefined;
+
+  const match = /^(v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.+-]+))?)$/.exec(
+    tag.slice(at + 1)
+  );
+  if (!match) return undefined;
+
+  return {
+    component: at > 0 ? tag.slice(0, at) : undefined,
+    version: match[1]!,
+    numbers: [Number(match[2]), Number(match[3]), Number(match[4])],
+    pre: match[5]
+  };
+}
+
+/**
+ * The version a tag names, without the component in front of it.
+ *
+ * What a reader sees and what a URL carries: `duxt@v0.4.0` is the name git
+ * knows and Content downloads, `v0.4.0` is the release. Anything that is not a
+ * version tag comes back unchanged.
+ */
+export const versionTagName = (tag: string): string =>
+  parseVersionTag(tag)?.version ?? tag;
+
+/**
+ * Does a tag belong to `component`?
+ *
+ * A plain tag always does. In a repository that adopted component tags it is
+ * the release history from before the switch — release-please's own migration
+ * leaves exactly that — and without it a source restricted to one component
+ * would lose every release it already published. Another component's tag
+ * never does.
+ */
+export function tagBelongsTo(
+  tag: DuxtVersionTag,
+  component: string | undefined
+): boolean {
+  return !component || !tag.component || tag.component === component;
+}
+
 /**
  * Order two version-ish tag names the way a release list is ordered.
  *
@@ -825,18 +925,8 @@ export function duxtSourceManifest(
  * and anything that is not a version at all sorts last so it can never win.
  */
 export function compareVersionTags(a: string, b: string): number {
-  const parse = (value: string) => {
-    const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-(.+))?$/.exec(value.trim());
-    if (!match) return undefined;
-
-    return {
-      numbers: [Number(match[1]), Number(match[2]), Number(match[3])],
-      pre: match[4]
-    };
-  };
-
-  const left = parse(a);
-  const right = parse(b);
+  const left = parseVersionTag(a);
+  const right = parseVersionTag(b);
 
   if (!left || !right) return left ? -1 : right ? 1 : a.localeCompare(b);
 
@@ -917,9 +1007,9 @@ export function versionRelation(
   if (!version || !preferred) return 'unknown';
   if (version === preferred) return 'same';
 
-  const isVersion = (value: string) =>
-    /^v?\d+\.\d+\.\d+(?:-.+)?$/.test(value.trim());
-  if (!isVersion(version) || !isVersion(preferred)) return 'unknown';
+  if (!parseVersionTag(version) || !parseVersionTag(preferred)) {
+    return 'unknown';
+  }
 
   const order = compareVersionTags(version, preferred);
 

package/content.config.ts

@@ -1,9 +1,9 @@
 import { fileURLToPath } from 'node:url';
 import { defineContentConfig } from '@nuxt/content';
-import { readDuxtBuildConfig } from './duxt-app-config';
-import { duxtSectionTypes } from './sections-resolve';
-import { duxtGeneratedCollections } from './sections';
-import { duxtSources } from './sources';
+import { readDuxtBuildConfig } from './build/config/duxt-app-config';
+import { duxtSectionTypes } from './build/sections/sections-resolve';
+import { duxtGeneratedCollections } from './build/sections/sections';
+import { duxtSources } from './build/sources/sources';
 
 /**
  * The collections, generated from the site's own `app.config.ts`.

package/modules/bruno.ts

@@ -29,12 +29,18 @@ import {
   brunoZipEntries,
   brunoZipName,
   zipStore
-} from '../bruno-zip';
-import { readDuxtBuildConfig } from '../duxt-app-config';
-import { duxtManifest, duxtSectionTypes } from '../sections-resolve';
-import { diskSectionInput, sectionArtefactExists } from '../section-input';
-import { repositoryRoot } from '../repository-root';
-import { resolveLatestRefs } from '../sources-git';
+} from '../build/bruno/bruno-zip';
+import { readDuxtBuildConfig } from '../build/config/duxt-app-config';
+import {
+  duxtManifest,
+  duxtSectionTypes
+} from '../build/sections/sections-resolve';
+import {
+  diskSectionInput,
+  sectionArtefactExists
+} from '../build/sections/section-input';
+import { repositoryRoot } from '../build/sources/repository-root';
+import { resolveLatestRefs } from '../build/sources/sources-git';
 
 export default function duxtBruno(_options: unknown, nuxt: Nuxt) {
   const dirs = nuxt.options._layers

package/modules/config.ts

@@ -3,16 +3,19 @@ import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import type { Nuxt } from '@nuxt/schema';
 import { bundledLanguagesInfo } from 'shiki/langs';
-import { enableWriteAheadLog } from '../content-cache';
-import type { DuxtBuildConfig } from '../duxt-app-config';
-import { readDuxtBuildConfig } from '../duxt-app-config';
+import { enableWriteAheadLog } from '../build/content/content-cache';
+import type { DuxtBuildConfig } from '../build/config/duxt-app-config';
+import { readDuxtBuildConfig } from '../build/config/duxt-app-config';
 import {
   duxtDefaultRequestSamples,
   duxtRequestSamples
 } from '../app/utils/request-samples';
-import { duxtManifest, duxtSectionTypes } from '../sections-resolve';
-import { readSectionReports } from '../section-reports';
-import { resolveLatestRefs } from '../sources-git';
+import {
+  duxtManifest,
+  duxtSectionTypes
+} from '../build/sections/sections-resolve';
+import { readSectionReports } from '../build/sections/section-reports';
+import { resolveLatestRefs } from '../build/sources/sources-git';
 
 /**
  * The build-time half of duxt's config, read from the site's `app.config.ts`.

package/modules/git-meta.ts

@@ -2,12 +2,15 @@ import { execFileSync } from 'node:child_process';
 import { dirname, relative, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import type { Nuxt } from '@nuxt/schema';
-import type { DuxtContributor } from '../git-contributors';
-import { contributorsOf } from '../git-contributors';
-import { readDuxtBuildConfig } from '../duxt-app-config';
-import { duxtManifest, duxtSectionTypes } from '../sections-resolve';
-import { resolveLatestRefs } from '../sources-git';
-import { normaliseTfplugindocsPage } from '../tfplugindocs';
+import type { DuxtContributor } from '../build/git/git-contributors';
+import { contributorsOf } from '../build/git/git-contributors';
+import { readDuxtBuildConfig } from '../build/config/duxt-app-config';
+import {
+  duxtManifest,
+  duxtSectionTypes
+} from '../build/sections/sections-resolve';
+import { resolveLatestRefs } from '../build/sources/sources-git';
+import { normaliseTfplugindocsPage } from '../build/sources/tfplugindocs';
 
 /**
  * "Last updated" and the contributor list, from the git history the file

package/modules/redirects.ts

@@ -1,9 +1,12 @@
 import { fileURLToPath } from 'node:url';
 import type { Nuxt } from '@nuxt/schema';
-import { readDuxtBuildConfig } from '../duxt-app-config';
-import { duxtManifest, duxtSectionTypes } from '../sections-resolve';
-import { resolveLatestRefs } from '../sources-git';
-import { readContentCache } from '../content-cache';
+import { readDuxtBuildConfig } from '../build/config/duxt-app-config';
+import {
+  duxtManifest,
+  duxtSectionTypes
+} from '../build/sections/sections-resolve';
+import { resolveLatestRefs } from '../build/sources/sources-git';
+import { readContentCache } from '../build/content/content-cache';
 
 /**
  * `redirectFrom` in a page's frontmatter, turned into route rules.

package/modules/search-records.ts

@@ -1,8 +1,8 @@
 import type { Nuxt } from '@nuxt/schema';
-import { readContentCache } from '../content-cache';
-import { duxtSearchRecords } from '../search-records';
-import type { DuxtSearchRecordOptions } from '../search-records';
-import type { DuxtResolvedSource } from '../sources-resolve';
+import { readContentCache } from '../build/content/content-cache';
+import { duxtSearchRecords } from '../build/search/search-records';
+import type { DuxtSearchRecordOptions } from '../build/search/search-records';
+import type { DuxtResolvedSource } from '../build/sources/sources-resolve';
 
 /**
  * duxt's one build-time extension point, and the whole of it.

package/modules/validate.ts

@@ -1,11 +1,14 @@
 import { fileURLToPath } from 'node:url';
 import type { Nuxt } from '@nuxt/schema';
-import { readDuxtBuildConfig } from '../duxt-app-config';
-import { duxtManifest, duxtSectionTypes } from '../sections-resolve';
-import { resolveLatestRefs } from '../sources-git';
-import { readContentCache } from '../content-cache';
-import type { Collected, PageRecord } from '../validate-report';
-import { report, walk } from '../validate-report';
+import { readDuxtBuildConfig } from '../build/config/duxt-app-config';
+import {
+  duxtManifest,
+  duxtSectionTypes
+} from '../build/sections/sections-resolve';
+import { resolveLatestRefs } from '../build/sources/sources-git';
+import { readContentCache } from '../build/content/content-cache';
+import type { Collected, PageRecord } from '../build/cli/validate-report';
+import { report, walk } from '../build/cli/validate-report';
 
 /**
  * Catch the silent failures.

package/nuxt.config.ts

@@ -3,7 +3,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { defineNuxtConfig } from 'nuxt/config';
 import tailwindcss from '@tailwindcss/vite';
-import { highlightLangs } from './highlight-langs';
+import { highlightLangs } from './build/content/highlight-langs';
 
 /** Resolve against this layer, not the project extending it. */
 const layer = (path: string) => fileURLToPath(new URL(path, import.meta.url));