Skip to content

Commit 495a512

Browse files
authored
Merge pull request #261 from zenstackhq/dev
merge dev to main
2 parents 96315a9 + ba735ae commit 495a512

File tree

134 files changed

+13326
-4387
lines changed

Some content is hidden

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

134 files changed

+13326
-4387
lines changed

.github/workflows/build-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
strategy:
3535
matrix:
3636
node-version: [20.x]
37+
provider: [sqlite, postgresql]
3738

3839
steps:
3940
- name: Checkout
@@ -76,4 +77,4 @@ jobs:
7677
run: pnpm run lint
7778

7879
- name: Test
79-
run: pnpm run test
80+
run: TEST_DB_PROVIDER=${{ matrix.provider }} pnpm run test

TODO.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,8 @@
9999
- [ ] Validation
100100
- [ ] Access Policy
101101
- [ ] Short-circuit pre-create check for scalar-field only policies
102-
- [ ] Inject "replace into"
103-
- [ ] Inject "on conflict do update"
104-
- [ ] Inject "insert into select from"
102+
- [x] Inject "on conflict do update"
103+
- [x] `check` function
105104
- [x] Migration
106105
- [ ] Databases
107106
- [x] SQLite

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "zenstack-v3",
3-
"version": "3.0.0-beta.4",
3+
"version": "3.0.0-beta.5",
44
"description": "ZenStack",
55
"packageManager": "[email protected]",
66
"scripts": {
77
"build": "turbo run build",
88
"watch": "turbo run watch build",
99
"lint": "turbo run lint",
10-
"test": "turbo run test",
10+
"test": "vitest run",
1111
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
1212
"pr": "gh pr create --fill-first --base dev",
1313
"merge-main": "gh pr create --title \"merge dev to main\" --body \"\" --base main --head dev",

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.4",
6+
"version": "3.0.0-beta.5",
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.4",
3+
"version": "3.0.0-beta.5",
44
"description": "ZenStack Common Helpers",
55
"type": "module",
66
"scripts": {

packages/common-helpers/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ export * from './param-case';
44
export * from './sleep';
55
export * from './tiny-invariant';
66
export * from './upper-case-first';
7+
export * from './zip';

packages/common-helpers/src/zip.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Zips two arrays into an array of tuples.
3+
*/
4+
export function zip<T, U>(arr1: T[], arr2: U[]): Array<[T, U]> {
5+
const length = Math.min(arr1.length, arr2.length);
6+
const result: Array<[T, U]> = [];
7+
for (let i = 0; i < length; i++) {
8+
result.push([arr1[i]!, arr2[i]!]);
9+
}
10+
return result;
11+
}

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.4",
3+
"version": "3.0.0-beta.5",
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.4",
3+
"version": "3.0.0-beta.5",
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.4",
3+
"version": "3.0.0-beta.5",
44
"type": "module",
55
"private": true,
66
"license": "MIT"

0 commit comments

Comments
 (0)