Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for commonjs (require) #1995

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions .changeset/every-melons-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
'@mastra/stabilityai': patch
'@mastra/vector-vectorize': patch
'@mastra/firecrawl': patch
'create-mastra': patch
'@mastra/vector-pinecone': patch
'@mastra/client-js': patch
'@mastra/composio': patch
'@mastra/vector-upstash': patch
'@mastra/deployer-cloudflare': patch
'@mastra/vector-chroma': patch
'@mastra/vector-qdrant': patch
'@mastra/github': patch
'@mastra/vector-astra': patch
'@mastra/ragie': patch
'@mastra/deployer-netlify': patch
'@mastra/deployer': patch
'@mastra/speech-elevenlabs': patch
'@mastra/deployer-vercel': patch
'@mastra/loggers': patch
'@mastra/speech-replicate': patch
'@mastra/speech-speechify': patch
'@mastra/vectorize': patch
'@mastra/vector-pg': patch
'@mastra/memory': patch
'@mastra/speech-deepgram': patch
'@mastra/store-upstash': patch
'@mastra/pinecone': patch
'@mastra/evals': patch
'@mastra/upstash': patch
'@mastra/core': patch
'@mastra/speech-google': patch
'@mastra/speech-openai': patch
'@mastra/speech-playai': patch
'@mastra/chroma': patch
'@mastra/qdrant': patch
'mastra': patch
'@mastra/mcp': patch
'@mastra/rag': patch
'@mastra/speech-azure': patch
'@mastra/astra': patch
'@mastra/speech-murf': patch
'@mastra/speech-ibm': patch
'@mastra/store-pg': patch
'@mastra/pg': patch
---

Fix licensing
46 changes: 46 additions & 0 deletions .changeset/hot-mice-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
---
'@mastra/stabilityai': patch
'@mastra/vector-vectorize': patch
'@mastra/firecrawl': patch
'@mastra/vector-pinecone': patch
'@mastra/client-js': patch
'@mastra/composio': patch
'@mastra/vector-upstash': patch
'@mastra/deployer-cloudflare': patch
'@mastra/vector-chroma': patch
'@mastra/vector-qdrant': patch
'@mastra/github': patch
'@mastra/vector-astra': patch
'@mastra/ragie': patch
'@mastra/deployer-netlify': patch
'@mastra/deployer': patch
'@mastra/speech-elevenlabs': patch
'@mastra/deployer-vercel': patch
'@mastra/loggers': patch
'@mastra/speech-replicate': patch
'@mastra/speech-speechify': patch
'@mastra/vectorize': patch
'@mastra/vector-pg': patch
'@mastra/memory': patch
'@mastra/speech-deepgram': patch
'@mastra/store-upstash': patch
'@mastra/pinecone': patch
'@mastra/evals': patch
'@mastra/upstash': patch
'@mastra/core': patch
'@mastra/speech-google': patch
'@mastra/speech-openai': patch
'@mastra/speech-playai': patch
'@mastra/chroma': patch
'@mastra/qdrant': patch
'@mastra/mcp': patch
'@mastra/rag': patch
'@mastra/speech-azure': patch
'@mastra/astra': patch
'@mastra/speech-murf': patch
'@mastra/speech-ibm': patch
'@mastra/store-pg': patch
'@mastra/pg': patch
---

Add support for commonjs (require)
7 changes: 7 additions & 0 deletions .changeset/huge-regions-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@mastra/client-js': patch
'@mastra/deployer': patch
'@mastra/speech-playai': patch
---

Fix build errors by changing contracts
6 changes: 6 additions & 0 deletions .changeset/quiet-cities-lead.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'mastra': patch
---

Allow column resizing on tracing UI
Fix UI issues in mastra dev agent chat page
6 changes: 6 additions & 0 deletions .changeset/ten-badgers-relax.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'create-mastra': patch
'mastra': patch
---

pass createVersionTag to create mastra deps
65 changes: 21 additions & 44 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,44 +1,21 @@
Elastic License 2.0 (ELv2)

**Acceptance**
By using the software, you agree to all of the terms and conditions below.

**Copyright License**
The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below

**Limitations**
You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.

You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.

You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.

**Patents**
The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.

**Notices**
You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.

If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.

**No Other Rights**
These terms do not imply any licenses other than those expressly granted in these terms.

**Termination**
If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.

**No Liability**
As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.

**Definitions**
The _licensor_ is the entity offering these terms, and the _software_ is the software the licensor makes available under these terms, including any portion of it.

_you_ refers to the individual or entity agreeing to these terms.

_your company_ is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. _control_ means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.

_your licenses_ are all the licenses granted to you for the software under these terms.

_use_ means anything you do with the software requiring one of your licenses.

_trademark_ means trademarks, service marks, and similar rights.
MIT License

Copyright (c) Meta Platforms, Inc. and affiliates.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
65 changes: 21 additions & 44 deletions client-sdks/client-js/LICENSE
Original file line number Diff line number Diff line change
@@ -1,44 +1,21 @@
Elastic License 2.0 (ELv2)

**Acceptance**
By using the software, you agree to all of the terms and conditions below.

**Copyright License**
The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below

**Limitations**
You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.

You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.

You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.

**Patents**
The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.

**Notices**
You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.

If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.

**No Other Rights**
These terms do not imply any licenses other than those expressly granted in these terms.

**Termination**
If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.

**No Liability**
As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.

**Definitions**
The _licensor_ is the entity offering these terms, and the _software_ is the software the licensor makes available under these terms, including any portion of it.

_you_ refers to the individual or entity agreeing to these terms.

_your company_ is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. _control_ means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.

_your licenses_ are all the licenses granted to you for the software under these terms.

_use_ means anything you do with the software requiring one of your licenses.

_trademark_ means trademarks, service marks, and similar rights.
MIT License

Copyright (c) Meta Platforms, Inc. and affiliates.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
14 changes: 9 additions & 5 deletions client-sdks/client-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,21 @@
"exports": {
".": {
"import": {
"types": "./dist/index.d.mts",
"default": "./dist/index.mjs"
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"require": {
"types": "./dist/index.d.cts",
"default": "./dist/index.cjs"
}
},
"./package.json": "./package.json"
},
"repository": "github:mastra-ai/client-js",
"license": "ISC",
"license": "MIT",
"scripts": {
"build": "tsup-node src/index.ts --format esm --dts --clean --treeshake",
"dev": "tsup-node src/index.ts --format esm --dts --clean --treeshake --watch",
"build": "tsup src/index.ts --format esm,cjs --dts --clean --treeshake",
"dev": "pnpm build --watch",
"test": "vitest run"
},
"dependencies": {
Expand Down
36 changes: 30 additions & 6 deletions client-sdks/client-js/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,35 @@ export class MastraClient extends BaseResource {
...(page ? { page: String(page) } : {}),
...(perPage ? { perPage: String(perPage) } : {}),
...(_attribute?.length ? { attribute: _attribute } : {}),
};

const hasQueryParams = Object.keys(queryObj).length > 0;

const queryParams = hasQueryParams ? new URLSearchParams(queryObj) : '';
return this.request(`/api/telemetry?${queryParams}`);
} as const;

const searchParams = new URLSearchParams();
if (name) {
searchParams.set('name', name);
}
if (scope) {
searchParams.set('scope', scope);
}
if (page) {
searchParams.set('page', String(page));
}
if (perPage) {
searchParams.set('perPage', String(perPage));
}
if (_attribute) {
if (Array.isArray(_attribute)) {
for (const attr of _attribute) {
searchParams.append('attribute', attr);
}
} else {
searchParams.set('attribute', _attribute);
}
}

if (searchParams.size) {
return this.request(`/api/telemetry?${searchParams}`);
} else {
return this.request(`/api/telemetry`);
}
}
}
21 changes: 21 additions & 0 deletions deployers/cloudflare/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) Meta Platforms, Inc. and affiliates.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
24 changes: 18 additions & 6 deletions deployers/cloudflare/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,35 @@
"types": "dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
"import": {
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"require": {
"types": "./dist/index.d.cts",
"default": "./dist/index.cjs"
}
},
"./secrets-manager": {
"types": "./dist/secrets-manager/index.d.ts",
"default": "./dist/secrets-manager/index.js"
"import": {
"types": "./dist/secrets-manager/index.d.ts",
"default": "./dist/secrets-manager/index.js"
},
"require": {
"types": "./dist/secrets-manager/index.d.cts",
"default": "./dist/secrets-manager/index.cjs"
}
},
"./package.json": "./package.json"
},
"scripts": {
"build": "tsup src/index.ts src/secrets-manager/index.ts --format esm --experimental-dts --clean --treeshake",
"build": "tsup src/index.ts src/secrets-manager/index.ts --format esm,cjs --experimental-dts --clean --treeshake",
"build:watch": "pnpm build --watch",
"test": "vitest run"
},
"keywords": [],
"author": "",
"license": "ISC",
"license": "MIT",
"dependencies": {
"@mastra/core": "workspace:^",
"@mastra/deployer": "workspace:^",
Expand Down
Loading
Loading