Project update. [p][robotic]

clevercanyon · Mar 14, 2024 · 6c44c21 · 6c44c21
1 parent c4b59af
commit 6c44c21
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 66 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 AM UTC.
 
 [production]
 node >= 20.9.0

diff --git a/.dockerignore b/.dockerignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 AM UTC.
 
 # Locals
 

diff --git a/.env.vault b/.env.vault
@@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="3rfi+ClkONvfHPiU9FTBcC1+Um/L8QeM9dRw1jFzEqzZXw=="
 DOTENV_VAULT_MAIN_VERSION=1
 
 # dev
-DOTENV_VAULT_DEV="9iUpKJ+QSVhYYCJkjPwCxlgc18ktd8YPUE8feW14tMxJibUv6eSbNe3SqycXbv5VgC5v0UKEJNj5+AmnVdu5s+BMGTSRCcHZjczGWqBi/CKy1zMmsZSFxA6btAwX2A+IpgAMhzlk7qfblHRJH1PxRaPIACo+yUm/+mloCJnKTY93lX2MYSTc90wnHMr67wgBe88Hf2d0bogNh7HoNkjBX7qF3klYl1DrQXcqeI8dXu7pkvk89FnHt/6bdP4D/W2OLdj5nPtPp2mlzhf82y3YAmR9f0Qn7gxZLtMztMu5ZHuPYMeFQOzQKJl8ouFNFad/bjimxVhOc9Cl4CgmDfbCBT8nNLx9SUrQFg62ZpFOLKyx5ZaSX0Iz69YeAsUmrRAkzbW58Y0wYiCQJaPjgnVGd7bDnGVkG/070XBe59/BN3LlAiSOOxtVem/+g2MhuoUFNt4xG1b+iynwbZ7kFy4FlRMgQmQjOtbWBq8elEQROm4K1Ku6R6HwdFFrXpwghQ8JLd1p5W4Pa/nuJbTmuT3qleIxB32PdnasjwSpyt9+p/DQCrF299O9mDvFvHFCuUCeGU7pESPXCTObe4AWbc41s0YK5qVEJyQl5ESAP9vhwKnG33h/u82womri5IQrPtN641NuydKPnj7zLq22uEjz033kHP64DNHF+dxhZ/jsEKX/XipU/HI/ybJjihMhREtUtUtZcnw2rNtjjezC0UN7UwpAnjzvBgqekGyh4tEAKLYiijDnDIn0Ed/xElIaaCLlcqWzGnvjNHr3+agGUWkzduhduPlohRH6tuoIwe4pD+WFYZDHBIVV0hsAnfHue7/YrE/OIKQH3/Yi9ecC8oENaLtRc1IK+Stei2N+4DukAmxyKbvqip9pZyp8FZEd"
-DOTENV_VAULT_DEV_VERSION=285
+DOTENV_VAULT_DEV="p+HLouucSz+2g9uiXWyiRM9J7NanfEL28ODGEEVqyVRyN7scxBPsKHsn45YKar2i5P8T/OkwLg8j/bmQii3zNBoPMu0xcXe5AgE3vbTKml9c7NmlAiG9+oW/Nj5IQKZYe2vq5mE+dDyTNl4UCwbpdlQYFaN6xSGLWwDiYACZmhwWcNWWh4KoorIOejX4rCXU2BjIvYoIclUDgalMW4MxFN36jPgoeXoio1rYrfL24WMMbS/+ONlQz5AarrrORnn8YB25rBnKYT9dKslZ/P4Y0ZW3xbt0Z1kIMHBJypC2ReDGOmKGzAeASyyj4DvWeueLFeifZPlseRiarVEr22ppR23H92NevwI8Rbfl10V5oYjAknwIA9EUzFlD+X5qOGIizkQaTl55PSCRnW2WoZt8DOKnE4ga1kU15QCx9FZp76ZO2LNDGxLmVr6bRibp2+z/k0OTYH2bhN/N6YcMQWAFLtJPO83XBkbB4bJC/qcIKc9Qp+T4iGHGsVp/Ct51CMxbYKn7g6rcWbZmnBnVOKP33gRoNilMXUZT4fzyaVtgfiEXuPVXjrA2m2lQGE1dRaQPK6NS4+QY0n+/sS0RSePqyegadJnkm+7Y4tLduyHp16YtaZCPm42nW6BUuYK9gy0/WUvL+JBBDQyzowgVlyXeL2PMNTk1q907YNLW6D+3+tpnBYGuC3rcfOnUcGQrkNuzsDTw8Hj6s0iwKYRK7QOq5l3E2xxfOl9MKzuXXt7oxIBMtMGW29/xM5kNGQ3P4P8+xjtMLbeL8kAqCXrR8D4WYmIwdy3RLtGwYcWdRKhWyfWXhLKIBM+Ttv9CufAXrytwgKehXrlXnnS8QHdFAFoGrmK0pVtcvBMxUdwghcxHfZfQf5BQeSbSvP1TuNtM"
+DOTENV_VAULT_DEV_VERSION=287
 
 # ci
-DOTENV_VAULT_CI="KrMVX442jzZtsaVhhXSFg+1gx2BGs+LjN8xGci++brtkginH/PQOQZgBXnDjxXcLzl/Q1l/mmwUsUQOnwWnJyqWPC05/GYFOSirRr4vPcuLP0+ZBEHVHJEcSD7j4xsfR2Mc8nxMWb1PUG0uzApSNQRWmKBJI6QpJFEBEx1TUN3rWUTnhya8HDKrwuGpsD/L37cdcnMcMUrXyoXe3zxNFAzi2YWzAMTipmxRsIYXQ5AJYab8TTjKNqLaAe3Np4vDmVW4xHKWt8CJWJCLebdTr8bxEAgGdQrmFtpqZ57BT/Nv63KLE/hj9tza04C2KHaHDkVVGIGKOn700iQA3W4zBgWrRmXv/R98xpxMrqUCvUuFlZfl1br3f+E0emz4rDajYp6o0hP0x+AeHruwm1Vo4oSAOAdU5OEfnjsQp2Q+tYHn6C2w5MGL8r0uBQ2qmRqAJ3D/ut61CtWna8Hjy+FwA21Zq1xhfrXr0pXDZ1LnB5Ywk9L9s99V59kUm4xLTimjMeVOXhbtnv98LQxupKnrQ9RHkShHxw85hH8kQpDS6RPVbcc7ZAJ/M79NdonUn7iRBFsA8SOYxnjn1u2w78NkP+s2CrfdMjaPauNjQgk9VW44KKPgUvatPrdKnjRdaKD0AL6WskcASw6eeD02q4Sr+ZtYVb5HzrhkJmth3Q4q4aphz+bhuwQmSs2O08m7cPVyvWphtAAU8pJWKgHHnH7cl5v6L4nnpwTusg1dLm8FKlaR7wnaYaSokrdDsut+Rslu5p8wTfr23PthZN1MlWhiHidn3z5OUIEKRH0mWmbYo72GhiZaQYog5aQu4F631tJ4DvKMgeucpeF0WGAQ0AkbFIDhwoKsVgd47WPpdYp8HUXcjBjnT/QjVc3KkP0qo"
-DOTENV_VAULT_CI_VERSION=285
+DOTENV_VAULT_CI="fMU4wfg+36O2x80e7GqCmrQar2kO1dPbiTfehqPKNWoIYT6F48VBJG3cka4IqvZO2QdmMwMuyU82StJyCSVO8aWWkfydrwApM6FrhJDoKNpaXT/9I4+gHEfFEMA+HqAILFIhpEanI1PL5X9cXLid2HcS2uc5O995M5z1vEdteSqyl/Vk0qd6QtnbtKJd+FEE+NBEHe3Ug/FYklj78SduDCMiyoduLj1cUx656i09hwupjS4Yfkz+SB5xLYu7M9jDlxK5E+qtdV5Z1eHo/eeb+QKgVq55TMtvMfgL1KbuGoD9NlkPZJm5kK1xEfc72ujzN0nrgs/Hh2AuvDo6E3zRGgF61LgJYPk2TwbN/Co88eIKQi5qeCcvl6K0QXvOTGTsvdZ8MMLbuiQJ9O6kLpXEoZP1UJtg5Lj1rThWnwE6zI5hJR7g3lIYIGclCgqXXSN+9DOo+FHvx732T1gcPjvu2stwXEnr4auKNXNXG8RC2Klj4jX2HutBF5XOWahuRLu1Wa4Rl83AajOJ+TJKA8uj47Kuv0Y/ZXN3IU1V0Enf76a9mQn+I9PBzmbcsB1mzcYgGyg+K4asESDv9XvyCrBsOfZ9GlMk0QpZiDXHj4oO03yWyBiTH9yZNdaGlNeOd8Z1jbAvlwsi/3/KHrqm9CK3UPf9ktGA2iUyPEqlL0Ru0A4Novo3QTQqXp8gDyTQ9rfc3I7XrcFUWAP5YjwLlEWJ/2S9E4Hdb1VGqrr2r75S9575NphF35WuGBEi/Q1FpT0patuRHkYyE7fy+9f7UsPjl2vTa8NZgbO+t2wG890O9J1xb88sJx4kuzghSntMY+z74itRB0BRHYtCXVQkE5uYkhFte3M0sKYDmPOqwWaSoiX1j1Gr3zC5xJ8Fq9RU"
+DOTENV_VAULT_CI_VERSION=287
 
 # stage
 DOTENV_VAULT_STAGE="bfqZYD8oVLWMZ0JR5LICV+sB/btaXavszxZLxTfwSH8U5fg="

diff --git a/.gitattributes b/.gitattributes
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 AM UTC.
 
 # Default
 

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 AM UTC.
 
 # Locals
 

diff --git a/.npmignore b/.npmignore
@@ -25,7 +25,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 AM UTC.
 
 # Locals
 

diff --git a/.prettierignore b/.prettierignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 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` Mar 14, 2024 2:43 AM UTC.
+ * Last generated using `./settings.mjs` Mar 14, 2024 3:46 AM UTC.
  */
 {
     "editor.formatOnType": false,

diff --git a/.vscodeignore b/.vscodeignore
@@ -17,7 +17,7 @@
 # Generated data.
 # <generated:start>
 
-# Last generated Mar 14, 2024 2:43 AM UTC.
+# Last generated Mar 14, 2024 3:46 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.296",
+    "version": "1.0.297",
     "license": "GPL-3.0-or-later",
     "name": "@clevercanyon/utilities.cfw",
     "description": "Utilities for JavaScript apps running in a Cloudflare Worker environment.",

diff --git a/src/cfw.ts b/src/cfw.ts
@@ -374,26 +374,18 @@ const subrequestCounterProxy = <Type extends object>(target: Type, subrequestCou
     if (target === cfw.fetch) {
         return subrequestCountryProxyꓺfetch(subrequestCounter) as Type;
     }
-    const targetC9rName = $obj.c9r(target)?.name,
-        supportedTargetC9rNames = [
-            'CacheStorage', //
-            'Cache',
-            'Fetcher',
-            'D1Database',
-            'D1PreparedStatement',
-            'R2Bucket',
-            'R2MultipartUpload',
-            'KvNamespace',
-            'WorkerQueue',
-        ];
+    const targetC9rName = $obj.c9r(target)?.name?.toLowerCase(),
+        supportedTargetC9rNames = ['cachestorage', 'cache', 'fetcher', 'd1database', 'd1preparedstatement', 'r2bucket', 'r2multipartupload', 'kvnamespace', 'workerqueue'];
+
     if (!targetC9rName || !supportedTargetC9rNames.includes(targetC9rName)) {
         throw Error('QGySmpVX'); // Unexpected object type.
     }
     return new Proxy(target, {
         get(target: Type, property: $type.ObjectKey, receiver: unknown): unknown {
-            const value = (target as $type.Keyable)[property];
+            const value = (target as $type.Keyable)[property],
+                valueC9rName = $obj.c9r(value)?.name?.toLowerCase();
 
-            if ('CacheStorage' === targetC9rName && 'Cache' === $obj.c9r(value)?.name) {
+            if ('cachestorage' === targetC9rName && 'cache' === valueC9rName) {
                 return subrequestCounterProxy(value as object, subrequestCounter);
             }
             if ($is.function(value))
@@ -487,60 +479,60 @@ const subrequestCountryProxyꓺfetch = <Type extends typeof cfw.fetch>(subreques
  */
 const subrequestCounterProxyꓺfnRtnValue = (targetC9rName: string, fnProperty: $type.ObjectKey, fnRtnValue: unknown, subrequestCounter: $type.$cfw.SubrequestCounter): unknown => {
     if ($is.object(fnRtnValue)) {
-        const fnRtnValueC9rName = $obj.c9r(fnRtnValue)?.name;
+        const fnRtnValueC9rName = $obj.c9r(fnRtnValue)?.name?.toLowerCase();
         if (
-            ('CacheStorage' === targetC9rName && 'Cache' === fnRtnValueC9rName) ||
-            (['D1Database', 'D1PreparedStatement'].includes(targetC9rName) && 'D1PreparedStatement' === fnRtnValueC9rName) ||
-            ('R2Bucket' === targetC9rName && 'R2MultipartUpload' === fnRtnValueC9rName)
+            ('cachestorage' === targetC9rName && 'cache' === fnRtnValueC9rName) ||
+            (['d1database', 'd1preparedstatement'].includes(targetC9rName) && 'd1preparedstatement' === fnRtnValueC9rName) ||
+            ('r2bucket' === targetC9rName && 'r2multipartupload' === fnRtnValueC9rName)
         ) {
             return subrequestCounterProxy(fnRtnValue, subrequestCounter);
         }
     }
     if ($is.string(fnProperty))
         switch (targetC9rName) {
-            case 'Cache': {
+            case 'cache': {
                 if (['put', 'match', 'delete'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'Fetcher': {
+            case 'fetcher': {
                 if (['fetch'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'D1Database': {
+            case 'd1database': {
                 if (['dump', 'exec', 'batch'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'D1PreparedStatement': {
+            case 'd1preparedstatement': {
                 if (['all', 'raw', 'first', 'run'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'R2Bucket': {
+            case 'r2bucket': {
                 if (['head', 'get', 'put', 'delete', 'list'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'R2MultipartUpload': {
+            case 'r2multipartupload': {
                 if (['uploadPart', 'complete'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'KvNamespace': {
+            case 'kvnamespace': {
                 if (['get', 'getWithMetadata', 'list', 'put', 'delete'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }
                 break;
             }
-            case 'WorkerQueue': {
+            case 'workerqueue': {
                 if (['send', 'sendBatch'].includes(fnProperty)) {
                     subrequestCounter.value++;
                 }

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,7 +7,7 @@
  * @note This entire file will be updated automatically.
  * @note Instead of editing here, please review `./tsconfig.mjs`.
  *
- * Last generated using `./tsconfig.mjs` Mar 14, 2024 2:43 AM UTC.
+ * Last generated using `./tsconfig.mjs` Mar 14, 2024 3:46 AM UTC.
  */
 {
     "include": ["./src/**/*", "./dev-types.d.ts"],

diff --git a/wrangler.toml b/wrangler.toml
@@ -7,7 +7,7 @@
 # @note This entire file will be updated automatically.
 # @note Instead of editing here, please review `./wrangler.mjs`.
 #
-# Last generated using `./wrangler.mjs` Mar 14, 2024 2:43 AM UTC.
+# Last generated using `./wrangler.mjs` Mar 14, 2024 3:46 AM UTC.
 ##
 
 send_metrics = false