Merge remote-tracking branch 'origin/dev' into v2

ymc9 · ymc9 · commit 50e5dbc83692 · 2024-01-08T16:26:20.000+08:00
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -82,7 +82,7 @@ jobs:
                   java-version: 17
 
             - name: Setup Gradle
-              uses: gradle/gradle-build-action@v2
+              uses: gradle/gradle-build-action@v2.4.2
               with:
                   gradle-home-cache-cleanup: true
 
diff --git a/README.md b/README.md
@@ -37,24 +37,30 @@ ZenStack incrementally extends Prisma's power with the following four layers:
 
 ZenStack introduces a data modeling language called "ZModel" - a superset of Prisma schema language. It extended Prisma schema with custom attributes and functions and, based on that, implemented a flexible access control layer around Prisma.
 
-```prisma
-// schema.zmodel
-
-model Post {
+```ts
+// base.zmodel
+abstract model Base {
     id String @id
-    title String
-    published Boolean @default(false)
     author User @relation(fields: [authorId], references: [id])
     authorId String
 
-    // 🔐 allow logged-in users to read published posts
-    @@allow('read', auth() != null && published)
-
     // 🔐 allow full CRUD by author
     @@allow('all', author == auth())
 }
 ```
 
+```ts
+// schema.zmodel
+import "base"
+model Post extends Base {
+    title String
+    published Boolean @default(false)
+
+    // 🔐 allow logged-in users to read published posts
+    @@allow('read', auth() != null && published)
+}
+```
+
 The `zenstack` CLI transpiles the ZModel into a standard Prisma schema, which you can use with the regular Prisma workflows.
 
 ### 2. Runtime enhancements to Prisma client
@@ -183,6 +189,7 @@ Check out the [Multi-tenant Todo App](https://zenstack-todo.vercel.app/) for a r
 -   [Next.js 13 + NextAuth + tRPC](https://github.com/zenstackhq/sample-todo-trpc)
 -   [Nuxt V3 + TanStack Query](https://github.com/zenstackhq/sample-todo-nuxt)
 -   [SvelteKit + TanStack Query](https://github.com/zenstackhq/sample-todo-sveltekit)
+-   [RedwoodJS](https://github.com/zenstackhq/sample-todo-redwood)
 
 ### Blog App
 
diff --git a/packages/ide/jetbrains/build.gradle.kts b/packages/ide/jetbrains/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "1.6.0"
+version = "1.6.1"
 
 repositories {
     mavenCentral()
diff --git a/packages/ide/jetbrains/package.json b/packages/ide/jetbrains/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jetbrains",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "displayName": "ZenStack JetBrains IDE Plugin",
     "description": "ZenStack JetBrains IDE plugin",
     "homepage": "https://zenstack.dev",
diff --git a/packages/misc/redwood/package.json b/packages/misc/redwood/package.json
@@ -1,15 +1,15 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "1.6.0",
+    "version": "1.6.1",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",
         "url": "https://github.com/zenstackhq/zenstack"
     },
     "scripts": {
         "clean": "rimraf dist",
-        "build": "pnpm lint --max-warnings=0 && pnpm clean && tsc",
+        "build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && pnpm pack dist --pack-destination '../../../.build'",
         "watch": "tsc --watch",
         "lint": "eslint src --ext ts",
         "prepublishOnly": "pnpm build"
diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json
@@ -32,11 +32,11 @@
     "change-case": "^4.1.2",
     "lower-case-first": "^2.0.2",
     "openapi-types": "^12.1.0",
-    "semver": "^7.3.8",
+    "semver": "^7.5.2",
     "tiny-invariant": "^1.3.1",
     "ts-pattern": "^4.3.0",
     "upper-case-first": "^2.0.2",
-    "yaml": "^2.2.1",
+    "yaml": "^2.2.2",
     "zod": "^3.22.4",
     "zod-validation-error": "^1.5.0"
   },
diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json
@@ -45,7 +45,7 @@
         "cross-fetch": "^4.0.0",
         "decimal.js": "^10.4.2",
         "lower-case-first": "^2.0.2",
-        "semver": "^7.3.8",
+        "semver": "^7.5.2",
         "ts-morph": "^16.0.0",
         "upper-case-first": "^2.0.2"
     },
diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json
@@ -87,7 +87,7 @@
         "cross-fetch": "^4.0.0",
         "decimal.js": "^10.4.2",
         "lower-case-first": "^2.0.2",
-        "semver": "^7.3.8",
+        "semver": "^7.5.2",
         "superjson": "^1.11.0",
         "ts-morph": "^16.0.0",
         "upper-case-first": "^2.0.2"
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -62,7 +62,7 @@
         "deepcopy": "^2.1.0",
         "lower-case-first": "^2.0.2",
         "pluralize": "^8.0.0",
-        "semver": "^7.3.8",
+        "semver": "^7.5.2",
         "superjson": "^1.11.0",
         "tiny-invariant": "^1.3.1",
         "tslib": "^2.4.1",
diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -95,7 +95,7 @@
         "pluralize": "^8.0.0",
         "pretty-repl": "^4.0.0",
         "promisify": "^0.0.3",
-        "semver": "^7.3.8",
+        "semver": "^7.5.2",
         "sleep-promise": "^9.1.0",
         "strip-color": "^0.1.0",
         "tiny-invariant": "^1.3.1",
diff --git a/packages/schema/src/language-server/zmodel-linker.ts b/packages/schema/src/language-server/zmodel-linker.ts
@@ -52,7 +52,12 @@ import {
 } from 'langium';
 import { match } from 'ts-pattern';
 import { CancellationToken } from 'vscode-jsonrpc';
-import { getAllDeclarationsFromImports, isAuthInvocation, getContainingDataModel } from '../utils/ast-utils';
+import {
+    getAllDeclarationsFromImports,
+    getContainingDataModel,
+    isAuthInvocation,
+    isCollectionPredicate,
+} from '../utils/ast-utils';
 import { mapBuiltinTypeToExpressionType } from './validator/utils';
 
 interface DefaultReference extends Reference {
@@ -94,9 +99,21 @@ export class ZModelLinker extends DefaultLinker {
         extraScopes: ScopeProvider[],
         onlyFromExtraScopes = false
     ) {
-        if (!this.resolveFromScopeProviders(container, property, document, extraScopes) && !onlyFromExtraScopes) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const reference: Reference<AstNode> = (container as any)[property];
+        if (this.resolveFromScopeProviders(container, property, document, extraScopes)) {
+            return;
+        }
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const reference: DefaultReference = (container as any)[property];
+
+        if (onlyFromExtraScopes) {
+            // if reference is not resolved from explicit scope providers and automatic linking is not allowed,
+            // we should explicitly create a linking error
+            reference._ref = this.createLinkingError({ reference, container, property });
+
+            // Add the reference to the document's array of references
+            document.references.push(reference);
+        } else {
             this.doLink({ reference, container, property }, document);
         }
     }
@@ -118,6 +135,10 @@ export class ZModelLinker extends DefaultLinker {
             if (target) {
                 reference._ref = target;
                 reference._nodeDescription = this.descriptions.createDescription(target, target.name, document);
+
+                // Add the reference to the document's array of references
+                document.references.push(reference);
+
                 return target;
             }
         }
@@ -244,6 +265,22 @@ export class ZModelLinker extends DefaultLinker {
         node.args.forEach((arg) => this.resolve(arg, document, extraScopes));
 
         if (node.target.ref) {
+            // if the reference is inside the RHS of a collection predicate, it cannot be resolve to a field
+            // not belonging to the collection's model type
+
+            const collectionPredicateContext = this.getCollectionPredicateContextDataModel(node);
+            if (
+                // inside a collection predicate RHS
+                collectionPredicateContext &&
+                // current ref expr is resolved to a field
+                isDataModelField(node.target.ref) &&
+                // the resolved field doesn't belong to the collection predicate's operand's type
+                node.target.ref.$container !== collectionPredicateContext
+            ) {
+                this.unresolvableRefExpr(node);
+                return;
+            }
+
             // resolve type
             if (node.target.ref.$type === EnumField) {
                 this.resolveToBuiltinTypeOrDecl(node, node.target.ref.$container);
@@ -253,6 +290,26 @@ export class ZModelLinker extends DefaultLinker {
         }
     }
 
+    private getCollectionPredicateContextDataModel(node: ReferenceExpr) {
+        let curr: AstNode | undefined = node;
+        while (curr) {
+            if (
+                curr.$container &&
+                // parent is a collection predicate
+                isCollectionPredicate(curr.$container) &&
+                // the collection predicate's LHS is resolved to a DataModel
+                isDataModel(curr.$container.left.$resolvedType?.decl) &&
+                // current node is the RHS
+                curr.$containerProperty === 'right'
+            ) {
+                // return the resolved type of LHS
+                return curr.$container.left.$resolvedType?.decl;
+            }
+            curr = curr.$container;
+        }
+        return undefined;
+    }
+
     private resolveArray(node: ArrayExpr, document: LangiumDocument<AstNode>, extraScopes: ScopeProvider[]) {
         node.items.forEach((item) => this.resolve(item, document, extraScopes));
 
@@ -414,13 +471,8 @@ export class ZModelLinker extends DefaultLinker {
                             if (resolved) {
                                 this.resolveToDeclaredType(item, (resolved as DataModelField).type);
                             } else {
-                                // need to clear linked reference, because it's resolved in default scope by default
-                                const ref = item.target as DefaultReference;
-                                ref._ref = this.createLinkingError({
-                                    reference: ref,
-                                    container: item,
-                                    property: 'target',
-                                });
+                                // mark unresolvable
+                                this.unresolvableRefExpr(item);
                             }
                         }
                     });
@@ -432,13 +484,8 @@ export class ZModelLinker extends DefaultLinker {
                     if (resolved) {
                         this.resolveToDeclaredType(node.value, (resolved as DataModelField).type);
                     } else {
-                        // need to clear linked reference, because it's resolved in default scope by default
-                        const ref = node.value.target as DefaultReference;
-                        ref._ref = this.createLinkingError({
-                            reference: ref,
-                            container: node.value,
-                            property: 'target',
-                        });
+                        // mark unresolvable
+                        this.unresolvableRefExpr(node.value);
                     }
                 }
             }
@@ -448,6 +495,15 @@ export class ZModelLinker extends DefaultLinker {
         node.$resolvedType = node.value.$resolvedType;
     }
 
+    private unresolvableRefExpr(item: ReferenceExpr) {
+        const ref = item.target as DefaultReference;
+        ref._ref = this.createLinkingError({
+            reference: ref,
+            container: item,
+            property: 'target',
+        });
+    }
+
     private findAttrParamForArg(arg: AttributeArg): AttributeParam | undefined {
         const attr = arg.$container.decl.ref;
         if (!attr) {
diff --git a/packages/schema/src/plugins/access-policy/expression-writer.ts b/packages/schema/src/plugins/access-policy/expression-writer.ts
@@ -461,8 +461,9 @@ export class ExpressionWriter {
         this.writer.write(`db.${lowerCaseFirst(containingModel.name)}.fields.${expr.target.ref.name}`);
     }
 
-    private isAuthOrAuthMemberAccess(expr: Expression) {
-        return isAuthInvocation(expr) || (isMemberAccessExpr(expr) && isAuthInvocation(expr.operand));
+    private isAuthOrAuthMemberAccess(expr: Expression): boolean {
+        // recursive check for auth().x.y.z
+        return isAuthInvocation(expr) || (isMemberAccessExpr(expr) && this.isAuthOrAuthMemberAccess(expr.operand));
     }
 
     private writeOperator(operator: ComparisonOperator, fieldAccess: Expression, writeOperand: () => void) {
diff --git a/packages/schema/src/plugins/prisma/prisma-builder.ts b/packages/schema/src/plugins/prisma/prisma-builder.ts
@@ -304,17 +304,10 @@ export class FunctionCall {
 }
 
 export class FunctionCallArg {
-    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
-    constructor(public name: string | undefined, public value: any) {}
+    constructor(public name: string | undefined, public value: string) {}
 
     toString(): string {
-        const val =
-            this.value === null || this.value === undefined
-                ? 'null'
-                : typeof this.value === 'string'
-                ? `"${this.value}"`
-                : this.value.toString();
-        return this.name ? `${this.name}: ${val}` : val;
+        return this.name ? `${this.name}: ${this.value}` : this.value;
     }
 }
 
diff --git a/packages/schema/src/plugins/prisma/schema-generator.ts b/packages/schema/src/plugins/prisma/schema-generator.ts
@@ -18,7 +18,9 @@ import {
     isArrayExpr,
     isInvocationExpr,
     isLiteralExpr,
+    isNullExpr,
     isReferenceExpr,
+    isStringLiteral,
     LiteralExpr,
     Model,
     NumberLiteral,
@@ -35,6 +37,7 @@ import {
     PluginOptions,
     resolved,
     resolvePath,
+    ZModelCodeGenerator,
 } from '@zenstackhq/sdk';
 import fs from 'fs';
 import { writeFile } from 'fs/promises';
@@ -45,6 +48,7 @@ import { name } from '.';
 import { getStringLiteral } from '../../language-server/validator/utils';
 import telemetry from '../../telemetry';
 import { execSync } from '../../utils/exec-utils';
+import { getPackageJson } from '../../utils/pkg-utils';
 import {
     ModelFieldType,
     AttributeArg as PrismaAttributeArg,
@@ -62,8 +66,6 @@ import {
     PassThroughAttribute as PrismaPassThroughAttribute,
     SimpleField,
 } from './prisma-builder';
-import { ZModelCodeGenerator } from '@zenstackhq/sdk';
-import { getPackageJson } from '../../utils/pkg-utils';
 
 const MODEL_PASSTHROUGH_ATTR = '@@prisma.passthrough';
 const FIELD_PASSTHROUGH_ATTR = '@prisma.passthrough';
@@ -377,10 +379,15 @@ export default class PrismaSchemaGenerator {
         return new PrismaFunctionCall(
             resolved(node.function).name,
             node.args.map((arg) => {
-                if (!isLiteralExpr(arg.value)) {
-                    throw new PluginError(name, 'Function call argument must be literal');
-                }
-                return new PrismaFunctionCallArg(arg.name, arg.value.value);
+                const val = match(arg.value)
+                    .when(isStringLiteral, (v) => `"${v.value}"`)
+                    .when(isLiteralExpr, (v) => v.value.toString())
+                    .when(isNullExpr, () => 'null')
+                    .otherwise(() => {
+                        throw new PluginError(name, 'Function call argument must be literal or null');
+                    });
+
+                return new PrismaFunctionCallArg(arg.name, val);
             })
         );
     }
diff --git a/packages/schema/src/res/stdlib.zmodel b/packages/schema/src/res/stdlib.zmodel
@@ -93,6 +93,12 @@ function uuid(): String {
 function cuid(): String {
 } @@@expressionContext([DefaultValue])
 
+/**
+ * Generates an indentifier based on the nanoid spec.
+ */
+function nanoid(length: Int?): String {
+} @@@expressionContext([DefaultValue])
+
 /**
  * Creates a sequence of integers in the underlying database and assign the incremented 
  * values to the ID values of the created records based on the sequence.
diff --git a/packages/schema/tests/generator/prisma-builder.test.ts b/packages/schema/tests/generator/prisma-builder.test.ts
@@ -102,7 +102,7 @@ describe('Prisma Builder Tests', () => {
                     undefined,
                     new AttributeArgValue(
                         'FunctionCall',
-                        new FunctionCall('dbgenerated', [new FunctionCallArg(undefined, 'timestamp_id()')])
+                        new FunctionCall('dbgenerated', [new FunctionCallArg(undefined, '"timestamp_id()"')])
                     )
                 ),
             ]),
diff --git a/packages/schema/tests/generator/prisma-generator.test.ts b/packages/schema/tests/generator/prisma-generator.test.ts
diff --git a/packages/schema/tests/schema/validation/attribute-validation.test.ts b/packages/schema/tests/schema/validation/attribute-validation.test.ts
diff --git a/packages/schema/tests/schema/zmodel-generator.test.ts b/packages/schema/tests/schema/zmodel-generator.test.ts
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
diff --git a/packages/sdk/src/prisma.ts b/packages/sdk/src/prisma.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tests/integration/tests/plugins/policy.test.ts b/tests/integration/tests/plugins/policy.test.ts
diff --git a/tests/integration/tests/regression/issue-925.test.ts b/tests/integration/tests/regression/issue-925.test.ts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`group = "dev.zenstack"`
`8`		`-version = "1.6.0"`
	`8`	`+version = "1.6.1"`
`9`	`9`
`10`	`10`	`repositories {`
`11`	`11`	`mavenCentral()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jetbrains",`
`3`		`- "version": "1.6.0",`
	`3`	`+ "version": "1.6.1",`
`4`	`4`	`"displayName": "ZenStack JetBrains IDE Plugin",`
`5`	`5`	`"description": "ZenStack JetBrains IDE plugin",`
`6`	`6`	`"homepage": "https://zenstack.dev",`