@korioinc/next-core 2.0.16 → 2.0.18

package/dist/i18n/routing.d.ts

@@ -18,8 +18,12 @@ export declare function getPathname({ locale, href }: {
 }): string;
 export declare function getLanguageAlternates(pathname?: string): Record<string, string>;
 export declare function getCurrentPathname(): Promise<string>;
-/**
- * pathname과 params를 조합하여 전체 URL을 생성하는 함수
- */
-export declare function getFullUrl(pathname: string, params?: Record<string, string | string[] | undefined> | ReadonlyURLSearchParams | undefined): string;
+export declare function getCurrentSearchParams(): Promise<URLSearchParams>;
+export declare function getDefaultPathname(): Promise<string>;
+export declare function getCurrentLanguageAlternates(): Promise<Record<string, string>>;
+type FullUrlParams = Record<string, string | string[] | undefined> | URLSearchParams | ReadonlyURLSearchParams | undefined;
+export declare function getFullUrlByPathname(pathname: string, params?: FullUrlParams): string;
+export declare function getFullUrl(params?: FullUrlParams): Promise<string>;
+export declare function getFullUrlWithCurrentParams(): Promise<string>;
+export {};
 //# sourceMappingURL=routing.d.ts.map

package/dist/i18n/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/i18n/routing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA6B7D;;GAEG;AACH,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAErC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AA2DD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,yBA2EvD;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAShE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAkB9F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAoBvG;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,UAY7E;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,GAAE,MAAY,0BAmC3D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAK1D;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,uBAAuB,GAAG,SAAS,GAC3F,MAAM,CAkCR"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/i18n/routing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAsC7D;;GAEG;AACH,wBAAgB,UAAU,IAAI,MAAM,EAAE,CAErC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAyDD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,WAAW,yBAyEvD;AAED,wBAAgB,gBAAgB,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAShE;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAkB9F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAoBvG;AAED,wBAAgB,WAAW,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,UAY7E;AAsBD,wBAAgB,qBAAqB,CAAC,QAAQ,GAAE,MAAY,0BAwB3D;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAK1D;AAED,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC,CAMvE;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAU1D;AAED,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAIpF;AAED,KAAK,aAAa,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,GAC7C,eAAe,GACf,uBAAuB,GACvB,SAAS,CAAC;AAiDd,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,MAAM,CAErF;AAED,wBAAsB,UAAU,CAAC,MAAM,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAIxE;AAED,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC,CAKnE"}

package/dist/i18n/routing.js

@@ -18,6 +18,13 @@ const DEFAULT_FALLBACK = () => {
 };
 const LOCALE_COOKIE_NAME = 'NEXT_LOCALE';
 const LOCALE_PREFIX = 'as-needed';
+const PATHNAME_HEADER_NAME = 'x-pathname';
+const SEARCH_PARAMS_HEADER_NAME = 'x-search-params';
+const setRoutingHeaders = (response, pathname, search) => {
+    response.headers.set(PATHNAME_HEADER_NAME, pathname);
+    response.headers.set(SEARCH_PARAMS_HEADER_NAME, search.replace(/^\?/, ''));
+    return response;
+};
 /**
  * Get all available locales
  */
@@ -54,8 +61,7 @@ const redirectWithoutLocale = (request, pathname, locale, shouldSetCookie = fals
     const url = new URL(newPathname, request.url);
     url.search = request.nextUrl.search;
     url.hash = request.nextUrl.hash;
-    const response = NextResponse.redirect(url, 302);
-    response.headers.set('x-pathname', newPathname);
+    const response = setRoutingHeaders(NextResponse.redirect(url, 302), newPathname, request.nextUrl.search);
     if (shouldSetCookie) {
         setCookie(response, locale);
     }
@@ -68,8 +74,7 @@ const rewriteWithLocale = (request, pathname, locale) => {
     const internalUrl = new URL(`/${locale}${pathname}`, request.url);
     internalUrl.search = request.nextUrl.search;
     internalUrl.hash = request.nextUrl.hash;
-    const response = NextResponse.rewrite(internalUrl);
-    response.headers.set('x-pathname', pathname);
+    const response = setRoutingHeaders(NextResponse.rewrite(internalUrl), pathname, request.nextUrl.search);
     return response;
 };
 export function handleLocaleRouting(request) {
@@ -89,8 +94,7 @@ export function handleLocaleRouting(request) {
     // 2. URL에 locale이 포함된 경우
     if (pathnameHasLocale) {
         // 이미 path에 locale이 있을 때
-        const response = NextResponse.next();
-        response.headers.set('x-pathname', pathname);
+        const response = setRoutingHeaders(NextResponse.next(), pathname, request.nextUrl.search);
         // 쿠키 값이 path locale과 다를 경우
         if (localeCookie?.value !== pathLocale) {
             // 기본 locale인 경우 URL에서 제거
@@ -125,8 +129,7 @@ export function handleLocaleRouting(request) {
     // 다른 locale은 URL에 표시
     const newPathname = getChangeLocalePath(pathname, defaultFallback, locale);
     request.nextUrl.pathname = newPathname;
-    const response = NextResponse.redirect(request.nextUrl);
-    response.headers.set('x-pathname', newPathname);
+    const response = setRoutingHeaders(NextResponse.redirect(request.nextUrl), newPathname, request.nextUrl.search);
     // 쿠키가 없는 경우 설정
     if (localeCookie?.value === undefined) {
         setCookie(response, locale);
@@ -189,18 +192,24 @@ export function getPathname({ locale, href }) {
     }
     return href.startsWith('/') ? `/${locale}${href}` : `/${locale}/${href}`;
 }
-export function getLanguageAlternates(pathname = '/') {
-    const defaultFallback = DEFAULT_FALLBACK();
-    // Remove any existing locale from the pathname to get the base path
-    let basePath = pathname;
+const getBasePathWithoutLocale = (pathname = '/') => {
+    let basePath = pathname || '/';
     locales.forEach((locale) => {
         const localePattern = new RegExp(`^/${locale}(/|$)`);
         if (localePattern.test(basePath)) {
             basePath = basePath.replace(localePattern, '/');
         }
     });
-    // Normalize path
+    // Normalize path and ensure root fallback
     basePath = basePath.replace(/\/+/g, '/');
+    if (!basePath.startsWith('/')) {
+        basePath = `/${basePath}`;
+    }
+    return basePath || '/';
+};
+export function getLanguageAlternates(pathname = '/') {
+    const defaultFallback = DEFAULT_FALLBACK();
+    const basePath = getBasePathWithoutLocale(pathname);
     const alternates = {};
     // Set x-default based on LOCALE_PREFIX and defaultFallback
     if (LOCALE_PREFIX === 'as-needed') {
@@ -224,40 +233,73 @@ export function getLanguageAlternates(pathname = '/') {
 export async function getCurrentPathname() {
     const { headers } = await import('next/headers');
     const headersList = await headers();
-    return headersList.get('x-pathname') || '';
+    return headersList.get(PATHNAME_HEADER_NAME) || '';
 }
-/**
- * pathname과 params를 조합하여 전체 URL을 생성하는 함수
- */
-export function getFullUrl(pathname, params) {
-    const baseUrl = process.env.NEXT_PUBLIC_APP_URL || '';
-    if (!params) {
-        return `${baseUrl}${pathname}`;
+export async function getCurrentSearchParams() {
+    const { headers } = await import('next/headers');
+    const headersList = await headers();
+    const rawSearchParams = headersList.get(SEARCH_PARAMS_HEADER_NAME) || '';
+    return new URLSearchParams(rawSearchParams);
+}
+export async function getDefaultPathname() {
+    const pathname = await getCurrentPathname();
+    const basePath = getBasePathWithoutLocale(pathname);
+    const defaultFallback = DEFAULT_FALLBACK();
+    if (LOCALE_PREFIX === 'as-needed') {
+        return basePath;
     }
+    return `/${defaultFallback}${basePath === '/' ? '' : basePath}`;
+}
+export async function getCurrentLanguageAlternates() {
+    const pathname = await getCurrentPathname();
+    return getLanguageAlternates(pathname);
+}
+const isSearchParamsLike = (params) => {
+    return typeof params.get === 'function' && typeof params.forEach === 'function';
+};
+const toSearchParams = (params) => {
     const searchParams = new URLSearchParams();
-    // ReadonlyURLSearchParams인 경우
-    if (params instanceof URLSearchParams) {
+    if (!params) {
+        return searchParams;
+    }
+    if (isSearchParamsLike(params)) {
         params.forEach((value, key) => {
-            // locale 파라미터는 제외
             if (key !== 'locale') {
                 searchParams.append(key, value);
             }
         });
+        return searchParams;
     }
-    else {
-        // Record<string, string | string[] | undefined>인 경우
-        Object.entries(params).forEach(([key, value]) => {
-            // undefined 값은 건너뛰기
-            if (value === undefined)
-                return;
-            if (Array.isArray(value)) {
-                value.forEach((v) => searchParams.append(key, v));
-            }
-            else {
-                searchParams.append(key, value);
-            }
-        });
-    }
+    Object.entries(params).forEach(([key, value]) => {
+        if (value === undefined)
+            return;
+        if (Array.isArray(value)) {
+            value.forEach((v) => searchParams.append(key, v));
+        }
+        else {
+            searchParams.append(key, value);
+        }
+    });
+    return searchParams;
+};
+/**
+ * pathname과 params를 조합하여 전체 URL을 생성하는 함수
+ */
+const buildFullUrl = (pathname, params) => {
+    const baseUrl = process.env.NEXT_PUBLIC_APP_URL || '';
+    const searchParams = toSearchParams(params);
     const queryString = searchParams.toString();
     return `${baseUrl}${pathname}${queryString ? `?${queryString}` : ''}`;
+};
+export function getFullUrlByPathname(pathname, params) {
+    return buildFullUrl(pathname, params);
+}
+export async function getFullUrl(params) {
+    const pathname = await getCurrentPathname();
+    return buildFullUrl(pathname, params);
+}
+export async function getFullUrlWithCurrentParams() {
+    const pathname = await getCurrentPathname();
+    const currentParams = await getCurrentSearchParams();
+    return buildFullUrl(pathname, currentParams);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@korioinc/next-core",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "type": "module",
   "exports": {
     "./ads": {
@@ -79,11 +79,11 @@
     "tsc-alias": "^1.8.16",
     "tw-animate-css": "^1.4.0",
     "typescript": "^5.9.3",
-    "@korioinc/next-configs": "2.0.16"
+    "@korioinc/next-configs": "2.0.18"
   },
   "dependencies": {
     "@floating-ui/react": "^0.27.17",
-    "@formatjs/intl-localematcher": "^0.7.5",
+    "@formatjs/intl-localematcher": "^0.8.1",
     "clsx": "^2.1.1",
     "cookies-next": "^6.1.1",
     "cosmiconfig": "^9.0.0",
@@ -94,7 +94,7 @@
     "schema-dts": "^1.1.5",
     "tailwind-merge": "^3.4.0",
     "valtio": "^2.3.0",
-    "@korioinc/next-conf": "2.0.16"
+    "@korioinc/next-conf": "2.0.18"
   },
   "publishConfig": {
     "access": "public",