fix: PR mege issues (#41)

* chore: remove unused spaces

* chore(sdk): move libraries from v2

* chore: remove some libraries, use local-helpers from sdk

* fix: PR merge issues

* update

* update

* update

* update

---------

Co-authored-by: FTB_lag <[email protected]>

Author: ymc9

packages/runtime/src/client/functions.ts

@@ -1,4 +1,4 @@
-import { invariant, capitalize, uncapitalize } from '@zenstackhq/common-helpers';
+import { invariant, lowerCaseFirst, upperCaseFirst } from '@zenstackhq/common-helpers';
 import { sql, ValueNode, type Expression, type ExpressionBuilder } from 'kysely';
 import { match } from 'ts-pattern';
 import type { ZModelFunction, ZModelFunctionContext } from './options';
@@ -132,10 +132,8 @@ function processCasing(casing: Expression<any>, result: string, model: string) {
         .with('original', () => model)
         .with('upper', () => result.toUpperCase())
         .with('lower', () => result.toLowerCase())
-        .with('
-              
-              ', () => capitalize(result))
-        .with('uncapitalize', () => uncapitalize(result))
+        .with('capitalize', () => upperCaseFirst(result))
+        .with('uncapitalize', () => lowerCaseFirst(result))
         .otherwise(() => {
             throw new Error(
                 `Invalid casing value: ${opNode.value}. Must be "original", "upper", "lower", "capitalize", or "uncapitalize".`,

packages/runtime/src/plugins/policy/expression-transformer.ts

@@ -1,5 +1,4 @@
 import { invariant } from '@zenstackhq/common-helpers';
-import type { OperandExpression } from 'kysely';
 import {
     AliasNode,
     BinaryOperationNode,

packages/runtime/test/utils.ts

@@ -1,7 +1,6 @@
 import { invariant } from '@zenstackhq/common-helpers';
 import { loadDocument } from '@zenstackhq/language';
 import { PrismaSchemaGenerator } from '@zenstackhq/sdk';
-import { invariant } from '@zenstackhq/sdk/local-helpers';
 import { generateTsSchema } from '@zenstackhq/testtools';
 import SQLite from 'better-sqlite3';
 import { execSync } from 'node:child_process';

packages/sdk/package.json

@@ -35,16 +35,6 @@
                 "types": "./dist/schema.d.cts",
                 "default": "./dist/schema.cjs"
             }
-        },
-        "./local-helpers": {
-            "import": {
-                "types": "./dist/local-helpers.d.ts",
-                "default": "./dist/local-helpers.js"
-            },
-            "require": {
-                "types": "./dist/local-helpers.d.cts",
-                "default": "./dist/local-helpers.cjs"
-            }
         }
     },
     "dependencies": {

packages/sdk/src/local-helpers/index.ts

@@ -39,7 +39,6 @@ import path from 'node:path';
 import { match } from 'ts-pattern';
 import * as ts from 'typescript';
 import { ModelUtils } from '.';
-import { invariant } from './local-helpers';
 import { getAttribute, getAuthDecl, hasAttribute, isIdField, isUniqueField } from './model-utils';
 
 export class TsSchemaGenerator {