najm-kit 2.11.20 → 2.11.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -3
- package/README.md +15 -9
- package/dist/server/index.d.ts +6 -0
- package/dist/server/index.mjs +43 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
|
-
# Changelog
|
|
2
|
-
|
|
3
|
-
## 2.11.
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
## 2.11.21 - 2026-09-09
|
|
4
|
+
|
|
5
|
+
- Added first-visit browser-language negotiation to `defineNajmPreferences`.
|
|
6
|
+
Applications can pass the raw `Accept-Language` header to `resolve`; explicit
|
|
7
|
+
cookies and account fallbacks retain priority, while quality weights and
|
|
8
|
+
regional language tags are matched against the configured catalog.
|
|
9
|
+
|
|
10
|
+
## 2.11.19 - 2026-09-06
|
|
4
11
|
|
|
5
12
|
- Made native calendar month and year dropdowns follow the resolved Najm light
|
|
6
13
|
or dark theme instead of opening with the browser's light color scheme.
|
package/README.md
CHANGED
|
@@ -1132,14 +1132,19 @@ field are the same `400`. Nothing from the request body reaches the response.
|
|
|
1132
1132
|
|
|
1133
1133
|
```tsx
|
|
1134
1134
|
// src/app/layout.tsx
|
|
1135
|
-
import { cookies } from "next/headers";
|
|
1135
|
+
import { cookies, headers } from "next/headers";
|
|
1136
1136
|
import { preferences } from "@/preferences";
|
|
1137
1137
|
|
|
1138
1138
|
export default async function RootLayout({ children }: { children: React.ReactNode }) {
|
|
1139
|
-
const [cookieStore, session] = await Promise.all([
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1139
|
+
const [cookieStore, requestHeaders, session] = await Promise.all([
|
|
1140
|
+
cookies(),
|
|
1141
|
+
headers(),
|
|
1142
|
+
getSession(),
|
|
1143
|
+
]);
|
|
1144
|
+
const { language, theme, timeZone } = preferences.resolve(cookieStore, {
|
|
1145
|
+
languageFallback: session?.user.language,
|
|
1146
|
+
acceptLanguage: requestHeaders.get("accept-language"),
|
|
1147
|
+
});
|
|
1143
1148
|
|
|
1144
1149
|
return (
|
|
1145
1150
|
<html
|
|
@@ -1155,10 +1160,11 @@ export default async function RootLayout({ children }: { children: React.ReactNo
|
|
|
1155
1160
|
}
|
|
1156
1161
|
```
|
|
1157
1162
|
|
|
1158
|
-
`resolve` takes anything with `get(name)` — Next's cookie store, or a plain
|
|
1159
|
-
object in a test.
|
|
1160
|
-
|
|
1161
|
-
|
|
1163
|
+
`resolve` takes anything with `get(name)` — Next's cookie store, or a plain
|
|
1164
|
+
object in a test. Language precedence is cookie, then `languageFallback`, then
|
|
1165
|
+
the `acceptLanguage` request header, then the catalog default. Browser
|
|
1166
|
+
negotiation honors quality weights and regional tags; invalid stored values
|
|
1167
|
+
fall through rather than pinning the UI.
|
|
1162
1168
|
|
|
1163
1169
|
### Types
|
|
1164
1170
|
|
package/dist/server/index.d.ts
CHANGED
|
@@ -77,6 +77,12 @@ interface NajmPreferenceResolveOptions {
|
|
|
77
77
|
* valid cookie: the cookie is what the user last chose in this browser.
|
|
78
78
|
*/
|
|
79
79
|
languageFallback?: unknown;
|
|
80
|
+
/**
|
|
81
|
+
* The raw `Accept-Language` request header. Used only after the language
|
|
82
|
+
* cookie and `languageFallback`; quality weights and regional language tags
|
|
83
|
+
* are matched against the application's supported languages.
|
|
84
|
+
*/
|
|
85
|
+
acceptLanguage?: string | null;
|
|
80
86
|
}
|
|
81
87
|
/** A route handler, ready to `export const POST = ...`. */
|
|
82
88
|
type NajmPreferenceHandler = (request: Request) => Promise<Response>;
|
package/dist/server/index.mjs
CHANGED
|
@@ -44,6 +44,44 @@ function rejection(message) {
|
|
|
44
44
|
function accepted(field, value, cookie) {
|
|
45
45
|
return Response.json({ [field]: value }, { headers: { "Set-Cookie": cookie } });
|
|
46
46
|
}
|
|
47
|
+
var LANGUAGE_RANGE_PATTERN = /^(?:\*|[a-z]{1,8}(?:-[a-z0-9]{1,8})*)$/i;
|
|
48
|
+
var LANGUAGE_QUALITY_PATTERN = /^q\s*=\s*(0(?:\.\d{0,3})?|1(?:\.0{0,3})?)$/i;
|
|
49
|
+
function parseAcceptLanguage(value) {
|
|
50
|
+
if (!value) return [];
|
|
51
|
+
return value.split(",").map((entry, order) => {
|
|
52
|
+
const [rawRange, ...parameters] = entry.split(";");
|
|
53
|
+
const range = rawRange?.trim().toLowerCase() ?? "";
|
|
54
|
+
if (!LANGUAGE_RANGE_PATTERN.test(range)) return null;
|
|
55
|
+
let quality = 1;
|
|
56
|
+
for (const rawParameter of parameters) {
|
|
57
|
+
const match = LANGUAGE_QUALITY_PATTERN.exec(rawParameter.trim());
|
|
58
|
+
if (!match) return null;
|
|
59
|
+
quality = Number(match[1]);
|
|
60
|
+
}
|
|
61
|
+
return { range, quality, order };
|
|
62
|
+
}).filter((entry) => entry !== null).sort((left, right) => right.quality - left.quality || left.order - right.order);
|
|
63
|
+
}
|
|
64
|
+
function lookupAcceptedLanguage(value, supportedLanguages, defaultLanguage) {
|
|
65
|
+
const supported = supportedLanguages.map((language) => ({
|
|
66
|
+
language,
|
|
67
|
+
normalized: language.toLowerCase()
|
|
68
|
+
}));
|
|
69
|
+
for (const preference of parseAcceptLanguage(value)) {
|
|
70
|
+
if (preference.quality === 0) continue;
|
|
71
|
+
if (preference.range === "*") return defaultLanguage;
|
|
72
|
+
let candidate = preference.range;
|
|
73
|
+
while (candidate) {
|
|
74
|
+
const match = supported.find(
|
|
75
|
+
(entry) => entry.normalized === candidate || entry.normalized.startsWith(`${candidate}-`)
|
|
76
|
+
);
|
|
77
|
+
if (match) return match.language;
|
|
78
|
+
const separator = candidate.lastIndexOf("-");
|
|
79
|
+
if (separator === -1) break;
|
|
80
|
+
candidate = candidate.slice(0, separator);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return void 0;
|
|
84
|
+
}
|
|
47
85
|
function defineNajmPreferences(config) {
|
|
48
86
|
const { i18n } = config;
|
|
49
87
|
const timeZones = Object.freeze([
|
|
@@ -81,7 +119,11 @@ function defineNajmPreferences(config) {
|
|
|
81
119
|
const isLanguage = (value) => typeof value === "string" && i18n.supportedLanguages.includes(value);
|
|
82
120
|
function resolve(cookies, options = {}) {
|
|
83
121
|
const languageCookie = cookies.get(cookieNames.language)?.value;
|
|
84
|
-
const language = isLanguage(languageCookie) ? languageCookie :
|
|
122
|
+
const language = isLanguage(languageCookie) ? languageCookie : isLanguage(options.languageFallback) ? options.languageFallback : lookupAcceptedLanguage(
|
|
123
|
+
options.acceptLanguage,
|
|
124
|
+
i18n.supportedLanguages,
|
|
125
|
+
i18n.defaultLanguage
|
|
126
|
+
) ?? i18n.defaultLanguage;
|
|
85
127
|
const themeCookie = cookies.get(cookieNames.theme)?.value;
|
|
86
128
|
const timeZoneCookie = cookies.get(cookieNames.timeZone)?.value;
|
|
87
129
|
return {
|