Skip to content

Commit 35a9e0d

Browse files
authored
Merge pull request #280 from zenstackhq/dev
merge dev to main (v3.0.0-beta.8)
2 parents 5f639de + 6eaf1cd commit 35a9e0d

Some content is hidden

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

59 files changed

+831
-373
lines changed

TODO.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
- [ ] Short-circuit pre-create check for scalar-field only policies
102102
- [x] Inject "on conflict do update"
103103
- [x] `check` function
104+
- [ ] Custom functions
105+
- [ ] Accessing tables not in the schema
104106
- [x] Migration
105107
- [ ] Databases
106108
- [x] SQLite

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zenstack-v3",
3-
"version": "3.0.0-beta.7",
3+
"version": "3.0.0-beta.8",
44
"description": "ZenStack",
55
"packageManager": "[email protected]",
66
"scripts": {

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"publisher": "zenstack",
44
"displayName": "ZenStack CLI",
55
"description": "FullStack database toolkit with built-in access control and automatic API generation.",
6-
"version": "3.0.0-beta.7",
6+
"version": "3.0.0-beta.8",
77
"type": "module",
88
"author": {
99
"name": "ZenStack Team"

packages/common-helpers/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/common-helpers",
3-
"version": "3.0.0-beta.7",
3+
"version": "3.0.0-beta.8",
44
"description": "ZenStack Common Helpers",
55
"type": "module",
66
"scripts": {

packages/create-zenstack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-zenstack",
3-
"version": "3.0.0-beta.7",
3+
"version": "3.0.0-beta.8",
44
"description": "Create a new ZenStack project",
55
"type": "module",
66
"scripts": {

packages/dialects/sql.js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/kysely-sql-js",
3-
"version": "3.0.0-beta.7",
3+
"version": "3.0.0-beta.8",
44
"description": "Kysely dialect for sql.js",
55
"type": "module",
66
"scripts": {

packages/eslint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@zenstackhq/eslint-config",
3-
"version": "3.0.0-beta.7",
3+
"version": "3.0.0-beta.8",
44
"type": "module",
55
"private": true,
66
"license": "MIT"

packages/ide/vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "zenstack-v3",
33
"publisher": "zenstack",
4-
"version": "3.0.8",
4+
"version": "3.0.9",
55
"displayName": "ZenStack V3 Language Tools",
66
"description": "VSCode extension for ZenStack (v3) ZModel language",
77
"private": true,

packages/language/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@zenstackhq/language",
33
"description": "ZenStack ZModel language specification",
4-
"version": "3.0.0-beta.7",
4+
"version": "3.0.0-beta.8",
55
"license": "MIT",
66
"author": "ZenStack Team",
77
"files": [

packages/language/res/stdlib.zmodel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ attribute @@@deprecated(_ message: String)
666666
* @param operation: comma-separated list of "create", "read", "update", "delete". Use "all" to denote all operations.
667667
* @param condition: a boolean expression that controls if the operation should be allowed.
668668
*/
669-
attribute @@allow(_ operation: String @@@completionHint(["'create'", "'read'", "'update'", "'delete'", "'all'"]), _ condition: Boolean)
669+
attribute @@allow(_ operation: String @@@completionHint(["'create'", "'read'", "'update'", "'post-update'","'delete'", "'all'"]), _ condition: Boolean)
670670

671671
/**
672672
* Defines an access policy that allows the annotated field to be read or updated.
@@ -684,7 +684,7 @@ attribute @allow(_ operation: String @@@completionHint(["'create'", "'read'", "'
684684
* @param operation: comma-separated list of "create", "read", "update", "delete". Use "all" to denote all operations.
685685
* @param condition: a boolean expression that controls if the operation should be denied.
686686
*/
687-
attribute @@deny(_ operation: String @@@completionHint(["'create'", "'read'", "'update'", "'delete'", "'all'"]), _ condition: Boolean)
687+
attribute @@deny(_ operation: String @@@completionHint(["'create'", "'read'", "'update'", "'post-update'","'delete'", "'all'"]), _ condition: Boolean)
688688

689689
/**
690690
* Defines an access policy that denies the annotated field to be read or updated.
@@ -705,8 +705,8 @@ function check(field: Any, operation: String?): Boolean {
705705
} @@@expressionContext([AccessPolicy])
706706

707707
/**
708-
* Gets entities value before an update. Only valid when used in a "update" policy rule.
708+
* Gets entity's value before an update. Only valid when used in a "post-update" policy rule.
709709
*/
710-
function future(): Any {
710+
function before(): Any {
711711
} @@@expressionContext([AccessPolicy])
712712

0 commit comments

Comments
 (0)