@i18n-micro/astro 1.3.1 → 1.3.2

package/dist/client/core.d.ts

@@ -12,7 +12,7 @@ export interface I18nState {
  * Pure function to get a translation from state
  *
  * Note: This is a simplified version optimized for client-side islands.
- * It supports basic translation lookup, interpolation, and fallback to general translations.
+ * It supports basic translation lookup and interpolation.
  * Returns CleanTranslation which can be string, number, boolean, object, or null.
  * For advanced features like Linked Messages (@:path.to.key), use the server-side i18n instance.
  */

package/dist/client/index.js

@@ -1,4 +1,4 @@
-import { h as s, t as o } from "../core-D32Y48CN.js";
+import { h as s, t as o } from "../core-Bk6qZuDf.js";
 import { I18nProvider as a, useAstroI18n as n } from "./preact.js";
 import { I18nProvider as u, useAstroI18n as A } from "./react.js";
 import { createI18nStore as f, useAstroI18n as i } from "./svelte.js";

package/dist/client/preact.js

@@ -1,7 +1,7 @@
 import { FormatService as g, defaultPlural as w } from "@i18n-micro/core";
 import { createContext as x, createElement as L } from "preact";
 import { useState as P, useContext as S, useMemo as a } from "preact/hooks";
-import { t as C, h as A } from "../core-D32Y48CN.js";
+import { t as C, h as A } from "../core-Bk6qZuDf.js";
 const s = new g(), i = x(null), F = ({ children: t, value: o }) => {
   const [l] = P(() => ({
     locale: o.locale,

package/dist/client/react.js

@@ -1,6 +1,6 @@
 import { FormatService as g, defaultPlural as w } from "@i18n-micro/core";
 import x, { createContext as L, useState as P, useContext as S, useMemo as a } from "react";
-import { t as C, h as A } from "../core-D32Y48CN.js";
+import { t as C, h as A } from "../core-Bk6qZuDf.js";
 const s = new g(), i = L(null);
 function D({ children: t, value: o }) {
   const [l] = P(() => ({

package/dist/client/svelte.js

@@ -1,6 +1,6 @@
 import { FormatService as R, defaultPlural as b } from "@i18n-micro/core";
 import { writable as d, get as v } from "svelte/store";
-import { h as L, t as S } from "../core-D32Y48CN.js";
+import { h as L, t as S } from "../core-Bk6qZuDf.js";
 const l = new R();
 function F(o) {
   return d({

package/dist/client/vue.js

@@ -1,5 +1,5 @@
 import { FormatService as wt, defaultPlural as yt } from "@i18n-micro/core";
-import { h as St, t as Ot } from "../core-D32Y48CN.js";
+import { h as St, t as Ot } from "../core-Bk6qZuDf.js";
 // @__NO_SIDE_EFFECTS__
 function Rt(e) {
   const t = /* @__PURE__ */ Object.create(null);

package/dist/core-B-Ia_nzr.cjs

@@ -0,0 +1 @@
+"use strict";const s=require("@i18n-micro/core");function l(r,t){if(r===null||typeof t!="string")return null;let n=r;if(r[t])n=r[t];else{const o=t.toString().split(".");for(const u of o)if(n&&typeof n=="object"&&n!==null&&u in n)n=n[u];else return null}return n??null}function f(r,t,n,o,u){if(!t)return o||t||"";const i=u||r.currentRoute;let e=null;return r.translations[i]&&(e=l(r.translations[i],t)),e||(e=o===void 0?t:o||t),typeof e=="string"&&n?s.interpolate(e,n):e}function c(r,t,n){const o=n||r.currentRoute,u=r.translations[o];if(u){const i=l(u,t);if(i!==null&&typeof i!="object")return!0}return!1}exports.hasTranslation=c;exports.translate=f;

package/dist/core-Bk6qZuDf.js

@@ -0,0 +1,37 @@
+import { interpolate as f } from "@i18n-micro/core";
+function e(r, t) {
+  if (r === null || typeof t != "string")
+    return null;
+  let n = r;
+  if (r[t])
+    n = r[t];
+  else {
+    const o = t.toString().split(".");
+    for (const u of o)
+      if (n && typeof n == "object" && n !== null && u in n)
+        n = n[u];
+      else
+        return null;
+  }
+  return n ?? null;
+}
+function c(r, t, n, o, u) {
+  if (!t)
+    return o || t || "";
+  const l = u || r.currentRoute;
+  let i = null;
+  return r.translations[l] && (i = e(r.translations[l], t)), i || (i = o === void 0 ? t : o || t), typeof i == "string" && n ? f(i, n) : i;
+}
+function a(r, t, n) {
+  const o = n || r.currentRoute, u = r.translations[o];
+  if (u) {
+    const l = e(u, t);
+    if (l !== null && typeof l != "object")
+      return !0;
+  }
+  return !1;
+}
+export {
+  a as h,
+  c as t
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i18n-micro/astro",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -52,8 +52,8 @@
   },
   "dependencies": {
     "@i18n-micro/core": "1.2.0",
-    "@i18n-micro/node": "1.2.0",
-    "@i18n-micro/types": "1.1.6"
+    "@i18n-micro/types": "1.1.6",
+    "@i18n-micro/node": "1.2.0"
   },
   "peerDependencies": {
     "astro": "^5.16.5",

package/src/client/core.ts

@@ -44,7 +44,7 @@ function findTranslation<T = unknown>(translations: Translations | null, key: st
  * Pure function to get a translation from state
  *
  * Note: This is a simplified version optimized for client-side islands.
- * It supports basic translation lookup, interpolation, and fallback to general translations.
+ * It supports basic translation lookup and interpolation.
  * Returns CleanTranslation which can be string, number, boolean, object, or null.
  * For advanced features like Linked Messages (@:path.to.key), use the server-side i18n instance.
  */
@@ -62,28 +62,18 @@ export function translate(
   const route = routeName || state.currentRoute
   let value: string | number | boolean | Translations | null = null
 
-  // 1. Look in route-specific translations
   if (state.translations[route]) {
     value = findTranslation<string | number | boolean | Translations>(state.translations[route], key)
   }
 
-  // 2. Fallback to general translations
-  if (!value && state.translations.general) {
-    value = findTranslation<string | number | boolean | Translations>(state.translations.general, key)
-  }
-
-  // 3. If not found, use defaultValue or key
+  // If not found, use defaultValue or key
   if (!value) {
     value = defaultValue === undefined ? key : defaultValue || key
   }
 
-  // 4. Parameter interpolation (strings only)
   if (typeof value === 'string' && params) {
     return interpolate(value, params)
   }
-
-  // 5. Return value as-is (can be string, number, boolean, object, or null)
-  // This matches the CleanTranslation type
   return value
 }
 
@@ -93,9 +83,7 @@ export function translate(
 export function hasTranslation(state: I18nState, key: string, routeName?: string): boolean {
   const route = routeName || state.currentRoute
   const routeTranslations = state.translations[route]
-  const generalTranslations = state.translations.general
 
-  // Check in route-specific translations
   if (routeTranslations) {
     const value = findTranslation(routeTranslations, key)
     if (value !== null && typeof value !== 'object') {
@@ -103,13 +91,5 @@ export function hasTranslation(state: I18nState, key: string, routeName?: string
     }
   }
 
-  // Check in general translations
-  if (generalTranslations) {
-    const value = findTranslation(generalTranslations, key)
-    if (value !== null && typeof value !== 'object') {
-      return true
-    }
-  }
-
   return false
 }

package/src/load-translations.ts

@@ -65,7 +65,6 @@ export function loadTranslationsFromDir(options: LoadTranslationsOptions): Loade
         if (entry === 'pages' && !disablePageLocales) {
           loadFiles(fullPath, '')
         } else if (routePrefix || disablePageLocales) {
-          // Continue in general translations
           loadFiles(fullPath, routePrefix)
         } else {
           // This is a route directory (e.g., pages/home/)

package/dist/core-Bx9n-eFD.cjs

@@ -1 +0,0 @@
-"use strict";const s=require("@i18n-micro/core");function u(n,t){if(n===null||typeof t!="string")return null;let o=n;if(n[t])o=n[t];else{const l=t.toString().split(".");for(const e of l)if(o&&typeof o=="object"&&o!==null&&e in o)o=o[e];else return null}return o??null}function a(n,t,o,l,e){if(!t)return l||t||"";const i=e||n.currentRoute;let r=null;return n.translations[i]&&(r=u(n.translations[i],t)),!r&&n.translations.general&&(r=u(n.translations.general,t)),r||(r=l===void 0?t:l||t),typeof r=="string"&&o?s.interpolate(r,o):r}function f(n,t,o){const l=o||n.currentRoute,e=n.translations[l],i=n.translations.general;if(e){const r=u(e,t);if(r!==null&&typeof r!="object")return!0}if(i){const r=u(i,t);if(r!==null&&typeof r!="object")return!0}return!1}exports.hasTranslation=f;exports.translate=a;

package/dist/core-D32Y48CN.js

@@ -1,42 +0,0 @@
-import { interpolate as s } from "@i18n-micro/core";
-function u(n, t) {
-  if (n === null || typeof t != "string")
-    return null;
-  let o = n;
-  if (n[t])
-    o = n[t];
-  else {
-    const l = t.toString().split(".");
-    for (const i of l)
-      if (o && typeof o == "object" && o !== null && i in o)
-        o = o[i];
-      else
-        return null;
-  }
-  return o ?? null;
-}
-function a(n, t, o, l, i) {
-  if (!t)
-    return l || t || "";
-  const e = i || n.currentRoute;
-  let r = null;
-  return n.translations[e] && (r = u(n.translations[e], t)), !r && n.translations.general && (r = u(n.translations.general, t)), r || (r = l === void 0 ? t : l || t), typeof r == "string" && o ? s(r, o) : r;
-}
-function c(n, t, o) {
-  const l = o || n.currentRoute, i = n.translations[l], e = n.translations.general;
-  if (i) {
-    const r = u(i, t);
-    if (r !== null && typeof r != "object")
-      return !0;
-  }
-  if (e) {
-    const r = u(e, t);
-    if (r !== null && typeof r != "object")
-      return !0;
-  }
-  return !1;
-}
-export {
-  c as h,
-  a as t
-};