create-ginko 0.4.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # create-ginko
 
+## 0.6.0
+
+### Patch Changes
+
+- [#28](https://github.com/lupinum-dev/ginko/pull/28) [`3246028`](https://github.com/lupinum-dev/ginko/commit/3246028d0b767801950f6f54f49e7edddd204143) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix the first release of a template or a docs home on the platform: every required field of a single now has a default (or is optional), so the platform can create its entry.
+
+## 0.5.0
+
+### Minor Changes
+
+- [#23](https://github.com/lupinum-dev/ginko/pull/23) [`7b165c2`](https://github.com/lupinum-dev/ginko/commit/7b165c25e17ed2f4fb50e8054febf618a6af10d7) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Add the blog template (`--template blog`): posts with tags, authors, reading time, older and newer links, and an RSS feed per language. The company and nonprofit news pages gain the same tag pages, reading time and older/newer links.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Add `--template <name>` and `--locales <codes>`: a complete starter site from Ginko's templates, with the languages you pick (the first is the main one) and its sample dates moved to the current week; `--preset` and `--locale` still work and print that they are deprecated.
+
+### Patch Changes
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix the example command after the list of templates: it names the starter, the template to begin with.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix `--template`: a restaurant site now opens with the current lunch week, since the lunch `weekOf` date moves with the other sample dates.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix `--template` sites on Nuxt 5: the font preload plugin and the news feed now type-check, because they use `useServerHooks()` and a relative import of `ginko.config.ts`.
+
+- [#23](https://github.com/lupinum-dev/ginko/pull/23) [`7b165c2`](https://github.com/lupinum-dev/ginko/commit/7b165c25e17ed2f4fb50e8054febf618a6af10d7) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix `--locales` with a new main language for content whose translation has no frontmatter (only text): the main file's fields, such as a changelog's version and date, now move to the new main file instead of failing the build.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix `--locales` with another main language: an image keeps its file when only its alt text is translated.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix `--locales` with another main language: a nested content field it cannot read now stops the copy with the file and field named, instead of being swapped whole and failing the site's build later.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix `--locales` with another main language: a translated photo text or list (gallery, lunch days, closures) now keeps its photo, prices and dates in the new main file instead of failing the build.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix the gastro starter's menu page: it leaves out a dish turned off with "onMenu" and marks a dish sold out today, by the preset's `dishOn` rule.
+
+- [#21](https://github.com/lupinum-dev/ginko/pull/21) [`80f93a4`](https://github.com/lupinum-dev/ginko/commit/80f93a4f6bd171e1146b929913254039becdd991) Thanks [@Mat4m0](https://github.com/Mat4m0)! - Fix --locales with a new main language: fields only the main file has move to the new main file, and the old main page keeps its address.
+
 ## 0.4.0
 
 ### Minor Changes

package/README.md

@@ -14,7 +14,7 @@ edit a brick on the Ginko platform instead, remove `source: 'files'` from it in
 and give the single's required fields a `default` or make them optional (`f.markdown`, `f.image` and `f.file` cannot have a default, so set `optional: true` on them). See
 [Platform and CLI](https://github.com/lupinum-dev/ginko/blob/main/sites/docs/content/docs/12.plattform-und-cli.en.md).
 
-The sample site is English. `--locale de` creates it in German.
+Without options it creates the plain starter in English; `--locales de` creates it in German.
 
 The site id (`site` in `ginko.config.ts`) comes from the folder name: lower case, every run of other characters
 becomes `-`, at most 40 characters, and it must start with a letter. When the id differs from the folder name, the
@@ -26,22 +26,29 @@ Write the options after `--`. npm keeps options before `--` for itself and passe
 command then stops and shows the right form. pnpm, yarn and bun accept the same command.
 
 ```bash
-npm create ginko@latest my-site -- --locale de
-npm create ginko@latest my-restaurant -- --preset gastro
-npm create ginko@latest my-docs -- --preset docs
+npm create ginko@latest my-site -- --template starter
+npm create ginko@latest my-site -- --locales de
 ```
 
 | Option | Values | Default |
 |---|---|---|
-| `--preset <name>` (or `--preset=<name>`) | `gastro`, `docs` | the plain starter |
-| `--locale <code>` (or `--locale=<code>`) | `en`, `de` | `en` |
+| `--template <name>` (or `--template=<name>`) | a bundled template: `starter` | the plain starter |
+| `--locales <codes>` (or `--locales=<codes>`) | the languages to keep, comma-separated; the first is the main language. A template offers its own languages (`--help` and the end of each run list them); the plain starter has `en` or `de`, one at a time. | all of the template's languages; `en` for the plain starter |
+| `--preset <name>` | deprecated, use `--template`: `gastro`, `docs` | |
+| `--locale <code>` | deprecated, use `--locales`: `en`, `de` | |
 | `-h`, `--help` | | |
 
-The command always says which starter and language it used. An unknown option, preset or locale stops
+With `--template`, the command copies the template, keeps only the languages of `--locales` (their content files,
+`i18n/<code>.json` and their entries in the route maps), moves the dates of upcoming sample entries (such as events and notices) by
+whole weeks to this week, sets the site id and writes a `.env` with `NUXT_APP_SECRET`.
+
+The command always says which starter and languages it used. An unknown option, template, preset or locale stops
 with exit code 2 (a usage error, as in the `ginko` CLI) and creates nothing. A folder that exists and is not
 empty stops with exit code 1.
 
-## Presets
+## Presets (deprecated)
+
+`--preset` still works for now and prints a note; use `--template` instead.
 
 | Preset | Package | What the starter shows | Platform needed? |
 |---|---|---|---|

package/index.mjs

@@ -1,12 +1,15 @@
 #!/usr/bin/env node
-// npm create ginko <folder> [-- --preset gastro|docs] [--locale en|de]: copies template/ into a new folder and sets
-// the site id and the Ginko versions. The Ginko packages release together, so they get this package's own version.
-// A preset is a small folder in presets/ that is copied over the base template and adds the preset's packages.
-// German: template-de/ goes over the base template; a preset has its own folder `<preset>-de`.
+// npm create ginko <folder> [-- --template <name>] [--locales a,b]: copies a template into a new folder and sets the
+// site id and the Ginko versions. The Ginko packages release together, so they get this package's own version.
+// --template: a complete site from templates/<name> (bundled by build.mjs from the repository's templates/). Its
+// languages are pruned to --locales (template-files.mjs), its sample dates move to this week, and its site id is set.
+// Without --template: the plain starter in template/ (German: template-de/ over it). --preset (deprecated) copies a
+// small folder from presets/ over the plain starter and adds the preset's packages; `<preset>-de` is its German one.
 import { randomBytes } from 'node:crypto'
-import { cpSync, existsSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
+import { cpSync, existsSync, readdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs'
 import { basename, join, resolve } from 'node:path'
 import { supportsNode } from './node-version.mjs'
+import { pruneLocales, shiftDates, weeksShift } from './template-files.mjs'
 
 // preset name -> the packages it adds (its own package, then the Ginko peers of that package that the base template
 // lacks; test/create-ginko.test.ts checks this against the packages' metadata), and what the next steps say about it
@@ -15,14 +18,22 @@ const presets = {
   docs: { packages: ['@lupinum/ginko-docs'], note: 'Pages are Markdown files in content/docs. No platform needed.' },
 }
 const langs = { en: 'English', de: 'German' }
+// The templates bundled into this package (build.mjs); none in a repository checkout before `pnpm build`.
+const templatesDir = new URL('./templates/', import.meta.url)
+const templates = existsSync(templatesDir) ? readdirSync(templatesDir).filter((name) => statSync(new URL(name, templatesDir)).isDirectory()).sort() : []
+/** Each bundled template's languages, from its manifest (build.mjs). */
+const templateLocales = Object.fromEntries(templates.map((name) => [name, JSON.parse(readFileSync(new URL(`${name}.json`, templatesDir), 'utf8')).locales]))
 const command = 'npm create ginko@latest'
-const usage = `Usage: ${command} <folder> -- [--preset gastro|docs] [--locale en|de]
+const usage = `Usage: ${command} <folder> -- [--template <name>] [--locales <codes>]
 
 Creates a Nuxt site with Ginko that reads its content from Markdown files.
 
-  --preset <name>  start from a preset: gastro (restaurant) or docs (documentation)
-  --locale <code>  locale code of the sample site: en (default) or de
-  -h, --help       show this help
+  --template <name>   start from a template: ${templates.join(', ') || '(none bundled)'}
+  --locales <codes>   the languages to keep, comma-separated; the first is the main language
+                      (default: all of the template's; without --template: en or de)
+  --preset <name>     deprecated: the older starters gastro (restaurant) and docs (documentation)
+  --locale <code>     deprecated: use --locales
+  -h, --help          show this help
 
 With npm, write -- before the options. Without it, npm keeps them for itself.`
 
@@ -33,36 +44,53 @@ function fail(message) {
 }
 
 const args = process.argv.slice(2)
+const options = { '--template': undefined, '--locales': undefined, '--preset': undefined, '--locale': undefined }
 let target
-let preset
-let lang = 'en'
 for (let i = 0; i < args.length; i++) {
   const arg = args[i]
-  // pnpm and yarn may pass the `--` of `pnpm create ginko my-site -- --preset gastro` through.
+  // pnpm and yarn may pass the `--` of `pnpm create ginko my-site -- --template starter` through.
   if (arg === '--') continue
   if (arg === '-h' || arg === '--help') { console.log(usage); process.exit(0) }
-  if (arg === '--preset' || arg === '--locale') {
-    const value = args[++i]
-    if (!value || value.startsWith('-')) fail(`${arg} needs a value.`)
-    if (arg === '--preset') preset = value
-    else lang = value
+  const [name, inline] = arg.startsWith('--') && arg.includes('=') ? [arg.slice(0, arg.indexOf('=')), arg.slice(arg.indexOf('=') + 1)] : [arg, undefined]
+  if (Object.hasOwn(options, name)) {
+    const value = inline ?? args[++i]
+    if (!value || value.startsWith('-')) fail(`${name} needs a value.`)
+    options[name] = value
   }
-  else if (arg.startsWith('--preset=')) preset = arg.slice('--preset='.length)
-  else if (arg.startsWith('--locale=')) lang = arg.slice('--locale='.length)
   else if (arg.startsWith('-')) fail(`Unknown option "${arg}".`)
   else if (target === undefined) target = arg
-  // npm drops `--preset` written without `--` and passes only its value, so a second name is almost always that.
+  // npm drops an option written without `--` and passes only its value, so a second name is almost always that.
+  else if (templates.includes(arg)) fail(`Unexpected argument "${arg}". npm drops --template when it comes before --. Write:\n  ${command} ${target} -- --template ${arg}`)
   else if (Object.hasOwn(presets, arg)) fail(`Unexpected argument "${arg}". npm drops --preset when it comes before --. Write:\n  ${command} ${target} -- --preset ${arg}`)
-  else if (Object.hasOwn(langs, arg)) fail(`Unexpected argument "${arg}". npm drops --locale when it comes before --. Write:\n  ${command} ${target} -- --locale ${arg}`)
+  else if (Object.hasOwn(langs, arg)) fail(`Unexpected argument "${arg}". npm drops --locales when it comes before --. Write:\n  ${command} ${target} -- --locales ${arg}`)
   else fail(`Unexpected argument "${arg}". Give one folder name.`)
 }
+const { '--template': template, '--preset': preset } = options
+// The old flags still work for one minor release; each says what replaces it.
+if (preset !== undefined) console.warn(`Note: --preset is deprecated and will be removed; use --template <name> (${templates.join(', ')}).`)
+if (options['--locale'] !== undefined) console.warn('Note: --locale is deprecated and will be removed; use --locales.')
+if (options['--locale'] !== undefined && options['--locales'] !== undefined) fail('Use --locales, not both --locales and --locale.')
+if (template !== undefined && preset !== undefined) fail('Use --template or --preset, not both.')
+const locales = (options['--locales'] ?? options['--locale'])?.split(',').map((code) => code.trim()).filter((code, i, all) => code && all.indexOf(code) === i)
+if (locales?.length === 0) fail('--locales needs at least one language code.')
+if (template !== undefined && !templates.includes(template)) {
+  fail(templates.length ? `Unknown template "${template}". Choose one of: ${templates.join(', ')}.` : 'This copy of create-ginko has no templates. In the Ginko repository, run `pnpm build` first.')
+}
+const manifest = template && JSON.parse(readFileSync(new URL(`${template}.json`, templatesDir), 'utf8'))
+if (manifest) {
+  const unknown = (locales ?? []).filter((code) => !manifest.locales.includes(code))
+  if (unknown.length) fail(`Unknown locale ${unknown.map((code) => `"${code}"`).join(', ')}. The ${template} template has: ${manifest.locales.join(', ')}.`)
+}
 if (preset !== undefined && !Object.hasOwn(presets, preset)) {
   fail(`Unknown preset "${preset}". Choose one of: ${Object.keys(presets).join(', ')}.`)
 }
-if (!Object.hasOwn(langs, lang)) fail(`Unknown language "${lang}". Choose one of: ${Object.keys(langs).join(', ')}.`)
+// The plain starter and the presets have one language each.
+const lang = template ? undefined : locales?.[0] ?? 'en'
+if (!template && locales && locales.length > 1) fail(`The ${preset ? `${preset} preset` : 'plain starter'} has one language. Choose one of: ${Object.keys(langs).join(', ')}, or use a --template.`)
+if (lang !== undefined && !Object.hasOwn(langs, lang)) fail(`Unknown language "${lang}". Choose one of: ${Object.keys(langs).join(', ')}.`)
 const presetDir = preset && (lang === 'en' ? preset : `${preset}-${lang}`)
 if (presetDir && !existsSync(new URL(`./presets/${presetDir}`, import.meta.url))) {
-  fail(`The ${preset} preset has no ${langs[lang]} version yet. Leave out --locale ${lang}.`)
+  fail(`The ${preset} preset has no ${langs[lang]} version yet. Leave out --locales ${lang}.`)
 }
 if (!target) fail('Give the name of the folder to create.')
 const dir = resolve(target)
@@ -80,26 +108,65 @@ const own = JSON.parse(readFileSync(new URL('./package.json', import.meta.url),
 if (!supportsNode(process.versions.node, own.engines.node)) {
   console.warn(`Warning: Ginko needs Node ${own.engines.node}, but this is Node ${process.versions.node}. The site is created, but install and dev may fail or print warnings. Switch to a supported Node version before you run "install".\n`)
 }
-cpSync(new URL('./template', import.meta.url), dir, { recursive: true })
-// npm drops .gitignore from published packages, so the template carries it as `gitignore`.
-renameSync(join(dir, 'gitignore'), join(dir, '.gitignore'))
-if (presetDir) {
-  // The base page and sample text give way to the preset's own.
-  rmSync(join(dir, 'content/start.md'))
-  rmSync(join(dir, 'app/pages/index.vue'))
-  cpSync(new URL(`./presets/${presetDir}`, import.meta.url), dir, { recursive: true })
-}
-else if (lang !== 'en') cpSync(new URL(`./template-${lang}`, import.meta.url), dir, { recursive: true })
-for (const file of ['package.json', 'ginko.config.ts']) {
-  const path = join(dir, file)
-  writeFileSync(path, readFileSync(path, 'utf8').replaceAll('{{SITE}}', site).replaceAll('{{VERSION}}', own.version))
-}
-if (preset) {
+/** A language's English name (`de` → German), for the messages. */
+const languageName = (code) => langs[code] ?? new Intl.DisplayNames(['en'], { type: 'language' }).of(code) ?? code
+const writeJson = (path, value) => writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`)
+let chosen = lang ? [lang] : manifest.locales
+let moved = 0
+if (template) {
+  cpSync(new URL(template, templatesDir), dir, { recursive: true })
+  if (existsSync(join(dir, 'gitignore'))) renameSync(join(dir, 'gitignore'), join(dir, '.gitignore'))
+  chosen = locales ?? manifest.locales
+  if (chosen.join() !== manifest.locales.join()) {
+    try {
+      pruneLocales(dir, manifest.locales, chosen)
+    } catch (error) {
+      rmSync(dir, { recursive: true, force: true })
+      console.error(`Could not set the languages: ${error.message}`)
+      process.exit(1)
+    }
+  }
+  const config = join(dir, 'ginko.config.ts')
+  writeFileSync(config, readFileSync(config, 'utf8').replace(/(\bsite:\s*)(['"])[^'"]*\2/, `$1'${site}'`))
   const path = join(dir, 'package.json')
   const pkg = JSON.parse(readFileSync(path, 'utf8'))
-  for (const name of presets[preset].packages) pkg.dependencies[name] = `^${own.version}`
-  pkg.dependencies = Object.fromEntries(Object.entries(pkg.dependencies).sort(([a], [b]) => a.localeCompare(b)))
-  writeFileSync(path, `${JSON.stringify(pkg, null, 2)}\n`)
+  pkg.name = site
+  for (const field of ['dependencies', 'devDependencies']) {
+    for (const name of Object.keys(pkg[field] ?? {})) if (name.startsWith('@lupinum/ginko')) pkg[field][name] = `^${own.version}`
+  }
+  // Sample dates move by whole weeks to today (spec T10), so a new site does not open with past events.
+  const anchor = pkg.ginko?.sampleAnchor
+  if (anchor) {
+    const days = weeksShift(anchor, new Date().toISOString().slice(0, 10))
+    moved = shiftDates(dir, manifest.shift, days).length
+    pkg.ginko.sampleAnchor = new Date(Date.parse(`${anchor}T00:00:00Z`) + days * 864e5).toISOString().slice(0, 10)
+  }
+  // Which shared sources the template uses matters only inside the Ginko repository.
+  if (pkg.ginko) delete pkg.ginko.features
+  writeJson(path, pkg)
+}
+else {
+  cpSync(new URL('./template', import.meta.url), dir, { recursive: true })
+  // npm drops .gitignore from published packages, so the template carries it as `gitignore`.
+  renameSync(join(dir, 'gitignore'), join(dir, '.gitignore'))
+  if (presetDir) {
+    // The base page and sample text give way to the preset's own.
+    rmSync(join(dir, 'content/start.md'))
+    rmSync(join(dir, 'app/pages/index.vue'))
+    cpSync(new URL(`./presets/${presetDir}`, import.meta.url), dir, { recursive: true })
+  }
+  else if (lang !== 'en') cpSync(new URL(`./template-${lang}`, import.meta.url), dir, { recursive: true })
+  for (const file of ['package.json', 'ginko.config.ts']) {
+    const path = join(dir, file)
+    writeFileSync(path, readFileSync(path, 'utf8').replaceAll('{{SITE}}', site).replaceAll('{{VERSION}}', own.version))
+  }
+  if (preset) {
+    const path = join(dir, 'package.json')
+    const pkg = JSON.parse(readFileSync(path, 'utf8'))
+    for (const name of presets[preset].packages) pkg.dependencies[name] = `^${own.version}`
+    pkg.dependencies = Object.fromEntries(Object.entries(pkg.dependencies).sort(([a], [b]) => a.localeCompare(b)))
+    writeJson(path, pkg)
+  }
 }
 
 // The share cards (nuxt-og-image) sign their URLs with this secret; `nuxt dev` and `nuxt preview` read .env.
@@ -109,12 +176,16 @@ writeFileSync(join(dir, '.env'), `# Signs the share card URLs. Set the same vari
 const agent = (process.env.npm_config_user_agent ?? '').split('/')[0]
 const pm = ['pnpm', 'yarn', 'bun'].includes(agent) ? agent : 'npm'
 const cd = /^[\w./-]+$/.test(target) ? target : `'${target.replaceAll('\'', '\'\\\'\'')}'`
-console.log(`Created ${target} from the ${preset ? `${preset} preset` : 'plain starter'} in ${langs[lang]}.`)
+const from = template ? `the ${template} template` : preset ? `the ${preset} preset` : 'the plain starter'
+console.log(`Created ${target} from ${from} in ${chosen.map(languageName).join(' and ').replace(/ and (?=.* and )/g, ', ')}.`)
 if (site !== basename(dir)) console.log(`The site id is "${site}": the folder name in lower case, with other characters replaced by "-", at most 40 characters. Change \`site\` in ginko.config.ts to use another one.`)
+if (moved) console.log(`The sample dates in ${moved} content file${moved === 1 ? '' : 's'} moved to this week.`)
 if (preset) console.log(presets[preset].note)
 // npm keeps options for itself unless they come after --; pnpm, yarn and bun pass them on.
-const example = pm === 'npm' ? `${command} my-site -- --preset gastro` : `${pm} create ginko my-site --preset gastro`
-console.log(`Other starters: --preset gastro, --preset docs; German sample: --locale de.${pm === 'npm' ? ' With npm, put -- before them:' : ''}
+// The example names the starter, the neutral start, also when other templates sort before it.
+const sample = templates.includes('starter') ? 'starter' : templates[0] ?? 'starter'
+const example = pm === 'npm' ? `${command} my-site -- --template ${sample}` : `${pm} create ginko my-site --template ${sample}`
+console.log(`Templates (languages for --locales): ${templates.map((name) => `${name} (${templateLocales[name].join(', ')})`).join(', ')}.${pm === 'npm' ? ' With npm, put -- before the options:' : ''}
   ${example}
 
 Next:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ginko",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "type": "module",
   "description": "Start a Ginko site: npm create ginko my-site",
   "bin": {
@@ -9,9 +9,11 @@
   "files": [
     "index.mjs",
     "node-version.mjs",
+    "template-files.mjs",
     "template",
     "template-de",
     "presets",
+    "templates",
     "CHANGELOG.md"
   ],
   "license": "MIT",
@@ -30,5 +32,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "build": "node build.mjs"
   }
 }

package/presets/gastro/app/pages/index.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { formatMoney } from '@lupinum/ginko'
-import { priceOn, timesOf, weekdayNames, type Weekday } from '@lupinum/ginko-preset-gastro'
+import { dishOn, priceOn, timesOf, weekdayNames, type Weekday } from '@lupinum/ginko-preset-gastro'
 
 const hours = useGinko('hours')
 const menu = useGinko('menu')
 const today = useGinkoToday()
 const { language } = useI18n()
+// A dish turned off with "onMenu" is left out; one sold out today stays, marked (dishOn).
+const dishes = computed(() => menu.value.items.map((i) => ({ ...i, ...dishOn(i.data, today.value) })).filter((i) => i.shown))
 const categories = [['starters', 'Starters'], ['soups', 'Soups'], ['mains', 'Mains'], ['desserts', 'Desserts'], ['drinks', 'Drinks']] as const
 useGinkoSeo({ title: 'Menu and opening hours' })
 </script>
@@ -22,11 +24,11 @@ useGinkoSeo({ title: 'Menu and opening hours' })
       </tbody>
     </table>
     <h1>Menu</h1>
-    <section v-for="[key, title] in categories.filter(([k]) => menu.items.some((i) => i.data.category === k))" :key="key">
+    <section v-for="[key, title] in categories.filter(([k]) => dishes.some((i) => i.data.category === k))" :key="key">
       <h2>{{ title }}</h2>
       <ul>
-        <li v-for="dish in menu.items.filter((i) => i.data.category === key)" :key="dish.id">
-          <strong>{{ dish.data.name }}</strong>, {{ formatMoney(priceOn(dish.data, today), language) }}
+        <li v-for="dish in dishes.filter((i) => i.data.category === key)" :key="dish.id">
+          <strong>{{ dish.data.name }}</strong><template v-if="dish.soldOut"> (sold out today)</template>, {{ formatMoney(priceOn(dish.data, today), language) }}
           <br>{{ dish.data.description }}
         </li>
       </ul>

package/presets/gastro-de/app/pages/index.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { formatMoney } from '@lupinum/ginko'
-import { priceOn, timesOf, weekdayNames, type Weekday } from '@lupinum/ginko-preset-gastro'
+import { dishOn, priceOn, timesOf, weekdayNames, type Weekday } from '@lupinum/ginko-preset-gastro'
 
 const hours = useGinko('hours')
 const menu = useGinko('menu')
 const today = useGinkoToday()
 const { language } = useI18n()
+// A dish turned off with "onMenu" is left out; one sold out today stays, marked (dishOn).
+const dishes = computed(() => menu.value.items.map((i) => ({ ...i, ...dishOn(i.data, today.value) })).filter((i) => i.shown))
 const categories = [['starters', 'Vorspeisen'], ['soups', 'Suppen'], ['mains', 'Hauptspeisen'], ['desserts', 'Nachspeisen'], ['drinks', 'Getränke']] as const
 useGinkoSeo({ title: 'Speisekarte und Öffnungszeiten' })
 </script>
@@ -22,11 +24,11 @@ useGinkoSeo({ title: 'Speisekarte und Öffnungszeiten' })
       </tbody>
     </table>
     <h1>Speisekarte</h1>
-    <section v-for="[key, title] in categories.filter(([k]) => menu.items.some((i) => i.data.category === k))" :key="key">
+    <section v-for="[key, title] in categories.filter(([k]) => dishes.some((i) => i.data.category === k))" :key="key">
       <h2>{{ title }}</h2>
       <ul>
-        <li v-for="dish in menu.items.filter((i) => i.data.category === key)" :key="dish.id">
-          <strong>{{ dish.data.name }}</strong>, {{ formatMoney(priceOn(dish.data, today), language) }}
+        <li v-for="dish in dishes.filter((i) => i.data.category === key)" :key="dish.id">
+          <strong>{{ dish.data.name }}</strong><template v-if="dish.soldOut"> (heute aus)</template>, {{ formatMoney(priceOn(dish.data, today), language) }}
           <br>{{ dish.data.description }}
         </li>
       </ul>