@jjlmoya/utils-aquarium 1.61.0 → 1.62.0

package/src/types.ts

@@ -1,18 +1,16 @@
 import type { SEOSection } from '@jjlmoya/utils-shared';
+import type { UtilityLocale } from '@jjlmoya/utils-shared/routing';
 import type { WithContext, Thing } from 'schema-dts';
 
 export type { SEOSection };
 
-export type KnownLocale =
-  | 'ar' | 'da' | 'de' | 'en' | 'es' | 'fi'
-  | 'fr' | 'id' | 'it' | 'ja' | 'ko' | 'nb' | 'nl'
-  | 'pl' | 'pt' | 'ru' | 'sv' | 'tr' | 'zh';
+export type KnownLocale = UtilityLocale;
 
 export interface FAQItem { question: string; answer: string; }
 export interface BibliographyEntry { name: string; url: string; }
 export interface HowToStep { name: string; text: string; }
 
-export interface ToolLocaleContent<TUI extends Record<string, string> = Record<string, string>> {
+export interface ToolLocaleContent<TUI extends object = Record<string, string>> {
   slug: string;
   title: string;
   description: string;
@@ -34,7 +32,7 @@ export interface CategoryLocaleContent {
 export type LocaleLoader<T> = () => Promise<T>;
 export type LocaleMap<T> = Partial<Record<KnownLocale, LocaleLoader<T>>>;
 
-export interface AquariumToolEntry<TUI extends Record<string, string> = Record<string, string>> {
+export interface AquariumToolEntry<TUI extends object = Record<string, string>> {
   id: string;
   icons: { bg: string; fg: string; };
   i18n: LocaleMap<ToolLocaleContent<TUI>>;

package/src/worker.ts

@@ -0,0 +1,27 @@
+interface UtilityMfeEnvironment {
+    ASSETS: { fetch(request: Request): Promise<Response> };
+}
+
+export const LONG_LIVED_ASSET_CACHE = "public, max-age=31536000, immutable";
+export const SITEMAP_CACHE = "public, max-age=3600, s-maxage=3600, must-revalidate";
+
+export const getCacheControl = (pathname: string): string | undefined => {
+    if (pathname.endsWith("/sitemap.xml")) return SITEMAP_CACHE;
+    if (pathname.endsWith("/manifest.json")) return LONG_LIVED_ASSET_CACHE;
+    if (pathname.startsWith("/_utilities/")) {
+        return LONG_LIVED_ASSET_CACHE;
+    }
+    return undefined;
+};
+
+export default {
+    async fetch(request: Request, environment: UtilityMfeEnvironment): Promise<Response> {
+        const response = await environment.ASSETS.fetch(request);
+        const cacheControl = getCacheControl(new URL(request.url).pathname);
+        if (!cacheControl) return response;
+
+        const headers = new Headers(response.headers);
+        headers.set("Cache-Control", cacheControl);
+        return new Response(response.body, { status: response.status, headers });
+    },
+};

package/src/pages/[locale]/[slug].astro

@@ -1,65 +0,0 @@
----
-import PreviewLayout from '../../layouts/PreviewLayout.astro';
-import PreviewNavSidebar from '../../components/PreviewNavSidebar.astro';
-import { ALL_TOOLS } from '../../index';
-import { UtilityHeader, FAQSection, Bibliography, SEORenderer } from '@jjlmoya/utils-shared';
-import type { KnownLocale, ToolLocaleContent } from '../../types';
-import type { UtilitySEOContent } from '@jjlmoya/utils-shared';
-
-export async function getStaticPaths() {
-  const paths = [];
-  for (const { entry, Component: lazyComponent } of ALL_TOOLS) {
-    const { default: Component } = await lazyComponent();
-    const localeContents = await Promise.all(Object.entries(entry.i18n).map(async ([locale, loader]) => ({
-      locale: locale as KnownLocale,
-      content: await loader(),
-    })));
-    const localeUrls = Object.fromEntries(localeContents.map(({ locale, content }) => [locale, '/' + locale + '/' + content.slug]));
-    for (const { locale, content } of localeContents) {
-      const allToolsNav = (await Promise.all(ALL_TOOLS.map(async ({ entry: navEntry }) => {
-        const loader = navEntry.i18n[locale] ?? navEntry.i18n.en;
-        if (loader === undefined) return null;
-        const navContent = await loader();
-        return { id: navEntry.id, title: navContent.title, href: '/' + locale + '/' + navContent.slug, isActive: navEntry.id === entry.id };
-      }))).filter((item): item is { id: string; title: string; href: string; isActive: boolean } => item !== null);
-      const englishLoader = entry.i18n.en ?? Object.values(entry.i18n)[0];
-      const englishSlug = englishLoader === undefined ? entry.id : (await englishLoader()).slug;
-      paths.push({ params: { locale, slug: content.slug }, props: { Component, locale, content, localeUrls, allToolsNav, englishSlug } });
-    }
-  }
-  return paths;
-}
-
-const { Component, locale, content, localeUrls, allToolsNav, englishSlug } = Astro.props as {
-  Component: (_props: Record<string, unknown>) => unknown;
-  locale: KnownLocale;
-  content: ToolLocaleContent;
-  localeUrls: Partial<Record<KnownLocale, string>>;
-  allToolsNav: { id: string; title: string; href: string; isActive?: boolean }[];
-  englishSlug: string;
-};
-
-const cssFiles = import.meta.glob('../../tool/**' + '/' + '*.css', { query: '?raw', import: 'default' });
-const cssKey = Object.keys(cssFiles).find((key) => key.endsWith('/' + englishSlug + '.css'));
-const cssLoader = cssKey === undefined ? undefined : cssFiles[cssKey];
-const toolCss = cssLoader === undefined ? '' : await cssLoader() as string;
-const seoContent: UtilitySEOContent = { locale, sections: content.seo };
-const words = content.title.split(' ');
-const titleHighlight = words[0] ?? '';
-const titleBase = words.slice(1).join(' ');
----
-
-<PreviewLayout title={content.title} currentLocale={locale} localeUrls={localeUrls} hasSidebar={true}>
-  <PreviewNavSidebar slot="sidebar" categoryTitle="Aquarium tools" tools={allToolsNav} />
-  <Fragment slot="head">
-    {toolCss !== '' && <Fragment set:html={'<style is:inline>' + toolCss + '</style>'} />}
-    {content.schemas.map((schema: unknown) => <script is:inline type="application/ld+json" set:html={JSON.stringify(schema)} />)}
-  </Fragment>
-  <div class="tool-page">
-    <UtilityHeader titleHighlight={titleHighlight} titleBase={titleBase} description={content.description} />
-    <section class="section-tool"><Component ui={content.ui} /></section>
-    <section class="section-seo"><SEORenderer content={seoContent} /></section>
-    <section class="section-faq"><FAQSection items={content.faq} /></section>
-    <section class="section-bibliography"><Bibliography links={content.bibliography} /></section>
-  </div>
-</PreviewLayout>

package/src/pages/[locale].astro

@@ -1,69 +0,0 @@
----
-import PreviewLayout from '../layouts/PreviewLayout.astro';
-import PreviewNavSidebar from '../components/PreviewNavSidebar.astro';
-import { aquariumCategory, ALL_TOOLS } from '../index';
-import { Icon } from 'astro-icon/components';
-import type { KnownLocale, ToolLocaleContent } from '../types';
-
-export async function getStaticPaths() {
-  const locales = ['en'] as KnownLocale[];
-  return locales.map((locale) => ({ params: { locale } }));
-}
-
-const currentLocale = (Astro.params.locale ?? 'en') as KnownLocale;
-const categoryLoader = aquariumCategory.i18n[currentLocale] ?? aquariumCategory.i18n.en;
-const categoryContent = categoryLoader === undefined ? {
-  slug: 'aquarium',
-  title: 'Aquarium Tools',
-  description: 'Aquarium volume tools',
-  seo: [],
-} : await categoryLoader();
-
-const toolsWithContent = await Promise.all(
-  ALL_TOOLS.map(async ({ entry, Component }) => {
-    const localeEntries = await Promise.all(
-      Object.entries(entry.i18n).map(async ([locale, loader]) => [locale, await loader()] as const),
-    );
-    const localeContents = Object.fromEntries(localeEntries) as Record<string, ToolLocaleContent>;
-    const locale = localeContents[currentLocale] ?? localeContents.en;
-    const availableLocales: Record<string, string> = {};
-    for (const [localeCode, content] of Object.entries(localeContents)) {
-      availableLocales[localeCode] = '/' + localeCode + '/' + content.slug;
-    }
-    return { entry, Component, locale, availableLocales };
-  }),
-);
----
-
-<PreviewLayout title={categoryContent.title} currentLocale={currentLocale} hasSidebar={true}>
-  <PreviewNavSidebar
-    slot="sidebar"
-    categoryTitle={categoryContent.title}
-    tools={toolsWithContent.map(({ entry, locale, availableLocales }) => ({
-      id: entry.id,
-      title: locale?.title ?? entry.id,
-      href: availableLocales[currentLocale] ?? '#',
-    }))}
-  />
-  <div class="dashboard">
-    <header class="preview-header">
-      <span class="badge">preview · @jjlmoya/utils-aquarium</span>
-      <h1>{categoryContent.title}</h1>
-      <p>{categoryContent.description}</p>
-    </header>
-    <div class="tool-list">
-      {toolsWithContent.map(({ entry, locale, availableLocales }) => (
-        <article class="tool-card">
-          <a href={availableLocales[currentLocale] ?? '#'} class="tool-card-link">
-            <div class="tool-icons"><div class="icon-wrapper bg"><Icon name={entry.icons.bg} /></div><div class="icon-wrapper fg"><Icon name={entry.icons.fg} /></div></div>
-            <div class="tool-card-content"><h2 class="tool-title">{locale?.title}</h2><p class="tool-description">{locale?.description}</p></div>
-            <div class="tool-card-meta"><span class="tool-id">{entry.id}</span></div>
-          </a>
-          <div class="tool-locales">
-            {Object.entries(availableLocales).map(([localeCode, url]) => <a href={url} class:list={{ active: localeCode === currentLocale }} class="locale-badge">{localeCode.toUpperCase()}</a>)}
-          </div>
-        </article>
-      ))}
-    </div>
-  </div>
-</PreviewLayout>