From 2222b0c070f6324568bbaa4e315f9988d5ba75eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 14:11:44 -0800 Subject: [PATCH 1/2] chore: bump the npm_and_yarn group across 1 directory with 3 updates (#1223) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the npm_and_yarn group with 3 updates in the /typescript/fiddle-proxy directory: [cross-spawn](https://github.com/moxystudio/node-cross-spawn), [path-to-regexp](https://github.com/pillarjs/path-to-regexp) and [express](https://github.com/expressjs/express). Updates `cross-spawn` from 7.0.3 to 7.0.6
Changelog

Sourced from cross-spawn's changelog.

7.0.6 (2024-11-18)

Bug Fixes

7.0.5 (2024-11-07)

Bug Fixes

7.0.4 (2024-11-07)

Bug Fixes

Commits

Updates `path-to-regexp` from 0.1.10 to 0.1.12
Release notes

Sourced from path-to-regexp's releases.

Fix backtracking (again)

Fixed

https://github.com/pillarjs/path-to-regexp/compare/v0.1.11...v0.1.12

Error on bad input

Changed

https://github.com/pillarjs/path-to-regexp/compare/v0.1.10...v0.1.11

Commits

Updates `express` from 4.21.1 to 4.21.2
Release notes

Sourced from express's releases.

4.21.2

What's Changed

Full Changelog: https://github.com/expressjs/express/compare/4.21.1...4.21.2

Changelog

Sourced from express's changelog.

4.21.2 / 2024-11-06

Commits
Maintainer changes

This version was pushed to npm by jonchurch, a new releaser for express since your current version.


Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/BoundaryML/baml/network/alerts).
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- typescript/fiddle-proxy/package-lock.json | 27 +++-- typescript/fiddle-proxy/package.json | 2 +- typescript/pnpm-lock.yaml | 140 ++++++++++++---------- 3 files changed, 92 insertions(+), 77 deletions(-) diff --git a/typescript/fiddle-proxy/package-lock.json b/typescript/fiddle-proxy/package-lock.json index be6eb8397..780f8ed9c 100644 --- a/typescript/fiddle-proxy/package-lock.json +++ b/typescript/fiddle-proxy/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "cors": "^2.8.5", "dotenv": "16.4.5", - "express": "^4.21.1", + "express": "^4.21.2", "http-proxy-middleware": "^3.0.3" }, "devDependencies": { @@ -566,10 +566,11 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -758,9 +759,9 @@ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, "node_modules/express": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", - "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -782,7 +783,7 @@ "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.10", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", "qs": "6.13.0", "range-parser": "~1.2.1", @@ -797,6 +798,10 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/express/node_modules/encodeurl": { @@ -1644,9 +1649,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", - "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "license": "MIT" }, "node_modules/picocolors": { diff --git a/typescript/fiddle-proxy/package.json b/typescript/fiddle-proxy/package.json index 3f51240c8..d475d0b03 100644 --- a/typescript/fiddle-proxy/package.json +++ b/typescript/fiddle-proxy/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "cors": "^2.8.5", - "express": "^4.21.1", + "express": "^4.21.2", "dotenv": "16.4.5", "http-proxy-middleware": "^3.0.3" } diff --git a/typescript/pnpm-lock.yaml b/typescript/pnpm-lock.yaml index 173b104ca..951754edf 100644 --- a/typescript/pnpm-lock.yaml +++ b/typescript/pnpm-lock.yaml @@ -55,7 +55,7 @@ importers: dependencies: '@codemirror/autocomplete': specifier: ^6.15.0 - version: 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.2) + version: 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.2) '@codemirror/language': specifier: ^6.0.0 version: 6.10.3 @@ -73,7 +73,7 @@ importers: version: 1.4.2 '@uiw/codemirror-theme-vscode': specifier: ^4.21.25 - version: 4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0) + version: 4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1) devDependencies: '@lezer/generator': specifier: ^1.0.0 @@ -851,7 +851,7 @@ importers: version: 6.2.2 '@codemirror/lang-python': specifier: ^6.1.6 - version: 6.1.6(@codemirror/view@6.35.0) + version: 6.1.6(@codemirror/view@6.35.1) '@gloo-ai/baml-schema-wasm-web': specifier: workspace:* version: link:../../../baml-schema-wasm-web @@ -926,10 +926,10 @@ importers: version: 3.10.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@uiw/codemirror-extensions-hyper-link': specifier: ^4.22.2 - version: 4.23.4(@codemirror/state@6.4.1)(@codemirror/view@6.35.0) + version: 4.23.4(@codemirror/state@6.4.1)(@codemirror/view@6.35.1) '@uiw/react-codemirror': specifier: ^4.21.25 - version: 4.23.4(@babel/runtime@7.25.7)(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3))(@codemirror/language@6.10.5)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.35.0)(codemirror@6.0.1(@lezer/common@1.2.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.23.4(@babel/runtime@7.25.7)(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3))(@codemirror/language@6.10.6)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.35.1)(codemirror@6.0.1(@lezer/common@1.2.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@vercel/kv': specifier: ^1.0.1 version: 1.0.1 @@ -1436,8 +1436,8 @@ packages: '@codemirror/language@6.10.3': resolution: {integrity: sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==} - '@codemirror/language@6.10.5': - resolution: {integrity: sha512-sECWJyNmwqw6mSO6Qf0IVPHwhEnuYbqHBZaaIbdcXtZ6Y2r5vU/dxgC7K1ppWaJFy8XGtTBC0Pd60qI7NfJreQ==} + '@codemirror/language@6.10.6': + resolution: {integrity: sha512-KrsbdCnxEztLVbB5PycWXFxas4EOyk/fPAfruSOnDDppevQgid2XZ+KbJ9u+fDikP/e7MW7HPBTvTb8JlZK9vA==} '@codemirror/legacy-modes@6.4.1': resolution: {integrity: sha512-vdg3XY7OAs5uLDx2Iw+cGfnwtd7kM+Et/eMsqAGTfT/JKiVBQZXosTzjEbWAi/FrY6DcQIz8mQjBozFHZEUWQA==} @@ -1457,8 +1457,8 @@ packages: '@codemirror/view@6.34.1': resolution: {integrity: sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==} - '@codemirror/view@6.35.0': - resolution: {integrity: sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==} + '@codemirror/view@6.35.1': + resolution: {integrity: sha512-OUs9Z2UabSfJxSoEnuHUzGF0wHpWiJ/3IW/cgrKBqbp5Yj7XTYXQAQaLHZUP48ctRMvxgarEXTginrocUG8J7A==} '@cspotcode/source-map-support@0.8.1': resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} @@ -4532,6 +4532,10 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} + engines: {node: '>= 8'} + crosspath@2.0.0: resolution: {integrity: sha512-ju88BYCQ2uvjO2bR+SsgLSTwTSctU+6Vp2ePbKPgSCZyy4MWZxYsT738DlKVRE5utUjobjPRm1MkTYKJxCmpTA==} engines: {node: '>=14.9.0'} @@ -8594,11 +8598,11 @@ snapshots: '@codemirror/view': 6.34.1 '@lezer/common': 1.2.2 - '@codemirror/autocomplete@6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.2)': + '@codemirror/autocomplete@6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.2)': dependencies: '@codemirror/language': 6.10.3 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.2 '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.2)': @@ -8608,25 +8612,25 @@ snapshots: '@codemirror/view': 6.34.1 '@lezer/common': 1.2.2 - '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)': + '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)': dependencies: - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 '@codemirror/view': 6.34.1 '@lezer/common': 1.2.3 - '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.2)': + '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.2)': dependencies: - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.2 - '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3)': + '@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3)': dependencies: - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.3 '@codemirror/commands@6.6.2': @@ -8638,9 +8642,9 @@ snapshots: '@codemirror/commands@6.7.1': dependencies: - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.3 '@codemirror/lang-angular@0.1.3': @@ -8669,8 +8673,8 @@ snapshots: '@codemirror/lang-css@6.3.1(@codemirror/view@6.34.1)': dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) - '@codemirror/language': 6.10.5 + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 '@lezer/common': 1.2.3 '@lezer/css': 1.1.9 @@ -8679,8 +8683,8 @@ snapshots: '@codemirror/lang-go@6.0.1(@codemirror/view@6.34.1)': dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) - '@codemirror/language': 6.10.5 + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 '@lezer/common': 1.2.3 '@lezer/go': 1.0.0 @@ -8749,11 +8753,11 @@ snapshots: '@codemirror/lang-liquid@6.2.2': dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3) + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3) '@codemirror/lang-html': 6.4.9 - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.3 '@lezer/highlight': 1.2.1 '@lezer/lr': 1.4.2 @@ -8770,11 +8774,11 @@ snapshots: '@codemirror/lang-markdown@6.3.1': dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3) + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3) '@codemirror/lang-html': 6.4.9 - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.3 '@lezer/markdown': 1.3.2 @@ -8796,9 +8800,9 @@ snapshots: transitivePeerDependencies: - '@codemirror/view' - '@codemirror/lang-python@6.1.6(@codemirror/view@6.35.0)': + '@codemirror/lang-python@6.1.6(@codemirror/view@6.35.1)': dependencies: - '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.2) + '@codemirror/autocomplete': 6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.2) '@codemirror/language': 6.10.3 '@codemirror/state': 6.4.1 '@lezer/common': 1.2.2 @@ -8859,8 +8863,8 @@ snapshots: '@codemirror/lang-yaml@6.1.1(@codemirror/view@6.34.1)': dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) - '@codemirror/language': 6.10.5 + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 '@lezer/common': 1.2.3 '@lezer/highlight': 1.2.1 @@ -8890,7 +8894,7 @@ snapshots: '@codemirror/lang-wast': 6.0.2 '@codemirror/lang-xml': 6.1.0 '@codemirror/lang-yaml': 6.1.1(@codemirror/view@6.34.1) - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/legacy-modes': 6.4.1 transitivePeerDependencies: - '@codemirror/view' @@ -8904,10 +8908,10 @@ snapshots: '@lezer/lr': 1.4.2 style-mod: 4.1.2 - '@codemirror/language@6.10.5': + '@codemirror/language@6.10.6': dependencies: '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/common': 1.2.3 '@lezer/highlight': 1.2.1 '@lezer/lr': 1.4.2 @@ -8926,16 +8930,16 @@ snapshots: '@codemirror/search@6.5.6': dependencies: '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 crelt: 1.0.6 '@codemirror/state@6.4.1': {} '@codemirror/theme-one-dark@6.1.2': dependencies: - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@lezer/highlight': 1.2.1 '@codemirror/view@6.34.1': @@ -8944,7 +8948,7 @@ snapshots: style-mod: 4.1.2 w3c-keyname: 2.2.8 - '@codemirror/view@6.35.0': + '@codemirror/view@6.35.1': dependencies: '@codemirror/state': 6.4.1 style-mod: 4.1.2 @@ -11081,25 +11085,25 @@ snapshots: '@codemirror/state': 6.4.1 '@codemirror/view': 6.34.1 - '@uiw/codemirror-extensions-basic-setup@4.23.4(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3))(@codemirror/commands@6.6.2)(@codemirror/language@6.10.5)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)': + '@uiw/codemirror-extensions-basic-setup@4.23.4(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3))(@codemirror/commands@6.6.2)(@codemirror/language@6.10.6)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)': dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3) + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3) '@codemirror/commands': 6.6.2 - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/lint': 6.8.2 '@codemirror/search': 6.5.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@uiw/codemirror-extensions-hyper-link@4.23.4(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)': dependencies: '@codemirror/state': 6.4.1 '@codemirror/view': 6.34.1 - '@uiw/codemirror-extensions-hyper-link@4.23.4(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)': + '@uiw/codemirror-extensions-hyper-link@4.23.4(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)': dependencies: '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@uiw/codemirror-extensions-langs@4.23.4(@codemirror/autocomplete@6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.2))(@codemirror/language-data@6.5.1(@codemirror/view@6.34.1))(@codemirror/language@6.10.3)(@codemirror/legacy-modes@6.4.1)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.2)(@lezer/highlight@1.2.1)(@lezer/javascript@1.4.18)(@lezer/lr@1.4.2)': dependencies: @@ -11148,9 +11152,9 @@ snapshots: - '@codemirror/state' - '@codemirror/view' - '@uiw/codemirror-theme-vscode@4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)': + '@uiw/codemirror-theme-vscode@4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)': dependencies: - '@uiw/codemirror-themes': 4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0) + '@uiw/codemirror-themes': 4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1) transitivePeerDependencies: - '@codemirror/language' - '@codemirror/state' @@ -11162,11 +11166,11 @@ snapshots: '@codemirror/state': 6.4.1 '@codemirror/view': 6.34.1 - '@uiw/codemirror-themes@4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)': + '@uiw/codemirror-themes@4.23.4(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)': dependencies: '@codemirror/language': 6.10.3 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 '@uiw/react-codemirror@4.23.4(@babel/runtime@7.25.7)(@codemirror/autocomplete@6.18.1(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.2))(@codemirror/language@6.10.3)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.34.1)(codemirror@6.0.1(@lezer/common@1.2.2))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: @@ -11202,14 +11206,14 @@ snapshots: - '@codemirror/lint' - '@codemirror/search' - '@uiw/react-codemirror@4.23.4(@babel/runtime@7.25.7)(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3))(@codemirror/language@6.10.5)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.35.0)(codemirror@6.0.1(@lezer/common@1.2.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@uiw/react-codemirror@4.23.4(@babel/runtime@7.25.7)(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3))(@codemirror/language@6.10.6)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.35.1)(codemirror@6.0.1(@lezer/common@1.2.3))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.7 '@codemirror/commands': 6.6.2 '@codemirror/state': 6.4.1 '@codemirror/theme-one-dark': 6.1.2 - '@codemirror/view': 6.35.0 - '@uiw/codemirror-extensions-basic-setup': 4.23.4(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3))(@codemirror/commands@6.6.2)(@codemirror/language@6.10.5)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0) + '@codemirror/view': 6.35.1 + '@uiw/codemirror-extensions-basic-setup': 4.23.4(@codemirror/autocomplete@6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3))(@codemirror/commands@6.6.2)(@codemirror/language@6.10.6)(@codemirror/lint@6.8.2)(@codemirror/search@6.5.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1) codemirror: 6.0.1(@lezer/common@1.2.3) react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -12266,25 +12270,25 @@ snapshots: codemirror@6.0.1(@lezer/common@1.2.2): dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.2) + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.2) '@codemirror/commands': 6.7.1 - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/lint': 6.8.2 '@codemirror/search': 6.5.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 transitivePeerDependencies: - '@lezer/common' codemirror@6.0.1(@lezer/common@1.2.3): dependencies: - '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.5)(@codemirror/state@6.4.1)(@codemirror/view@6.35.0)(@lezer/common@1.2.3) + '@codemirror/autocomplete': 6.18.3(@codemirror/language@6.10.6)(@codemirror/state@6.4.1)(@codemirror/view@6.35.1)(@lezer/common@1.2.3) '@codemirror/commands': 6.7.1 - '@codemirror/language': 6.10.5 + '@codemirror/language': 6.10.6 '@codemirror/lint': 6.8.2 '@codemirror/search': 6.5.6 '@codemirror/state': 6.4.1 - '@codemirror/view': 6.35.0 + '@codemirror/view': 6.35.1 transitivePeerDependencies: - '@lezer/common' @@ -12408,6 +12412,12 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 + cross-spawn@7.0.6: + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + crosspath@2.0.0: dependencies: '@types/node': 17.0.45 @@ -12954,7 +12964,7 @@ snapshots: debug: 4.3.7 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.8.0(eslint@8.57.1)(typescript@5.2.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 @@ -12967,7 +12977,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.8.0(eslint@8.57.1)(typescript@5.2.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -12989,7 +12999,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.8.0(eslint@8.57.1)(typescript@5.2.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.2.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -13310,7 +13320,7 @@ snapshots: foreground-child@3.3.0: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 signal-exit: 4.1.0 form-data@4.0.0: From 7384ba8cb5d1f012c50ddfb2a44a142ec9654397 Mon Sep 17 00:00:00 2001 From: aaronvg Date: Tue, 10 Dec 2024 13:41:56 -0800 Subject: [PATCH 2/2] Fix reqwest caching images on the playground tests (#1228) reqwest caches image requests since the base_url is always empty. Adding the path of the original url into the proxy url fixes it. --- .../src/internal/llm_client/traits/mod.rs | 5 +- engine/baml-runtime/src/lib.rs | 3 + .../baml-schema-wasm/src/runtime_wasm/mod.rs | 6 +- .../tests/test_file_manager.rs | 56 +++++++++++++++++++ 4 files changed, 67 insertions(+), 3 deletions(-) diff --git a/engine/baml-runtime/src/internal/llm_client/traits/mod.rs b/engine/baml-runtime/src/internal/llm_client/traits/mod.rs index 6e5172bb2..ef72f9b40 100644 --- a/engine/baml-runtime/src/internal/llm_client/traits/mod.rs +++ b/engine/baml-runtime/src/internal/llm_client/traits/mod.rs @@ -655,8 +655,11 @@ async fn fetch_with_proxy( proxy_url: Option<&str>, ) -> Result { let client = reqwest::Client::new(); + let request = if let Some(proxy) = proxy_url { - client.get(proxy).header("baml-original-url", url) + client + .get(format!("{}/{}", proxy, url)) + .header("baml-original-url", url) } else { client.get(url) }; diff --git a/engine/baml-runtime/src/lib.rs b/engine/baml-runtime/src/lib.rs index e847b53fb..8af6ddcdb 100644 --- a/engine/baml-runtime/src/lib.rs +++ b/engine/baml-runtime/src/lib.rs @@ -228,6 +228,7 @@ impl BamlRuntime { let rctx = ctx.create_ctx(None, None)?; let (params, constraints) = self.get_test_params_and_constraints(function_name, test_name, &rctx, true)?; + log::info!("params: {:#?}", params); let rctx_stream = ctx.create_ctx(None, None)?; let mut stream = self.inner.stream_function_impl( function_name.into(), @@ -238,12 +239,14 @@ impl BamlRuntime { self.async_runtime.clone(), )?; let (response_res, span_uuid) = stream.run(on_event, ctx, None, None).await; + log::info!("response_res: {:#?}", response_res); let res = response_res?; let (_, llm_resp, _, val) = res .event_chain() .iter() .last() .context("Expected non-empty event chain")?; + log::info!("llm_resp: {:#?}", llm_resp); let complete_resp = match llm_resp { LLMResponse::Success(complete_llm_response) => Ok(complete_llm_response), LLMResponse::InternalFailure(e) => Err(anyhow::anyhow!("{}", e)), diff --git a/engine/baml-schema-wasm/src/runtime_wasm/mod.rs b/engine/baml-schema-wasm/src/runtime_wasm/mod.rs index aafa61af1..edf84ffbc 100644 --- a/engine/baml-schema-wasm/src/runtime_wasm/mod.rs +++ b/engine/baml-schema-wasm/src/runtime_wasm/mod.rs @@ -60,8 +60,8 @@ pub fn on_wasm_init() { const LOG_LEVEL: log::Level = log::Level::Warn; } }; - // This line is required if we want to see normal log::info! messages in JS console logs. - wasm_logger::init(wasm_logger::Config::new(LOG_LEVEL)); + // I dont think we need this line anymore -- seems to break logging if you add it. + //wasm_logger::init(wasm_logger::Config::new(LOG_LEVEL)); match console_log::init_with_level(LOG_LEVEL) { Ok(_) => web_sys::console::log_1( &format!("Initialized BAML runtime logging as log::{}", LOG_LEVEL).into(), @@ -1661,6 +1661,8 @@ impl WasmFunction { .run_test(&function_name, &test_name, &ctx, Some(cb)) .await; + log::info!("test_response: {:#?}", test_response); + Ok(WasmTestResponse { test_response, span, diff --git a/engine/baml-schema-wasm/tests/test_file_manager.rs b/engine/baml-schema-wasm/tests/test_file_manager.rs index dfed4997a..8de0e0743 100644 --- a/engine/baml-schema-wasm/tests/test_file_manager.rs +++ b/engine/baml-schema-wasm/tests/test_file_manager.rs @@ -1,5 +1,6 @@ // Run from the baml-schema-wasm folder with: // wasm-pack test --node +// and make sure to set rust-analyzer target in vscode settings to: "rust-analyzer.cargo.target": "wasm32-unknown-unknown", #[cfg(target_arch = "wasm32")] #[cfg(test)] mod tests { @@ -173,4 +174,59 @@ function PredictAgeBare(inp: string @assert(big_enough, {{this|length > 1}}) ) - assert!(diagnostics.errors().is_empty()); } + + #[wasm_bindgen_test] + fn test_run_tests() { + wasm_logger::init(wasm_logger::Config::new(log::Level::Info)); + let sample_baml_content = r##" +function Func(name: string ) -> string { + client "openai/gpt-4o" + prompt #" + Return the name of {{name}} + "# +} + +test One { + functions [Func] + args { + name "john" + } +} + +test Two { + functions [Func] + args { + name "jane" + } +} + + + "##; + let mut files = HashMap::new(); + files.insert("error.baml".to_string(), sample_baml_content.to_string()); + let files_js = to_value(&files).unwrap(); + let project = WasmProject::new("baml_src", files_js) + .map_err(JsValue::from) + .unwrap(); + + let env_vars = [("OPENAI_API_KEY", "12345")] + .iter() + .cloned() + .collect::>(); + let env_vars_js = to_value(&env_vars).unwrap(); + + let current_runtime = project.runtime(env_vars_js).map_err(JsValue::from).unwrap(); + + let diagnostics = project.diagnostics(¤t_runtime); + let functions = current_runtime.list_functions(); + functions.iter().for_each(|f| { + log::info!("function: {:#?}", f); + f.test_cases.iter().for_each(|t| { + log::info!("test case: {:#?}", t); + }); + // f.run_test(&mut current_runtime, "One".to_string(), None, None); + }); + + assert!(diagnostics.errors().is_empty()); + } }