merge dev to main (1.5.0)

.eslintignore

@@ -0,0 +1 @@
+**/dist/**

packages/schema/.eslintrc.json → .eslintrc.json

@@ -15,6 +15,5 @@
     "rules": {
         "jest/expect-expect": "off",
         "@typescript-eslint/no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_" }]
-    },
-    "ignorePatterns": ["src/language-server/generated/*"]
+    }
 }

README.md

@@ -29,7 +29,7 @@ Our goal is to let you save time writing boilerplate code and focus on building
 
 ## How it works
 
-> Read full documentation at 👉🏻 [zenstack.dev](https://zenstack.dev).
+> Read full documentation at 👉🏻 [zenstack.dev](https://zenstack.dev). Join [Discord](https://discord.gg/Ykhr738dUe) for feedback and questions.
 
 ZenStack incrementally extends Prisma's power with the following four layers:
 

jest.config.ts

@@ -0,0 +1,29 @@
+/*
+ * For a detailed explanation regarding each configuration property and type check, visit:
+ * https://jestjs.io/docs/configuration
+ */
+
+export default {
+    // Automatically clear mock calls, instances, contexts and results before every test
+    clearMocks: true,
+
+    // Indicates whether the coverage information should be collected while executing the test
+    collectCoverage: true,
+
+    // The directory where Jest should output its coverage files
+    coverageDirectory: 'tests/coverage',
+
+    // An array of regexp pattern strings used to skip coverage collection
+    coveragePathIgnorePatterns: ['/node_modules/', '/tests/'],
+
+    // Indicates which provider should be used to instrument code for coverage
+    coverageProvider: 'v8',
+
+    // A list of reporter names that Jest uses when writing coverage reports
+    coverageReporters: ['json', 'text', 'lcov', 'clover'],
+
+    // A map from regular expressions to paths to transformers
+    transform: { '^.+\\.tsx?$': 'ts-jest' },
+
+    testTimeout: 300000,
+};

package.json

@@ -1,12 +1,12 @@
 {
     "name": "zenstack-monorepo",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r build",
+        "lint": "pnpm -r lint",
         "test": "ZENSTACK_TEST=1 pnpm -r run test --silent --forceExit",
         "test-ci": "ZENSTACK_TEST=1 pnpm -r run test --silent --forceExit",
-        "lint": "pnpm -r lint",
         "publish-all": "pnpm --filter \"./packages/**\" -r publish --access public",
         "publish-preview": "pnpm --filter \"./packages/**\" -r publish --force --registry https://preview.registry.zenstack.dev/",
         "unpublish-preview": "pnpm --recursive --shell-mode exec -- npm unpublish -f --registry https://preview.registry.zenstack.dev/ \"\\$PNPM_PACKAGE_NAME\""
@@ -16,8 +16,20 @@
     "license": "MIT",
     "devDependencies": {
         "@changesets/cli": "^2.26.0",
+        "@types/jest": "^29.5.10",
+        "@types/node": "^20.10.2",
+        "@typescript-eslint/eslint-plugin": "^6.13.1",
+        "@typescript-eslint/parser": "^6.13.1",
         "concurrently": "^7.4.0",
+        "copyfiles": "^2.4.1",
+        "eslint": "^8.55.0",
+        "eslint-plugin-jest": "^27.6.0",
+        "jest": "^29.7.0",
         "replace-in-file": "^7.0.1",
-        "tsup": "^7.1.0"
+        "rimraf": "^3.0.2",
+        "ts-jest": "^29.1.1",
+        "ts-node": "^10.9.1",
+        "tsup": "^8.0.1",
+        "typescript": "^5.3.2"
     }
 }

packages/language/.eslintrc.json

@@ -1,15 +1,4 @@
 {
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module"
-    },
-    "plugins": ["@typescript-eslint"],
     "ignorePatterns": "src/generated/*",
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
-        "plugin:@typescript-eslint/recommended"
-    ]
+    "extends": ["../../.eslintrc.json"]
 }

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",
@@ -19,11 +19,7 @@
     "author": "ZenStack Team",
     "license": "MIT",
     "devDependencies": {
-        "concurrently": "^7.4.0",
-        "copyfiles": "^2.4.1",
-        "langium-cli": "1.2.0",
-        "rimraf": "^3.0.2",
-        "typescript": "^4.9.4"
+        "langium-cli": "1.2.0"
     },
     "dependencies": {
         "langium": "1.2.0"

packages/plugins/openapi/jest.config.ts

@@ -0,0 +1 @@
+../../../jest.config.ts

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
@@ -40,21 +40,11 @@
   },
   "devDependencies": {
     "@readme/openapi-parser": "^2.4.0",
-    "@types/jest": "^29.5.0",
-    "@types/node": "^18.0.0",
     "@types/pluralize": "^0.0.29",
     "@types/tmp": "^0.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
     "@zenstackhq/testtools": "workspace:*",
-    "copyfiles": "^2.4.1",
-    "eslint": "^8.35.0",
-    "jest": "^29.5.0",
     "pluralize": "^8.0.0",
-    "rimraf": "^3.0.2",
     "tmp": "^0.2.1",
-    "ts-jest": "^29.0.5",
-    "typescript": "^4.9.5",
     "zenstack": "workspace:*"
   }
 }

packages/plugins/swr/jest.config.ts

@@ -0,0 +1 @@
+../../../jest.config.ts

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "1.4.1",
+    "version": "1.5.0",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {
@@ -10,8 +10,8 @@
     },
     "scripts": {
         "clean": "rimraf dist",
-        "build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && copyfiles ./package.json ./README.md ./LICENSE dist && pnpm pack dist --pack-destination '../../../../.build'",
-        "watch": "tsc --watch",
+        "build": "pnpm lint --max-warnings=0 && pnpm clean && tsc && tsup-node --config ./tsup.config.ts && copyfiles ./package.json ./README.md ./LICENSE dist && pnpm pack dist --pack-destination '../../../../.build'",
+        "watch": "concurrently \"tsc --watch\" \"tsup-node --config ./tsup.config.ts --watch\"",
         "lint": "eslint src --ext ts",
         "test": "ZENSTACK_TEST=1 jest",
         "prepublishOnly": "pnpm build"
@@ -23,6 +23,20 @@
     "keywords": [],
     "author": "ZenStack Team",
     "license": "MIT",
+    "exports": {
+        ".": {
+            "default": "./index.js"
+        },
+        "./package.json": {
+            "default": "./package.json"
+        },
+        "./runtime": {
+            "types": "./runtime/index.d.ts",
+            "import": "./runtime/index.mjs",
+            "require": "./runtime/index.js",
+            "default": "./runtime/index.js"
+        }
+    },
     "dependencies": {
         "@prisma/generator-helper": "^5.0.0",
         "@zenstackhq/runtime": "workspace:*",
@@ -38,19 +52,12 @@
     "devDependencies": {
         "@tanstack/react-query": "^4.28.0",
         "@testing-library/react": "^14.0.0",
-        "@types/jest": "^29.5.0",
-        "@types/node": "^18.0.0",
         "@types/react": "18.2.0",
         "@types/semver": "^7.3.13",
         "@types/tmp": "^0.2.3",
         "@zenstackhq/testtools": "workspace:*",
-        "copyfiles": "^2.4.1",
-        "jest": "^29.5.0",
         "nock": "^13.3.6",
         "react": "18.2.0",
-        "rimraf": "^3.0.2",
-        "swr": "^2.2.4",
-        "ts-jest": "^29.0.5",
-        "typescript": "^4.9.4"
+        "swr": "^2.2.4"
     }
 }

packages/plugins/swr/src/generator.ts

@@ -93,6 +93,7 @@ function generateModelHooks(
                   'const { endpoint, fetch } = useHooksContext();',
                   `const invalidate = request.useInvalidation('${model.name}', metadata);`,
               ],
+              docs: ['@deprecated Use mutation hooks (useCreateXXX, useUpdateXXX, etc.) instead.'],
           })
         : undefined;
 
@@ -382,7 +383,7 @@ function generateMutation(
             `const mutation = request.useModelMutation('${model.name}', '${method}', '${operation}', metadata, options, ${checkReadBack});`,
             `return {
                 ...mutation,
-                trigger<T extends ${argsType}>(args: ${genericInputType}) {
+                trigger: <T extends ${argsType}>(args: ${genericInputType}) => {
                     return mutation.trigger(args, options as any) as Promise<${genericReturnType}>;
                 }
             };`,

packages/plugins/swr/tsconfig.json

@@ -5,5 +5,6 @@
         "outDir": "dist",
         "jsx": "react"
     },
-    "include": ["src/**/*.ts"]
+    "include": ["src/**/*.ts"],
+    "exclude": ["src/runtime"]
 }

packages/plugins/swr/tsup.config.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+    entry: ['src/runtime/index.ts'],
+    outDir: 'dist/runtime',
+    splitting: false,
+    sourcemap: true,
+    clean: true,
+    dts: true,
+    format: ['cjs', 'esm'],
+});

packages/plugins/tanstack-query/jest.config.ts

@@ -0,0 +1 @@
+../../../jest.config.ts