diff --git a/packages/misc/redwood/package.json b/packages/misc/redwood/package.json index 6b5d3b269..5c03ca6ac 100644 --- a/packages/misc/redwood/package.json +++ b/packages/misc/redwood/package.json @@ -46,7 +46,7 @@ "listr2": "^6.0.0", "semver": "^7.5.2", "terminal-link": "^2.0.0", - "ts-morph": "^16.0.0", + "ts-morph": "^26.0.0", "yargs": "^17.7.2" }, "devDependencies": { diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json index 8bf66694a..161393a01 100644 --- a/packages/plugins/swr/package.json +++ b/packages/plugins/swr/package.json @@ -42,7 +42,7 @@ "@zenstackhq/sdk": "workspace:*", "cross-fetch": "^4.0.0", "semver": "^7.5.2", - "ts-morph": "^16.0.0", + "ts-morph": "^26.0.0", "ts-pattern": "^4.3.0" }, "peerDependencies": { diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json index 8793764b9..077c2dd36 100644 --- a/packages/plugins/tanstack-query/package.json +++ b/packages/plugins/tanstack-query/package.json @@ -84,7 +84,7 @@ "@zenstackhq/sdk": "workspace:*", "cross-fetch": "^4.0.0", "semver": "^7.5.2", - "ts-morph": "^16.0.0", + "ts-morph": "^26.0.0", "ts-pattern": "^4.3.0" }, "devDependencies": { diff --git a/packages/plugins/tanstack-query/tests/plugin.test.ts b/packages/plugins/tanstack-query/tests/plugin.test.ts index 950b0d9a2..c893c6bf7 100644 --- a/packages/plugins/tanstack-query/tests/plugin.test.ts +++ b/packages/plugins/tanstack-query/tests/plugin.test.ts @@ -65,7 +65,7 @@ model Foo { 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?.pages[0]?.[0]?.published); console.log(data?.pageParams[0]); } @@ -130,7 +130,7 @@ ${sharedModel} useSuspenseInfiniteFindManypost_Item({ where: { published: true } }); useSuspenseInfiniteFindManypost_Item(undefined, { getNextPageParam: () => null }); console.log(queryKey); - console.log(data?.pages[0][0].published); + console.log(data?.pages[0]?.[0]?.published); console.log(data?.pageParams[0]); } `, @@ -157,7 +157,7 @@ ${sharedModel} useInfiniteFindManypost_Item({ where: { published: true } }, { enabled: true, getNextPageParam: () => null }); useInfiniteFindManypost_Item(undefined, { getNextPageParam: () => null }); console.log(queryKey); - console.log(data.value?.pages[0][0].published); + console.log(data.value?.pages[0]?.[0]?.published); console.log(data.value?.pageParams[0]); } @@ -233,7 +233,7 @@ ${sharedModel} 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?.pages[0]?.[0]?.published); console.log(data?.pageParams[0]); } diff --git a/packages/plugins/tanstack-query/tests/portable.test.ts b/packages/plugins/tanstack-query/tests/portable.test.ts index 6ddbb1cc3..aa22abf8a 100644 --- a/packages/plugins/tanstack-query/tests/portable.test.ts +++ b/packages/plugins/tanstack-query/tests/portable.test.ts @@ -41,7 +41,7 @@ describe('Tanstack Query Plugin Portable Tests', () => { import { useFindUniqueUser } from './hooks'; const { data } = useFindUniqueUser({ where: { id: 1 }, include: { posts: true } }); console.log(data?.email); -console.log(data?.posts[0].title); +console.log(data?.posts[0]?.title); `, }, ], @@ -101,7 +101,7 @@ console.log(data?.posts[0].title); import { useFindUniqueUser } from './hooks'; const { data } = useFindUniqueUser({ where: { id: 1 }, include: { posts: true } }); console.log(data?.email); -console.log(data?.posts[0].title); +console.log(data?.posts[0]?.title); `, }, ], diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json index 61b4d280f..19bef7137 100644 --- a/packages/plugins/trpc/package.json +++ b/packages/plugins/trpc/package.json @@ -28,7 +28,7 @@ "dependencies": { "@zenstackhq/runtime": "workspace:*", "@zenstackhq/sdk": "workspace:*", - "ts-morph": "^16.0.0", + "ts-morph": "^26.0.0", "tslib": "^2.4.1" }, "peerDependencies": { 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 index 8dad6ebd7..52473a46f 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index dd7e05774..c8daf7ec5 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index ee24d694d..f235f54f7 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 2d003e1a8..a8c6d46e3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 6b99aa63d..34cabdc6b 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 7a4417fa7..6e44414d3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 21f6ea4cd..631963d4a 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 7d811eef4..dd6cab640 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index d6ff6ee09..f99948ca7 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 17bad9a1e..f4eeb17f3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 8788515d9..706ec9348 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 2d003e1a8..a8c6d46e3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 6b99aa63d..34cabdc6b 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 25ce457f9..b12745f4a 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index f3d98197e..1ac428b58 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index ea7eca4ed..ddf28e89f 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index b7ce17bdb..c6ffcf2e6 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 8ce5b7e35..1f197eb2c 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 55d4c8a78..cc43f9af4 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 2d003e1a8..a8c6d46e3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 6b99aa63d..34cabdc6b 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 7a4417fa7..6e44414d3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 21f6ea4cd..631963d4a 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 7d811eef4..dd6cab640 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index a154285c4..edbed5068 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 37ba687ca..6bb8a9109 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 351154db9..e2f4d6c7c 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 2d003e1a8..a8c6d46e3 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 6b99aa63d..34cabdc6b 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index 25ce457f9..b12745f4a 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index f3d98197e..1ac428b58 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck 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 index ea7eca4ed..ddf28e89f 100644 --- 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 @@ -1,6 +1,6 @@ /****************************************************************************** -* This file was generated by ZenStack CLI 2.9.0. -******************************************************************************/ + * This file was generated by ZenStack CLI. + ******************************************************************************/ /* eslint-disable */ // @ts-nocheck diff --git a/packages/schema/package.json b/packages/schema/package.json index dc516b6b7..2b146b9f0 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -106,7 +106,7 @@ "semver": "^7.5.2", "strip-color": "^0.1.0", "terminal-link": "^2.0.0", - "ts-morph": "^16.0.0", + "ts-morph": "^26.0.0", "ts-pattern": "^4.3.0", "uuid": "^9.0.0", "vscode-jsonrpc": "^8.0.2", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index bfee4b4f7..1d4e8ad51 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -24,7 +24,7 @@ "@zenstackhq/runtime": "workspace:*", "langium": "1.3.1", "semver": "^7.5.2", - "ts-morph": "^16.0.0", + "ts-morph": "^26.0.0", "ts-pattern": "^4.3.0" }, "devDependencies": { diff --git a/packages/testtools/src/schema.ts b/packages/testtools/src/schema.ts index 152b05ada..746b257cc 100644 --- a/packages/testtools/src/schema.ts +++ b/packages/testtools/src/schema.ts @@ -12,7 +12,6 @@ import type { PolicyDef } from '@zenstackhq/runtime/enhancements/node'; import { getDMMF, type DMMF } from '@zenstackhq/sdk/prisma'; import { execSync } from 'child_process'; import * as fs from 'fs'; -import json from 'json5'; import * as path from 'path'; import tmp from 'tmp'; import { loadDocument } from 'zenstack/cli/cli-util'; @@ -363,11 +362,20 @@ export function createProjectAndCompile(schema: string, options: SchemaLoadOptio if (opt.compile || opt.extraSourceFiles) { console.log('Compiling...'); - run('npx tsc --init'); - // add generated '.zenstack/zod' folder to typescript's search path, // so that it can be resolved from symbolic-linked files - const tsconfig = json.parse(fs.readFileSync(path.join(projectDir, './tsconfig.json'), 'utf-8')); + + const tsconfig: any = { + compilerOptions: { + target: 'es2016', + module: 'commonjs', + esModuleInterop: true, + forceConsistentCasingInFileNames: true, + strict: true, + skipLibCheck: true, + }, + }; + tsconfig.compilerOptions.paths = { '.zenstack/zod/input': ['./node_modules/.zenstack/zod/input/index.d.ts'], '.zenstack/models': ['./node_modules/.zenstack/models.d.ts'], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d35a0cc7..50a7e5526 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -104,8 +104,8 @@ importers: specifier: ^2.0.0 version: 2.1.1 ts-morph: - specifier: ^16.0.0 - version: 16.0.0 + specifier: ^26.0.0 + version: 26.0.0 yargs: specifier: ^17.7.2 version: 17.7.2 @@ -191,8 +191,8 @@ importers: specifier: 2.2.5 - 2 version: 2.2.5(react@18.2.0) ts-morph: - specifier: ^16.0.0 - version: 16.0.0 + specifier: ^26.0.0 + version: 26.0.0 ts-pattern: specifier: ^4.3.0 version: 4.3.0 @@ -238,8 +238,8 @@ importers: specifier: ^7.5.2 version: 7.6.2 ts-morph: - specifier: ^16.0.0 - version: 16.0.0 + specifier: ^26.0.0 + version: 26.0.0 ts-pattern: specifier: ^4.3.0 version: 4.3.0 @@ -312,8 +312,8 @@ importers: specifier: workspace:* version: link:../../sdk/dist ts-morph: - specifier: ^16.0.0 - version: 16.0.0 + specifier: ^26.0.0 + version: 26.0.0 tslib: specifier: ^2.4.1 version: 2.6.3 @@ -466,8 +466,8 @@ importers: specifier: ^2.0.0 version: 2.1.1 ts-morph: - specifier: ^16.0.0 - version: 16.0.0 + specifier: ^26.0.0 + version: 26.0.0 ts-pattern: specifier: ^4.3.0 version: 4.3.0 @@ -567,8 +567,8 @@ importers: specifier: ^7.5.2 version: 7.6.2 ts-morph: - specifier: ^16.0.0 - version: 16.0.0 + specifier: ^26.0.0 + version: 26.0.0 ts-pattern: specifier: ^4.3.0 version: 4.3.0 @@ -3047,8 +3047,8 @@ packages: '@ts-morph/common@0.16.0': resolution: {integrity: sha512-SgJpzkTgZKLKqQniCjLaE3c2L2sdL7UShvmTmPBejAKd2OKV/yfMpQ2IWpAuA+VY5wy7PkSUaEObIqEK6afFuw==} - '@ts-morph/common@0.17.0': - resolution: {integrity: sha512-RMSSvSfs9kb0VzkvQ2NWobwnj7TxCA9vI/IjR9bDHqgAyVbu2T0DN4wiKVqomyDWqO7dPr/tErSfq7urQ1Q37g==} + '@ts-morph/common@0.27.0': + resolution: {integrity: sha512-Wf29UqxWDpc+i61k3oIOzcUfQt79PIT9y/MWfAGlrkjg6lBC1hwDECLXPVJAhWjiGbfBCxZd65F/LIZF3+jeJQ==} '@tsconfig/node10@1.0.11': resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==} @@ -4038,6 +4038,9 @@ packages: code-block-writer@11.0.3: resolution: {integrity: sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==} + code-block-writer@13.0.3: + resolution: {integrity: sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==} + code-error-fragment@0.0.230: resolution: {integrity: sha512-cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw==} engines: {node: '>= 4'} @@ -8016,8 +8019,8 @@ packages: ts-morph@15.1.0: resolution: {integrity: sha512-RBsGE2sDzUXFTnv8Ba22QfeuKbgvAGJFuTN7HfmIRUkgT/NaVLfDM/8OFm2NlFkGlWEXdpW5OaFIp1jvqdDuOg==} - ts-morph@16.0.0: - resolution: {integrity: sha512-jGNF0GVpFj0orFw55LTsQxVYEUOCWBAbR5Ls7fTYE5pQsbW18ssTb/6UXx/GYAEjS+DQTp8VoTw0vqYMiaaQuw==} + ts-morph@26.0.0: + resolution: {integrity: sha512-ztMO++owQnz8c/gIENcM9XfCEzgoGphTv+nKpYNM1bgsdOVC/jRZuEBf6N+mLLDNg68Kl+GgUZfOySaRiG1/Ug==} ts-node@10.9.2: resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} @@ -11461,11 +11464,10 @@ snapshots: mkdirp: 1.0.4 path-browserify: 1.0.1 - '@ts-morph/common@0.17.0': + '@ts-morph/common@0.27.0': dependencies: - fast-glob: 3.3.2 - minimatch: 5.1.6 - mkdirp: 1.0.4 + fast-glob: 3.3.3 + minimatch: 10.0.3 path-browserify: 1.0.1 '@tsconfig/node10@1.0.11': @@ -12682,6 +12684,8 @@ snapshots: code-block-writer@11.0.3: {} + code-block-writer@13.0.3: {} + code-error-fragment@0.0.230: {} code-red@1.0.4: @@ -17344,10 +17348,10 @@ snapshots: '@ts-morph/common': 0.16.0 code-block-writer: 11.0.3 - ts-morph@16.0.0: + ts-morph@26.0.0: dependencies: - '@ts-morph/common': 0.17.0 - code-block-writer: 11.0.3 + '@ts-morph/common': 0.27.0 + code-block-writer: 13.0.3 ts-node@10.9.2(@types/node@20.14.9)(typescript@5.5.2): dependencies: diff --git a/script/test-scaffold.ts b/script/test-scaffold.ts index 8406b575b..b41f3bad9 100644 --- a/script/test-scaffold.ts +++ b/script/test-scaffold.ts @@ -19,6 +19,8 @@ function run(cmd: string) { } run('npm init -y'); -run('npm i --no-audit --no-fund typescript prisma@6.11.x @prisma/client@6.11.x zod@^3.22.4 decimal.js @types/node'); +run( + 'npm i --no-audit --no-fund typescript@~5.8.0 prisma@6.11.x @prisma/client@6.11.x zod@^3.22.4 decimal.js @types/node' +); console.log('Test scaffold setup complete.');