Merge branch 'dev' into feature/permission-checker

Author: Azzerty23

packages/ide/jetbrains/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Added support to complex usage of `@@index` attribute like `@@index([content(ops: raw("gin_trgm_ops"))], type: Gin)`.
+### Fixed
+- Fixed several ZModel validation issues related to model inheritance.
 
+## 1.7.0
 ### Added
 - Auto-completion is now supported inside attributes.

packages/ide/jetbrains/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.0.0-alpha.1"
+version = "1.9.0"
 
 repositories {
     mavenCentral()

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jetbrains",
-    "version": "2.0.0-alpha.1",
+    "version": "1.9.0",
     "displayName": "ZenStack JetBrains IDE Plugin",
     "description": "ZenStack JetBrains IDE plugin",
     "homepage": "https://zenstack.dev",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "2.0.0-alpha.1",
+    "version": "1.9.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/misc/redwood/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.0.0-alpha.1",
+    "version": "1.9.0",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.0.0-alpha.1",
+  "version": "1.9.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/tanstack-query/src/runtime/vue.ts

@@ -61,7 +61,7 @@ export function useModelQuery<TQueryFnData, TData, TError>(
     model: string,
     url: string,
     args?: unknown,
-    options?: UseQueryOptions<TQueryFnData, TError, TData>,
+    options?: Omit<UseQueryOptions<TQueryFnData, TError, TData>, 'queryKey'>,
     fetch?: FetchFn,
     optimisticUpdate = false
 ) {
@@ -87,7 +87,7 @@ export function useInfiniteModelQuery<TQueryFnData, TData, TError>(
     model: string,
     url: string,
     args?: unknown,
-    options?: UseInfiniteQueryOptions<TQueryFnData, TError, TData>,
+    options?: Omit<UseInfiniteQueryOptions<TQueryFnData, TError, TData>, 'queryKey'>,
     fetch?: FetchFn
 ) {
     return useInfiniteQuery<TQueryFnData, TError, TData>({

packages/schema/src/cli/actions/repl.ts

@@ -2,7 +2,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 import colors from 'colors';
 import path from 'path';
-import prettyRepl from 'pretty-repl';
 import { inspect } from 'util';
 
 // inspired by: https://github.com/Kinjalrk2k/prisma-console
@@ -11,6 +10,13 @@ import { inspect } from 'util';
  * CLI action for starting a REPL session
  */
 export async function repl(projectPath: string, options: { prismaClient?: string; debug?: boolean; table?: boolean }) {
+    if (!process?.stdout?.isTTY && process?.versions?.bun) {
+        console.error('REPL on Bun is only available in a TTY terminal at this time. Please use npm/npx to run the command in this context instead of bun/bunx.');
+        return;
+    }
+
+    const prettyRepl = await import('pretty-repl')
+
     console.log('Welcome to ZenStack REPL. See help with the ".help" command.');
     console.log('Global variables:');
     console.log(`    ${colors.blue('db')} to access enhanced PrismaClient`);

packages/schema/src/language-server/validator/datamodel-validator.ts

@@ -5,6 +5,7 @@ import {
     isDataModel,
     isStringLiteral,
     ReferenceExpr,
+    isEnum,
 } from '@zenstackhq/language/ast';
 import { getLiteral, getModelIdFields, getModelUniqueFields, isDelegateModel } from '@zenstackhq/sdk';
 import { AstNode, DiagnosticInfo, getDocument, ValidationAcceptor } from 'langium';
@@ -61,8 +62,13 @@ export default class DataModelValidator implements AstValidator<DataModel> {
                 if (idField.type.optional) {
                     accept('error', 'Field with @id attribute must not be optional', { node: idField });
                 }
-                if (idField.type.array || !idField.type.type || !SCALAR_TYPES.includes(idField.type.type)) {
-                    accept('error', 'Field with @id attribute must be of scalar type', { node: idField });
+
+                const isArray = idField.type.array;
+                const isScalar = SCALAR_TYPES.includes(idField.type.type as typeof SCALAR_TYPES[number])
+                const isValidType = isScalar || isEnum(idField.type.reference?.ref)
+
+                if (isArray || !isValidType) {
+                    accept('error', 'Field with @id attribute must be of scalar or enum type', { node: idField });
                 }
             });
         }

packages/schema/src/language-server/zmodel-linker.ts

@@ -470,6 +470,18 @@ export class ZModelLinker extends DefaultLinker {
     }
 
     private resolveDataModel(node: DataModel, document: LangiumDocument<AstNode>, extraScopes: ScopeProvider[]) {
+        if (node.superTypes.length > 0) {
+            const superTypeProviders: ScopeProvider[] = [];
+            // build scope providers for super types recursively with breadth-first search
+            const queue = node.superTypes.map((t) => t.ref!);
+            while (queue.length > 0) {
+                const superType = queue.shift()!;
+                const provider = (name: string) => superType.fields.find((f) => f.name === name);
+                superTypeProviders.push(provider);
+                queue.push(...superType.superTypes.map((t) => t.ref!));
+            }
+            extraScopes = [...superTypeProviders, ...extraScopes];
+        }
         return this.resolveDefault(node, document, extraScopes);
     }