fix: hooks generation emits Provider export for backward compatibility (#594)

ymc9 · web-flow · commit ca3ebdae4e21 · 2023-07-19T18:18:43.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,17 @@ 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)}';`));
+    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) {
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "zenstack-monorepo",`
`3`		`- "version": "1.0.0-beta.9",`
	`3`	`+ "version": "1.0.0-beta.10",`
`4`	`4`	`"description": "",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "pnpm -r build",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/language",`
`3`		`- "version": "1.0.0-beta.9",`
	`3`	`+ "version": "1.0.0-beta.10",`
`4`	`4`	`"displayName": "ZenStack modeling language compiler",`
`5`	`5`	`"description": "ZenStack modeling language compiler",`
`6`	`6`	`"homepage": "https://zenstack.dev",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/openapi",`
`3`	`3`	`"displayName": "ZenStack Plugin and Runtime for OpenAPI",`
`4`		`- "version": "1.0.0-beta.9",`
	`4`	`+ "version": "1.0.0-beta.10",`
`5`	`5`	`"description": "ZenStack plugin and runtime supporting OpenAPI",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/swr",`
`3`	`3`	`"displayName": "ZenStack plugin for generating SWR hooks",`
`4`		`- "version": "1.0.0-beta.9",`
	`4`	`+ "version": "1.0.0-beta.10",`
`5`	`5`	`"description": "ZenStack plugin for generating SWR hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,7 @@ function generateModelHooks(project: Project, outDir: string, model: DataModel,`
`269`	`269`	`function generateIndex(project: Project, outDir: string, models: DataModel[]) {`
`270`	`270`	`const sf = project.createSourceFile(path.join(outDir, 'index.ts'), undefined, { overwrite: true });`
`271`	`271`	sf.addStatements(models.map((d) => `export * from './${paramCase(d.name)}';`));
	`272`	+ sf.addStatements(`export { Provider } from '@zenstackhq/swr/runtime';`);
`272`	`273`	`}`
`273`	`274`
`274`	`275`	`function generateQueryHook(`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/tanstack-query",`
`3`	`3`	`"displayName": "ZenStack plugin for generating tanstack-query hooks",`
`4`		`- "version": "1.0.0-beta.9",`
	`4`	`+ "version": "1.0.0-beta.10",`
`5`	`5`	`"description": "ZenStack plugin for generating tanstack-query hooks",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"exports": {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.`
`36`	`36`	`);`
`37`	`37`	`}`
`38`	`38`
`39`		`- generateIndex(project, outDir, models);`
	`39`	`+ generateIndex(project, outDir, models, target);`
`40`	`40`
`41`	`41`	`models.forEach((dataModel) => {`
`42`	`42`	`const mapping = dmmf.mappings.modelOperations.find((op) => op.model === dataModel.name);`
`@@ -387,9 +387,17 @@ function generateModelHooks(`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`
`390`		`-function generateIndex(project: Project, outDir: string, models: DataModel[]) {`
	`390`	`+function generateIndex(project: Project, outDir: string, models: DataModel[], target: string) {`
`391`	`391`	`const sf = project.createSourceFile(path.join(outDir, 'index.ts'), undefined, { overwrite: true });`
`392`	`392`	sf.addStatements(models.map((d) => `export * from './${paramCase(d.name)}';`));
	`393`	`+ switch (target) {`
	`394`	`+ case 'react':`
	`395`	+ sf.addStatements(`export { Provider } from '@zenstackhq/tanstack-query/runtime/react';`);
	`396`	`+ break;`
	`397`	`+ case 'svelte':`
	`398`	+ sf.addStatements(`export { SvelteQueryContextKey } from '@zenstackhq/tanstack-query/runtime/svelte';`);
	`399`	`+ break;`
	`400`	`+ }`
`393`	`401`	`}`
`394`	`402`
`395`	`403`	`function makeGetContext(target: TargetFramework) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/trpc",`
`3`	`3`	`"displayName": "ZenStack plugin for tRPC",`
`4`		`- "version": "1.0.0-beta.9",`
	`4`	`+ "version": "1.0.0-beta.10",`
`5`	`5`	`"description": "ZenStack plugin for tRPC",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/runtime",`
`3`	`3`	`"displayName": "ZenStack Runtime Library",`
`4`		`- "version": "1.0.0-beta.9",`
	`4`	`+ "version": "1.0.0-beta.10",`
`5`	`5`	`"description": "Runtime of ZenStack for both client-side and server-side environments.",`
`6`	`6`	`"repository": {`
`7`	`7`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@zenstackhq/sdk",`
`3`		`- "version": "1.0.0-beta.9",`
	`3`	`+ "version": "1.0.0-beta.10",`
`4`	`4`	`"description": "ZenStack plugin development SDK",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`