@nimpl/getters 1.3.1 → 1.3.2-canary.1

package/create-server-context.d.ts

@@ -1,3 +1,3 @@
-import type { ServerContext } from './types';
+import type { ServerContext } from "./types";
 declare function createServerContext<T>(defaultValue?: T): ServerContext<T>;
 export default createServerContext;

package/create-server-context.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const async_hooks_1 = require("async_hooks");
 const server_getter_in_client_component_error_1 = require("./server-getter-in-client-component-error");
 const react_1 = __importDefault(require("react"));
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const Enter = ({ storage, value }) => {
     storage.enterWith({ value });
     return react_1.default.createElement(react_1.default.Fragment, null);
 };
 function createServerContext(defaultValue) {
-    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)('createServerContext');
+    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("createServerContext");
     const storage = new async_hooks_1.AsyncLocalStorage();
     return {
         Provider: async ({ children, value }) => {

package/get-page-config.js

@@ -4,21 +4,21 @@ exports.getPageConfig = void 0;
 const static_generation_async_storage_external_1 = require("next/dist/client/components/static-generation-async-storage.external");
 const server_getter_in_client_component_error_1 = require("./server-getter-in-client-component-error");
 const getPageConfig = () => {
-    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)('getPageConfig');
+    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("getPageConfig");
     const store = static_generation_async_storage_external_1.staticGenerationAsyncStorage.getStore();
     if (!store)
         return {};
-    const basePath = process.env.__NEXT_ROUTER_BASEPATH || '';
+    const basePath = process.env.__NEXT_ROUTER_BASEPATH || "";
     const { pagePath, forceDynamic, forceStatic, dynamicShouldError, revalidate } = store || {};
-    let dynamic = 'auto';
+    let dynamic = "auto";
     if (forceDynamic) {
-        dynamic = 'force-dynamic';
+        dynamic = "force-dynamic";
     }
     else if (forceStatic) {
-        dynamic = 'force-static';
+        dynamic = "force-static";
     }
     else if (dynamicShouldError) {
-        dynamic = 'error';
+        dynamic = "error";
     }
     return { pagePath, dynamic, revalidate, basePath };
 };

package/get-params.js

@@ -5,26 +5,33 @@ const static_generation_async_storage_external_1 = require("next/dist/client/com
 const utils_1 = require("./utils");
 const server_getter_in_client_component_error_1 = require("./server-getter-in-client-component-error");
 const getParams = () => {
-    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)('getParams');
+    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("getParams");
     const store = static_generation_async_storage_external_1.staticGenerationAsyncStorage.getStore();
     if (!store)
         return {};
-    const { urlPathname, pagePath = '/' } = store;
+    const { urlPathname, pagePath = "/" } = store;
     const cleanUrlPathname = (0, utils_1.normalizePathname)(urlPathname);
     const cleanPagePath = (0, utils_1.normalizePagePath)(pagePath);
-    const pagePathParts = cleanPagePath.split('/').slice(1).filter(part => !part.match(/^(\([^)]+\)|\@.+)$/));
+    const pagePathParts = cleanPagePath
+        .split("/")
+        .slice(1)
+        .filter((part) => !part.match(/^(\([^)]+\)|\@.+)$/));
     const pagePathInterceptedParts = (0, utils_1.normalizeInterceptingRoutes)(pagePathParts);
-    const pathnameParts = cleanUrlPathname.split('/').slice(1);
-    const isRootPage = cleanUrlPathname === '' && cleanPagePath === '';
+    const pathnameParts = cleanUrlPathname.split("/").slice(1);
+    const isRootPage = cleanUrlPathname === "" && cleanPagePath === "";
     const isNotFoundPage = pagePath.match(/\/_not-found\/?$/);
     const isValidCatchALl = cleanPagePath.match(/\/\[\.\.\.[^\]]+\]/) && pathnameParts.length >= pagePathInterceptedParts.length;
     const isValidOptionalCatchALl = cleanPagePath.match(/\/\[\[\.\.\.[^\]]+\]\]/) && pathnameParts.length >= pagePathInterceptedParts.length - 1;
-    const isCorrectMatched = isRootPage || isNotFoundPage || pagePathInterceptedParts.length === pathnameParts.length || isValidCatchALl || isValidOptionalCatchALl;
+    const isCorrectMatched = isRootPage ||
+        isNotFoundPage ||
+        pagePathInterceptedParts.length === pathnameParts.length ||
+        isValidCatchALl ||
+        isValidOptionalCatchALl;
     if (!isCorrectMatched) {
-        const createIssueUrl = new URL('https://github.com/vordgi/nimpl-getters/issues/new');
-        createIssueUrl.searchParams.set('title', 'Error parsing segments in get-params');
-        createIssueUrl.searchParams.set('body', `urlPathname: \`${urlPathname}\`;\n\npagePath: \`${pagePath}\`;`);
-        createIssueUrl.searchParams.append('labels', 'bug');
+        const createIssueUrl = new URL("https://github.com/vordgi/nimpl-getters/issues/new");
+        createIssueUrl.searchParams.set("title", "Error parsing segments in get-params");
+        createIssueUrl.searchParams.set("body", `urlPathname: \`${urlPathname}\`;\n\npagePath: \`${pagePath}\`;`);
+        createIssueUrl.searchParams.append("labels", "bug");
         throw new Error(`Something went wrong. Please create an issue on Github: ${createIssueUrl}`);
     }
     const query = (0, utils_1.parseSegments)(pagePathInterceptedParts, pathnameParts);

package/get-pathname.js

@@ -6,15 +6,13 @@ const has_base_path_1 = require("next/dist/client/has-base-path");
 const remove_base_path_1 = require("next/dist/client/remove-base-path");
 const server_getter_in_client_component_error_1 = require("./server-getter-in-client-component-error");
 function getPathname() {
-    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)('getPathname');
+    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("getPathname");
     const store = static_generation_async_storage_external_1.staticGenerationAsyncStorage.getStore();
     if (!store)
         return null;
     const { urlPathname } = store;
-    const url = new URL(urlPathname, 'http://n');
-    const pathname = (0, has_base_path_1.hasBasePath)(url.pathname)
-        ? (0, remove_base_path_1.removeBasePath)(url.pathname)
-        : url.pathname;
+    const url = new URL(urlPathname, "http://n");
+    const pathname = (0, has_base_path_1.hasBasePath)(url.pathname) ? (0, remove_base_path_1.removeBasePath)(url.pathname) : url.pathname;
     return pathname;
 }
 exports.getPathname = getPathname;

package/get-search-params.d.ts

@@ -1,4 +1,4 @@
-import { ReadonlyURLSearchParams } from 'next/navigation';
+import { ReadonlyURLSearchParams } from "next/navigation";
 /** @deprecated getSearchParams is deprecated. [Read more](https://nimpl.tech/getters/current-getters/get-search-params) */
 export declare function getSearchParams(opts?: {
     ignoreDynamicOptionErrors?: boolean;

package/get-search-params.js

@@ -7,24 +7,24 @@ const navigation_1 = require("next/navigation");
 const internal_utils_1 = require("next/dist/server/internal-utils");
 /** @deprecated getSearchParams is deprecated. [Read more](https://nimpl.tech/getters/current-getters/get-search-params) */
 function getSearchParams(opts) {
-    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)('getSearchParams');
-    console.error('getSearchParams is deprecated. Read more - https://nimpl.tech/getters/current-getters/get-search-params');
+    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("getSearchParams");
+    console.error("getSearchParams is deprecated. Read more - https://nimpl.tech/getters/current-getters/get-search-params");
     const store = static_generation_async_storage_external_1.staticGenerationAsyncStorage.getStore();
     if (!store)
         return new URLSearchParams();
     const { urlPathname, forceStatic, forceDynamic, dynamicShouldError } = store;
     if (!opts?.ignoreDynamicOptionErrors) {
         if (forceStatic) {
-            throw new Error('Сannot get client search parameters with dynamic=force-static setting');
+            throw new Error("Сannot get client search parameters with dynamic=force-static setting");
         }
         else if (dynamicShouldError) {
-            throw new Error('Сannot get client search parameters with dynamic=error setting');
+            throw new Error("Сannot get client search parameters with dynamic=error setting");
         }
         else if (!forceDynamic) {
-            console.warn('Do not use getSearchParams with unselected dynamic setting, use force-dynamic instead');
+            console.warn("Do not use getSearchParams with unselected dynamic setting, use force-dynamic instead");
         }
     }
-    const url = new URL(urlPathname, 'http://n');
+    const url = new URL(urlPathname, "http://n");
     const strippedUrl = (0, internal_utils_1.stripInternalSearchParams)(url, true);
     const readonlySearchParams = new navigation_1.ReadonlyURLSearchParams(strippedUrl.searchParams);
     return readonlySearchParams;

package/get-server-context.d.ts

@@ -1,3 +1,3 @@
-import type { ServerContext } from './types';
+import type { ServerContext } from "./types";
 declare function getServerContext<T>({ _storage, _defaultValue }: ServerContext<T>): T | undefined;
 export default getServerContext;

package/get-server-context.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const server_getter_in_client_component_error_1 = require("./server-getter-in-client-component-error");
 function getServerContext({ _storage, _defaultValue }) {
-    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)('getServerContext');
+    (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("getServerContext");
     const store = _storage.getStore();
     if (!store)
         return _defaultValue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimpl/getters",
-  "version": "1.3.1",
+  "version": "1.3.2-canary.1",
   "description": "Implementation of server getters and server contexts in React Server Components without switching to SSR",
   "files": [
     "**/*.js",

package/server-getter-in-client-component-error.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverGetterInClientComponentError = void 0;
 const react_1 = __importDefault(require("react"));
 function serverGetterInClientComponentError(getterName) {
-    if (process.env.NODE_ENV !== 'production') {
+    if (process.env.NODE_ENV !== "production") {
         // If useState is defined we're in a client component
         if (Boolean(react_1.default.useState)) {
             throw new Error(`${getterName} only works in Server Components`);

package/utils.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeInterceptingRoutes = exports.parseSegments = exports.normalizePagePath = exports.normalizePathname = void 0;
 const normalizePathname = (pathname) => {
-    const cleanPathname = pathname && new URL(pathname, 'http://n').pathname;
-    const pathnameWithoutTrailingSlash = cleanPathname?.replace(/^(\/.*)\/$/, '$1');
-    const pathnameWithoutFileType = pathnameWithoutTrailingSlash?.replace(/\/_not-found$/, '');
-    return pathnameWithoutFileType || '/';
+    const cleanPathname = pathname && new URL(pathname, "http://n").pathname;
+    const pathnameWithoutTrailingSlash = cleanPathname?.replace(/^(\/.*)\/$/, "$1");
+    const pathnameWithoutFileType = pathnameWithoutTrailingSlash?.replace(/\/_not-found$/, "");
+    return pathnameWithoutFileType || "/";
 };
 exports.normalizePathname = normalizePathname;
 const normalizePagePath = (pagePath) => {
-    const cleanPagePath = pagePath && new URL(pagePath, 'http://n').pathname;
-    const pagePathWithoutFileType = cleanPagePath?.replace(/(\/page|\/_not-found)$/, '');
-    return pagePathWithoutFileType || '/';
+    const cleanPagePath = pagePath && new URL(pagePath, "http://n").pathname;
+    const pagePathWithoutFileType = cleanPagePath?.replace(/(\/page|\/_not-found)$/, "");
+    return pagePathWithoutFileType || "/";
 };
 exports.normalizePagePath = normalizePagePath;
 const parseSegments = (pagePathParts, pathnameParts) => {
@@ -50,17 +50,17 @@ const normalizeInterceptingRoutes = (pageParts) => {
             skip -= 1;
             continue;
         }
-        if (pagepart.startsWith('(...)')) {
-            normilizedParts.push(pagepart.replace(/^\(\.\.\.\)/, ''));
+        if (pagepart.startsWith("(...)")) {
+            normilizedParts.push(pagepart.replace(/^\(\.\.\.\)/, ""));
             break;
         }
-        else if (pagepart.startsWith('(.)')) {
-            normilizedParts.push(pagepart.replace(/^\(\.\)/, ''));
+        else if (pagepart.startsWith("(.)")) {
+            normilizedParts.push(pagepart.replace(/^\(\.\)/, ""));
         }
-        else if (pagepart.startsWith('(..)')) {
+        else if (pagepart.startsWith("(..)")) {
             const skipLeafs = pagepart.match(/\(\.\.\)/g);
             skip += skipLeafs?.length || 0;
-            normilizedParts.push(pagepart.replace(/^(\(\.\.\))+/, ''));
+            normilizedParts.push(pagepart.replace(/^(\(\.\.\))+/, ""));
         }
         else {
             normilizedParts.push(pagepart);