merge dev to main (v2.20.0)

.devcontainer/.env

@@ -0,0 +1,11 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=abc123
+POSTGRES_DB=postgres
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+
+ZENSTACK_TEST_DB_USER=postgres
+ZENSTACK_TEST_DB_PASS=abc123
+ZENSTACK_TEST_DB_NAME=postgres
+ZENSTACK_TEST_DB_HOST=postgres
+ZENSTACK_TEST_DB_PORT=5432

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+  "name": "zenstack",
+  "dockerComposeFile": [
+    "./docker-compose.yml"
+  ],
+  "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind",
+  "workspaceFolder": "/workspace",
+  "service": "workspace",
+  "shutdownAction": "stopCompose",
+  "postCreateCommand": "npm i -g pnpm@9.15.9 && pnpm install && pnpm build && pnpm test-scaffold",
+  "remoteUser": "node",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "langium.langium-vscode",
+        "firsttris.vscode-jest-runner"
+      ]
+    }
+  }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,37 @@
+name: zenstack
+
+volumes:
+  postgres-data:
+
+networks:
+  workspace:
+    external: false
+
+services:
+  workspace:
+    container_name: zenstack-workspace
+    image: mcr.microsoft.com/devcontainers/javascript-node:20
+    restart: always
+    volumes:
+      - ..:/workspace:cached
+    env_file: ./.env
+    command: sleep infinity
+    networks:
+      - workspace
+
+  postgres:
+    container_name: zenstack-postgres
+    image: postgres
+    restart: always
+    volumes:
+      - postgres-data:/var/lib/postgresql/
+    env_file: ./.env
+    networks:
+      - workspace
+    ports:
+      - 5432:5432
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5

.gitignore

@@ -8,3 +8,4 @@ dist
 coverage
 .build
 .test
+.pnpm-store

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.19.2",
+    "version": "2.20.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r --filter=\"!./packages/ide/*\" build",

packages/ide/jetbrains/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### Fixed
 
+-   Update JetBrains platform version compatibility.
+
+## 2.18.0
+
+### Fixed
+
 -   Views are not required to have a unique identifying field marked with `@id` or `@unique`.
 
 ## 2.17.0

packages/ide/jetbrains/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "dev.zenstack"
-version = "2.19.2"
+version = "2.20.0"
 
 repositories {
     mavenCentral()
@@ -57,7 +57,7 @@ tasks {
 
     patchPluginXml {
         sinceBuild.set("233.2")
-        untilBuild.set("251.*")
+        untilBuild.set("271.*")
         changeNotes.set(provider {
             changelog.renderItem(
                     changelog

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.19.2",
+  "version": "2.20.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.19.2",
+    "version": "2.20.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.19.2",
+    "version": "2.20.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.19.2",
+  "version": "2.20.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.19.2",
+    "version": "2.20.0",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {

packages/plugins/tanstack-query/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "2.19.2",
+    "version": "2.20.0",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {

packages/plugins/tanstack-query/src/generator.ts

@@ -161,7 +161,7 @@ function generateQueryHook(
             isExported: true,
         });
 
-        if (version === 'v5' && infinite && ['react', 'svelte'].includes(target)) {
+        if (version === 'v5' && infinite && ['react', 'svelte', 'angular'].includes(target)) {
             // getNextPageParam option is required in v5
             func.addStatements([`options = options ?? { getNextPageParam: () => null };`]);
         }

packages/plugins/tanstack-query/tests/plugin.test.ts

@@ -303,17 +303,15 @@ ${sharedModel}
         })
         export class TestComponent {
             query() {
-                const { data, queryKey } = useFindFirstpost_Item({include: { author: true }}, { enabled: true, optimisticUpdate: false });
-                console.log(queryKey);
+                const { data } = useFindFirstpost_Item({include: { author: true }}, { enabled: true, optimisticUpdate: false });
                 console.log(data()?.viewCount);
                 console.log(data()?.author?.email);
             }
 
             infiniteQuery() {
-                const { data, queryKey, fetchNextPage, hasNextPage } = useInfiniteFindManypost_Item();
+                const { data, fetchNextPage, hasNextPage } = useInfiniteFindManypost_Item();
                 useInfiniteFindManypost_Item({ where: { published: true } });
                 useInfiniteFindManypost_Item(undefined, { enabled: true, getNextPageParam: () => null });
-                console.log(queryKey);
                 console.log(data()?.pages[0][0].published);
                 console.log(data()?.pageParams[0]);
             }
@@ -346,9 +344,9 @@ ${sharedModel}
                     '@angular/core@^20.0.0',
                     '@angular/common@^20.0.0',
                     '@angular/platform-browser@^20.0.0',
-                    '@tanstack/angular-query-v5@npm:@tanstack/angular-query-experimental@5.84.x',
+                    '@tanstack/angular-query-experimental@5.84.x',
                     'rxjs@^7.8.0',
-                    'zone.js@^0.15.0'
+                    'zone.js@^0.15.0',
                 ],
                 copyDependencies: [path.resolve(__dirname, '../dist')],
                 compile: true,

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "2.19.2",
+    "version": "2.20.0",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/package.json

@@ -10,7 +10,7 @@
         "postinstall": "nuxt prepare"
     },
     "dependencies": {
-        "@prisma/client": "6.16.x",
+        "@prisma/client": "6.17.x",
         "@trpc/client": "^10.45.2",
         "@trpc/server": "^10.45.2",
         "nuxt": "^3.14.1592",
@@ -21,7 +21,7 @@
     },
     "devDependencies": {
         "esbuild": "^0.24.0",
-        "prisma": "6.16.x",
+        "prisma": "6.17.x",
         "typescript": "^5.6.2",
         "vue-tsc": "^2.1.10"
     }

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/Post.nuxt.type.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/User.nuxt.type.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/nuxt.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { AnyRouter } from '@trpc/server';
 import { createTRPCNuxtClient as _createTRPCNuxtClient } from 'trpc-nuxt/client';

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/utils.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 type Primitive = string | Function | number | boolean | Symbol | undefined | null;
 

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/helper.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { TRPCError } from '@trpc/server';
 import { isPrismaClientKnownRequestError } from '@zenstackhq/runtime';

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/routers/Post.router.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { type RouterFactory, type ProcBuilder, type BaseConfig, db } from ".";
 import * as _Schema from '@zenstackhq/runtime/zod/input';

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/routers/User.router.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { type RouterFactory, type ProcBuilder, type BaseConfig, db } from ".";
 import * as _Schema from '@zenstackhq/runtime/zod/input';

packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/routers/index.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { unsetMarker, AnyRouter, AnyRootConfig, CreateRouterInner, Procedure, ProcedureBuilder, ProcedureParams, ProcedureRouterRecord, ProcedureType } from "@trpc/server";
 import type { PrismaClient } from "@prisma/client";

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/package.json

@@ -10,7 +10,7 @@
         "postinstall": "nuxt prepare"
     },
     "dependencies": {
-        "@prisma/client": "6.16.x",
+        "@prisma/client": "6.17.x",
         "@trpc/client": "^11.0.0-rc.563",
         "@trpc/server": "^11.0.0-rc.563",
         "nuxt": "^3.14.1592",
@@ -21,7 +21,7 @@
     },
     "devDependencies": {
         "esbuild": "^0.24.0",
-        "prisma": "6.16.x",
+        "prisma": "6.17.x",
         "typescript": "^5.6.2",
         "vue-tsc": "^2.1.10"
     }

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/Post.nuxt.type.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/User.nuxt.type.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/nuxt.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { AnyTRPCRouter as AnyRouter } from '@trpc/server';
 import { createTRPCNuxtClient as _createTRPCNuxtClient } from 'trpc-nuxt/client';

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/utils.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 type Primitive = string | Function | number | boolean | Symbol | undefined | null;
 

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/helper.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { TRPCError } from '@trpc/server';
 import { isPrismaClientKnownRequestError } from '@zenstackhq/runtime';

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/routers/Post.router.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { db } from ".";
 import { createTRPCRouter } from "../../generated-router-helper";

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/routers/User.router.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { db } from ".";
 import { createTRPCRouter } from "../../generated-router-helper";

packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/routers/index.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { AnyTRPCRouter as AnyRouter } from "@trpc/server";
 import type { PrismaClient } from "@prisma/client";

packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/Post.next.type.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';

packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/User.next.type.ts

@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';