@jjlmoya/utils-diy 1.4.0 → 1.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jjlmoya/utils-diy",
-    "version": "1.4.0",
+    "version": "1.7.0",
     "type": "module",
     "main": "./src/index.ts",
     "types": "./src/index.ts",

package/src/index.ts

@@ -1,5 +1,5 @@
 export { diyCategory } from './category';
-export { default as diyCategorySEO } from './category/seo.astro';
+export const diyCategorySEO = () => import('./category/seo.astro').then((m) => m.default);
 
 export type {
   KnownLocale,
@@ -15,7 +15,7 @@ export type {
   ToolDefinition,
 } from './types';
 
-export { ALL_TOOLS } from './tools';
+export { ALL_ENTRIES, ALL_TOOLS } from './tools';
 
 export { ClayCalculatorComponent, ClayCalculatorSEO, ClayCalculatorBibliography } from './tool/clayCalculator';
 export { CLAY_CALCULATOR_TOOL } from './tool/clayCalculator/index';

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

@@ -14,7 +14,8 @@ import type { UtilitySEOContent } from "@jjlmoya/utils-shared";
 export async function getStaticPaths() {
   const paths = [];
 
-  for (const { entry, Component } of ALL_TOOLS) {
+  for (const { entry, Component: lazyComp } of ALL_TOOLS) {
+    const { default: Component } = await lazyComp();
     const localeEntries = Object.entries(entry.i18n) as [
       KnownLocale,
       () => Promise<ToolLocaleContent>,
@@ -52,8 +53,6 @@ export async function getStaticPaths() {
   return paths;
 }
 
-type ToolComponent = (props: { ui: Record<string, string> }) => unknown;
-
 interface NavItem {
   id: string;
   title: string;
@@ -62,7 +61,7 @@ interface NavItem {
 }
 
 interface Props {
-  Component: ToolComponent;
+  Component: unknown;
   locale: KnownLocale;
   content: ToolLocaleContent;
   localeUrls: Partial<Record<KnownLocale, string>>;

package/src/tests/category_validation.test.ts

@@ -0,0 +1,18 @@
+import { describe, it, expect } from 'vitest';
+import { diyCategory as toolsCategory } from '../category/index';
+
+const EXPECTED_LOCALES = [
+  'de', 'en', 'es', 'fr', 'id', 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'ru', 'sv', 'tr', 'zh'
+];
+
+describe('Category Validation', () => {
+  it('should have all 15 required locales', () => {
+    const registeredLocales = Object.keys(toolsCategory.i18n);
+    EXPECTED_LOCALES.forEach((locale) => {
+      expect(
+        registeredLocales,
+        `Category is missing locale "${locale}"`,
+      ).toContain(locale);
+    });
+  });
+});

package/src/tests/slug_language_code_format.test.ts

@@ -0,0 +1,23 @@
+import { describe, it, expect } from 'vitest';
+import { ALL_TOOLS } from '../tools';
+import type { ToolLocaleContent } from '../types';
+
+describe('Slug Language Code Format Validation', () => {
+  ALL_TOOLS.forEach((tool) => {
+    describe(`Tool: ${tool.entry.id}`, () => {
+      it('slug should not end with 2-letter language codes like -ja, -ru, -ko', async () => {
+        const locales = Object.keys(tool.entry.i18n);
+
+        for (const locale of locales) {
+          const loader = tool.entry.i18n[locale as keyof typeof tool.entry.i18n];
+          const content = (await loader?.()) as ToolLocaleContent;
+
+          expect(
+            content.slug,
+            `Tool "${tool.entry.id}" locale "${locale}" slug ("${content.slug}") cannot end with a 2-letter language code (e.g., -ja, -ru, -ko).`,
+          ).not.toMatch(/-[a-z]{2}$/);
+        }
+      });
+    });
+  });
+});

package/src/tests/slug_uniqueness.test.ts

@@ -2,6 +2,54 @@ import { describe, it, expect } from 'vitest';
 import { ALL_TOOLS } from '../tools';
 import type { ToolLocaleContent } from '../types';
 
+const sharingLocales = ['ja', 'ko', 'zh'];
+
+interface ValidateParams {
+  toolId: string;
+  locale: string;
+  content: ToolLocaleContent;
+  enSlug: string;
+  slugs: Map<string, string>;
+}
+
+const validateLocaleSlug = ({
+  toolId,
+  locale,
+  content,
+  enSlug,
+  slugs,
+}: ValidateParams) => {
+  expect(
+    content.slug,
+    `Tool "${toolId}" locale "${locale}" has an invalid slug ("${content.slug}"). Slugs must be transliterated (only a-z, 0-9, and -).`,
+  ).toMatch(/^[a-z0-9-]+$/);
+
+  if (locale === 'en') {
+    return;
+  }
+
+  if (sharingLocales.includes(locale)) {
+    expect(
+      content.slug,
+      `Tool "${toolId}" locale "${locale}" must use the same slug as "en" ("${enSlug}").`,
+    ).toBe(enSlug);
+  } else {
+    expect(
+      content.slug,
+      `Tool "${toolId}" locale "${locale}" has the same slug as "en" ("${enSlug}"). Cada slug tiene que estar en su propia idioma`,
+    ).not.toBe(enSlug);
+
+    if (slugs.has(content.slug)) {
+      const previousLocale = slugs.get(content.slug);
+      expect(
+        false,
+        `Tool "${toolId}" locales "${locale}" and "${previousLocale}" share the same slug ("${content.slug}"). Cada slug tiene que estar en su propia idioma`,
+      ).toBe(true);
+    }
+    slugs.set(content.slug, locale);
+  }
+};
+
 describe('Slug Localization and Uniqueness Validation', () => {
   ALL_TOOLS.forEach((tool) => {
     describe(`Tool: ${tool.entry.id}`, () => {
@@ -16,43 +64,18 @@ describe('Slug Localization and Uniqueness Validation', () => {
           enSlug = enContent.slug;
         }
 
-        const sharingLocales = ['ja', 'ko', 'zh'];
-
         for (const locale of locales) {
           const loader = tool.entry.i18n[locale as keyof typeof tool.entry.i18n];
           const content = (await loader?.()) as ToolLocaleContent;
-
-          expect(
-            content.slug,
-            `Tool "${tool.entry.id}" locale "${locale}" has an invalid slug ("${content.slug}"). Slugs must be transliterated (only a-z, 0-9, and -).`,
-          ).toMatch(/^[a-z0-9-]+$/);
-
-          if (locale === 'en') {
-            continue;
-          }
-
-          if (sharingLocales.includes(locale)) {
-            expect(
-              content.slug,
-              `Tool "${tool.entry.id}" locale "${locale}" must use the same slug as "en" ("${enSlug}").`,
-            ).toBe(enSlug);
-          } else {
-            expect(
-              content.slug,
-              `Tool "${tool.entry.id}" locale "${locale}" has the same slug as "en" ("${enSlug}"). Cada slug tiene que estar en su propia idioma`,
-            ).not.toBe(enSlug);
-
-            const previousLocale = slugs.get(content.slug);
-            if (previousLocale) {
-              expect(
-                false,
-                `Tool "${tool.entry.id}" locales "${locale}" and "${previousLocale}" share the same slug ("${content.slug}"). Cada slug tiene que estar en su propia idioma`,
-              ).toBe(true);
-            }
-            slugs.set(content.slug, locale);
-          }
+          validateLocaleSlug({
+            toolId: tool.entry.id,
+            locale,
+            content,
+            enSlug,
+            slugs,
+          });
         }
       });
     });
   });
-});
+});

package/src/tool/balusterCalculator/index.ts

@@ -1,7 +1,4 @@
 import type { DiyToolEntry, ToolLocaleContent, ToolDefinition } from '../../types';
-import BalusterCalculatorComponent from './component.astro';
-import BalusterCalculatorSEO from './seo.astro';
-import BalusterCalculatorBibliography from './bibliography.astro';
 import type { BalusterCalculatorUI } from './ui';
 
 export type BalusterCalculatorLocaleContent = ToolLocaleContent<BalusterCalculatorUI>;
@@ -31,11 +28,10 @@ export const balusterCalculator: DiyToolEntry<BalusterCalculatorUI> = {
   },
 };
 
-export { BalusterCalculatorComponent, BalusterCalculatorSEO, BalusterCalculatorBibliography };
 
 export const BALUSTER_CALCULATOR_TOOL: ToolDefinition = {
   entry: balusterCalculator,
-  Component: BalusterCalculatorComponent,
-  SEOComponent: BalusterCalculatorSEO,
-  BibliographyComponent: BalusterCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/clayCalculator/index.ts

@@ -1,7 +1,4 @@
 import type { DiyToolEntry, ToolLocaleContent, ToolDefinition } from '../../types';
-import ClayCalculatorComponent from './component.astro';
-import ClayCalculatorSEO from './seo.astro';
-import ClayCalculatorBibliography from './bibliography.astro';
 import type { ClayCalculatorUI } from './ui';
 
 export type ClayCalculatorLocaleContent = ToolLocaleContent<ClayCalculatorUI>;
@@ -31,11 +28,10 @@ export const clayCalculator: DiyToolEntry<ClayCalculatorUI> = {
   },
 };
 
-export { ClayCalculatorComponent, ClayCalculatorSEO, ClayCalculatorBibliography };
 
 export const CLAY_CALCULATOR_TOOL: ToolDefinition = {
   entry: clayCalculator,
-  Component: ClayCalculatorComponent,
-  SEOComponent: ClayCalculatorSEO,
-  BibliographyComponent: ClayCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/concreteCalculator/index.ts

@@ -1,14 +1,6 @@
-import ConcreteCalculatorComponent from './component.astro';
-import ConcreteCalculatorSEO from './seo.astro';
-import ConcreteCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { ConcreteCalculatorUI } from './ui';
 
-export {
-  ConcreteCalculatorComponent,
-  ConcreteCalculatorSEO,
-  ConcreteCalculatorBibliography,
-};
 
 export const concreteCalculator: DiyToolEntry<ConcreteCalculatorUI> = {
   id: 'concrete-calculator',
@@ -34,7 +26,7 @@ export const concreteCalculator: DiyToolEntry<ConcreteCalculatorUI> = {
 
 export const CONCRETE_CALCULATOR_TOOL: ToolDefinition = {
   entry: concreteCalculator,
-  Component: ConcreteCalculatorComponent,
-  SEOComponent: ConcreteCalculatorSEO,
-  BibliographyComponent: ConcreteCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/cutOptimizer/index.ts

@@ -1,14 +1,6 @@
-import CutOptimizerComponent from './component.astro';
-import CutOptimizerSEO from './seo.astro';
-import CutOptimizerBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { CutOptimizerUI } from './ui';
 
-export {
-  CutOptimizerComponent,
-  CutOptimizerSEO,
-  CutOptimizerBibliography,
-};
 
 export const cutOptimizer: DiyToolEntry<CutOptimizerUI> = {
   id: 'cut-optimizer',
@@ -34,7 +26,7 @@ export const cutOptimizer: DiyToolEntry<CutOptimizerUI> = {
 
 export const CUT_OPTIMIZER_TOOL: ToolDefinition = {
   entry: cutOptimizer,
-  Component: CutOptimizerComponent,
-  SEOComponent: CutOptimizerSEO,
-  BibliographyComponent: CutOptimizerBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/drillCalculator/index.ts

@@ -1,14 +1,6 @@
-import DrillCalculatorComponent from './component.astro';
-import DrillCalculatorSEO from './seo.astro';
-import DrillCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { DrillCalculatorUI } from './ui';
 
-export {
-  DrillCalculatorComponent,
-  DrillCalculatorSEO,
-  DrillCalculatorBibliography,
-};
 
 export const drillCalculator: DiyToolEntry<DrillCalculatorUI> = {
   id: 'drill-rpm-calculator',
@@ -34,7 +26,7 @@ export const drillCalculator: DiyToolEntry<DrillCalculatorUI> = {
 
 export const DRILL_CALCULATOR_TOOL: ToolDefinition = {
   entry: drillCalculator,
-  Component: DrillCalculatorComponent,
-  SEOComponent: DrillCalculatorSEO,
-  BibliographyComponent: DrillCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/drillSharpener/index.ts

@@ -1,15 +1,7 @@
-import DrillSharpenerComponent from './component.astro';
-import DrillSharpenerSEO from './seo.astro';
-import DrillSharpenerBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { DrillSharpenerUI } from './ui';
 import { drillSharpenerUI } from './ui';
 
-export {
-  DrillSharpenerComponent,
-  DrillSharpenerSEO,
-  DrillSharpenerBibliography,
-};
 
 export const drillSharpener: DiyToolEntry<DrillSharpenerUI> = {
   id: 'drill-sharpener',
@@ -35,9 +27,9 @@ export const drillSharpener: DiyToolEntry<DrillSharpenerUI> = {
 
 export const DRILL_SHARPENER_TOOL: ToolDefinition = {
   entry: drillSharpener,
-  Component: DrillSharpenerComponent,
-  SEOComponent: DrillSharpenerSEO,
-  BibliographyComponent: DrillSharpenerBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };
 
 export { drillSharpenerUI };

package/src/tool/epoxyCalculator/index.ts

@@ -1,7 +1,4 @@
 import type { DiyToolEntry, ToolLocaleContent, ToolDefinition } from '../../types';
-import EpoxyCalculatorComponent from './component.astro';
-import EpoxyCalculatorSEO from './seo.astro';
-import EpoxyCalculatorBibliography from './bibliography.astro';
 import type { EpoxyCalculatorUI } from './ui';
 
 export type EpoxyCalculatorLocaleContent = ToolLocaleContent<EpoxyCalculatorUI>;
@@ -31,11 +28,10 @@ export const epoxyCalculator: DiyToolEntry<EpoxyCalculatorUI> = {
   },
 };
 
-export { EpoxyCalculatorComponent, EpoxyCalculatorSEO, EpoxyCalculatorBibliography };
 
 export const EPOXY_CALCULATOR_TOOL: ToolDefinition = {
   entry: epoxyCalculator,
-  Component: EpoxyCalculatorComponent,
-  SEOComponent: EpoxyCalculatorSEO,
-  BibliographyComponent: EpoxyCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/furnitureFit/index.ts

@@ -1,14 +1,6 @@
-import FurnitureFitComponent from './component.astro';
-import FurnitureFitSEO from './seo.astro';
-import FurnitureFitBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { FurnitureFitUI } from './ui';
 
-export {
-  FurnitureFitComponent,
-  FurnitureFitSEO,
-  FurnitureFitBibliography,
-};
 
 export const furnitureFit: DiyToolEntry<FurnitureFitUI> = {
   id: 'furniture-fit-calculator',
@@ -34,7 +26,7 @@ export const furnitureFit: DiyToolEntry<FurnitureFitUI> = {
 
 export const FURNITURE_FIT_TOOL: ToolDefinition = {
   entry: furnitureFit,
-  Component: FurnitureFitComponent,
-  SEOComponent: FurnitureFitSEO,
-  BibliographyComponent: FurnitureFitBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/mortarCalculator/index.ts

@@ -1,10 +1,6 @@
-import MortarCalculatorComponent from './component.astro';
-import MortarCalculatorSEO from './seo.astro';
-import MortarCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { MortarCalculatorUI } from './ui';
 
-export { MortarCalculatorComponent, MortarCalculatorSEO, MortarCalculatorBibliography };
 
 export const mortarCalculator: DiyToolEntry<MortarCalculatorUI> = {
   id: 'mortar-calculator',
@@ -30,7 +26,7 @@ export const mortarCalculator: DiyToolEntry<MortarCalculatorUI> = {
 
 export const MORTAR_CALCULATOR_TOOL: ToolDefinition = {
   entry: mortarCalculator,
-  Component: MortarCalculatorComponent,
-  SEOComponent: MortarCalculatorSEO,
-  BibliographyComponent: MortarCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/passepartoutCalculator/index.ts

@@ -1,14 +1,6 @@
-import PassepartoutCalculatorComponent from './component.astro';
-import PassepartoutCalculatorSEO from './seo.astro';
-import PassepartoutCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { PassepartoutCalculatorUI } from './ui';
 
-export {
-  PassepartoutCalculatorComponent,
-  PassepartoutCalculatorSEO,
-  PassepartoutCalculatorBibliography,
-};
 
 export const passepartoutCalculator: DiyToolEntry<PassepartoutCalculatorUI> = {
   id: 'passepartout-calculator',
@@ -34,7 +26,7 @@ export const passepartoutCalculator: DiyToolEntry<PassepartoutCalculatorUI> = {
 
 export const PASSEPARTOUT_CALCULATOR_TOOL: ToolDefinition = {
   entry: passepartoutCalculator,
-  Component: PassepartoutCalculatorComponent,
-  SEOComponent: PassepartoutCalculatorSEO,
-  BibliographyComponent: PassepartoutCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/stairCalculator/index.ts

@@ -1,15 +1,7 @@
-import StairCalculatorComponent from './component.astro';
-import StairCalculatorSEO from './seo.astro';
-import StairCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { StairCalculatorUI } from './ui';
 import { stairCalculatorUI } from './ui';
 
-export {
-  StairCalculatorComponent,
-  StairCalculatorSEO,
-  StairCalculatorBibliography,
-};
 
 export const stairCalculator: DiyToolEntry<StairCalculatorUI> = {
   id: 'stair-calculator',
@@ -35,9 +27,9 @@ export const stairCalculator: DiyToolEntry<StairCalculatorUI> = {
 
 export const STAIR_CALCULATOR_TOOL: ToolDefinition = {
   entry: stairCalculator,
-  Component: StairCalculatorComponent,
-  SEOComponent: StairCalculatorSEO,
-  BibliographyComponent: StairCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };
 
 export { stairCalculatorUI };

package/src/tool/thermalExpansionCalculator/index.ts

@@ -1,14 +1,6 @@
-import ThermalExpansionCalculatorComponent from './component.astro';
-import ThermalExpansionCalculatorSEO from './seo.astro';
-import ThermalExpansionCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { ThermalExpansionCalculatorUI } from './ui';
 
-export {
-  ThermalExpansionCalculatorComponent,
-  ThermalExpansionCalculatorSEO,
-  ThermalExpansionCalculatorBibliography,
-};
 
 export const thermalExpansionCalculator: DiyToolEntry<ThermalExpansionCalculatorUI> = {
   id: 'thermal-expansion-calculator',
@@ -34,7 +26,7 @@ export const thermalExpansionCalculator: DiyToolEntry<ThermalExpansionCalculator
 
 export const THERMAL_EXPANSION_CALCULATOR_TOOL: ToolDefinition = {
   entry: thermalExpansionCalculator,
-  Component: ThermalExpansionCalculatorComponent,
-  SEOComponent: ThermalExpansionCalculatorSEO,
-  BibliographyComponent: ThermalExpansionCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tool/voltageDropCalculator/index.ts

@@ -1,14 +1,6 @@
-import VoltageDropCalculatorComponent from './component.astro';
-import VoltageDropCalculatorSEO from './seo.astro';
-import VoltageDropCalculatorBibliography from './bibliography.astro';
 import type { DiyToolEntry, ToolDefinition } from '../../types';
 import type { VoltageDropCalculatorUI } from './ui';
 
-export {
-  VoltageDropCalculatorComponent,
-  VoltageDropCalculatorSEO,
-  VoltageDropCalculatorBibliography,
-};
 
 export const voltageDropCalculator: DiyToolEntry<VoltageDropCalculatorUI> = {
   id: 'voltage-drop-calculator',
@@ -34,7 +26,7 @@ export const voltageDropCalculator: DiyToolEntry<VoltageDropCalculatorUI> = {
 
 export const VOLTAGE_DROP_CALCULATOR_TOOL: ToolDefinition = {
   entry: voltageDropCalculator,
-  Component: VoltageDropCalculatorComponent,
-  SEOComponent: VoltageDropCalculatorSEO,
-  BibliographyComponent: VoltageDropCalculatorBibliography,
+  Component: () => import('./component.astro'),
+  SEOComponent: () => import('./seo.astro'),
+  BibliographyComponent: () => import('./bibliography.astro'),
 };

package/src/tools.ts

@@ -14,3 +14,5 @@ import { STAIR_CALCULATOR_TOOL } from './tool/stairCalculator/index';
 import { DRILL_SHARPENER_TOOL } from './tool/drillSharpener/index';
 
 export const ALL_TOOLS: ToolDefinition[] = [CLAY_CALCULATOR_TOOL, EPOXY_CALCULATOR_TOOL, BALUSTER_CALCULATOR_TOOL, MORTAR_CALCULATOR_TOOL, PASSEPARTOUT_CALCULATOR_TOOL, CONCRETE_CALCULATOR_TOOL, CUT_OPTIMIZER_TOOL, VOLTAGE_DROP_CALCULATOR_TOOL, FURNITURE_FIT_TOOL, THERMAL_EXPANSION_CALCULATOR_TOOL, DRILL_CALCULATOR_TOOL, STAIR_CALCULATOR_TOOL, DRILL_SHARPENER_TOOL];
+
+export const ALL_ENTRIES = ALL_TOOLS.map(t => t.entry);