@koine/next 2.0.0-beta.2 → 2.0.0-beta.4

package/config/index.js

@@ -1,62 +1,63 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withKoine = exports.getRewrites = exports.getRedirects = exports.getPathRedirect = exports.getPathRewrite = exports.encodePathname = exports.toPath = exports.normaliseUrlPathname = void 0;
-var tslib_1 = require("tslib");
-/**
- * Normalise pathname
- *
- * From a path like `/some//malformed/path///` it returns `some/malformed/path`
- *
- * - Removes subsequent slashes
- * - Removing initial and ending slashes
- * - Returns an empty string `"""` if only slashes are given
- */
-function normaliseUrlPathname(pathname) {
-    if (pathname === void 0) { pathname = ""; }
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    normaliseUrlPathname: function() {
+        return normaliseUrlPathname;
+    },
+    toPath: function() {
+        return toPath;
+    },
+    encodePathname: function() {
+        return encodePathname;
+    },
+    getPathRewrite: function() {
+        return getPathRewrite;
+    },
+    getPathRedirect: function() {
+        return getPathRedirect;
+    },
+    getRedirects: function() {
+        return getRedirects;
+    },
+    getRewrites: function() {
+        return getRewrites;
+    },
+    withKoine: function() {
+        return withKoine;
+    },
+    default: function() {
+        return _default;
+    }
+});
+function normaliseUrlPathname(pathname = "") {
     // with return pathname.replace(/\/+\//g, "/").replace(/^\/+(.*?)\/+$/, "$1");
     // we would instead return a single slash if only slashes are given
     return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
 }
-exports.normaliseUrlPathname = normaliseUrlPathname;
-/**
- * Transform to path any absolute or relative URL
- *
- * Useful when setting up `rewrites` and `redirects` especally in a [multi-zones
- * setup](https://nextjs.org/docs/advanced-features/multi-zones).
- *
- * From a path like `http://localhost/some//malformed/path///` it returns `/some/malformed/path`
- *
- * @see {@link normaliseUrlPathname}
- */
-function toPath(urlOrPathname) {
-    if (urlOrPathname === void 0) { urlOrPathname = ""; }
-    var pathname = "";
+function toPath(urlOrPathname = "") {
+    let pathname = "";
     try {
-        var parsed = new URL(urlOrPathname);
+        const parsed = new URL(urlOrPathname);
         pathname = parsed.pathname;
-    }
-    catch (e) {
+    } catch (e) {
         pathname = urlOrPathname;
     }
     // with return pathname.replace(/\/+\//g, "/").replace(/^\/+(.*?)\/+$/, "$1");
     // we would instead return a single slash if only slashes are given
     return pathname.replace(/\/+\//g, "/").replace(/^\/*(.*?)\/*$/, "$1");
 }
-exports.toPath = toPath;
-/**
- * Clean a pathname and encode each part
- *
- * @see {@link normaliseUrlPathname}
- */
-function encodePathname(pathname) {
-    if (pathname === void 0) { pathname = ""; }
-    var parts = normaliseUrlPathname(pathname).split("/");
-    return parts
-        .filter(function (part) { return !!part; })
-        .map(function (part) { return encodeURIComponent(part); })
-        .join("/");
+function encodePathname(pathname = "") {
+    const parts = normaliseUrlPathname(pathname).split("/");
+    return parts.filter((part)=>!!part).map((part)=>encodeURIComponent(part)).join("/");
 }
-exports.encodePathname = encodePathname;
 /**
  * Transform the route translated defintion into a `pathname` and a `template`.
  *
@@ -66,61 +67,48 @@ exports.encodePathname = encodePathname;
  * having asterisks there is a bit cumbersome.
  *
  * @see https://nextjs.org/docs/messages/invalid-multi-match
- */
-function transformRoute(route) {
-    var rawPathname = route.pathname, rawTemplate = route.template;
-    var pathnameParts = rawPathname.split("/").filter(function (part) { return !!part; });
-    var templateParts = rawTemplate.split("/").filter(function (part) { return !!part; });
-    var mapPartsByIdx = {};
-    var pathname = pathnameParts
-        .map(function (part) {
-        var _a, _b;
-        var hasWildcard = part.endsWith("*");
+ */ function transformRoute(route) {
+    const { pathname: rawPathname, template: rawTemplate } = route;
+    const pathnameParts = rawPathname.split("/").filter((part)=>!!part);
+    const templateParts = rawTemplate.split("/").filter((part)=>!!part);
+    const mapPartsByIdx = {};
+    const pathname = pathnameParts.map((part)=>{
+        const 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 asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
+        const isDynamic = part.startsWith("{{") && part.endsWith("}}");
+        const asValue = isDynamic ? part.match(/{{(.+)}}/)?.[1].trim() ?? "" : part.trim();
+        const asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
         mapPartsByIdx[asValue] = {
-            isDynamic: isDynamic,
-            hasWildcard: hasWildcard,
+            isDynamic,
+            hasWildcard
         };
-        return isDynamic ? ":".concat(asPath) : asPath;
-    })
-        .join("/");
-    var template = templateParts
-        .map(function (part) {
-        var _a, _b, _c;
-        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 = (_c = mapPartsByIdx[asValue]) === null || _c === void 0 ? void 0 : _c.hasWildcard;
-        var asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
-        return isDynamic ? ":".concat(asPath) : asPath;
-    })
-        .join("/");
-    return { pathname: pathname, template: template };
+        return isDynamic ? `:${asPath}` : asPath;
+    }).join("/");
+    const template = templateParts.map((part)=>{
+        const isDynamic = part.startsWith("[") && part.endsWith("]");
+        const asValue = isDynamic ? part.match(/\[(.+)\]/)?.[1].trim() ?? "" : part.trim();
+        const hasWildcard = mapPartsByIdx[asValue]?.hasWildcard;
+        const asPath = encodeURIComponent(asValue) + (hasWildcard ? "*" : "");
+        return isDynamic ? `:${asPath}` : asPath;
+    }).join("/");
+    return {
+        pathname,
+        template
+    };
 }
 /**
  * Get routes map dictionary
- */
-function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
-    if (map === void 0) { map = {}; }
-    if (pathnameBuffer === void 0) { pathnameBuffer = ""; }
-    if (templateBuffer === void 0) { templateBuffer = ""; }
-    for (var key in routes) {
-        var pathOrNestedRoutes = routes[key];
-        var template = "".concat(templateBuffer, "/").concat(key);
+ */ function getRoutesMap(map = {}, routes, pathnameBuffer = "", templateBuffer = "") {
+    for(const key in routes){
+        const pathOrNestedRoutes = routes[key];
+        const template = `${templateBuffer}/${key}`;
         if (typeof pathOrNestedRoutes === "string") {
             map[template] = {
-                template: template,
+                template,
                 pathname: pathOrNestedRoutes,
-                wildcard: pathOrNestedRoutes.includes("*"),
+                wildcard: pathOrNestedRoutes.includes("*")
             };
-        }
-        else {
+        } else {
             getRoutesMap(map, pathOrNestedRoutes, pathnameBuffer, template);
         }
     }
@@ -128,137 +116,131 @@ function getRoutesMap(map, routes, pathnameBuffer, templateBuffer) {
 }
 /**
  * Removes `/index` from a template/url path
- */
-function getWithoutIndex(template) {
+ */ function getWithoutIndex(template) {
     return template.replace(/\/index$/, "");
 }
-/**
- * Get path rewrite
- */
 function getPathRewrite(route) {
-    var _a = transformRoute(route), pathname = _a.pathname, template = _a.template;
-    var source = "/".concat(normaliseUrlPathname(pathname));
-    var destination = "/".concat(normaliseUrlPathname(template));
+    const { pathname, template } = transformRoute(route);
+    const source = `/${normaliseUrlPathname(pathname)}`;
+    const destination = `/${normaliseUrlPathname(template)}`;
     // console.log(`rewrite pathname "${source}" to template "${destination}"`);
     return {
-        source: source,
-        destination: getWithoutIndex(destination),
+        source,
+        destination: getWithoutIndex(destination)
     };
 }
-exports.getPathRewrite = getPathRewrite;
-/**
- * Get path redirect
- */
-function getPathRedirect(locale, route, permanent) {
-    if (locale === void 0) { locale = ""; }
-    var _a = transformRoute(route), template = _a.template, pathname = _a.pathname;
-    var source = "/".concat(normaliseUrlPathname((locale ? "/".concat(locale, "/") : "/") + template));
-    var destination = "/".concat(normaliseUrlPathname(pathname));
+function getPathRedirect(locale = "", route, permanent) {
+    const { template, pathname } = transformRoute(route);
+    const source = `/${normaliseUrlPathname((locale ? `/${locale}/` : "/") + template)}`;
+    const destination = `/${normaliseUrlPathname(pathname)}`;
     // console.log(`redirect template "${source}" to pathname "${destination}"`);
     return {
         source: getWithoutIndex(source),
-        destination: destination,
+        destination,
         permanent: Boolean(permanent),
-        locale: false,
+        locale: false
     };
 }
-exports.getPathRedirect = getPathRedirect;
-/**
- */
-function getRedirects(defaultLocale, routes, permanent, debug) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var redirects, routesMap;
-        return tslib_1.__generator(this, function (_a) {
-            redirects = [];
-            routesMap = getRoutesMap({}, routes);
-            Object.keys(routesMap).forEach(function (template) {
-                var route = routesMap[template];
-                // TODO: add option hideDefaultLocaleInUrl?
-                // this is meant to redirect the URL with the default locale to the same
-                // url without locale prefix, e.g.: /en/about -> /about (assuming en is the
-                // defualt locale).
-                // Actually this redirect seem not to be necessary, probably the i18n routing
-                // mechanism of next 12 already does this, enabling causes infinite redirects
-                // if (hideDefaultLocaleInUrl) {
-                // redirects.push(getPathRedirect(defaultLocale, route, permanent));
-                // }
-                if (route.pathname !== getWithoutIndex(template)) {
-                    redirects.push(getPathRedirect("", route, permanent));
-                }
-            });
-            if (debug)
-                console.info("[@koine/next/config:getRedirects]", redirects);
-            return [2 /*return*/, redirects];
-        });
+async function getRedirects(defaultLocale, routes, permanent, debug) {
+    const redirects = [];
+    const routesMap = getRoutesMap({}, routes);
+    Object.keys(routesMap).forEach((template)=>{
+        const route = routesMap[template];
+        // TODO: add option hideDefaultLocaleInUrl?
+        // this is meant to redirect the URL with the default locale to the same
+        // url without locale prefix, e.g.: /en/about -> /about (assuming en is the
+        // defualt locale).
+        // Actually this redirect seem not to be necessary, probably the i18n routing
+        // mechanism of next 12 already does this, enabling causes infinite redirects
+        // if (hideDefaultLocaleInUrl) {
+        // redirects.push(getPathRedirect(defaultLocale, route, permanent));
+        // }
+        if (route.pathname !== getWithoutIndex(template)) {
+            redirects.push(getPathRedirect("", route, permanent));
+        }
     });
+    if (debug) console.info("[@koine/next/config:getRedirects]", redirects);
+    return redirects;
 }
-exports.getRedirects = getRedirects;
-/**
- */
-function getRewrites(routes, debug) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var rewrites, routesMap;
-        return tslib_1.__generator(this, function (_a) {
-            rewrites = [];
-            routesMap = getRoutesMap({}, routes);
-            Object.keys(routesMap).forEach(function (template) {
-                var route = routesMap[template];
-                if (route.pathname !== getWithoutIndex(template)) {
-                    rewrites.push(getPathRewrite(route));
-                }
-            });
-            if (debug)
-                console.info("[@koine/next/config:getRewrites]", rewrites);
-            return [2 /*return*/, rewrites];
-        });
+async function getRewrites(routes, debug) {
+    const rewrites = [];
+    const routesMap = getRoutesMap({}, routes);
+    Object.keys(routesMap).forEach((template)=>{
+        const route = routesMap[template];
+        if (route.pathname !== getWithoutIndex(template)) {
+            rewrites.push(getPathRewrite(route));
+        }
     });
+    if (debug) console.info("[@koine/next/config:getRewrites]", rewrites);
+    return rewrites;
 }
-exports.getRewrites = getRewrites;
-/**
- * Get Next.js config with some basic opinionated defaults
- *
- * @param {object} options
- * @property {boolean} [options.nx=false] Nx monorepo setup
- * @property {boolean} [options.svg=false] Svg to react components
- * @property {boolean} [options.sc=false] Styled components enabled
- * @property {boolean} [options.page=false] When `true` uses `*.page.ts` or `*.page.tsx`
- *                                          extension for next.js config option [`pageExtensions`](https://nextjs.org/docs/api-reference/next.config.js/custom-page-extensions#including-non-page-files-in-the-pages-directory)
- *                                          and it enables the same for `next-translate`.
- */
-function withKoine(_a) {
-    var _b;
-    if (_a === void 0) { _a = {
-        i18n: { locales: ["en"], defaultLocale: "en" },
-    }; }
-    var _c = _a.nx, nx = _c === void 0 ? true : _c, _d = _a.svg, svg = _d === void 0 ? true : _d, _e = _a.sc, sc = _e === void 0 ? true : _e, page = _a.page, routes = _a.routes, permanent = _a.permanent, debug = _a.debug, custom = tslib_1.__rest(_a, ["nx", "svg", "sc", "page", "routes", "permanent", "debug"]);
-    var nextConfig = tslib_1.__assign({ 
+function withKoine({ nx = true, svg = true, sc = true, page, routes, permanent, debug, ...custom } = {
+    i18n: {
+        locales: [
+            "en"
+        ],
+        defaultLocale: "en"
+    }
+}) {
+    const nextConfig = {
         // @see https://nextjs.org/docs/api-reference/next.config.js/custom-page-extensions#including-non-page-files-in-the-pages-directory
-        pageExtensions: page ? ["page.tsx", "page.ts"] : undefined, eslint: {
-            ignoreDuringBuilds: true, // we have this strict check on each commit
-        }, typescript: {
-            ignoreBuildErrors: true, // we have this strict check on each commit
-        }, poweredByHeader: false, swcMinify: true, modularizeImports: tslib_1.__assign({ "@koine/api": { transform: "@koine/api/{{member}}" }, "@koine/browser": { transform: "@koine/browser/{{member}}" }, "@koine/dom": { transform: "@koine/dom/{{member}}" }, "@koine/next/?(((\\w*)?/?)*)": {
-                transform: "@koine/next/{{ matches.[1] }}/{{member}}",
-            }, "@koine/react/?(((\\w*)?/?)*)": {
-                transform: "@koine/react/{{ matches.[1] }}/{{member}}",
-            }, "@koine/utils": { transform: "@koine/utils/{{member}}" } }, (custom["modularizeImports"] || {})), experimental: tslib_1.__assign({ 
+        pageExtensions: page ? [
+            "page.tsx",
+            "page.ts"
+        ] : undefined,
+        eslint: {
+            ignoreDuringBuilds: true
+        },
+        typescript: {
+            ignoreBuildErrors: true
+        },
+        poweredByHeader: false,
+        swcMinify: true,
+        modularizeImports: {
+            "@koine/api": {
+                transform: "@koine/api/{{member}}"
+            },
+            "@koine/browser": {
+                transform: "@koine/browser/{{member}}"
+            },
+            "@koine/dom": {
+                transform: "@koine/dom/{{member}}"
+            },
+            "@koine/next/?(((\\w*)?/?)*)": {
+                transform: "@koine/next/{{ matches.[1] }}/{{member}}"
+            },
+            "@koine/react/?(((\\w*)?/?)*)": {
+                transform: "@koine/react/{{ matches.[1] }}/{{member}}"
+            },
+            "@koine/utils": {
+                transform: "@koine/utils/{{member}}"
+            },
+            ...custom["modularizeImports"] || {}
+        },
+        experimental: {
             // @see https://github.com/vercel/vercel/discussions/5973#discussioncomment-472618
             // @see critters error https://github.com/vercel/next.js/issues/20742
             // optimizeCss: true,
             // @see https://github.com/vercel/next.js/discussions/30174#discussion-3643870
-            scrollRestoration: true }, (custom["experimental"] || {})) }, custom);
+            scrollRestoration: true,
+            // concurrentFeatures: true,
+            // serverComponents: true,
+            // reactRoot: true,
+            ...custom["experimental"] || {}
+        },
+        // @see https://github.com/vercel/next.js/issues/7322#issuecomment-887330111
+        // reactStrictMode: true,
+        ...custom
+    };
     if (svg) {
         if (nx) {
             // @see https://github.com/gregberge/svgr
             nextConfig["nx"] = {
-                svgr: true,
+                svgr: true
             };
-        }
-        else {
-            nextConfig.webpack = function (_config, options) {
-                var webpackConfig = typeof nextConfig.webpack === "function"
-                    ? nextConfig.webpack(_config, options)
-                    : _config;
+        } else {
+            nextConfig.webpack = (_config, options)=>{
+                const webpackConfig = typeof nextConfig.webpack === "function" ? nextConfig.webpack(_config, options) : _config;
                 // @see https://dev.to/dolearning/importing-svgs-to-next-js-nna#svgr
                 webpackConfig.module.rules.push({
                     test: /\.svg$/,
@@ -270,13 +252,13 @@ function withKoine(_a) {
                                     plugins: [
                                         {
                                             name: "removeViewBox",
-                                            active: false,
-                                        },
-                                    ],
-                                },
-                            },
-                        },
-                    ],
+                                            active: false
+                                        }
+                                    ]
+                                }
+                            }
+                        }
+                    ]
                 });
                 return webpackConfig;
             };
@@ -284,60 +266,52 @@ function withKoine(_a) {
     }
     if (sc) {
         nextConfig.compiler = {
-            styledComponents: true,
+            styledComponents: true
         };
     }
     if (routes) {
         // we pass the default values, so we can assert I guess
-        var defaultLocale_1 = (_b = nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.i18n) === null || _b === void 0 ? void 0 : _b.defaultLocale;
-        return tslib_1.__assign(tslib_1.__assign({}, nextConfig), { redirects: function () {
-                return tslib_1.__awaiter(this, void 0, void 0, function () {
-                    var defaults, customs;
-                    return tslib_1.__generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, getRedirects(defaultLocale_1, routes, permanent, debug)];
-                            case 1:
-                                defaults = _a.sent();
-                                if (!nextConfig.redirects) return [3 /*break*/, 3];
-                                return [4 /*yield*/, nextConfig.redirects()];
-                            case 2:
-                                customs = _a.sent();
-                                return [2 /*return*/, tslib_1.__spreadArray(tslib_1.__spreadArray([], defaults, true), customs, true)];
-                            case 3: return [2 /*return*/, defaults];
-                        }
-                    });
-                });
-            }, rewrites: function () {
-                return tslib_1.__awaiter(this, void 0, void 0, function () {
-                    var defaults, customs;
-                    return tslib_1.__generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, getRewrites(routes, debug)];
-                            case 1:
-                                defaults = _a.sent();
-                                if (!nextConfig.rewrites) return [3 /*break*/, 3];
-                                return [4 /*yield*/, nextConfig.rewrites()];
-                            case 2:
-                                customs = _a.sent();
-                                if (Array.isArray(customs)) {
-                                    return [2 /*return*/, {
-                                            beforeFiles: defaults,
-                                            afterFiles: customs,
-                                            fallback: [],
-                                        }];
-                                }
-                                return [2 /*return*/, tslib_1.__assign(tslib_1.__assign({}, customs), { beforeFiles: tslib_1.__spreadArray(tslib_1.__spreadArray([], defaults, true), (customs.beforeFiles || []), true) })];
-                            case 3: return [2 /*return*/, {
-                                    afterFiles: [],
-                                    beforeFiles: defaults,
-                                    fallback: [],
-                                }];
-                        }
-                    });
-                });
-            } });
+        const defaultLocale = nextConfig?.i18n?.defaultLocale;
+        return {
+            ...nextConfig,
+            async redirects () {
+                const defaults = await getRedirects(defaultLocale, routes, permanent, debug);
+                if (nextConfig.redirects) {
+                    const customs = await nextConfig.redirects();
+                    return [
+                        ...defaults,
+                        ...customs
+                    ];
+                }
+                return defaults;
+            },
+            async rewrites () {
+                const defaults = await getRewrites(routes, debug);
+                if (nextConfig.rewrites) {
+                    const customs = await nextConfig.rewrites();
+                    if (Array.isArray(customs)) {
+                        return {
+                            beforeFiles: defaults,
+                            afterFiles: customs,
+                            fallback: []
+                        };
+                    }
+                    return {
+                        ...customs,
+                        beforeFiles: [
+                            ...defaults,
+                            ...customs.beforeFiles || []
+                        ]
+                    };
+                }
+                return {
+                    afterFiles: [],
+                    beforeFiles: defaults,
+                    fallback: []
+                };
+            }
+        };
     }
     return nextConfig;
 }
-exports.withKoine = withKoine;
-exports.default = withKoine;
+const _default = withKoine;