@koine/next 1.0.69 → 1.0.70

package/config/index.d.ts

@@ -101,7 +101,7 @@ declare type KoineNextConfig = {
      * {
      *   "category": {
      *     "[slug]": {
-     *       "[id]": "/categories/{{ slug }}/{{ id* }}"
+     *       "[id]": "/categories/{{ slug }}/{{ id }}*"
      *     }
      *   }
      * }

package/config/index.js

@@ -56,8 +56,8 @@ export function encodePathname(pathname) {
  *
  * Here we add the wildcard flag maybe found in the pathname to the template
  * name too, this is because we do not want to have the wildcard in the JSON
- * keys as those are also used to construct the links through `useTo` hook and
- * handling asterisks there might become cumbersome.
+ * keys as those are also used to throught the `useT` hook and having asterisks
+ * there is a bit cumbersome.
  *
  * @see https://nextjs.org/docs/messages/invalid-multi-match
  */
@@ -69,13 +69,14 @@ function transformRoute(route) {
     var pathname = pathnameParts
         .map(function (part) {
         var _a, _b;
+        var hasWildcard = part.endsWith("*");
+        part = part.replace("*", "");
         var isDynamic = part.startsWith("{{") && part.endsWith("}}");
         var asValue = isDynamic
             ? (_b = (_a = part.match(/{{(.+)}}/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
             : part.trim();
-        var hasWildcard = part.includes("*");
-        var asPath = encodeURIComponent(asValue.replace("*", "")) + (hasWildcard ? "*" : "");
-        mapPartsByIdx[asValue.replace("*", "")] = {
+        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
+        mapPartsByIdx[asValue] = {
             isDynamic: isDynamic,
             hasWildcard: hasWildcard,
         };
@@ -90,7 +91,7 @@ function transformRoute(route) {
             ? (_b = (_a = part.match(/\[(.+)\]/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
             : part.trim();
         var hasWildcard = (_c = mapPartsByIdx[asValue]) === null || _c === void 0 ? void 0 : _c.hasWildcard;
-        var asPath = encodeURIComponent(asValue.replace("*", "")) + (hasWildcard ? "*" : "");
+        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
         return isDynamic ? ":".concat(asPath) : asPath;
     })
         .join("/");

package/node/config/index.js

@@ -62,8 +62,8 @@ exports.encodePathname = encodePathname;
  *
  * Here we add the wildcard flag maybe found in the pathname to the template
  * name too, this is because we do not want to have the wildcard in the JSON
- * keys as those are also used to construct the links through `useTo` hook and
- * handling asterisks there might become cumbersome.
+ * keys as those are also used to throught the `useT` hook and having asterisks
+ * there is a bit cumbersome.
  *
  * @see https://nextjs.org/docs/messages/invalid-multi-match
  */
@@ -75,13 +75,14 @@ function transformRoute(route) {
     var pathname = pathnameParts
         .map(function (part) {
         var _a, _b;
+        var hasWildcard = part.endsWith("*");
+        part = part.replace("*", "");
         var isDynamic = part.startsWith("{{") && part.endsWith("}}");
         var asValue = isDynamic
             ? (_b = (_a = part.match(/{{(.+)}}/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
             : part.trim();
-        var hasWildcard = part.includes("*");
-        var asPath = encodeURIComponent(asValue.replace("*", "")) + (hasWildcard ? "*" : "");
-        mapPartsByIdx[asValue.replace("*", "")] = {
+        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
+        mapPartsByIdx[asValue] = {
             isDynamic: isDynamic,
             hasWildcard: hasWildcard,
         };
@@ -96,7 +97,7 @@ function transformRoute(route) {
             ? (_b = (_a = part.match(/\[(.+)\]/)) === null || _a === void 0 ? void 0 : _a[1].trim()) !== null && _b !== void 0 ? _b : ""
             : part.trim();
         var hasWildcard = (_c = mapPartsByIdx[asValue]) === null || _c === void 0 ? void 0 : _c.hasWildcard;
-        var asPath = encodeURIComponent(asValue.replace("*", "")) + (hasWildcard ? "*" : "");
+        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
         return isDynamic ? ":".concat(asPath) : asPath;
     })
         .join("/");

package/node/to.js

@@ -17,7 +17,7 @@ function to() {
     var t = args[0];
     if (args.length === 3) {
         if (args[2]) {
-            relative = t(args[1], args[2]);
+            relative = t(args[1], args[2]).replace("*", "");
         }
     }
     else if (args.length === 2) {

package/package.json

@@ -18,9 +18,9 @@
   "peerDependencies": {
     "react": "^16.8 || ^17 || ^18",
     "next": "^12.2.3",
-    "@koine/utils": "1.0.69",
+    "@koine/utils": "1.0.70",
     "framer-motion": "^6.5.1",
-    "@koine/react": "1.0.69",
+    "@koine/react": "1.0.70",
     "styled-components": "^5.3.5",
     "@mui/base": "^5.0.0-alpha.90",
     "react-icons": "^4.4.0",
@@ -41,7 +41,7 @@
     "next-seo": "^5.5.0",
     "@hookform/resolvers": "^2.9.6"
   },
-  "version": "1.0.69",
+  "version": "1.0.70",
   "module": "./index.js",
   "types": "./index.d.ts"
 }

package/to.js

@@ -14,7 +14,7 @@ export function to() {
     var t = args[0];
     if (args.length === 3) {
         if (args[2]) {
-            relative = t(args[1], args[2]);
+            relative = t(args[1], args[2]).replace("*", "");
         }
     }
     else if (args.length === 2) {