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

DoctorFTB · DoctorFTB · commit 3d26907626c5 · 2025-06-23T00:21:07.000+03:00
diff --git a/package.json b/package.json
@@ -18,10 +18,8 @@
     "license": "MIT",
     "devDependencies": {
         "@eslint/js": "^9.29.0",
-        "@swc/core": "^1.12.5",
         "@types/node": "^20.17.24",
         "eslint": "~9.29.0",
-        "npm-run-all": "^4.1.5",
         "prettier": "^3.5.3",
         "tsup": "^8.5.0",
         "tsx": "^4.20.3",
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -29,28 +29,22 @@
     "dependencies": {
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
-        "async-exit-hook": "^2.0.1",
         "colors": "1.4.0",
         "commander": "^8.3.0",
         "langium": "catalog:",
         "ora": "^5.4.1",
         "package-manager-detector": "^1.3.0",
-        "tiny-invariant": "^1.3.3",
         "ts-pattern": "catalog:"
     },
     "peerDependencies": {
         "prisma": "catalog:"
     },
     "devDependencies": {
-        "@types/async-exit-hook": "^2.0.0",
         "@types/better-sqlite3": "^7.6.13",
-        "@types/semver": "^7.3.13",
-        "@types/tmp": "^0.2.6",
+        "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/runtime": "workspace:*",
         "@zenstackhq/testtools": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*",
-        "better-sqlite3": "^11.8.1",
-        "tmp": "^0.2.3"
+        "better-sqlite3": "^11.8.1"
     }
 }
diff --git a/packages/create-zenstack/package.json b/packages/create-zenstack/package.json
@@ -35,7 +35,7 @@
         "ora": "^5.4.1"
     },
     "devDependencies": {
-        "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/typescript-config": "workspace:*"
     }
 }
diff --git a/packages/ide/vscode/package.json b/packages/ide/vscode/package.json
@@ -30,15 +30,15 @@
     "license": "MIT",
     "packageManager": "pnpm@10.12.1",
     "dependencies": {
+        "@zenstackhq/language": "workspace:*",
         "langium": "catalog:",
         "vscode-languageclient": "^9.0.1",
-        "vscode-languageserver": "^9.0.1",
-        "@zenstackhq/language": "workspace:*"
+        "vscode-languageserver": "^9.0.1"
     },
     "devDependencies": {
         "@types/vscode": "^1.63.0",
-        "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/typescript-config": "workspace:*"
     },
     "files": [
         "dist",
diff --git a/packages/language/package.json b/packages/language/package.json
@@ -49,9 +49,9 @@
     },
     "devDependencies": {
         "@types/pluralize": "^0.0.33",
-        "langium-cli": "~3.3.0",
+        "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "langium-cli": "~3.3.0"
     },
     "volta": {
         "node": "18.19.1",
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -66,14 +66,11 @@
     "dependencies": {
         "@paralleldrive/cuid2": "^2.2.2",
         "decimal.js": "^10.4.3",
-        "is-plain-object": "^5.0.0",
         "json-stable-stringify": "^1.3.0",
         "kysely": "catalog:",
         "nanoid": "^5.0.9",
-        "tiny-invariant": "^1.3.3",
         "ts-pattern": "catalog:",
         "ulid": "^3.0.0",
-        "utility-types": "^3.11.0",
         "uuid": "^11.0.5"
     },
     "peerDependencies": {
@@ -92,13 +89,11 @@
     "devDependencies": {
         "@types/better-sqlite3": "^7.0.0",
         "@types/pg": "^8.0.0",
-        "@types/tmp": "^0.2.6",
+        "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/language": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
         "@zenstackhq/testtools": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*",
-        "tmp": "^0.2.3",
         "tsx": "^4.19.2"
     }
 }
diff --git a/packages/runtime/src/client/crud-types.ts b/packages/runtime/src/client/crud-types.ts
@@ -1,5 +1,4 @@
 import type { ExpressionBuilder, OperandExpression, SqlBool } from 'kysely';
-import type { Optional } from 'utility-types';
 import type {
     BuiltinType,
     FieldDef,
@@ -29,6 +28,7 @@ import type {
     MapBaseType,
     NonEmptyArray,
     NullableIf,
+    Optional,
     OrArray,
     ValueOfPotentialTuple,
     WrapType,
diff --git a/packages/runtime/src/client/crud/dialects/base.ts b/packages/runtime/src/client/crud/dialects/base.ts
@@ -1,11 +1,9 @@
+import { invariant, isPlainObject } from '@zenstackhq/sdk/local-helpers';
 import type { Expression, ExpressionBuilder, ExpressionWrapper, SqlBool, ValueNode } from 'kysely';
 import { sql, type SelectQueryBuilder } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match, P } from 'ts-pattern';
 import type { BuiltinType, DataSourceProviderType, FieldDef, GetModels, SchemaDef } from '../../../schema';
 import { enumerate } from '../../../utils/enumerate';
-// @ts-expect-error
-import { isPlainObject } from 'is-plain-object';
 import type { OrArray } from '../../../utils/type-utils';
 import type {
     BooleanFilter,
diff --git a/packages/runtime/src/client/crud/dialects/postgresql.ts b/packages/runtime/src/client/crud/dialects/postgresql.ts
@@ -1,3 +1,4 @@
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import {
     sql,
     type Expression,
@@ -6,7 +7,6 @@ import {
     type RawBuilder,
     type SelectQueryBuilder,
 } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import type { BuiltinType, FieldDef, GetModels, SchemaDef } from '../../../schema';
 import type { FindArgs } from '../../crud-types';
diff --git a/packages/runtime/src/client/crud/dialects/sqlite.ts b/packages/runtime/src/client/crud/dialects/sqlite.ts
@@ -1,3 +1,4 @@
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import type Decimal from 'decimal.js';
 import {
     ExpressionWrapper,
@@ -7,7 +8,6 @@ import {
     type RawBuilder,
     type SelectQueryBuilder,
 } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import type { BuiltinType, GetModels, SchemaDef } from '../../../schema';
 import type { FindArgs } from '../../crud-types';
diff --git a/packages/runtime/src/client/crud/operations/base.ts b/packages/runtime/src/client/crud/operations/base.ts
@@ -1,4 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import {
     DeleteResult,
     expressionBuilder,
@@ -10,7 +11,6 @@ import {
     type SelectQueryBuilder,
 } from 'kysely';
 import { nanoid } from 'nanoid';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import { ulid } from 'ulid';
 import * as uuid from 'uuid';
diff --git a/packages/runtime/src/client/executor/zenstack-query-executor.ts b/packages/runtime/src/client/executor/zenstack-query-executor.ts
@@ -22,7 +22,6 @@ import {
 } from 'kysely';
 import { nanoid } from 'nanoid';
 import { match } from 'ts-pattern';
-import type { PromiseType } from 'utility-types';
 import type { GetModels, SchemaDef } from '../../schema';
 import type { ClientImpl } from '../client-impl';
 import type { ClientContract } from '../contract';
@@ -58,7 +57,7 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
 
     override async executeQuery(compiledQuery: CompiledQuery, queryId: QueryId) {
         let queryNode = compiledQuery.query;
-        let mutationInterceptionInfo: PromiseType<ReturnType<typeof this.callMutationInterceptionFilters>>;
+        let mutationInterceptionInfo: Awaited<ReturnType<typeof this.callMutationInterceptionFilters>>;
         if (this.isMutationNode(queryNode) && this.hasMutationHooks) {
             mutationInterceptionInfo = await this.callMutationInterceptionFilters(queryNode);
         }
@@ -291,7 +290,7 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
 
     private callBeforeMutationHooks(
         queryNode: OperationNode,
-        mutationInterceptionInfo: PromiseType<ReturnType<typeof this.callMutationInterceptionFilters>>,
+        mutationInterceptionInfo: Awaited<ReturnType<typeof this.callMutationInterceptionFilters>>,
     ) {
         if (!mutationInterceptionInfo?.intercept) {
             return;
@@ -315,7 +314,7 @@ export class ZenStackQueryExecutor<Schema extends SchemaDef> extends DefaultQuer
     private async callAfterQueryInterceptionFilters(
         queryResult: QueryResult<unknown>,
         queryNode: OperationNode,
-        mutationInterceptionInfo: PromiseType<ReturnType<typeof this.callMutationInterceptionFilters>>,
+        mutationInterceptionInfo: Awaited<ReturnType<typeof this.callMutationInterceptionFilters>>,
     ) {
         if (!mutationInterceptionInfo?.intercept) {
             return;
diff --git a/packages/runtime/src/client/functions.ts b/packages/runtime/src/client/functions.ts
@@ -1,5 +1,5 @@
+import { invariant, capitalize, uncapitalize } from '@zenstackhq/sdk/local-helpers';
 import { sql, ValueNode, type Expression, type ExpressionBuilder } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import type { ZModelFunction, ZModelFunctionContext } from './options';
 
@@ -132,8 +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.charAt(0).toUpperCase() + result.slice(1)}`)
-        .with('uncapitalize', () => `${result.charAt(0).toLowerCase() + result.slice(1)}`)
+        .with('capitalize', () => capitalize(result))
+        .with('uncapitalize', () => uncapitalize(result))
         .otherwise(() => {
             throw new Error(
                 `Invalid casing value: ${opNode.value}. Must be "original", "upper", "lower", "capitalize", or "uncapitalize".`,
diff --git a/packages/runtime/src/client/helpers/schema-db-pusher.ts b/packages/runtime/src/client/helpers/schema-db-pusher.ts
@@ -1,5 +1,5 @@
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import { CreateTableBuilder, sql, type ColumnDataType, type OnModifyForeignAction } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import {
     ExpressionUtils,
diff --git a/packages/runtime/src/client/options.ts b/packages/runtime/src/client/options.ts
@@ -1,7 +1,6 @@
 import type { Expression, ExpressionBuilder, KyselyConfig, PostgresDialectConfig, SqliteDialectConfig } from 'kysely';
-import type { Optional } from 'utility-types';
 import type { DataSourceProvider, GetModel, GetModels, ProcedureDef, SchemaDef } from '../schema';
-import type { PrependParameter } from '../utils/type-utils';
+import type { Optional, PrependParameter } from '../utils/type-utils';
 import type { ClientContract, CRUD, ProcedureFunc } from './contract';
 import type { BaseCrudDialect } from './crud/dialects/base';
 import type { RuntimePlugin } from './plugin';
diff --git a/packages/runtime/src/client/result-processor.ts b/packages/runtime/src/client/result-processor.ts
@@ -1,5 +1,5 @@
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import Decimal from 'decimal.js';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import type { BuiltinType, FieldDef, GetModels, SchemaDef } from '../schema';
 import { ensureArray, getField } from './query-utils';
diff --git a/packages/runtime/src/plugins/policy/expression-evaluator.ts b/packages/runtime/src/plugins/policy/expression-evaluator.ts
@@ -1,4 +1,4 @@
-import invariant from 'tiny-invariant';
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import { match } from 'ts-pattern';
 import {
     ExpressionUtils,
diff --git a/packages/runtime/src/plugins/policy/expression-transformer.ts b/packages/runtime/src/plugins/policy/expression-transformer.ts
@@ -1,4 +1,4 @@
-import type { OperandExpression } from 'kysely';
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import {
     AliasNode,
     BinaryOperationNode,
@@ -16,9 +16,9 @@ import {
     ValueNode,
     WhereNode,
     type ExpressionBuilder,
+    type OperandExpression,
     type OperationNode,
 } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import type { CRUD } from '../../client/contract';
 import { getCrudDialect } from '../../client/crud/dialects';
diff --git a/packages/runtime/src/plugins/policy/policy-handler.ts b/packages/runtime/src/plugins/policy/policy-handler.ts
@@ -1,3 +1,4 @@
+import { invariant } from '@zenstackhq/sdk/local-helpers';
 import {
     AliasNode,
     BinaryOperationNode,
@@ -22,7 +23,6 @@ import {
     type QueryResult,
     type RootOperationNode,
 } from 'kysely';
-import invariant from 'tiny-invariant';
 import { match } from 'ts-pattern';
 import type { ClientContract } from '../../client';
 import type { CRUD } from '../../client/contract';
diff --git a/packages/runtime/src/utils/type-utils.ts b/packages/runtime/src/utils/type-utils.ts
@@ -1,5 +1,7 @@
 import type Decimal from 'decimal.js';
 
+export type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+
 export type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
 
 export type PartialRecord<K extends string | number | symbol, T> = Partial<Record<K, T>>;
diff --git a/packages/runtime/test/utils.ts b/packages/runtime/test/utils.ts
@@ -1,12 +1,12 @@
 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';
 import fs from 'node:fs';
 import path from 'node:path';
 import { Client as PGClient, Pool } from 'pg';
-import invariant from 'tiny-invariant';
 import type { ClientOptions } from '../src/client';
 import { ZenStackClient } from '../src/client';
 import type { SchemaDef } from '../src/schema';
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -49,16 +49,13 @@
     "dependencies": {
         "@zenstackhq/language": "workspace:*",
         "langium": "catalog:",
-        "tiny-invariant": "^1.3.3",
-        "tmp": "^0.2.3",
         "ts-pattern": "catalog:",
         "typescript": "catalog:"
     },
     "devDependencies": {
-        "@types/tmp": "^0.2.6",
-        "decimal.js": "^10.4.3",
-        "kysely": "catalog:",
+        "@zenstackhq/eslint-config": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "decimal.js": "^10.4.3",
+        "kysely": "catalog:"
     }
 }
diff --git a/packages/sdk/src/ts-schema-generator.ts b/packages/sdk/src/ts-schema-generator.ts
@@ -34,10 +34,10 @@ import {
 } from '@zenstackhq/language/ast';
 import fs from 'node:fs';
 import path from 'node:path';
-import invariant from 'tiny-invariant';
 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 {
diff --git a/packages/sdk/tsup.config.ts b/packages/sdk/tsup.config.ts
@@ -4,6 +4,7 @@ export default defineConfig({
     entry: {
         index: 'src/index.ts',
         schema: 'src/schema/index.ts',
+        'local-helpers': 'src/local-helpers/index.ts',
     },
     outDir: 'dist',
     splitting: false,
diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json
@@ -28,8 +28,8 @@
         "@zenstackhq/runtime": "workspace:*"
     },
     "devDependencies": {
-        "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/typescript-config": "workspace:*"
     },
     "peerDependencies": {
         "@tanstack/react-query": "^5.0.0"
diff --git a/packages/testtools/package.json b/packages/testtools/package.json
@@ -41,7 +41,7 @@
     },
     "devDependencies": {
         "@types/tmp": "^0.2.6",
-        "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/typescript-config": "workspace:*"
     }
 }
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -29,8 +29,8 @@
         "ts-pattern": "catalog:"
     },
     "devDependencies": {
-        "@zenstackhq/typescript-config": "workspace:*",
-        "@zenstackhq/eslint-config": "workspace:*"
+        "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/typescript-config": "workspace:*"
     },
     "peerDependencies": {
         "zod": "catalog:"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`"ora": "^5.4.1"`
`36`	`36`	`},`
`37`	`37`	`"devDependencies": {`
`38`		`- "@zenstackhq/typescript-config": "workspace:*",`
`39`		`- "@zenstackhq/eslint-config": "workspace:*"`
	`38`	`+ "@zenstackhq/eslint-config": "workspace:*",`
	`39`	`+ "@zenstackhq/typescript-config": "workspace:*"`
`40`	`40`	`}`
`41`	`41`	`}`