Skip to content

Commit e97c699

Browse files
authored
merge dev to main (v2.1.0) (#1438)
2 parents 7ab07cd + b22c6a3 commit e97c699

File tree

87 files changed

+3072
-335
lines changed

Some content is hidden

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

87 files changed

+3072
-335
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ Thank you for your support!
234234

235235
<table>
236236
<tr>
237+
<td align="center"><a href="https://github.com/coderabbitai"><img src="https://avatars.githubusercontent.com/u/132028505?v=4" width="100" style="border-radius:50%" alt="CodeRabbit"/><br />CodeRabbit</a></td>
237238
<td align="center"><a href="https://github.com/j0hannr"><img src="https://avatars.githubusercontent.com/u/52762073?v=4" width="100" style="border-radius:50%" alt="Johann Rohn"/><br />Johann Rohn</a></td>
238239

239240
<td align="center"><a href="https://github.com/baenie"><img src="https://avatars.githubusercontent.com/u/58309104?v=4" width="100" style="border-radius:50%" alt="Benjamin Zecirovic"/><br />Benjamin Zecirovic</a></td>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-monorepo",
3-
"version": "2.0.3",
3+
"version": "2.1.0",
44
"description": "",
55
"scripts": {
66
"build": "pnpm -r build",
@@ -29,7 +29,7 @@
2929
"@typescript-eslint/parser": "^7.6.0",
3030
"concurrently": "^7.4.0",
3131
"copyfiles": "^2.4.1",
32-
"eslint": "^8.56.0",
32+
"eslint": "^8.57.0",
3333
"eslint-plugin-jest": "^28.2.0",
3434
"jest": "^29.7.0",
3535
"replace-in-file": "^7.0.1",

packages/ide/jetbrains/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "dev.zenstack"
12-
version = "2.0.3"
12+
version = "2.1.0"
1313

1414
repositories {
1515
mavenCentral()

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.0.3",
3+
"version": "2.1.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.0.3",
3+
"version": "2.1.0",
44
"displayName": "ZenStack modeling language compiler",
55
"description": "ZenStack modeling language compiler",
66
"homepage": "https://zenstack.dev",

packages/language/src/generated/ast.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ export function isRegularID(item: unknown): item is RegularID {
8484
return item === 'model' || item === 'enum' || item === 'attribute' || item === 'datasource' || item === 'plugin' || item === 'abstract' || item === 'in' || item === 'view' || item === 'import' || (typeof item === 'string' && (/[_a-zA-Z][\w_]*/.test(item)));
8585
}
8686

87+
export type RegularIDWithTypeNames = 'Any' | 'BigInt' | 'Boolean' | 'Bytes' | 'DateTime' | 'Decimal' | 'Float' | 'Int' | 'Json' | 'Null' | 'Object' | 'String' | 'Unsupported' | RegularID;
88+
89+
export function isRegularIDWithTypeNames(item: unknown): item is RegularIDWithTypeNames {
90+
return isRegularID(item) || item === 'String' || item === 'Boolean' || item === 'Int' || item === 'BigInt' || item === 'Float' || item === 'Decimal' || item === 'DateTime' || item === 'Json' || item === 'Bytes' || item === 'Null' || item === 'Object' || item === 'Any' || item === 'Unsupported';
91+
}
92+
8793
export type TypeDeclaration = DataModel | Enum;
8894

8995
export const TypeDeclaration = 'TypeDeclaration';
@@ -288,7 +294,7 @@ export interface DataModelField extends AstNode {
288294
readonly $type: 'DataModelField';
289295
attributes: Array<DataModelFieldAttribute>
290296
comments: Array<string>
291-
name: RegularID
297+
name: RegularIDWithTypeNames
292298
type: DataModelFieldType
293299
}
294300

0 commit comments

Comments
 (0)