From fd62a2292bdb0325693f56fe38bab56be7342bf7 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Wed, 19 Jul 2023 17:23:53 +0800
Subject: [PATCH 1/2] fix: hooks generation emits Provider export for backward
 compatibility

---
 package.json                                     | 2 +-
 packages/language/package.json                   | 2 +-
 packages/plugins/openapi/package.json            | 2 +-
 packages/plugins/swr/package.json                | 2 +-
 packages/plugins/swr/src/generator.ts            | 1 +
 packages/plugins/tanstack-query/package.json     | 2 +-
 packages/plugins/tanstack-query/src/generator.ts | 5 +++--
 packages/plugins/trpc/package.json               | 2 +-
 packages/runtime/package.json                    | 2 +-
 packages/schema/package.json                     | 2 +-
 packages/sdk/package.json                        | 2 +-
 packages/server/package.json                     | 2 +-
 packages/testtools/package.json                  | 2 +-
 13 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 08a617323..5a3dd817f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",
diff --git a/packages/language/package.json b/packages/language/package.json
index de3f4ac13..22601bb57 100644
--- a/packages/language/package.json
+++ b/packages/language/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",
diff --git a/packages/plugins/openapi/package.json b/packages/plugins/openapi/package.json
index 246e727c4..e1b9b2d74 100644
--- a/packages/plugins/openapi/package.json
+++ b/packages/plugins/openapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.10",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
diff --git a/packages/plugins/swr/package.json b/packages/plugins/swr/package.json
index 9a82acc77..34874c979 100644
--- a/packages/plugins/swr/package.json
+++ b/packages/plugins/swr/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {
diff --git a/packages/plugins/swr/src/generator.ts b/packages/plugins/swr/src/generator.ts
index e363c188d..699e1f681 100644
--- a/packages/plugins/swr/src/generator.ts
+++ b/packages/plugins/swr/src/generator.ts
@@ -269,6 +269,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,
 function generateIndex(project: Project, outDir: string, models: DataModel[]) {
     const sf = project.createSourceFile(path.join(outDir, 'index.ts'), undefined, { overwrite: true });
     sf.addStatements(models.map((d) => `export * from './${paramCase(d.name)}';`));
+    sf.addStatements(`export { Provider } from '@zenstackhq/swr/runtime';`);
 }
 
 function generateQueryHook(
diff --git a/packages/plugins/tanstack-query/package.json b/packages/plugins/tanstack-query/package.json
index f3ba5fd8c..a2b4455a6 100644
--- a/packages/plugins/tanstack-query/package.json
+++ b/packages/plugins/tanstack-query/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {
diff --git a/packages/plugins/tanstack-query/src/generator.ts b/packages/plugins/tanstack-query/src/generator.ts
index b2e5226e3..ad0bb3895 100644
--- a/packages/plugins/tanstack-query/src/generator.ts
+++ b/packages/plugins/tanstack-query/src/generator.ts
@@ -36,7 +36,7 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.
         );
     }
 
-    generateIndex(project, outDir, models);
+    generateIndex(project, outDir, models, target);
 
     models.forEach((dataModel) => {
         const mapping = dmmf.mappings.modelOperations.find((op) => op.model === dataModel.name);
@@ -387,9 +387,10 @@ function generateModelHooks(
     }
 }
 
-function generateIndex(project: Project, outDir: string, models: DataModel[]) {
+function generateIndex(project: Project, outDir: string, models: DataModel[], target: string) {
     const sf = project.createSourceFile(path.join(outDir, 'index.ts'), undefined, { overwrite: true });
     sf.addStatements(models.map((d) => `export * from './${paramCase(d.name)}';`));
+    sf.addStatements(`export { Provider } from '@zenstackhq/tanstack-query/runtime/${target}';`);
 }
 
 function makeGetContext(target: TargetFramework) {
diff --git a/packages/plugins/trpc/package.json b/packages/plugins/trpc/package.json
index 663db158c..e6e1412b2 100644
--- a/packages/plugins/trpc/package.json
+++ b/packages/plugins/trpc/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index 694614ca3..9c6633fde 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/runtime",
     "displayName": "ZenStack Runtime Library",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "description": "Runtime of ZenStack for both client-side and server-side environments.",
     "repository": {
         "type": "git",
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 4e36c4399..04f1944f8 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack Language Tools",
     "description": "A toolkit for building secure CRUD apps with Next.js + Typescript",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "author": {
         "name": "ZenStack Team"
     },
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f920d76b5..e1f47f0ae 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/sdk",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "description": "ZenStack plugin development SDK",
     "main": "index.js",
     "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 040d6312c..04b8e0760 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/server",
-    "version": "1.0.0-beta.9",
+    "version": "1.0.0-beta.10",
     "displayName": "ZenStack Server-side Adapters",
     "description": "ZenStack server-side adapters",
     "homepage": "https://zenstack.dev",
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
index 672fd171c..ce2f0e2eb 100644
--- a/packages/testtools/package.json
+++ b/packages/testtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zenstackhq/testtools",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0-beta.10",
   "description": "ZenStack Test Tools",
   "main": "index.js",
   "publishConfig": {

From 03fb21ccb071b6e95ee44466b74c989778d509a7 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Wed, 19 Jul 2023 17:50:09 +0800
Subject: [PATCH 2/2] fix

---
 packages/plugins/tanstack-query/src/generator.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/tanstack-query/src/generator.ts b/packages/plugins/tanstack-query/src/generator.ts
index ad0bb3895..8d34cf209 100644
--- a/packages/plugins/tanstack-query/src/generator.ts
+++ b/packages/plugins/tanstack-query/src/generator.ts
@@ -390,7 +390,14 @@ function generateModelHooks(
 function generateIndex(project: Project, outDir: string, models: DataModel[], target: string) {
     const sf = project.createSourceFile(path.join(outDir, 'index.ts'), undefined, { overwrite: true });
     sf.addStatements(models.map((d) => `export * from './${paramCase(d.name)}';`));
-    sf.addStatements(`export { Provider } from '@zenstackhq/tanstack-query/runtime/${target}';`);
+    switch (target) {
+        case 'react':
+            sf.addStatements(`export { Provider } from '@zenstackhq/tanstack-query/runtime/react';`);
+            break;
+        case 'svelte':
+            sf.addStatements(`export { SvelteQueryContextKey } from '@zenstackhq/tanstack-query/runtime/svelte';`);
+            break;
+    }
 }
 
 function makeGetContext(target: TargetFramework) {