@enonic/nextjs-adapter 2.0.0 → 2.0.2

package/UrlProcessor.js

@@ -59,7 +59,7 @@ export class UrlProcessor {
         // normalise localhost-127.0.0.1 if present in urls
         const normalUrl = url.replace(this.localhostPattern, '127.0.0.1');
         const normalApiUrl = apiUrl.replace(this.localhostPattern, '127.0.0.1');
-        const common = commonChars(normalUrl, normalApiUrl);
+        const common = commonChars(normalUrl, normalApiUrl, '/');
         const remaining = common.length > 0 ? normalUrl.substring(common.length) : normalUrl;
         return (remaining.length > 0 && remaining.charAt(0) === '/') ? remaining.substring(1) : remaining;
     }

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "license": "Apache-2.0",
   "main": "index.js",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "copy": "npx --yes cpy-cli package.json README.md dist",
+    "copy": "npx --yes cpy-cli package.json README.md setversion.js dist",
     "build": "tsc --build src/tsconfig.json && tsc --build server/tsconfig.json",
     "lint": "eslint --quiet server && eslint --quiet src",
-    "lint:fix": "eslint --fix server && eslint --fix src"
+    "lint:fix": "eslint --fix server && eslint --fix src",
+    "prepublishOnly": "node setversion.js"
   },
   "dependencies": {
     "html-react-parser": "^4.2.2",

package/setversion.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+"use strict";
+
+const { execSync } = require("child_process");
+const version = execSync("git describe --tags --abbrev=0").toString().slice(1).trim();
+
+execSync(`awk -v ver="${version}" '{gsub(/"version": ".*"/,"\\"version\\": \\""ver"\\"")}1' package.json > tmp && mv tmp package.json`);

package/utils.d.ts

@@ -101,7 +101,7 @@ export declare function getContentApiUrl(context?: MinimalContext): string;
 export declare function addJsessionHeaders(headers?: Object, context?: MinimalContext): void;
 export declare function addLocaleHeaders(headers?: Object, context?: Context): void;
 export declare const getXpBaseUrl: (context?: MinimalContext) => string;
-export declare const commonChars: (s1?: string, s2?: string) => string;
+export declare const commonChars: (s1?: string, s2?: string, wordSeparators?: string) => string;
 export declare const sanitizeGraphqlName: (text: string) => string;
 declare const adapterConstants: {
     IS_DEV_MODE: boolean;

package/utils.js

@@ -195,20 +195,31 @@ export const getXpBaseUrl = (context) => {
     // TODO: workaround for XP pattern controller mapping not picked up in edit mode
     return (header || '/').replace(/\/edit\//, '/inline/');
 };
-export const commonChars = (s1, s2) => {
+export const commonChars = (s1, s2, wordSeparators) => {
     let result = '';
     if (!s1 || s1.length === 0 || !s2 || s2.length === 0) {
         return result;
     }
+    let lastSeparatorIndex = -1;
+    let lastCommonIndex = -1;
     for (let i = 0; i < s1.length; i++) {
-        const s1Element = s1[i];
-        if (s2[i] === s1Element) {
-            result += s1Element;
+        const s1El = s1[i];
+        if ((wordSeparators === null || wordSeparators === void 0 ? void 0 : wordSeparators.indexOf(s1El)) >= 0) {
+            lastSeparatorIndex = i;
+        }
+        if (s2[i] === s1El) {
+            lastCommonIndex = i;
         }
         else {
             break;
         }
     }
+    if (lastSeparatorIndex > 0 || lastCommonIndex === lastSeparatorIndex) {
+        result = s1.substring(0, lastSeparatorIndex);
+    }
+    else if (lastCommonIndex > -1) {
+        result = s1.substring(0, lastCommonIndex + 1);
+    }
     return result;
 };
 // sanitizes text according to graphql naming spec http://spec.graphql.org/October2021/#sec-Names