@jjlmoya/utils-forensic-science 1.17.0 → 1.18.0

package/src/types.ts

@@ -1,12 +1,10 @@
 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;
@@ -23,7 +21,7 @@ export interface HowToStep {
   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;
@@ -46,7 +44,7 @@ export type LocaleLoader<T> = () => Promise<T>;
 
 export type LocaleMap<T> = Partial<Record<KnownLocale, LocaleLoader<T>>>;
 
-export interface ScienceToolEntry<TUI extends Record<string, string> = Record<string, string>> {
+export interface ScienceToolEntry<TUI extends object = Record<string, string>> {
   id: string;
   icons: {
     bg: string;
@@ -67,4 +65,4 @@ export interface ToolDefinition {
   SEOComponent: (_props: Record<string, unknown>) => unknown;
   BibliographyComponent: (_props: Record<string, unknown>) => unknown;
 }
-
+

package/src/worker.ts

@@ -0,0 +1,25 @@
+interface UtilityMfeEnvironment {
+    ASSETS: { fetch(request: Request): Promise<Response> };
+}
+
+export const LONG_LIVED_ASSET_CACHE = "public, max-age=31536000, immutable";
+
+export const getCacheControl = (pathname: string): string | undefined => {
+    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,164 +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";
-import type { AstroComponentFactory } from "astro/runtime/server/index.js";
-
-export async function getStaticPaths() {
-  const paths = [];
-
-  for (const { entry, Component: lazyComp } of ALL_TOOLS) {
-    const { default: Component } = await (lazyComp as () => Promise<{ default: unknown }>)();
-    const localeEntries = Object.entries(entry.i18n) as [
-      KnownLocale,
-      () => Promise<ToolLocaleContent>,
-    ][];
-    const localeContents = await Promise.all(
-      localeEntries.map(async ([locale, loader]) => ({
-        locale,
-        content: await loader(),
-      })),
-    );
-
-    const localeUrls = Object.fromEntries(
-      localeContents.map(({ locale, content }) => [
-        locale,
-        `/${locale}/${content.slug}`,
-      ]),
-    ) as Partial<Record<KnownLocale, string>>;
-
-    const firstLoader = entry.i18n.en ?? Object.values(entry.i18n)[0];
-    const englishSlug = firstLoader ? (await firstLoader()).slug : entry.id;
-
-    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) return null;
-            const navContent = await loader();
-            return {
-              id: navEntry.id,
-              title: navContent.title,
-              href: `/${locale}/${navContent.slug}`,
-              isActive: navEntry.id === entry.id,
-            };
-          }),
-        )
-      ).filter(Boolean) as NavItem[];
-      paths.push({
-        params: { locale, slug: content.slug },
-        props: { Component, locale, content, localeUrls, allToolsNav, englishSlug },
-      });
-    }
-  }
-
-  return paths;
-}
-
-interface NavItem {
-  id: string;
-  title: string;
-  href: string;
-  isActive?: boolean;
-}
-
-interface Props {
-  Component: unknown;
-  locale: KnownLocale;
-  content: ToolLocaleContent;
-  localeUrls: Partial<Record<KnownLocale, string>>;
-  allToolsNav: NavItem[];
-  englishSlug: string;
-}
-
-const { Component, locale, content, localeUrls, allToolsNav, englishSlug } = Astro.props as Props;
-const ToolComponent = Component as AstroComponentFactory;
-
-const cssFiles = import.meta.glob("../../tool/*/*.css", { query: "?raw", import: "default" });
-const cssKey = Object.keys(cssFiles).find((k) => k.endsWith(`/${englishSlug}.css`));
-const cssLoader = cssKey ? cssFiles[cssKey] : null;
-const toolCss = cssLoader ? 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="Tools"
-    tools={allToolsNav}
-  />
-  <Fragment slot="head">
-    {toolCss ? <Fragment set:html={`<style is:inline>${toolCss}</style>`} /> : null}
-    {
-      ( 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">
-      <ToolComponent 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>
-
-<style>
-  .tool-page {
-    display: flex;
-    flex-direction: column;
-    gap: 2rem;
-  }
-  .section-tool {
-    max-width: 1200px;
-    margin: 0 auto;
-    width: 100%;
-  }
-  .section-seo,
-  .section-faq,
-  .section-bibliography {
-    padding-top: 2rem;
-    border-top: 1px solid var(--border-color);
-  }
-</style>

package/src/pages/[locale].astro

@@ -1,264 +0,0 @@
----
-import PreviewLayout from '../layouts/PreviewLayout.astro';
-import PreviewNavSidebar from '../components/PreviewNavSidebar.astro';
-import { templateCategory, ALL_TOOLS } from '../index';
-import { Icon } from 'astro-icon/components';
-import type { KnownLocale, ToolLocaleContent } from '../types';
-
-export async function getStaticPaths() {
-  const locales = Object.keys(templateCategory.i18n) as KnownLocale[];
-  return locales.map((locale) => ({ params: { locale } }));
-}
-
-const categoryLocales = Object.keys(templateCategory.i18n) as KnownLocale[];
-
-const { locale: requestedLocale } = Astro.params as { locale: KnownLocale };
-const currentLocale = categoryLocales.includes(requestedLocale) ? requestedLocale : 'en';
-const categoryLoader = templateCategory.i18n[currentLocale] ?? templateCategory.i18n.en;
-
-if (!categoryLoader) {
-  throw new Error('No category locale loader is registered.');
-}
-
-const categoryContent = await categoryLoader();
-const tools = ALL_TOOLS || [];
-
-const toolsWithContent = tools.length > 0
-  ? await Promise.all(
-      tools.map(async ({ entry, Component }) => {
-        const languages = Object.keys(entry.i18n) as KnownLocale[];
-        const localeEntries = await Promise.all(
-        languages.map(async (l) => {
-            const loader = entry.i18n[l];
-            if (!loader) return null;
-            const content = await loader();
-            return [l, content] as const;
-          })
-        );
-
-        const availableLocaleEntries = localeEntries.filter(
-          (localeEntry): localeEntry is readonly [KnownLocale, ToolLocaleContent<Record<string, string>>] => localeEntry !== null,
-        );
-        const localeContents = Object.fromEntries(availableLocaleEntries) as Record<string, ToolLocaleContent<Record<string, string>>>;
-        const currentLocaleContent = localeContents[currentLocale] || localeContents.en;
-        const availableLocales: Record<string, string> = {};
-
-        for (const l of languages) {
-          const lCont = localeContents[l];
-          if (lCont) {
-            availableLocales[l] = `/${l}/${lCont.slug}`;
-          }
-        }
-
-        return { entry, Component, locale: currentLocaleContent, availableLocales };
-      })
-    )
-  : [];
----
-
-<PreviewLayout
-  title={categoryContent.title}
-  currentLocale={currentLocale}
-  hasSidebar={true}
->
-  <PreviewNavSidebar
-    slot="sidebar"
-    categoryTitle={categoryContent.title}
-    tools={toolsWithContent.map(({ entry, locale, availableLocales }) => {
-      const href = availableLocales[currentLocale] || (locale ? `/${currentLocale}/${locale.slug}` : '#');
-      return {
-        id: entry.id,
-        title: locale?.title || entry.id,
-        href: href,
-      };
-    })}
-  />
-  <div class="dashboard">
-    <header class="preview-header">
-      <span class="badge">preview - @jjlmoya/utils-forensic-science</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] || (locale ? `/${currentLocale}/${locale.slug}` : '#')} 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>
-
-          {availableLocales && Object.keys(availableLocales).length > 1 && (
-            <div class="tool-locales">
-              {Object.entries(availableLocales).map(([l, url]) => (
-                <a href={url} class="locale-badge" title={`View in ${l.toUpperCase()}`} class:list={{ active: l === currentLocale }}>
-                  {l.toUpperCase()}
-                </a>
-              ))}
-            </div>
-          )}
-        </article>
-      ))}
-    </div>
-  </div>
-</PreviewLayout>
-
-<style>
-  .dashboard {
-    display: flex;
-    flex-direction: column;
-    gap: 5rem;
-  }
-  .preview-header {
-    text-align: center;
-    padding-bottom: 3rem;
-    border-bottom: 1px solid var(--border-color);
-  }
-  .badge {
-    display: inline-block;
-    padding: 0.25rem 0.75rem;
-    background: var(--accent);
-    border-radius: 99px;
-    font-size: 0.7rem;
-    font-weight: 800;
-    margin-bottom: 1.5rem;
-    color: var(--text-base);
-    letter-spacing: 0.05em;
-  }
-  h1 {
-    font-size: clamp(2rem, 6vw, 3.5rem);
-    font-weight: 900;
-    margin: 0 0 1rem;
-    background: linear-gradient(to bottom, var(--text-base), var(--text-muted));
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-  }
-  .preview-header p {
-    color: var(--text-muted);
-    font-size: 1.1rem;
-    margin: 0;
-  }
-  .tool-list {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(320px, 1fr));
-    gap: 2rem;
-  }
-  .tool-card {
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
-  }
-  .tool-card-link {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    padding: 1.5rem;
-    background: var(--bg-surface);
-    border: 1px solid var(--border-color);
-    border-radius: 0.75rem;
-    text-decoration: none;
-    transition: all 0.2s ease;
-  }
-  .tool-card-link:hover {
-    border-color: var(--accent);
-    background: rgba(244, 63, 94, 0.05);
-    transform: translateY(-2px);
-  }
-  .tool-icons {
-    display: flex;
-    align-items: center;
-    gap: 1rem;
-    margin-bottom: 1.25rem;
-  }
-  .icon-wrapper {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 3rem;
-    height: 3rem;
-    border-radius: 0.5rem;
-    font-size: 1.5rem;
-  }
-  .icon-wrapper.bg {
-    background: var(--accent);
-    color: var(--text-base);
-  }
-  .icon-wrapper.fg {
-    background: var(--bg-page);
-    border: 1px solid var(--border-color);
-    color: var(--accent);
-  }
-  .tool-card-content {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-  }
-  .tool-title {
-    font-size: 1.25rem;
-    font-weight: 700;
-    margin: 0 0 0.5rem;
-    color: var(--text-base);
-  }
-  .tool-description {
-    font-size: 0.9375rem;
-    color: var(--text-muted);
-    line-height: 1.5;
-    margin: 0;
-  }
-  .tool-card-meta {
-    padding-top: 1rem;
-    border-top: 1px solid var(--border-color);
-    margin-top: 1.5rem;
-  }
-  .tool-id {
-    display: inline-block;
-    font-size: 0.7rem;
-    background: var(--bg-page);
-    border: 1px solid var(--border-color);
-    padding: 0.35rem 0.75rem;
-    border-radius: 0.4rem;
-    color: var(--accent);
-    font-weight: 600;
-  }
-  .tool-locales {
-    display: flex;
-    gap: 0.5rem;
-    flex-wrap: wrap;
-  }
-  .locale-badge {
-    display: inline-block;
-    padding: 0.4rem 0.85rem;
-    background: var(--bg-page);
-    border: 1px solid var(--border-color);
-    border-radius: 0.4rem;
-    color: var(--text-muted);
-    text-decoration: none;
-    font-size: 0.75rem;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 0.05em;
-    transition: all 0.15s ease;
-  }
-  .locale-badge:hover,
-  .locale-badge.active {
-    color: var(--accent);
-    border-color: var(--accent);
-    background: rgba(244, 63, 94, 0.1);
-  }
-</style>
-
-