Project update. [p][robotic]

clevercanyon · Apr 12, 2024 · e8f409b · e8f409b
1 parent 25f1d4a
commit e8f409b
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 81 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 [production]
 node >= 20.9.0

diff --git a/.dockerignore b/.dockerignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 # Locals
 

diff --git a/.env.vault b/.env.vault
@@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="7GW98NfL4hM4N6HbfeDXCKreVxKvcVPupFRnZ8XJ+pomaQ=="
 DOTENV_VAULT_MAIN_VERSION=1
 
 # dev
-DOTENV_VAULT_DEV="X+sBdBmkwgJE/a/hzf6jSJu91xivh5yPbDNjPHIN3kUWGKlzjbWh6bKCNmzpT2sC0owFgZ/R7R4f3mwgWHfg9Xf+zwEaMek24/V551CUyid79ysq7xOse2yFkelm9SsscG+ML6zHHAYv1Cw7alr4zvmXMgyl6U+B9BgM2DA+tLHMJpQApUp+3yNSWSUp/Wf3UBysI/femwWj72pU/VGo/fHtBQ0IdiWYQXXzpYbZWEt4/M3AogkMahPEEiNXEQPl2g=="
-DOTENV_VAULT_DEV_VERSION=541
+DOTENV_VAULT_DEV="nQmAGkQBrA0LJ6//jfhUoXrjBO7oNohwaU8qDw2eSW1tjVyt86be1LqAG7kLceYuc55x5geqwbfOX8IMZrt1ULiiTcRYLSRXUItObBmlpSv+muLpGgbqmmH5qa2Enag9zCwyRIPDx5Bc2346as+PyZIyweeHWY2qVvoGQUfGOoz6tXClyO3xJNrTlCMj/8tNP2q8HLFl244Gmzh8r9VibplUAvA65J/aha+t8rQpSL3v0uQq6Sty/HqO4DzTO9olwA=="
+DOTENV_VAULT_DEV_VERSION=543
 
 # ci
-DOTENV_VAULT_CI="vnrCPcwxExEIa5nOZsOGKL4xAg7nw4caLK2cbtUxo6WoFNfpONcC13+AY10qCZJAjori3/GB32FQwQbYx5k76SJow7i6cuFXLQ2Ww3S2Ahcr98jeCA19ssjFZ+gDll77ErMrsgBr+3loK95alJvHaDTgKTeICEpxw4p+qBk7vA=="
-DOTENV_VAULT_CI_VERSION=541
+DOTENV_VAULT_CI="KMYgM4Bd+iN2msYMa/wX6ydZY+CSjemRuiFliQBhQHJh6mswo47Wa4V7mbcs0UVkpHAfDrH0WuLw+lYVEMlKH6mQN2k/iq1GG7iLgkdJw+ADaZknJPrHAL9hZxYv2E32MMiP3A3a/VMGApyztwfveRgFxHsSNKfDZxz7cWzlAw=="
+DOTENV_VAULT_CI_VERSION=543
 
 # stage
 DOTENV_VAULT_STAGE="aRP8su2YV4jZu3w1HZ/SLaots0IwJDFw75TCpvXEFeNp7tw="

diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 # Default
 

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 # Locals
 

diff --git a/.npmignore b/.npmignore
@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 # Locals
 

diff --git a/.prettierignore b/.prettierignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 # Packages
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,7 @@
  * @note This entire file will be updated automatically.
  * @note Instead of editing here, please review `./settings.mjs`.
  *
- * Last generated using `./settings.mjs` Apr 11, 2024 11:08 AM UTC.
+ * Last generated using `./settings.mjs` Apr 12, 2024 12:20 AM UTC.
  */
 {
     "editor.formatOnType": false,

diff --git a/.vscodeignore b/.vscodeignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Apr 11, 2024 11:08 AM UTC.
+# Last generated Apr 12, 2024 12:20 AM UTC.
 
 # Locals
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "1.0.957",
+    "version": "1.0.958",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities",
     "description": "Utilities for JavaScript apps running in any environment.",

diff --git a/src/http.ts b/src/http.ts
@@ -413,33 +413,33 @@ export const requestPathIsSEORelatedFile = $fnꓺmemo(2, (request: $type.Request
 });
 
 /**
- * Request path is in an admin area?
+ * Request path is in an account area?
  *
  * @param   request HTTP request.
  * @param   url     Optional pre-parsed URL. Default is taken from `request`.
  *
- * @returns         True if request path is in an admin area.
+ * @returns         True if request path is in an account area.
  */
-export const requestPathIsInAdmin = $fnꓺmemo(2, (request: $type.Request, _url?: $type.URL): boolean => {
+export const requestPathIsInAccount = $fnꓺmemo(2, (request: $type.Request, _url?: $type.URL): boolean => {
     const url = _url || $url.parse(request.url);
     if ('/' === url.pathname) return false;
 
-    return /\/(?:[^/]+[-_])?admin(?:[-_][^/]+)?(?:$|\/)/iu.test(url.pathname);
+    return /\/(?:[^/]+[-_])?account(?:[-_][^/]+)?(?:$|\/)/iu.test(url.pathname);
 });
 
 /**
- * Request path is in an account area?
+ * Request path is in an admin area?
  *
  * @param   request HTTP request.
  * @param   url     Optional pre-parsed URL. Default is taken from `request`.
  *
- * @returns         True if request path is in an account area.
+ * @returns         True if request path is in an admin area.
  */
-export const requestPathIsInAccount = $fnꓺmemo(2, (request: $type.Request, _url?: $type.URL): boolean => {
+export const requestPathIsInAdmin = $fnꓺmemo(2, (request: $type.Request, _url?: $type.URL): boolean => {
     const url = _url || $url.parse(request.url);
     if ('/' === url.pathname) return false;
 
-    return /\/(?:[^/]+[-_])?account(?:[-_][^/]+)?(?:$|\/)/iu.test(url.pathname);
+    return /\/(?:[^/]+[-_])?admin(?:[-_][^/]+)?(?:$|\/)/iu.test(url.pathname);
 });
 
 /**
@@ -760,8 +760,8 @@ const prepareResponseHeaders = async (request: $type.Request, url: $type.URL, cf
                 if (
                     'none' === cfg.cacheVersion ||
                     !requestHasCacheableMethod(request) ||
-                    requestPathIsInAdmin(request, url) ||
                     requestPathIsInAccount(request, url) ||
+                    requestPathIsInAdmin(request, url) ||
                     (!cfg.cacheUsers && requestIsFromUser(request))
                 ) {
                     sMaxAge = 0; // No server-side cache.
@@ -801,10 +801,10 @@ const prepareResponseHeaders = async (request: $type.Request, url: $type.URL, cf
         } else if (requestPathIsStatic(request, url)) {
             cacheControl($time.yearInSeconds);
             //
-        } else if (requestPathIsInAdmin(request, url)) {
+        } else if (requestPathIsInAccount(request, url)) {
             cacheControl(0); // Do not cache.
             //
-        } else if (requestPathIsInAccount(request, url)) {
+        } else if (requestPathIsInAdmin(request, url)) {
             cacheControl(0); // Do not cache.
             //
         } else if (!cfg.cacheUsers && requestIsFromUser(request)) {