merge dev to main (v2.16.0)

.github/workflows/github-releases-to-discord.yml

@@ -12,4 +12,3 @@ jobs:
               with:
                   webhook_url: ${{ secrets.RELEASE_TO_DISCORD_WEBHOOK_URL }}
                   avatar_url: 'https://cdn.discordapp.com/avatars/1297059323314176051/df91181b3f1cf0ef1592fbe18e0962d7.webp?size=160'
-                  reduce_headings: true

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-monorepo",
-    "version": "2.15.1",
+    "version": "2.16.0",
     "description": "",
     "scripts": {
         "build": "pnpm -r --filter=\"!./packages/ide/*\" build",
@@ -34,10 +34,8 @@
         "eslint": "^8.57.0",
         "eslint-plugin-jest": "^28.2.0",
         "jest": "^29.7.0",
-        "replace-in-file": "^7.0.1",
         "rimraf": "^3.0.2",
         "ts-jest": "^29.1.1",
-        "ts-node": "^10.9.1",
         "tsup": "^8.0.1",
         "tsx": "^4.7.1",
         "typescript": "^5.4.4"

packages/ide/jetbrains/build.gradle.kts

@@ -85,9 +85,9 @@ changelog {
     introduction.set(
             """
         [ZenStack](https://zenstack.dev) is a toolkit that simplifies the development of a web app's backend. This plugin provides code editing experiences for its ZModel schema language.
-        
+
         ## Features
-        
+
         - Syntax highlighting
         - Error highlighting
         - Go to definition

packages/ide/jetbrains/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jetbrains",
-  "version": "2.15.1",
+  "version": "2.16.0",
   "displayName": "ZenStack JetBrains IDE Plugin",
   "description": "ZenStack JetBrains IDE plugin",
   "homepage": "https://zenstack.dev",

packages/language/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/language",
-    "version": "2.15.1",
+    "version": "2.16.0",
     "displayName": "ZenStack modeling language compiler",
     "description": "ZenStack modeling language compiler",
     "homepage": "https://zenstack.dev",

packages/language/src/zmodel.langium

@@ -164,7 +164,7 @@ Argument:
 DataModel:
     (comments+=TRIPLE_SLASH_COMMENT)*
     (
-        ((isAbstract?='abstract')? 'model' name=RegularID  
+        ((isAbstract?='abstract')? 'model' name=RegularID
             ('extends' superTypes+=[DataModel] (',' superTypes+=[DataModel])*)?) |
         ((isView?='view') name=RegularID)
     )
@@ -193,7 +193,7 @@ TypeDef:
 type TypeDefFieldTypes = TypeDef | Enum;
 
 TypeDefField:
-    (comments+=TRIPLE_SLASH_COMMENT)*   
+    (comments+=TRIPLE_SLASH_COMMENT)*
     name=RegularIDWithTypeNames type=TypeDefFieldType (attributes+=DataModelFieldAttribute)*;
 
 TypeDefFieldType:
@@ -208,7 +208,7 @@ Enum:
     'enum' name=RegularID '{' (
            fields+=EnumField
            | attributes+=DataModelAttribute
-        )+ 
+        )+
     '}';
 
 EnumField:

packages/misc/redwood/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/redwood",
     "displayName": "ZenStack RedwoodJS Integration",
-    "version": "2.15.1",
+    "version": "2.16.0",
     "description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
     "repository": {
         "type": "git",

packages/plugins/openapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zenstackhq/openapi",
   "displayName": "ZenStack Plugin and Runtime for OpenAPI",
-  "version": "2.15.1",
+  "version": "2.16.0",
   "description": "ZenStack plugin and runtime supporting OpenAPI",
   "main": "index.js",
   "repository": {
@@ -28,15 +28,11 @@
   "dependencies": {
     "@zenstackhq/runtime": "workspace:*",
     "@zenstackhq/sdk": "workspace:*",
-    "change-case": "^4.1.2",
-    "lower-case-first": "^2.0.2",
     "openapi-types": "^12.1.0",
     "semver": "^7.5.2",
-    "tiny-invariant": "^1.3.1",
     "ts-pattern": "^4.3.0",
-    "upper-case-first": "^2.0.2",
     "yaml": "^2.2.2",
-    "zod": "^3.22.4",    
+    "zod": "^3.22.4",
     "zod-validation-error": "^1.5.0"
   },
   "devDependencies": {

packages/plugins/openapi/src/rest-generator.ts

@@ -26,12 +26,11 @@ import {
     TypeDefFieldType,
 } from '@zenstackhq/sdk/ast';
 import type { DMMF } from '@zenstackhq/sdk/prisma';
+import { invariant, lowerCaseFirst } from '@zenstackhq/runtime/local-helpers';
 import fs from 'fs';
-import { lowerCaseFirst } from 'lower-case-first';
 import type { OpenAPIV3_1 as OAPI } from 'openapi-types';
 import path from 'path';
 import pluralize from 'pluralize';
-import invariant from 'tiny-invariant';
 import { match, P } from 'ts-pattern';
 import YAML from 'yaml';
 import { name } from '.';

packages/plugins/openapi/src/rpc-generator.ts

@@ -11,13 +11,11 @@ import {
     resolveAggregateOperationSupport,
 } from '@zenstackhq/sdk/dmmf-helpers';
 import { supportCreateMany, type DMMF } from '@zenstackhq/sdk/prisma';
+import { lowerCaseFirst, upperCaseFirst, invariant } from '@zenstackhq/runtime/local-helpers';
 import * as fs from 'fs';
-import { lowerCaseFirst } from 'lower-case-first';
 import type { OpenAPIV3_1 as OAPI } from 'openapi-types';
 import * as path from 'path';
-import invariant from 'tiny-invariant';
 import { P, match } from 'ts-pattern';
-import { upperCaseFirst } from 'upper-case-first';
 import YAML from 'yaml';
 import { name } from '.';
 import { OpenAPIGeneratorBase } from './generator-base';

packages/plugins/openapi/tests/baseline/rest-3.1.0.baseline.yaml

@@ -10,7 +10,7 @@ tags:
     - name: post_Item
       description: Post-related operations
     - name: postLike
-      description: PostLike operations 
+      description: PostLike operations
 paths:
     /user:
         get:

packages/plugins/swr/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/swr",
     "displayName": "ZenStack plugin for generating SWR hooks",
-    "version": "2.15.1",
+    "version": "2.16.0",
     "description": "ZenStack plugin for generating SWR hooks",
     "main": "index.js",
     "repository": {
@@ -40,13 +40,10 @@
     "dependencies": {
         "@zenstackhq/runtime": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
-        "change-case": "^4.1.2",
         "cross-fetch": "^4.0.0",
-        "lower-case-first": "^2.0.2",
         "semver": "^7.5.2",
         "ts-morph": "^16.0.0",
-        "ts-pattern": "^4.3.0",
-        "upper-case-first": "^2.0.2"
+        "ts-pattern": "^4.3.0"
     },
     "peerDependencies": {
         "swr": "2.2.5 - 2"

packages/plugins/swr/src/generator.ts

@@ -12,11 +12,10 @@ import {
 } from '@zenstackhq/sdk';
 import { DataModel, DataModelFieldType, Model, isEnum, isTypeDef } from '@zenstackhq/sdk/ast';
 import { getPrismaClientImportSpec, supportCreateMany, type DMMF } from '@zenstackhq/sdk/prisma';
-import { paramCase } from 'change-case';
+import { upperCaseFirst, paramCase } from '@zenstackhq/runtime/local-helpers';
 import path from 'path';
 import type { OptionalKind, ParameterDeclarationStructure, Project, SourceFile } from 'ts-morph';
 import { P, match } from 'ts-pattern';
-import { upperCaseFirst } from 'upper-case-first';
 import { name } from '.';
 
 export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.Document) {

packages/plugins/swr/src/runtime/index.ts

@@ -7,7 +7,7 @@ import {
     type ModelMeta,
     type PrismaWriteActionType,
 } from '@zenstackhq/runtime/cross';
-import { lowerCaseFirst } from 'lower-case-first';
+import { lowerCaseFirst } from '@zenstackhq/runtime/local-helpers';
 import { createContext, useContext } from 'react';
 import type { Cache, Fetcher, SWRConfiguration, SWRResponse } from 'swr';
 import useSWR, { useSWRConfig } from 'swr';

packages/plugins/swr/tests/react-hooks.test.tsx

@@ -7,7 +7,7 @@
 /// <reference types="@types/jest" />
 
 import { renderHook, waitFor } from '@testing-library/react';
-import { lowerCaseFirst } from 'lower-case-first';
+import { lowerCaseFirst } from '@zenstackhq/runtime/local-helpers';
 import nock from 'nock';
 import { SWRConfig, useSWRConfig } from 'swr';
 import {

packages/plugins/tanstack-query/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/tanstack-query",
     "displayName": "ZenStack plugin for generating tanstack-query hooks",
-    "version": "2.15.1",
+    "version": "2.16.0",
     "description": "ZenStack plugin for generating tanstack-query hooks",
     "main": "index.js",
     "exports": {
@@ -82,13 +82,10 @@
     "dependencies": {
         "@zenstackhq/runtime": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
-        "change-case": "^4.1.2",
         "cross-fetch": "^4.0.0",
-        "lower-case-first": "^2.0.2",
         "semver": "^7.5.2",
         "ts-morph": "^16.0.0",
-        "ts-pattern": "^4.3.0",
-        "upper-case-first": "^2.0.2"
+        "ts-pattern": "^4.3.0"
     },
     "devDependencies": {
         "@tanstack/react-query": "^4.29.7",
@@ -101,11 +98,11 @@
         "@types/semver": "^7.3.13",
         "@types/tmp": "^0.2.3",
         "@zenstackhq/testtools": "workspace:*",
+        "glob": "^8.1.0",
         "jest-environment-jsdom": "^29.7.0",
         "nock": "^13.3.6",
         "react": "18.2.0",
         "react-test-renderer": "^18.2.0",
-        "replace-in-file": "^7.0.1",
         "svelte": "^4.2.1",
         "swr": "^2.0.3",
         "tmp": "^0.2.3",

packages/plugins/tanstack-query/scripts/postbuild.js

@@ -1,32 +1,47 @@
 // tsup doesn't replace npm dependency aliases in the dist files, so we have to do it manually
 
-const replace = require('replace-in-file');
+const fs = require('fs');
+const glob = require('glob');
+
+function replaceSync({ file, from, to }) {
+    const paths = glob.sync(file, { ignore: [], nodir: true });
+
+    paths.forEach(path => {
+        const contents = fs.readFileSync(path, { encoding: 'utf-8' });
+
+        const newContents = contents.replace(from, to);
+
+        if (newContents !== contents) {
+            fs.writeFileSync(path, newContents, { encoding: 'utf-8' });
+        }
+    });
+}
 
 // tsup incorrectly resolve to legacy types, make a fix here
 console.log('Replacing @tanstack/react-query-v5/build/legacy/types');
-replace.sync({
-    files: 'dist/runtime-v5/react*(.d.ts|.d.mts)',
+replaceSync({
+    file: 'dist/runtime-v5/react*(.d.ts|.d.mts)',
     from: /@tanstack\/react-query-v5\/build\/legacy\/types/g,
     to: '@tanstack/react-query',
 });
 
 console.log('Replacing @tanstack/react-query-v5');
-replace.sync({
-    files: 'dist/runtime-v5/react*(.d.ts|.d.mts|.js|.mjs)',
+replaceSync({
+    file: 'dist/runtime-v5/react*(.d.ts|.d.mts|.js|.mjs)',
     from: /@tanstack\/react-query-v5/g,
     to: '@tanstack/react-query',
 });
 
 console.log('Replacing @tanstack/svelte-query-v5');
-replace.sync({
-    files: 'dist/runtime-v5/svelte*(.d.ts|.d.mts|.js|.mjs)',
+replaceSync({
+    file: 'dist/runtime-v5/svelte*(.d.ts|.d.mts|.js|.mjs)',
     from: /@tanstack\/svelte-query-v5/g,
     to: '@tanstack/svelte-query',
 });
 
 console.log('Replacing @tanstack/vue-query-v5');
-replace.sync({
-    files: 'dist/runtime-v5/vue*(.d.ts|.d.mts|.js|.mjs)',
+replaceSync({
+    file: 'dist/runtime-v5/vue*(.d.ts|.d.mts|.js|.mjs)',
     from: /@tanstack\/vue-query-v5/g,
     to: '@tanstack/vue-query',
 });

packages/plugins/tanstack-query/src/generator.ts

@@ -6,20 +6,19 @@ import {
     ensureEmptyDir,
     generateModelMeta,
     getDataModels,
+    getPrismaClientGenerator,
     isDelegateModel,
     requireOption,
     resolvePath,
     saveProject,
 } from '@zenstackhq/sdk';
 import { DataModel, DataModelFieldType, Model, isEnum, isTypeDef } from '@zenstackhq/sdk/ast';
 import { getPrismaClientImportSpec, supportCreateMany, type DMMF } from '@zenstackhq/sdk/prisma';
-import { paramCase } from 'change-case';
+import { lowerCaseFirst, upperCaseFirst, paramCase } from '@zenstackhq/runtime/local-helpers';
 import fs from 'fs';
-import { lowerCaseFirst } from 'lower-case-first';
 import path from 'path';
 import { Project, SourceFile, VariableDeclarationKind } from 'ts-morph';
 import { P, match } from 'ts-pattern';
-import { upperCaseFirst } from 'upper-case-first';
 import { name } from '.';
 
 const supportedTargets = ['react', 'vue', 'svelte'];
@@ -52,7 +51,6 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.
             `Invalid value for "portable" option: ${options.portable}, a boolean value is expected`
         );
     }
-    const portable = options.portable ?? false;
 
     await generateModelMeta(project, models, typeDefs, {
         output: path.join(outDir, '__model_meta.ts'),
@@ -70,8 +68,13 @@ export async function generate(model: Model, options: PluginOptions, dmmf: DMMF.
         generateModelHooks(target, version, project, outDir, dataModel, mapping, options);
     });
 
-    if (portable) {
-        generateBundledTypes(project, outDir, options);
+    if (options.portable) {
+        const gen = getPrismaClientGenerator(model);
+        if (gen?.isNewGenerator) {
+            warnings.push(`The "portable" option is not supported with the "prisma-client" generator and is ignored.`);
+        } else {
+            generateBundledTypes(project, outDir, options);
+        }
     }
 
     await saveProject(project);

packages/plugins/trpc/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/trpc",
     "displayName": "ZenStack plugin for tRPC",
-    "version": "2.15.1",
+    "version": "2.16.0",
     "description": "ZenStack plugin for tRPC",
     "main": "index.js",
     "repository": {
@@ -26,15 +26,13 @@
     "author": "ZenStack Team",
     "license": "MIT",
     "dependencies": {
+        "@zenstackhq/runtime": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
-        "change-case": "^4.1.2",
-        "lower-case-first": "^2.0.2",
         "ts-morph": "^16.0.0",
-        "tslib": "^2.4.1",
-        "upper-case-first": "^2.0.2"
+        "tslib": "^2.4.1"
     },
     "peerDependencies": {
-        "zod": "^3.22.4"        
+        "zod": "^3.22.4"
     },
     "devDependencies": {
         "@trpc/next": "^10.32.0",

packages/plugins/trpc/src/client-helper/index.ts

@@ -1,7 +1,7 @@
 import { PluginError, type PluginOptions } from '@zenstackhq/sdk';
 import { getPrismaClientImportSpec } from '@zenstackhq/sdk/prisma';
+import { lowerCaseFirst, upperCaseFirst } from '@zenstackhq/runtime/local-helpers';
 import fs from 'fs';
-import { lowerCaseFirst } from 'lower-case-first';
 import path from 'path';
 import {
     InterfaceDeclarationStructure,
@@ -10,7 +10,6 @@ import {
     SourceFile,
     StructureKind,
 } from 'ts-morph';
-import { upperCaseFirst } from 'upper-case-first';
 import { name } from '..';
 import { SupportedClientHelpers } from '../utils';
 import * as NextHelpers from './next';