Skip to content

Commit 9596d33

Browse files
authored
merge dev to main (v2.16.0) (#2156)
2 parents 19f4870 + 8d118ee commit 9596d33

File tree

89 files changed

+715
-650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+715
-650
lines changed

.github/workflows/github-releases-to-discord.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ jobs:
1212
with:
1313
webhook_url: ${{ secrets.RELEASE_TO_DISCORD_WEBHOOK_URL }}
1414
avatar_url: 'https://cdn.discordapp.com/avatars/1297059323314176051/df91181b3f1cf0ef1592fbe18e0962d7.webp?size=160'
15-
reduce_headings: true

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.15.1",
3+
"version": "2.16.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r --filter=\"!./packages/ide/*\" build",
@@ -34,10 +34,8 @@
3434
"eslint": "^8.57.0",
3535
"eslint-plugin-jest": "^28.2.0",
3636
"jest": "^29.7.0",
37-
"replace-in-file": "^7.0.1",
3837
"rimraf": "^3.0.2",
3938
"ts-jest": "^29.1.1",
40-
"ts-node": "^10.9.1",
4139
"tsup": "^8.0.1",
4240
"tsx": "^4.7.1",
4341
"typescript": "^5.4.4"

packages/ide/jetbrains/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ changelog {
8585
introduction.set(
8686
"""
8787
[ZenStack](https://zenstack.dev) is a toolkit that simplifies the development of a web app's backend. This plugin provides code editing experiences for its ZModel schema language.
88-
88+
8989
## Features
90-
90+
9191
- Syntax highlighting
9292
- Error highlighting
9393
- Go to definition

packages/ide/jetbrains/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jetbrains",
3-
"version": "2.15.1",
3+
"version": "2.16.0",
44
"displayName": "ZenStack JetBrains IDE Plugin",
55
"description": "ZenStack JetBrains IDE plugin",
66
"homepage": "https://zenstack.dev",

packages/language/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/language",
3-
"version": "2.15.1",
3+
"version": "2.16.0",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

packages/language/src/zmodel.langium

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Argument:
164164
DataModel:
165165
(comments+=TRIPLE_SLASH_COMMENT)*
166166
(
167-
((isAbstract?='abstract')? 'model' name=RegularID
167+
((isAbstract?='abstract')? 'model' name=RegularID
168168
('extends' superTypes+=[DataModel] (',' superTypes+=[DataModel])*)?) |
169169
((isView?='view') name=RegularID)
170170
)
@@ -193,7 +193,7 @@ TypeDef:
193193
type TypeDefFieldTypes = TypeDef | Enum;
194194

195195
TypeDefField:
196-
(comments+=TRIPLE_SLASH_COMMENT)*
196+
(comments+=TRIPLE_SLASH_COMMENT)*
197197
name=RegularIDWithTypeNames type=TypeDefFieldType (attributes+=DataModelFieldAttribute)*;
198198

199199
TypeDefFieldType:
@@ -208,7 +208,7 @@ Enum:
208208
'enum' name=RegularID '{' (
209209
fields+=EnumField
210210
| attributes+=DataModelAttribute
211-
)+
211+
)+
212212
'}';
213213

214214
EnumField:

packages/misc/redwood/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/redwood",
33
"displayName": "ZenStack RedwoodJS Integration",
4-
"version": "2.15.1",
4+
"version": "2.16.0",
55
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
66
"repository": {
77
"type": "git",

packages/plugins/openapi/package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/openapi",
33
"displayName": "ZenStack Plugin and Runtime for OpenAPI",
4-
"version": "2.15.1",
4+
"version": "2.16.0",
55
"description": "ZenStack plugin and runtime supporting OpenAPI",
66
"main": "index.js",
77
"repository": {
@@ -28,15 +28,11 @@
2828
"dependencies": {
2929
"@zenstackhq/runtime": "workspace:*",
3030
"@zenstackhq/sdk": "workspace:*",
31-
"change-case": "^4.1.2",
32-
"lower-case-first": "^2.0.2",
3331
"openapi-types": "^12.1.0",
3432
"semver": "^7.5.2",
35-
"tiny-invariant": "^1.3.1",
3633
"ts-pattern": "^4.3.0",
37-
"upper-case-first": "^2.0.2",
3834
"yaml": "^2.2.2",
39-
"zod": "^3.22.4",
35+
"zod": "^3.22.4",
4036
"zod-validation-error": "^1.5.0"
4137
},
4238
"devDependencies": {

packages/plugins/openapi/src/rest-generator.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ import {
2626
TypeDefFieldType,
2727
} from '@zenstackhq/sdk/ast';
2828
import type { DMMF } from '@zenstackhq/sdk/prisma';
29+
import { invariant, lowerCaseFirst } from '@zenstackhq/runtime/local-helpers';
2930
import fs from 'fs';
30-
import { lowerCaseFirst } from 'lower-case-first';
3131
import type { OpenAPIV3_1 as OAPI } from 'openapi-types';
3232
import path from 'path';
3333
import pluralize from 'pluralize';
34-
import invariant from 'tiny-invariant';
3534
import { match, P } from 'ts-pattern';
3635
import YAML from 'yaml';
3736
import { name } from '.';

packages/plugins/openapi/src/rpc-generator.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ import {
1111
resolveAggregateOperationSupport,
1212
} from '@zenstackhq/sdk/dmmf-helpers';
1313
import { supportCreateMany, type DMMF } from '@zenstackhq/sdk/prisma';
14+
import { lowerCaseFirst, upperCaseFirst, invariant } from '@zenstackhq/runtime/local-helpers';
1415
import * as fs from 'fs';
15-
import { lowerCaseFirst } from 'lower-case-first';
1616
import type { OpenAPIV3_1 as OAPI } from 'openapi-types';
1717
import * as path from 'path';
18-
import invariant from 'tiny-invariant';
1918
import { P, match } from 'ts-pattern';
20-
import { upperCaseFirst } from 'upper-case-first';
2119
import YAML from 'yaml';
2220
import { name } from '.';
2321
import { OpenAPIGeneratorBase } from './generator-base';

0 commit comments

Comments
 (0)