fix tests and angular-query generation

ymc9 · ymc9 · commit 2bdaa27826a8 · 2025-10-14T14:28:25.000-07:00
diff --git a/packages/plugins/tanstack-query/src/generator.ts b/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 };`]);
         }
diff --git a/packages/plugins/tanstack-query/tests/plugin.test.ts b/packages/plugins/tanstack-query/tests/plugin.test.ts
@@ -346,9 +346,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,
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/Post.nuxt.type.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/User.nuxt.type.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/nuxt.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/client/utils.ts b/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;
 
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/helper.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/routers/Post.router.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/routers/User.router.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v10/server/trpc/routers/generated/routers/index.ts b/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";
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/Post.nuxt.type.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/User.nuxt.type.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/nuxt.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/client/utils.ts b/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;
 
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/helper.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/routers/Post.router.ts b/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";
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/routers/User.router.ts b/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";
diff --git a/packages/plugins/trpc/tests/projects/nuxt-trpc-v11/server/trpc/routers/generated/routers/index.ts b/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";
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/Post.next.type.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/User.next.type.ts b/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';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/next.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/next.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { AnyRouter } from '@trpc/server';
 import type { NextPageContext } from 'next';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/utils.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/client/utils.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 type Primitive = string | Function | number | boolean | Symbol | undefined | null;
 
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/helper.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/helper.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { TRPCError } from '@trpc/server';
 import { isPrismaClientKnownRequestError } from '@zenstackhq/runtime';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/Post.router.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/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';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/User.router.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/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';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/routers/generated/routers/index.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v10/src/server/api/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";
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/Post.react.type.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/Post.react.type.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/User.react.type.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/User.react.type.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { Prisma } from '@prisma/client';
 import type { TRPCClientErrorLike, TRPCRequestOptions } from '@trpc/client';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/react.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/react.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import type { AnyTRPCRouter as AnyRouter } from '@trpc/server';
 import type { CreateTRPCReactOptions } from '@trpc/react-query/shared';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/utils.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/client/utils.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 type Primitive = string | Function | number | boolean | Symbol | undefined | null;
 
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/helper.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/helper.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { TRPCError } from '@trpc/server';
 import { isPrismaClientKnownRequestError } from '@zenstackhq/runtime';
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/routers/Post.router.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/routers/Post.router.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { db } from ".";
 import { createTRPCRouter } from "../../generated-router-helper";
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/routers/User.router.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/routers/User.router.ts
@@ -3,7 +3,6 @@
  ******************************************************************************/
 
 /* eslint-disable */
-// @ts-nocheck
 
 import { db } from ".";
 import { createTRPCRouter } from "../../generated-router-helper";
diff --git a/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/routers/generated/routers/index.ts b/packages/plugins/trpc/tests/projects/t3-trpc-v11/src/server/api/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";
diff --git a/packages/plugins/trpc/tests/trpc.test.ts b/packages/plugins/trpc/tests/trpc.test.ts
@@ -57,7 +57,7 @@ model Foo {
             {
                 provider: 'postgresql',
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
                 fullZod: true,
             }
@@ -99,7 +99,7 @@ model Foo {
         `,
             {
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
                 fullZod: true,
             }
@@ -129,7 +129,7 @@ model Post {
         `,
             {
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
                 fullZod: true,
                 customSchemaFilePath: 'zenstack/schema.zmodel',
@@ -154,7 +154,7 @@ model Post {
         `,
             {
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
                 fullZod: true,
                 customSchemaFilePath: 'zenstack/schema.zmodel',
@@ -184,7 +184,7 @@ model Post {
         `,
             {
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
                 fullZod: true,
                 customSchemaFilePath: 'zenstack/schema.zmodel',
@@ -232,9 +232,9 @@ model Post {
                 pushDb: false,
                 extraDependencies: [
                     path.resolve(__dirname, '../dist'),
-                    '@trpc/client',
-                    '@trpc/server',
-                    '@trpc/react-query',
+                    '@trpc/client@10',
+                    '@trpc/server@10',
+                    '@trpc/react-query@10',
                 ],
                 compile: true,
                 fullZod: true,
@@ -255,7 +255,12 @@ model Post {
             `,
             {
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server', '@trpc/next'],
+                extraDependencies: [
+                    path.resolve(__dirname, '../dist'),
+                    '@trpc/client@10',
+                    '@trpc/server@10',
+                    '@trpc/next@10',
+                ],
                 compile: true,
                 fullZod: true,
             }
@@ -285,7 +290,7 @@ model post_item {
         `,
             {
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
                 fullZod: true,
             }
@@ -332,7 +337,7 @@ model Foo {
             {
                 addPrelude: false,
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
             }
         );
@@ -403,7 +408,7 @@ model Foo {
             {
                 addPrelude: false,
                 pushDb: false,
-                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client', '@trpc/server'],
+                extraDependencies: [path.resolve(__dirname, '../dist'), '@trpc/client@10', '@trpc/server@10'],
                 compile: true,
             }
         );

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ function generateQueryHook(`
`161`	`161`	`isExported: true,`
`162`	`162`	`});`
`163`	`163`
`164`		`- if (version === 'v5' && infinite && ['react', 'svelte'].includes(target)) {`
	`164`	`+ if (version === 'v5' && infinite && ['react', 'svelte', 'angular'].includes(target)) {`
`165`	`165`	`// getNextPageParam option is required in v5`
`166`	`166`	func.addStatements([`options = options ?? { getNextPageParam: () => null };`]);
`167`	`167`	`}`