@koine/next 1.0.44 → 1.0.45

package/Theme/Theme.d.ts

@@ -47,6 +47,12 @@ export declare type ThemeProviderProps = React.PropsWithChildren<{
     /** Nonce string to pass to the inline script for CSP headers */
     nonce?: string;
 }>;
+/**
+ * @borrows [next-themes](https://github.com/pacocoursey/next-themes)
+ */
 export declare const useTheme: () => UseThemeProps;
+/**
+ * @borrows [next-themes](https://github.com/pacocoursey/next-themes)
+ */
 export declare const ThemeProvider: ({ forcedTheme, disableTransitionOnChange, enableSystem, enableColorScheme, themes, defaultTheme, attribute, value, children, nonce, }: ThemeProviderProps) => JSX.Element;
 export {};

package/Theme/Theme.js

@@ -22,7 +22,13 @@ var ThemeContext = createContext({
     setTheme: function (_) { },
     themes: [],
 });
+/**
+ * @borrows [next-themes](https://github.com/pacocoursey/next-themes)
+ */
 export var useTheme = function () { return useContext(ThemeContext); };
+/**
+ * @borrows [next-themes](https://github.com/pacocoursey/next-themes)
+ */
 export var ThemeProvider = function (_a) {
     var forcedTheme = _a.forcedTheme, _b = _a.disableTransitionOnChange, disableTransitionOnChange = _b === void 0 ? false : _b, _c = _a.enableSystem, enableSystem = _c === void 0 ? true : _c, enableColorScheme = _a.enableColorScheme, _d = _a.themes, themes = _d === void 0 ? ["light", "dark"] : _d, _e = _a.defaultTheme, defaultTheme = _e === void 0 ? enableSystem ? "system" : "light" : _e, _f = _a.attribute, attribute = _f === void 0 ? "data-theme" : _f, value = _a.value, children = _a.children, nonce = _a.nonce;
     var _g = useState(function () {

package/config/index.d.ts

@@ -76,10 +76,10 @@ declare type KoineNextConfig = {
      *   "home": "/",
      *   "products": {
      *     "list": "/products",
-     *     "[category]": "/products/[category]",
+     *     "[category]": "/products/{{ category }}",
      *     "[tag]": {
-     *       "view": "/products/[category]/[tag]",
-     *       "related": "/products/[category]/[tag]/related"
+     *       "view": "/products/{{ category }}/{{ tag }}",
+     *       "related": "/products/{{ category }}/{{ tag }}/related"
      *     }
      *   },
      *   "company": {

package/config/index.js

@@ -52,9 +52,25 @@ export function encodePathname(pathname) {
         .join("/");
 }
 /**
- * It replaces `/[dynamic-slug]/` with the given replacer.
+ * It replaces `/{{ slug }}/` with the given replacer.
  */
 function transformRoutePathname(rawPathname, replacer) {
+    var pathNameParts = rawPathname.split("/").filter(function (part) { return !!part; });
+    return pathNameParts
+        .map(function (part, _idx) {
+        var isDynamic = part.startsWith("{{") && part.endsWith("}}");
+        part = isDynamic ? replacer : part;
+        // if (isDynamic && _idx === pathNameParts.length - 1) {
+        //   part += "*";
+        // }
+        return isDynamic ? part : encodeURIComponent(part);
+    })
+        .join("/");
+}
+/**
+ * It replaces `/[slug]/` with the given replacer.
+ */
+function transformRouteTemplate(rawPathname, replacer) {
     var pathNameParts = rawPathname.split("/").filter(function (part) { return !!part; });
     return pathNameParts
         .map(function (part, _idx) {
@@ -91,7 +107,7 @@ function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
  */
 export function getPathRewrite(pathname, template) {
     pathname = transformRoutePathname(pathname, ":path");
-    template = transformRoutePathname(template, ":path");
+    template = transformRouteTemplate(template, ":path");
     var source = "/".concat(normaliseUrlPathname(pathname));
     var destination = "/".concat(normaliseUrlPathname(template));
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
@@ -105,7 +121,7 @@ export function getPathRewrite(pathname, template) {
  */
 export function getPathRedirect(locale, pathname, template, permanent) {
     if (locale === void 0) { locale = ""; }
-    template = transformRoutePathname(template, ":slug");
+    template = transformRouteTemplate(template, ":slug");
     pathname = transformRoutePathname(pathname, ":slug");
     var source = "/".concat(normaliseUrlPathname((locale ? "/".concat(locale, "/") : "/") + template));
     var destination = "/".concat(normaliseUrlPathname(pathname));

package/node/Theme/Theme.js

@@ -25,8 +25,14 @@ var ThemeContext = (0, react_1.createContext)({
     setTheme: function (_) { },
     themes: [],
 });
+/**
+ * @borrows [next-themes](https://github.com/pacocoursey/next-themes)
+ */
 var useTheme = function () { return (0, react_1.useContext)(ThemeContext); };
 exports.useTheme = useTheme;
+/**
+ * @borrows [next-themes](https://github.com/pacocoursey/next-themes)
+ */
 var ThemeProvider = function (_a) {
     var forcedTheme = _a.forcedTheme, _b = _a.disableTransitionOnChange, disableTransitionOnChange = _b === void 0 ? false : _b, _c = _a.enableSystem, enableSystem = _c === void 0 ? true : _c, enableColorScheme = _a.enableColorScheme, _d = _a.themes, themes = _d === void 0 ? ["light", "dark"] : _d, _e = _a.defaultTheme, defaultTheme = _e === void 0 ? enableSystem ? "system" : "light" : _e, _f = _a.attribute, attribute = _f === void 0 ? "data-theme" : _f, value = _a.value, children = _a.children, nonce = _a.nonce;
     var _g = (0, react_1.useState)(function () {

package/node/config/index.js

@@ -58,9 +58,25 @@ function encodePathname(pathname) {
 }
 exports.encodePathname = encodePathname;
 /**
- * It replaces `/[dynamic-slug]/` with the given replacer.
+ * It replaces `/{{ slug }}/` with the given replacer.
  */
 function transformRoutePathname(rawPathname, replacer) {
+    var pathNameParts = rawPathname.split("/").filter(function (part) { return !!part; });
+    return pathNameParts
+        .map(function (part, _idx) {
+        var isDynamic = part.startsWith("{{") && part.endsWith("}}");
+        part = isDynamic ? replacer : part;
+        // if (isDynamic && _idx === pathNameParts.length - 1) {
+        //   part += "*";
+        // }
+        return isDynamic ? part : encodeURIComponent(part);
+    })
+        .join("/");
+}
+/**
+ * It replaces `/[slug]/` with the given replacer.
+ */
+function transformRouteTemplate(rawPathname, replacer) {
     var pathNameParts = rawPathname.split("/").filter(function (part) { return !!part; });
     return pathNameParts
         .map(function (part, _idx) {
@@ -97,7 +113,7 @@ function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
  */
 function getPathRewrite(pathname, template) {
     pathname = transformRoutePathname(pathname, ":path");
-    template = transformRoutePathname(template, ":path");
+    template = transformRouteTemplate(template, ":path");
     var source = "/".concat(normaliseUrlPathname(pathname));
     var destination = "/".concat(normaliseUrlPathname(template));
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
@@ -112,7 +128,7 @@ exports.getPathRewrite = getPathRewrite;
  */
 function getPathRedirect(locale, pathname, template, permanent) {
     if (locale === void 0) { locale = ""; }
-    template = transformRoutePathname(template, ":slug");
+    template = transformRouteTemplate(template, ":slug");
     pathname = transformRoutePathname(pathname, ":slug");
     var source = "/".concat(normaliseUrlPathname((locale ? "/".concat(locale, "/") : "/") + template));
     var destination = "/".concat(normaliseUrlPathname(pathname));

package/package.json

@@ -18,9 +18,9 @@
   "peerDependencies": {
     "react": "^16.8 || ^17 || ^18",
     "next": "^12.2.0",
-    "@koine/utils": "1.0.44",
+    "@koine/utils": "1.0.45",
     "framer-motion": "^6.3.16",
-    "@koine/react": "1.0.44",
+    "@koine/react": "1.0.45",
     "styled-components": "^5.3.5",
     "@mui/base": "^5.0.0-alpha.87",
     "react-icons": "^4.4.0",
@@ -41,7 +41,7 @@
     "next-translate": "^1.4.0",
     "next-seo": "^5.4.0"
   },
-  "version": "1.0.44",
+  "version": "1.0.45",
   "module": "./index.js",
   "types": "./index.d.ts"
 }