diff --git a/.browserslistrc b/.browserslistrc index 00d9f2e..b0e5ba7 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. [production] node >= 20.9.0 diff --git a/.dockerignore b/.dockerignore index 9368e78..bb9d53c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. # Locals diff --git a/.env.vault b/.env.vault index b786989..82b923b 100644 --- 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="Z2neo6qDCxFAqysWleQLxd99TA9Au+qub6IvYwwU5XoejHz47fFd4oBdn1R3NuXYx3uyZBMCut8edJy8itYd+KC36J64yYT03TQeEy6skFQRt1bVmjL0ExMArvyae9MPukV11SWd4I7Ko14W5zJncg4WAo2CDRnjLCpt1nuLlgMejfKjoiQsxuGRIm72d2sccJwReM+XAwQIfJAcxTAR63YYRO5RmkVyqdpE4liLTwa91nTytlBcM6D9TW04Q0TDjU9RRVhRlDxOd7W4m5iDUxDCYrGT5zOtIbsOXj5psOx7n804Kx/Ui336FNQJ9aX9q7Omgfn5oqEi2+a6Ai189qHAM/LIMQ2kDzvly6jDQESQMEBAcBLhOK0c4yc/GY9xG4D3/1Eb1Tiv7vDMbfwCAGGN0r4jJRfAuQheqV7Yeg/yK7HblZlTtorXJ11IBSP9MDsmg8LGo6m9dL/zZHCNvi3HyQKLJ9XdXxJgER4koGL2YhVyNoOQoEP85LPl5alMo3qhG8w9l0ebMFplhmNE0o4UAy0aLTp4Aa3C4OAQdti43lyqgU1qyQLtVyRHcddp6ocJfwFsX5eNiKoNNfiPs8kyi8GXib3kJXDCIcji8M9JDAdETaMpOA0diCFYLE2GyMYABklymOZBkLV6srn1I/GzOqDvVZ0RZ4s3P/6yxwLm4sbxog4nIxX/V8lfHaR+/craNrKrqxSpSSz1O5v7QeJVysAmQj9zlb4kIWbDogxpRQhf9otiG9Sz78Wlkz4ybJSu1xEiGfxZmsBwCoi5DoTSAaK/N2VO7DWDyUa0CVStYrukA/Sv79gKEwCUKPrkUhp390xjIym/rxj7yfen+r3FJrVGolW/3abt4NR8YV2PzvHclNeDokuwMpZJ" -DOTENV_VAULT_DEV_VERSION=245 +DOTENV_VAULT_DEV="uo9igBgtrYb2dvvi+ExwX70qVXLBcypogCen1MDxWdoY1mwY6zrumOVcCbEeT0fDvmuWOYlX/cA3xDYVPfxQz4gUkODdxzawcdN2lYXUhBCtMa3O6/E32xAQ8S39u3cNgdqkCPeeZGiAxfAkOGVqnvTKsQHahwxTq1FwyhLRUkYN1BX5f0DLxm8Z1n7Nq5R31r02LNZMK8KuG99m0HPZ4jBrPbAB24ZntfdQSifM2blFaBMGkXDptsOAaXb0Qxnb4gcm0CoE67lm+9/Wy389qCHwksQDM3MDFO3VBCwsvz9sTYeqzC4Lt6Zva2ZvwqeSQDL/5G1PUSrnDC0m0MktRqtqgJ2evOmH+MD/UV6YAWrIBAnxtp7DQOIiAMj5kztCA2MDOtP97xxf4W39nAh0/7rx0A0pLEoFaBrsLN8w/tGO6h6LTDwAl1CXaMzcuSnhCCeCfYTtv7hXHmPXtBwAAgD05L+CqfEtMU8sVysXMkgf0gzE5xjs8GYTemwUtWVW/zQjdENlG3W1tX/EqEwfJ3lxT0plQgDb2Le85lMiH6mhTYPZDrc0qYzZ9TOobViijBJAqViPeEzhFauvcbaqj4P9NHuyL1Oxjc66yNK9qO/54RyOYXl2ZJXX9cDVC4AOnGytcv06hZ0hq1DyGzznAbXNQqczUbrJILTjqw8+k8MsSmDpZ61GSI8exl8OykNHrSxza0i0XKYav6L6g+/P7AOfRoGJoutzzW8LhADz57XHRslVXyxknJ8hDyVWSJYRtxViTUo+wmWiZiioV3+AZ/OwABa4a7bcUUtJe5MtJi/8I4w9ZsoTpOGXW/kYAYFgxiIfL+F0r7pzOXeYaNvh62hFC8PdTzuaz/ZV7qrIgted55L9NksGXxPCpouY" +DOTENV_VAULT_DEV_VERSION=247 # ci -DOTENV_VAULT_CI="sq3STahgnunSAvFGdTpwycywyCFJ3J8SLol1hNIhuB1c7xEXIA7OPmEQ2U1wa5J4RZUVN6wSW7naM62zH6ysSXyO266FsZ5znw6lngKCb2YSLb7J39X5alwbsQDJnSQBciP515Wpu8RCZeOuEFOghpU9peigEw723ojWnxVnbKAaUN8FS6wS4wf8z5qrYyvtO4tn2rq24JYx7WFpnKi2tjDxo/nxqvrHicb1hMP/sJbmSsfEAljVOcZeQwc3SmsqkEcQjfcw1KavG7arZ7os5cAYOmYVqsKRhSfBRG0x/G7y9etT27jDB8QnS10wcOeyJgDmrUIstRNhynUAyfVPntBfKSBfA21DOqdLiRFQeT1v2qrsNjv6hl/dbq6/+MfzFyK7DAcnOqYLUr129VJt8xpfAi7TkH1LtzOfDikcDnvrJuX7YX4fQLCa8CucHcsl2DP1mnSsrKksCVUHUorwCsoaGai74rviaARzH4qndpz2iblYB7yFCWNbJdOItE5WCLI7J8STXE3XlhGDHiQLMpd8QWtcCE8HkoE1WhJmDNruBm+d9oIjKj2Y+18EjEOlSi+cnpEx89HMzQWMN4beO5y2tNhrVjMXiStAZFBoReeoL1+0dtVkmUQ/hi7JzycBTyVQcQxM745KjarWdEBvulJh7KGA90MjGEgf1BbBqfgrPcK1FZq1N9C361LEDL1nJWApoXdZZ5v7zqn5RYxj+feM/gY7N3c1dHGWRwuDJ4mit0dyYehbGluXc1aYZwuNbJ+2Y0gr6XWIiK6YRfuTdq2FsGDw3sVh5mB9zOkets8mntWNYgBRCxGWyZw0eUWmwJl25oy2CPfyS0gGIttNAOVfpHqOQnR5AwYhm00f8fKDYlPXrdbpt9oR2bZ2" -DOTENV_VAULT_CI_VERSION=245 +DOTENV_VAULT_CI="zqkjXoPxYaAi/MJlRysIJWkq5etqFlz6iynZnPt5YlVdSNRH81MIJimtoUB1HQnaMxfIVJXPLKYShJ33ZNtldBtRBB9QD+MKLTnQkcSNjWKoSqD4XXc5dKcG05GfW+Eq+mJU0f1Yvpv2cMvp1N/Uyf74fSXHoznwQxYsZT0OT0enh7bE8BKdZRD4ftVGd89zxPRCQHiHE8URHyw1gM0WNieGcLMtNLvwqNE4NwaTNY659G+8v0KAo9PT/4js5kkyQgFoKPKgyfAbV9a8ASq5RRhUd3NHvmZNM5pt8Hn6Ag/huJqD/IOA2cTMIObSubqxQb0VfYM//A/BrpN8PZNpqGdgiD8yumk2qauwA0HbtaaE/AwcmHiL7/edvExefBOwbWg7WashpdxRKZUiqKQY7Pwm73wjO/VJg2vRjAAx2xNMBrqNGfcu+SM1L0mC9mSbZCnniccp7LejQ4IKYeUWQHZ5bW9rHYFb2TeFYGHdM/TQBSNWM1oc01xCw6DckbquaRWSNqfxgUR78ep3cgHSqMDiAocUu7FiwN5q9e2SWd4eD+JqbdISxSCCZ/NcR2iPxrCNdJnZcRJRXxjQKh6n2lOqzkn00yLTO+12KQDuxxjyfiVvp2LLGllXhBrtT2681DL3urMMAHth/CT56uQyXjGMGWPZbTG3/geKI9TGxuOFtIPOjm0Dd8INV+0UdbZgD7PgkuNKQ+XVqjkhQEBO/oLi9a7VzSsMTOHHEDXzRKWW+9HOsTB6WVEtjCXuRA/FclqefOAyX+db/dcaLmr4KkIDNcytcigMCEeZuaj6Pb74pYtCcjRoSUjL+ko2I5YAm8r1Fph+B4CXz1h+OYHdRQx7wHDZioqLvfHffWlXemkIfIkbtbM3/elLnJoc" +DOTENV_VAULT_CI_VERSION=247 # stage DOTENV_VAULT_STAGE="bfqZYD8oVLWMZ0JR5LICV+sB/btaXavszxZLxTfwSH8U5fg=" diff --git a/.gitattributes b/.gitattributes index f1e8327..750d412 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. # Default diff --git a/.gitignore b/.gitignore index eb8c08d..259fc8b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. # Locals diff --git a/.npmignore b/.npmignore index 872e4f0..d26485d 100644 --- a/.npmignore +++ b/.npmignore @@ -25,7 +25,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. # Locals diff --git a/.prettierignore b/.prettierignore index 9dcb914..ea6ffc7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. # Packages diff --git a/.vscode/settings.json b/.vscode/settings.json index f2521ec..5f3d31d 100644 --- 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 6, 2024 5:38 AM UTC. + * Last generated using `./settings.mjs` Mar 6, 2024 5:44 AM UTC. */ { "editor.formatOnType": false, diff --git a/.vscodeignore b/.vscodeignore index 9d857aa..5230e8c 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Mar 6, 2024 5:38 AM UTC. +# Last generated Mar 6, 2024 5:44 AM UTC. # Locals diff --git a/package-lock.json b/package-lock.json index 47dbd7a..302beba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@clevercanyon/utilities.cfw", - "version": "1.0.275", + "version": "1.0.276", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@clevercanyon/utilities.cfw", - "version": "1.0.275", + "version": "1.0.276", "cpu": [ "x64", "arm64" @@ -1103,9 +1103,9 @@ } }, "node_modules/@clevercanyon/utilities.cfw": { - "version": "1.0.274", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfw/-/utilities.cfw-1.0.274.tgz", - "integrity": "sha512-52HxXqDVzWi3I/S9IUsgB6+J0cfjFRg4Rpe3COd5fRGKU7fvjc3GAxOZwdhlvMXirc+3dNEPhZMVO01DBZlDFA==", + "version": "1.0.276", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfw/-/utilities.cfw-1.0.276.tgz", + "integrity": "sha512-YvAxEBVk5xsn4f/pGKKx5pPqReSg5i0fMMJuIVcAyNtwAN7rAnM94O+JoeI0wyKGGkh0VzALmZ3MIM+NfbeG4A==", "cpu": [ "x64", "arm64" @@ -1124,7 +1124,7 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.884", + "@clevercanyon/utilities": "^1.0.885", "@cloudflare/ai": "1.0.53", "@upstash/ratelimit": "1.0.0", "@upstash/redis": "1.28.0" diff --git a/package.json b/package.json index 86d1621..c51786b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "publishConfig": { "access": "public" }, - "version": "1.0.276", + "version": "1.0.277", "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 index ad9d198..2b77592 100644 --- a/src/cfw.ts +++ b/src/cfw.ts @@ -7,8 +7,8 @@ import '#@initialize.ts'; import { $app, $bytes, $class, $crypto, $env, $error, $http, $is, $mm, $obj, $url, $user, type $type } from '@clevercanyon/utilities'; // @ts-ignore -- Broken types. -import { Ai as AiWithBrokenTypes } from '@cloudflare/ai'; -import type { Ai as AiClass } from '@cloudflare/ai/dist/ai.d.ts'; +import { Ai as AiClass } from '@cloudflare/ai'; +import type { Ai as AiInstance } from '@cloudflare/ai/dist/ai.d.ts'; /** * Defines types. @@ -76,21 +76,6 @@ export type StdRequestContextData = Readonly<{ */ let initializedGlobals = false; -/** - * Cloudflare worker global scope. - */ -export const cfw = globalThis as unknown as $type.cfw.ServiceWorkerGlobalScope & { - fetch( - this: void, // {@see https://typescript-eslint.io/rules/unbound-method/}. - ...args: Parameters<$type.cfw.ServiceWorkerGlobalScope['fetch']> - ): ReturnType<$type.cfw.ServiceWorkerGlobalScope['fetch']>; -}; - -/** - * Cloudflare Worker AI class definition. - */ -export const Ai = AiWithBrokenTypes as new (AI: $type.cfw.Fetcher) => AiClass; - /** * Initializes worker globals. * @@ -191,6 +176,21 @@ export const handleFetchEvent = async (ircData: InitialRequestContextData): Prom // --- // Misc exports. +/** + * Cloudflare worker global scope. + */ +export const cfw = globalThis as unknown as $type.cfw.ServiceWorkerGlobalScope & { + fetch( + this: void, // {@see https://typescript-eslint.io/rules/unbound-method/}. + ...args: Parameters<$type.cfw.ServiceWorkerGlobalScope['fetch']> + ): ReturnType<$type.cfw.ServiceWorkerGlobalScope['fetch']>; +}; + +/** + * Cloudflare Worker AI class definition. + */ +export const Ai = AiClass as new (AI: $type.cfw.Fetcher) => AiInstance; + /** * Creates a scheduled event request. * diff --git a/tsconfig.json b/tsconfig.json index 0ba55f0..22bf821 100644 --- 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 6, 2024 5:38 AM UTC. + * Last generated using `./tsconfig.mjs` Mar 6, 2024 5:44 AM UTC. */ { "include": ["./src/**/*", "./dev-types.d.ts"], diff --git a/wrangler.toml b/wrangler.toml index 47fc45c..201f42d 100644 --- 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 6, 2024 5:38 AM UTC. +# Last generated using `./wrangler.mjs` Mar 6, 2024 5:44 AM UTC. ## send_metrics = false