simple-content-site 2.0.1 → 2.1.1

package/app/components/app/AppFooterLeft.vue

@@ -1,26 +1,66 @@
 <script setup lang="ts">
-import { defu } from 'defu'
+type ReplaceKey = string | number | symbol | RegExp
+type ReplaceFn = (matches: string[]) => string
+type ReplaceValue = string | number | ReplaceFn
+type ReplaceItem = { match: ReplaceKey, replace: ReplaceValue }
 
 const props = withDefaults(defineProps<{
   parts?: string[]
-  replacements?: Record<string, string>
+  replacements?: ReplaceItem[]
 }>(), {
   parts: () => ['Copyright ©', '{fullYear}'],
-
 })
 
-const replaceParams = (text: string, params: Record<string, string>) => text.replace(/\{([^}]+)\}/g, (_, key) => params[key] || '')
+const currentUrl = useRequestURL()
+
+// todo: move this logic to a shared space
+const allReplacements = computed<ReplaceItem[]>(() => [
+  {
+    match: '{fullYear}',
+    replace: () => String(new Date().getFullYear()),
+  },
+  {
+    match: '{url}',
+    replace: () => currentUrl.toString(),
+  },
+  ...(props.replacements ?? []),
+])
 
 const rawItems = computed(() => {
   if (!props.parts || props.parts.length === 0) return ['']
-
   return props.parts
 })
 
+const normalizeMatch = (match: ReplaceKey): RegExp => {
+  if (match instanceof RegExp) return match
+  return new RegExp(String(match), 'g')
+}
+
+const applyReplace = (
+  text: string,
+  matcher: RegExp,
+  replacer: ReplaceValue,
+) => {
+  if (typeof replacer === 'function') {
+    return text.replace(matcher, (...args) => {
+      const matches = args.slice(0, -2)
+      return replacer(matches)
+    })
+  }
+
+  return text.replace(matcher, String(replacer))
+}
+
+const replaceParts = (text: string) => {
+  return allReplacements.value.reduce((acc, item) => {
+    const matcher = normalizeMatch(item.match)
+    return applyReplace(acc, matcher, item.replace)
+  }, text)
+}
+
 const text = computed(() => {
-  return replaceParams([...toValue(rawItems)].join(' '), defu(props.replacements || {}, {
-    fullYear: new Date().getFullYear(),
-  }))
+  const joined = [...toValue(rawItems)].join(' ')
+  return replaceParts(joined)
 })
 </script>
 

package/content.config.ts

@@ -84,10 +84,10 @@ const createFooterSchema = () => z.object({
 
 let collections: Record<string, DefinedCollection>
 
-if (locales && Array.isArray(locales)) {
+const buildI18nCollections = () => {
   collections = {}
   for (const locale of locales) {
-    const code = typeof locale === 'string' ? locale : locale.code
+    const code = (typeof locale === 'string' ? locale : locale.code).replace('-', '_')
 
     collections[`landing_${code}`] = defineCollection({
       type: 'page',
@@ -133,7 +133,8 @@ if (locales && Array.isArray(locales)) {
     })
   }
 }
-else {
+
+const buildDefaultCollections = () => {
   collections = {
     landing: defineCollection({
       type: 'page',
@@ -174,4 +175,14 @@ else {
   }
 }
 
+if (locales && Array.isArray(locales)) {
+  if (locales.length === 0) {
+    console.warn('Site: There are 0 locales, building with defaults instead.')
+  }
+  buildI18nCollections()
+}
+else {
+  buildDefaultCollections()
+}
+
 export default defineContentConfig({ collections })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "simple-content-site",
   "description": "Nuxt layer for simple website with basic functions.",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "type": "module",
   "main": "./nuxt.config.ts",
   "repository": {
@@ -39,7 +39,7 @@
     "minimark": "^0.2.0",
     "motion-v": "^1.7.4",
     "nuxt-og-image": "^5.1.13",
-    "nuxt-studio": "^1.0.0",
+    "nuxt-studio": "^1.1.0",
     "pkg-types": "^2.3.0",
     "scule": "^1.3.0",
     "tailwindcss": "^4.1.17",