npm - appstage - Versions diffs - 0.2.22 → 0.2.23 - Mend

appstage 0.2.22 → 0.2.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/index.cjs +19 -10
package/dist/index.d.ts +9 -0
package/dist/index.mjs +19 -10
package/package.json +1 -1
package/src/controllers/files.ts +43 -29
package/src/controllers/redirect.ts +10 -0

package/dist/index.cjs CHANGED Viewed

@@ -79,7 +79,6 @@ function matches(x, matcher) {
 }
 const defaultExtensions = ["html", "htm"];
 const defaultPath = (req) => req.path;
-const defaultLanguages = getLanguageList;
 /**
 * Serves files from the specified directory path or paths in a locale-aware
 * fashion after applying optional transforms.
@@ -91,6 +90,7 @@ const files = (params) => {
   let fallthrough = p.fallthrough ?? true;
   return async (req, res, next) => {
     let urlPath = typeof p.path === "string" ? p.path : (p.path ?? defaultPath)(req);
+    let defaultLanguage = typeof p.defaultLanguage === "function" ? p.defaultLanguage(req) : p.defaultLanguage ?? "en";
     if (!matches(urlPath, p.matches)) {
       if (fallthrough) next();
       else {
@@ -113,24 +113,25 @@ const files = (params) => {
       }
       return;
     }
-    let langs = (p.languages ?? defaultLanguages)(req);
     let filePath = null;
     let urlExt = (0, node_path.extname)(urlPath);
+    let langs = (p.languages ?? getLanguageList)(req);
+    let defaultLanguageIndex = langs.indexOf(defaultLanguage);
+    let suffixes = langs.map((s) => `.${s}`);
+    if (defaultLanguageIndex === -1) suffixes.push("");
+    else suffixes.splice(defaultLanguageIndex + 1, 0, "");
     for (let k = 0; k < bases.length && filePath === null; k++) {
       let base = bases[k];
       if (!urlPath.endsWith("/")) {
-        for (let i = 0; i < langs.length && filePath === null; i++) filePath = await resolve(base, `${urlPath}.${langs[i]}`);
+        for (let i = 0; i < suffixes.length && filePath === null; i++) filePath = await resolve(base, `${urlPath}${suffixes[i]}`);
         if (filePath === null && urlExt) {
           let urlPathBase = urlPath.slice(0, -urlExt.length);
-          for (let i = 0; i < langs.length && filePath === null; i++) filePath = await resolve(base, `${urlPathBase}.${langs[i]}${urlExt}`);
+          for (let i = 0; i < suffixes.length && filePath === null; i++) filePath = await resolve(base, `${urlPathBase}${suffixes[i]}${urlExt}`);
         }
-        if (filePath === null) filePath = await resolve(base, urlPath);
-        for (let i = 0; i < langs.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve(base, `${urlPath}.${langs[i]}.${exts[j]}`);
-        for (let i = 0; i < exts.length && filePath === null; i++) filePath = await resolve(base, `${urlPath}.${exts[i]}`);
+        for (let i = 0; i < suffixes.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve(base, `${urlPath}${suffixes[i]}.${exts[j]}`);
       }
-      for (let i = 0; i < langs.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve(base, `${urlPath}.${langs[i]}`, `index.${exts[j]}`);
-      for (let i = 0; i < langs.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve(base, urlPath, `index.${langs[i]}.${exts[j]}`);
-      for (let i = 0; i < exts.length && filePath === null; i++) filePath = await resolve(base, urlPath, `index.${exts[i]}`);
+      for (let i = 0; i < suffixes.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve(base, `${urlPath}${suffixes[i]}`, `index.${exts[j]}`);
+      for (let i = 0; i < suffixes.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve(base, urlPath, `index${suffixes[i]}.${exts[j]}`);
     }
     if (filePath === null) {
       if (fallthrough) next();
@@ -167,6 +168,14 @@ const redirect = (params) => {
   return (req, res) => {
     let search = req.originalUrl.split("?")[1] ?? "";
     if (search) search = `${url.includes("?") ? "&" : "?"}${search}`;
+    emitLog(req.app, "Redirecting", {
+      data: {
+        from: req.originalUrl,
+        to: `${url}${search}`
+      },
+      req,
+      res
+    });
     res.redirect(status, `${url}${search}`);
   };
 };

package/dist/index.d.ts CHANGED Viewed

@@ -21,8 +21,17 @@ type FilesParams = {
   base: string | string[];
   path?: string | ((req: Request) => string); /** Specifies which paths should be accepted. */
   matches?: StringMatcher;
+  /**
+   * @default ["html", "htm"]
+   */
   extensions?: string[];
   languages?: (req: Request) => string[];
+  /**
+   * Assumed file language if unspecified in the file name.
+   *
+   * @default "en"
+   */
+  defaultLanguage?: string | ((req: Request) => string);
   transform?: TransformContent[];
   fallthrough?: boolean;
 };

package/dist/index.mjs CHANGED Viewed

@@ -53,7 +53,6 @@ function matches(x, matcher) {
 }
 const defaultExtensions = ["html", "htm"];
 const defaultPath = (req) => req.path;
-const defaultLanguages = getLanguageList;
 /**
 * Serves files from the specified directory path or paths in a locale-aware
 * fashion after applying optional transforms.
@@ -65,6 +64,7 @@ const files = (params) => {
   let fallthrough = p.fallthrough ?? true;
   return async (req, res, next) => {
     let urlPath = typeof p.path === "string" ? p.path : (p.path ?? defaultPath)(req);
+    let defaultLanguage = typeof p.defaultLanguage === "function" ? p.defaultLanguage(req) : p.defaultLanguage ?? "en";
     if (!matches(urlPath, p.matches)) {
       if (fallthrough) next();
       else {
@@ -87,24 +87,25 @@ const files = (params) => {
       }
       return;
     }
-    let langs = (p.languages ?? defaultLanguages)(req);
     let filePath = null;
     let urlExt = extname(urlPath);
+    let langs = (p.languages ?? getLanguageList)(req);
+    let defaultLanguageIndex = langs.indexOf(defaultLanguage);
+    let suffixes = langs.map((s) => `.${s}`);
+    if (defaultLanguageIndex === -1) suffixes.push("");
+    else suffixes.splice(defaultLanguageIndex + 1, 0, "");
     for (let k = 0; k < bases.length && filePath === null; k++) {
       let base = bases[k];
       if (!urlPath.endsWith("/")) {
-        for (let i = 0; i < langs.length && filePath === null; i++) filePath = await resolve$1(base, `${urlPath}.${langs[i]}`);
+        for (let i = 0; i < suffixes.length && filePath === null; i++) filePath = await resolve$1(base, `${urlPath}${suffixes[i]}`);
         if (filePath === null && urlExt) {
           let urlPathBase = urlPath.slice(0, -urlExt.length);
-          for (let i = 0; i < langs.length && filePath === null; i++) filePath = await resolve$1(base, `${urlPathBase}.${langs[i]}${urlExt}`);
+          for (let i = 0; i < suffixes.length && filePath === null; i++) filePath = await resolve$1(base, `${urlPathBase}${suffixes[i]}${urlExt}`);
         }
-        if (filePath === null) filePath = await resolve$1(base, urlPath);
-        for (let i = 0; i < langs.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve$1(base, `${urlPath}.${langs[i]}.${exts[j]}`);
-        for (let i = 0; i < exts.length && filePath === null; i++) filePath = await resolve$1(base, `${urlPath}.${exts[i]}`);
+        for (let i = 0; i < suffixes.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve$1(base, `${urlPath}${suffixes[i]}.${exts[j]}`);
       }
-      for (let i = 0; i < langs.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve$1(base, `${urlPath}.${langs[i]}`, `index.${exts[j]}`);
-      for (let i = 0; i < langs.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve$1(base, urlPath, `index.${langs[i]}.${exts[j]}`);
-      for (let i = 0; i < exts.length && filePath === null; i++) filePath = await resolve$1(base, urlPath, `index.${exts[i]}`);
+      for (let i = 0; i < suffixes.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve$1(base, `${urlPath}${suffixes[i]}`, `index.${exts[j]}`);
+      for (let i = 0; i < suffixes.length && filePath === null; i++) for (let j = 0; j < exts.length && filePath === null; j++) filePath = await resolve$1(base, urlPath, `index${suffixes[i]}.${exts[j]}`);
     }
     if (filePath === null) {
       if (fallthrough) next();
@@ -141,6 +142,14 @@ const redirect = (params) => {
   return (req, res) => {
     let search = req.originalUrl.split("?")[1] ?? "";
     if (search) search = `${url.includes("?") ? "&" : "?"}${search}`;
+    emitLog(req.app, "Redirecting", {
+      data: {
+        from: req.originalUrl,
+        to: `${url}${search}`
+      },
+      req,
+      res
+    });
     res.redirect(status, `${url}${search}`);
   };
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "appstage",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/src/controllers/files.ts CHANGED Viewed

@@ -66,15 +66,23 @@ export type FilesParams = {
   path?: string | ((req: Request) => string);
   /** Specifies which paths should be accepted. */
   matches?: StringMatcher;
+  /**
+   * @default ["html", "htm"]
+   */
   extensions?: string[];
   languages?: (req: Request) => string[];
+  /**
+   * Assumed file language if unspecified in the file name.
+   *
+   * @default "en"
+   */
+  defaultLanguage?: string | ((req: Request) => string);
   transform?: TransformContent[];
   fallthrough?: boolean;
 };
 const defaultExtensions = ["html", "htm"];
 const defaultPath = (req: Request) => req.path;
-const defaultLanguages = getLanguageList;
 /**
  * Serves files from the specified directory path or paths in a locale-aware
@@ -91,6 +99,11 @@ export const files: Controller<string | FilesParams> = (params) => {
     let urlPath =
       typeof p.path === "string" ? p.path : (p.path ?? defaultPath)(req);
+    let defaultLanguage =
+      typeof p.defaultLanguage === "function"
+        ? p.defaultLanguage(req)
+        : (p.defaultLanguage ?? "en");
     if (!matches(urlPath, p.matches)) {
       if (fallthrough) next();
       else {
@@ -125,67 +138,68 @@ export const files: Controller<string | FilesParams> = (params) => {
       return;
     }
-    let langs = (p.languages ?? defaultLanguages)(req);
     let filePath: string | null = null;
     let urlExt = extname(urlPath);
-    // Example: path = /x, langs = [en, ru], exts = [html, htm]
+    let langs = (p.languages ?? getLanguageList)(req);
+    let defaultLanguageIndex = langs.indexOf(defaultLanguage);
+    let suffixes = langs.map((s) => `.${s}`);
+    // Check the suffixless path right after the default language suffix.
+    if (defaultLanguageIndex === -1) suffixes.push("");
+    else suffixes.splice(defaultLanguageIndex + 1, 0, "");
+    // Example:
+    // path = /x, langs = [en, ru], default lang: en, exts = [html, htm]
     for (let k = 0; k < bases.length && filePath === null; k++) {
       let base = bases[k];
       if (!urlPath.endsWith("/")) {
-        // /x.en /x.ru
-        for (let i = 0; i < langs.length && filePath === null; i++)
-          filePath = await resolve(base, `${urlPath}.${langs[i]}`);
+        // /x.en /x /x.ru
+        for (let i = 0; i < suffixes.length && filePath === null; i++)
+          filePath = await resolve(base, `${urlPath}${suffixes[i]}`);
         if (filePath === null && urlExt) {
           let urlPathBase = urlPath.slice(0, -urlExt.length);
-          // /x.en.ext /x.ru.ext
-          for (let i = 0; i < langs.length && filePath === null; i++)
+          // /x.en.ext /x.ext /x.ru.ext
+          for (let i = 0; i < suffixes.length && filePath === null; i++)
             filePath = await resolve(
               base,
-              `${urlPathBase}.${langs[i]}${urlExt}`,
+              `${urlPathBase}${suffixes[i]}${urlExt}`,
             );
         }
-        // /x
-        if (filePath === null) filePath = await resolve(base, urlPath);
-        // /x.en.html /x.en.htm /x.ru.html /x.ru.htm
-        for (let i = 0; i < langs.length && filePath === null; i++) {
+        // /x.en.html /x.en.htm /x.html /x.htm /x.ru.html /x.ru.htm
+        for (let i = 0; i < suffixes.length && filePath === null; i++) {
           for (let j = 0; j < exts.length && filePath === null; j++)
-            filePath = await resolve(base, `${urlPath}.${langs[i]}.${exts[j]}`);
+            filePath = await resolve(
+              base,
+              `${urlPath}${suffixes[i]}.${exts[j]}`,
+            );
         }
-        // /x.html /x.htm
-        for (let i = 0; i < exts.length && filePath === null; i++)
-          filePath = await resolve(base, `${urlPath}.${exts[i]}`);
       }
-      // /x.en/index.html /x.en/index.htm /x.ru/index.html /x.ru/index.htm
-      for (let i = 0; i < langs.length && filePath === null; i++) {
+      // /x.en/index.html /x.en/index.htm /x/index.html /x/index.htm /x.ru/index.html /x.ru/index.htm
+      for (let i = 0; i < suffixes.length && filePath === null; i++) {
         for (let j = 0; j < exts.length && filePath === null; j++)
           filePath = await resolve(
             base,
-            `${urlPath}.${langs[i]}`,
+            `${urlPath}${suffixes[i]}`,
             `index.${exts[j]}`,
           );
       }
-      // /x/index.en.html /x/index.en.htm /x/index.ru.html /x/index.ru.htm
-      for (let i = 0; i < langs.length && filePath === null; i++) {
+      // /x/index.en.html /x/index.en.htm /x/index.html /x/index.htm /x/index.ru.html /x/index.ru.htm
+      for (let i = 0; i < suffixes.length && filePath === null; i++) {
         for (let j = 0; j < exts.length && filePath === null; j++)
           filePath = await resolve(
             base,
             urlPath,
-            `index.${langs[i]}.${exts[j]}`,
+            `index${suffixes[i]}.${exts[j]}`,
           );
       }
-      // /x/index.html /x/index.htm
-      for (let i = 0; i < exts.length && filePath === null; i++)
-        filePath = await resolve(base, urlPath, `index.${exts[i]}`);
     }
     if (filePath === null) {

package/src/controllers/redirect.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import type { Controller } from "../types/Controller.ts";
+import { emitLog } from "../utils/emitLog.ts";
 export type RedirectParams = {
   url: string;
@@ -14,6 +15,15 @@ export const redirect: Controller<string | RedirectParams> = (params) => {
     if (search) search = `${url.includes("?") ? "&" : "?"}${search}`;
+    emitLog(req.app, "Redirecting", {
+      data: {
+        from: req.originalUrl,
+        to: `${url}${search}`,
+      },
+      req,
+      res,
+    });
     res.redirect(status, `${url}${search}`);
   };
 };