@nimpl/getters 2.1.2 → 2.2.0-canary.0

package/get-app-params.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppParams = void 0;
 const work_async_storage_external_1 = require("next/dist/server/app-render/work-async-storage.external");
-const work_unit_async_storage_external_1 = require("next/dist/server/app-render/work-unit-async-storage.external");
 const server_getter_in_client_component_error_1 = require("./server-getter-in-client-component-error");
 const utils_1 = require("./utils");
 const get_app_pathname_1 = require("./get-app-pathname");
@@ -13,14 +12,14 @@ const getAppParams = (options = {}) => {
         return {};
     const { ignoreDifferenceError, pagePaths, pathname } = options;
     const pageConfigurationStore = work_async_storage_external_1.workAsyncStorage.getStore();
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const pageStore = work_unit_async_storage_external_1.workUnitAsyncStorage.getStore();
-    if (!pageConfigurationStore || !pageStore?.url?.pathname)
+    if (!pageConfigurationStore)
         return {};
     const { route } = pageConfigurationStore;
     const pagePath = route;
     const urlPathname = (0, get_app_pathname_1.getAppPathname)();
     const targetUrlPathname = pathname || urlPathname;
+    if (!targetUrlPathname)
+        return {};
     let isInvalid = false;
     try {
         if (pagePaths) {

package/get-app-pathname.js

@@ -7,7 +7,10 @@ function getAppPathname() {
     (0, server_getter_in_client_component_error_1.serverGetterInClientComponentError)("getAppPathname");
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const pageStore = work_unit_async_storage_external_1.workUnitAsyncStorage.getStore();
-    const pageTags = pageStore.implicitTags.filter((tag) => tag.startsWith("_N_T_/"));
+    const tags = (Array.isArray(pageStore.implicitTags.tags) && pageStore.implicitTags.tags) ||
+        (Array.isArray(pageStore.implicitTags) && pageStore.implicitTags) ||
+        [];
+    const pageTags = tags.filter((tag) => tag.startsWith("_N_T_/"));
     const pathnameTag = pageTags[pageTags.length - 1];
     return pathnameTag.substring(5);
 }

package/get-params.js

@@ -14,12 +14,14 @@ const getParams = (options = {}) => {
     const pageConfigurationStore = work_async_storage_external_1.workAsyncStorage.getStore();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const pageStore = work_unit_async_storage_external_1.workUnitAsyncStorage.getStore();
-    if (!pageConfigurationStore || !pageStore?.url?.pathname)
+    if (!pageConfigurationStore)
         return {};
     const { route } = pageConfigurationStore;
     const pagePath = route;
-    const urlPathname = pageStore.url.pathname;
+    const urlPathname = pageStore?.url?.pathname;
     const targetUrlPathname = pathname || urlPathname;
+    if (!targetUrlPathname)
+        return {};
     let isInvalid = false;
     try {
         if (pagePaths) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimpl/getters",
-  "version": "2.1.2",
+  "version": "2.2.0-canary.0",
   "description": "Implementation of server getters in React Server Components without switching to SSR in next.js",
   "files": [
     "**/*.js",
@@ -44,4 +44,4 @@
     "react-dom": ">= 18.2.0",
     "next": ">= 14.0.0"
   }
-}
+}