diff --git a/CLAUDE.md b/CLAUDE.md index 4c48ffd2..6f74cd60 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -19,8 +19,6 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ### Testing -- Runtime package tests: `pnpm test` (includes vitest, typing generation, and typecheck) -- CLI tests: `pnpm test` - E2E tests are in `tests/e2e/` directory ### ZenStack CLI Commands @@ -35,7 +33,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ### Core Components -- **@zenstackhq/runtime** - Main database client and ORM engine built on Kysely +- **@zenstackhq/orm** - ORM engine built above Kysely - **@zenstackhq/cli** - Command line interface and project management - **@zenstackhq/language** - ZModel language specification and parser (uses Langium) - **@zenstackhq/sdk** - Code generation utilities and schema processing @@ -56,14 +54,14 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ### Package Dependencies -- **Runtime**: Depends on Kysely, Zod, and various utility libraries +- **ORM**: Depends on Kysely, Zod, and various utility libraries - **CLI**: Depends on language package, Commander.js, and Prisma (for migrations) - **Language**: Uses Langium for grammar parsing and AST generation - **Database Support**: SQLite (better-sqlite3) and PostgreSQL (pg) only ### Testing Strategy -- Runtime package has comprehensive client API tests and policy tests +- ORM package has comprehensive client API tests and policy tests - CLI has action-specific tests for commands - E2E tests validate real-world schema compatibility (cal.com, formbricks, trigger.dev) - Type coverage tests ensure TypeScript inference works correctly diff --git a/README.md b/README.md index 7f6dfbe0..beec8471 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Even without using advanced features, ZenStack offers the following benefits as 2. More TypeScript type inference, less code generation. 3. Fully-typed query-builder API as a better escape hatch compared to Prisma's [raw queries](https://www.prisma.io/docs/orm/prisma-client/using-raw-sql/raw-queries) or [typed SQL](https://www.prisma.io/docs/orm/prisma-client/using-raw-sql/typedsql). -> Although ZenStack v3's runtime doesn't depend on Prisma anymore (specifically, `@prisma/client`), it still relies on Prisma to handle database migration. See [database migration](https://zenstack.dev/docs/3.x/orm/migration) for more details. +> Although ZenStack v3's ORM runtime doesn't depend on Prisma anymore (specifically, `@prisma/client`), it still relies on Prisma to handle database migration. See [database migration](https://zenstack.dev/docs/3.x/orm/migration) for more details. # Quick start @@ -77,7 +77,7 @@ Alternatively, you can set it up manually: ```bash npm install -D @zenstackhq/cli@next -npm install @zenstackhq/runtime@next +npm install @zenstackhq/orm@next ``` Then create a `zenstack` folder and a `schema.zmodel` file in it. diff --git a/packages/cli/package.json b/packages/cli/package.json index 9fe1ae72..c3cb0517 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -49,7 +49,7 @@ "@types/semver": "^7.7.0", "@types/tmp": "catalog:", "@zenstackhq/eslint-config": "workspace:*", - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "@zenstackhq/testtools": "workspace:*", "@zenstackhq/typescript-config": "workspace:*", "@zenstackhq/vitest-config": "workspace:*", diff --git a/packages/cli/src/actions/generate.ts b/packages/cli/src/actions/generate.ts index 2db079e1..a4a01cb8 100644 --- a/packages/cli/src/actions/generate.ts +++ b/packages/cli/src/actions/generate.ts @@ -33,7 +33,7 @@ export async function run(options: Options) { console.log(`You can now create a ZenStack client with it. \`\`\`ts -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from '${outputPath}/schema'; const client = new ZenStackClient(schema, { diff --git a/packages/cli/src/actions/init.ts b/packages/cli/src/actions/init.ts index 6c63efda..c0eeac0f 100644 --- a/packages/cli/src/actions/init.ts +++ b/packages/cli/src/actions/init.ts @@ -13,7 +13,7 @@ import { STARTER_ZMODEL } from './templates'; export async function run(projectPath: string) { const packages = [ { name: '@zenstackhq/cli@next', dev: true }, - { name: '@zenstackhq/runtime@next', dev: false }, + { name: '@zenstackhq/orm@next', dev: false }, ]; let pm = await detect(); if (!pm) { diff --git a/packages/cli/src/actions/templates.ts b/packages/cli/src/actions/templates.ts index ac469224..65ad278a 100644 --- a/packages/cli/src/actions/templates.ts +++ b/packages/cli/src/actions/templates.ts @@ -26,7 +26,7 @@ model Post { } `; -export const STARTER_MAIN_TS = `import { ZenStackClient } from '@zenstackhq/runtime'; +export const STARTER_MAIN_TS = `import { ZenStackClient } from '@zenstackhq/orm'; import SQLite from 'better-sqlite3'; import { SqliteDialect } from 'kysely'; import { schema } from './zenstack/schema'; diff --git a/packages/cli/test/ts-schema-gen.test.ts b/packages/cli/test/ts-schema-gen.test.ts index 4ac6f94f..7a6ece60 100644 --- a/packages/cli/test/ts-schema-gen.test.ts +++ b/packages/cli/test/ts-schema-gen.test.ts @@ -1,4 +1,4 @@ -import { ExpressionUtils } from '@zenstackhq/runtime/schema'; +import { ExpressionUtils } from '@zenstackhq/orm/schema'; import { createTestProject, generateTsSchema, generateTsSchemaInPlace } from '@zenstackhq/testtools'; import fs from 'node:fs'; import path from 'node:path'; diff --git a/packages/create-zenstack/src/index.ts b/packages/create-zenstack/src/index.ts index 14af8a12..2099c42c 100644 --- a/packages/create-zenstack/src/index.ts +++ b/packages/create-zenstack/src/index.ts @@ -67,7 +67,7 @@ function initProject(name: string) { // install packages const packages = [ { name: '@zenstackhq/cli@next', dev: true }, - { name: '@zenstackhq/runtime@next', dev: false }, + { name: '@zenstackhq/orm@next', dev: false }, { name: 'better-sqlite3', dev: false }, { name: '@types/better-sqlite3', dev: true }, { name: 'typescript', dev: true }, diff --git a/packages/runtime/eslint.config.js b/packages/orm/eslint.config.js similarity index 100% rename from packages/runtime/eslint.config.js rename to packages/orm/eslint.config.js diff --git a/packages/runtime/package.json b/packages/orm/package.json similarity index 97% rename from packages/runtime/package.json rename to packages/orm/package.json index 0ce4fa0d..34aea6b9 100644 --- a/packages/runtime/package.json +++ b/packages/orm/package.json @@ -1,7 +1,7 @@ { - "name": "@zenstackhq/runtime", + "name": "@zenstackhq/orm", "version": "3.0.0-beta.13", - "description": "ZenStack Runtime", + "description": "ZenStack ORM", "type": "module", "scripts": { "build": "tsc --noEmit && tsup-node", diff --git a/packages/runtime/src/client/client-impl.ts b/packages/orm/src/client/client-impl.ts similarity index 100% rename from packages/runtime/src/client/client-impl.ts rename to packages/orm/src/client/client-impl.ts diff --git a/packages/runtime/src/client/constants.ts b/packages/orm/src/client/constants.ts similarity index 100% rename from packages/runtime/src/client/constants.ts rename to packages/orm/src/client/constants.ts diff --git a/packages/runtime/src/client/contract.ts b/packages/orm/src/client/contract.ts similarity index 100% rename from packages/runtime/src/client/contract.ts rename to packages/orm/src/client/contract.ts diff --git a/packages/runtime/src/client/crud-types.ts b/packages/orm/src/client/crud-types.ts similarity index 100% rename from packages/runtime/src/client/crud-types.ts rename to packages/orm/src/client/crud-types.ts diff --git a/packages/runtime/src/client/crud/dialects/base-dialect.ts b/packages/orm/src/client/crud/dialects/base-dialect.ts similarity index 100% rename from packages/runtime/src/client/crud/dialects/base-dialect.ts rename to packages/orm/src/client/crud/dialects/base-dialect.ts diff --git a/packages/runtime/src/client/crud/dialects/index.ts b/packages/orm/src/client/crud/dialects/index.ts similarity index 100% rename from packages/runtime/src/client/crud/dialects/index.ts rename to packages/orm/src/client/crud/dialects/index.ts diff --git a/packages/runtime/src/client/crud/dialects/postgresql.ts b/packages/orm/src/client/crud/dialects/postgresql.ts similarity index 100% rename from packages/runtime/src/client/crud/dialects/postgresql.ts rename to packages/orm/src/client/crud/dialects/postgresql.ts diff --git a/packages/runtime/src/client/crud/dialects/sqlite.ts b/packages/orm/src/client/crud/dialects/sqlite.ts similarity index 100% rename from packages/runtime/src/client/crud/dialects/sqlite.ts rename to packages/orm/src/client/crud/dialects/sqlite.ts diff --git a/packages/runtime/src/client/crud/operations/aggregate.ts b/packages/orm/src/client/crud/operations/aggregate.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/aggregate.ts rename to packages/orm/src/client/crud/operations/aggregate.ts diff --git a/packages/runtime/src/client/crud/operations/base.ts b/packages/orm/src/client/crud/operations/base.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/base.ts rename to packages/orm/src/client/crud/operations/base.ts diff --git a/packages/runtime/src/client/crud/operations/count.ts b/packages/orm/src/client/crud/operations/count.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/count.ts rename to packages/orm/src/client/crud/operations/count.ts diff --git a/packages/runtime/src/client/crud/operations/create.ts b/packages/orm/src/client/crud/operations/create.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/create.ts rename to packages/orm/src/client/crud/operations/create.ts diff --git a/packages/runtime/src/client/crud/operations/delete.ts b/packages/orm/src/client/crud/operations/delete.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/delete.ts rename to packages/orm/src/client/crud/operations/delete.ts diff --git a/packages/runtime/src/client/crud/operations/find.ts b/packages/orm/src/client/crud/operations/find.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/find.ts rename to packages/orm/src/client/crud/operations/find.ts diff --git a/packages/runtime/src/client/crud/operations/group-by.ts b/packages/orm/src/client/crud/operations/group-by.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/group-by.ts rename to packages/orm/src/client/crud/operations/group-by.ts diff --git a/packages/runtime/src/client/crud/operations/update.ts b/packages/orm/src/client/crud/operations/update.ts similarity index 100% rename from packages/runtime/src/client/crud/operations/update.ts rename to packages/orm/src/client/crud/operations/update.ts diff --git a/packages/runtime/src/client/crud/validator/index.ts b/packages/orm/src/client/crud/validator/index.ts similarity index 100% rename from packages/runtime/src/client/crud/validator/index.ts rename to packages/orm/src/client/crud/validator/index.ts diff --git a/packages/runtime/src/client/crud/validator/utils.ts b/packages/orm/src/client/crud/validator/utils.ts similarity index 100% rename from packages/runtime/src/client/crud/validator/utils.ts rename to packages/orm/src/client/crud/validator/utils.ts diff --git a/packages/runtime/src/client/errors.ts b/packages/orm/src/client/errors.ts similarity index 100% rename from packages/runtime/src/client/errors.ts rename to packages/orm/src/client/errors.ts diff --git a/packages/runtime/src/client/executor/name-mapper.ts b/packages/orm/src/client/executor/name-mapper.ts similarity index 100% rename from packages/runtime/src/client/executor/name-mapper.ts rename to packages/orm/src/client/executor/name-mapper.ts diff --git a/packages/runtime/src/client/executor/zenstack-driver.ts b/packages/orm/src/client/executor/zenstack-driver.ts similarity index 100% rename from packages/runtime/src/client/executor/zenstack-driver.ts rename to packages/orm/src/client/executor/zenstack-driver.ts diff --git a/packages/runtime/src/client/executor/zenstack-query-executor.ts b/packages/orm/src/client/executor/zenstack-query-executor.ts similarity index 100% rename from packages/runtime/src/client/executor/zenstack-query-executor.ts rename to packages/orm/src/client/executor/zenstack-query-executor.ts diff --git a/packages/runtime/src/client/functions.ts b/packages/orm/src/client/functions.ts similarity index 100% rename from packages/runtime/src/client/functions.ts rename to packages/orm/src/client/functions.ts diff --git a/packages/runtime/src/client/helpers/schema-db-pusher.ts b/packages/orm/src/client/helpers/schema-db-pusher.ts similarity index 100% rename from packages/runtime/src/client/helpers/schema-db-pusher.ts rename to packages/orm/src/client/helpers/schema-db-pusher.ts diff --git a/packages/runtime/src/client/index.ts b/packages/orm/src/client/index.ts similarity index 100% rename from packages/runtime/src/client/index.ts rename to packages/orm/src/client/index.ts diff --git a/packages/runtime/src/client/options.ts b/packages/orm/src/client/options.ts similarity index 100% rename from packages/runtime/src/client/options.ts rename to packages/orm/src/client/options.ts diff --git a/packages/runtime/src/client/plugin.ts b/packages/orm/src/client/plugin.ts similarity index 100% rename from packages/runtime/src/client/plugin.ts rename to packages/orm/src/client/plugin.ts diff --git a/packages/runtime/src/client/promise.ts b/packages/orm/src/client/promise.ts similarity index 100% rename from packages/runtime/src/client/promise.ts rename to packages/orm/src/client/promise.ts diff --git a/packages/runtime/src/client/query-builder.ts b/packages/orm/src/client/query-builder.ts similarity index 100% rename from packages/runtime/src/client/query-builder.ts rename to packages/orm/src/client/query-builder.ts diff --git a/packages/runtime/src/client/query-utils.ts b/packages/orm/src/client/query-utils.ts similarity index 100% rename from packages/runtime/src/client/query-utils.ts rename to packages/orm/src/client/query-utils.ts diff --git a/packages/runtime/src/client/result-processor.ts b/packages/orm/src/client/result-processor.ts similarity index 100% rename from packages/runtime/src/client/result-processor.ts rename to packages/orm/src/client/result-processor.ts diff --git a/packages/runtime/src/helpers.ts b/packages/orm/src/helpers.ts similarity index 100% rename from packages/runtime/src/helpers.ts rename to packages/orm/src/helpers.ts diff --git a/packages/runtime/src/index.ts b/packages/orm/src/index.ts similarity index 100% rename from packages/runtime/src/index.ts rename to packages/orm/src/index.ts diff --git a/packages/runtime/src/schema/auth.ts b/packages/orm/src/schema/auth.ts similarity index 100% rename from packages/runtime/src/schema/auth.ts rename to packages/orm/src/schema/auth.ts diff --git a/packages/runtime/src/schema/expression.ts b/packages/orm/src/schema/expression.ts similarity index 100% rename from packages/runtime/src/schema/expression.ts rename to packages/orm/src/schema/expression.ts diff --git a/packages/runtime/src/schema/index.ts b/packages/orm/src/schema/index.ts similarity index 100% rename from packages/runtime/src/schema/index.ts rename to packages/orm/src/schema/index.ts diff --git a/packages/runtime/src/utils/clone.ts b/packages/orm/src/utils/clone.ts similarity index 100% rename from packages/runtime/src/utils/clone.ts rename to packages/orm/src/utils/clone.ts diff --git a/packages/runtime/src/utils/enumerate.ts b/packages/orm/src/utils/enumerate.ts similarity index 100% rename from packages/runtime/src/utils/enumerate.ts rename to packages/orm/src/utils/enumerate.ts diff --git a/packages/runtime/src/utils/kysely-utils.ts b/packages/orm/src/utils/kysely-utils.ts similarity index 100% rename from packages/runtime/src/utils/kysely-utils.ts rename to packages/orm/src/utils/kysely-utils.ts diff --git a/packages/runtime/src/utils/object-utils.ts b/packages/orm/src/utils/object-utils.ts similarity index 100% rename from packages/runtime/src/utils/object-utils.ts rename to packages/orm/src/utils/object-utils.ts diff --git a/packages/runtime/src/utils/schema-utils.ts b/packages/orm/src/utils/schema-utils.ts similarity index 100% rename from packages/runtime/src/utils/schema-utils.ts rename to packages/orm/src/utils/schema-utils.ts diff --git a/packages/runtime/src/utils/type-utils.ts b/packages/orm/src/utils/type-utils.ts similarity index 100% rename from packages/runtime/src/utils/type-utils.ts rename to packages/orm/src/utils/type-utils.ts diff --git a/packages/runtime/src/utils/zod-utils.ts b/packages/orm/src/utils/zod-utils.ts similarity index 100% rename from packages/runtime/src/utils/zod-utils.ts rename to packages/orm/src/utils/zod-utils.ts diff --git a/packages/runtime/tsconfig.json b/packages/orm/tsconfig.json similarity index 100% rename from packages/runtime/tsconfig.json rename to packages/orm/tsconfig.json diff --git a/packages/runtime/tsup.config.ts b/packages/orm/tsup.config.ts similarity index 100% rename from packages/runtime/tsup.config.ts rename to packages/orm/tsup.config.ts diff --git a/packages/runtime/vitest.config.ts b/packages/orm/vitest.config.ts similarity index 100% rename from packages/runtime/vitest.config.ts rename to packages/orm/vitest.config.ts diff --git a/packages/plugins/policy/package.json b/packages/plugins/policy/package.json index b91b474a..9a537095 100644 --- a/packages/plugins/policy/package.json +++ b/packages/plugins/policy/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@zenstackhq/common-helpers": "workspace:*", - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "ts-pattern": "catalog:" }, "peerDependencies": { diff --git a/packages/plugins/policy/src/column-collector.ts b/packages/plugins/policy/src/column-collector.ts index ed68c76d..8fcbb408 100644 --- a/packages/plugins/policy/src/column-collector.ts +++ b/packages/plugins/policy/src/column-collector.ts @@ -1,4 +1,4 @@ -import { KyselyUtils } from '@zenstackhq/runtime'; +import { KyselyUtils } from '@zenstackhq/orm'; import type { ColumnNode, OperationNode } from 'kysely'; /** diff --git a/packages/plugins/policy/src/expression-evaluator.ts b/packages/plugins/policy/src/expression-evaluator.ts index 330bf48f..a09c87d1 100644 --- a/packages/plugins/policy/src/expression-evaluator.ts +++ b/packages/plugins/policy/src/expression-evaluator.ts @@ -10,7 +10,7 @@ import { type LiteralExpression, type MemberExpression, type UnaryExpression, -} from '@zenstackhq/runtime/schema'; +} from '@zenstackhq/orm/schema'; type ExpressionEvaluatorContext = { auth?: any; diff --git a/packages/plugins/policy/src/expression-transformer.ts b/packages/plugins/policy/src/expression-transformer.ts index 02d3f756..ad448805 100644 --- a/packages/plugins/policy/src/expression-transformer.ts +++ b/packages/plugins/policy/src/expression-transformer.ts @@ -7,7 +7,7 @@ import { type BaseCrudDialect, type ClientContract, type CRUD_EXT, -} from '@zenstackhq/runtime'; +} from '@zenstackhq/orm'; import type { BinaryExpression, BinaryOperator, @@ -17,7 +17,7 @@ import type { LiteralExpression, MemberExpression, UnaryExpression, -} from '@zenstackhq/runtime/schema'; +} from '@zenstackhq/orm/schema'; import { ExpressionUtils, type ArrayExpression, @@ -25,7 +25,7 @@ import { type Expression, type FieldExpression, type SchemaDef, -} from '@zenstackhq/runtime/schema'; +} from '@zenstackhq/orm/schema'; import { AliasNode, BinaryOperationNode, diff --git a/packages/plugins/policy/src/functions.ts b/packages/plugins/policy/src/functions.ts index d131f933..a42de65b 100644 --- a/packages/plugins/policy/src/functions.ts +++ b/packages/plugins/policy/src/functions.ts @@ -1,6 +1,6 @@ import { invariant } from '@zenstackhq/common-helpers'; -import type { ZModelFunction, ZModelFunctionContext } from '@zenstackhq/runtime'; -import { CRUD, QueryUtils } from '@zenstackhq/runtime'; +import type { ZModelFunction, ZModelFunctionContext } from '@zenstackhq/orm'; +import { CRUD, QueryUtils } from '@zenstackhq/orm'; import { ExpressionWrapper, ValueNode, type Expression, type ExpressionBuilder } from 'kysely'; import { PolicyHandler } from './policy-handler'; diff --git a/packages/plugins/policy/src/plugin.ts b/packages/plugins/policy/src/plugin.ts index bbb3d0a7..b45f30bf 100644 --- a/packages/plugins/policy/src/plugin.ts +++ b/packages/plugins/policy/src/plugin.ts @@ -1,5 +1,5 @@ -import { type OnKyselyQueryArgs, type RuntimePlugin } from '@zenstackhq/runtime'; -import type { SchemaDef } from '@zenstackhq/runtime/schema'; +import { type OnKyselyQueryArgs, type RuntimePlugin } from '@zenstackhq/orm'; +import type { SchemaDef } from '@zenstackhq/orm/schema'; import { check } from './functions'; import { PolicyHandler } from './policy-handler'; diff --git a/packages/plugins/policy/src/policy-handler.ts b/packages/plugins/policy/src/policy-handler.ts index 4a845a50..a9473f31 100644 --- a/packages/plugins/policy/src/policy-handler.ts +++ b/packages/plugins/policy/src/policy-handler.ts @@ -1,5 +1,5 @@ import { invariant } from '@zenstackhq/common-helpers'; -import type { BaseCrudDialect, ClientContract, ProceedKyselyQueryFunction } from '@zenstackhq/runtime'; +import type { BaseCrudDialect, ClientContract, ProceedKyselyQueryFunction } from '@zenstackhq/orm'; import { getCrudDialect, InternalError, @@ -9,7 +9,7 @@ import { RejectedByPolicyReason, SchemaUtils, type CRUD_EXT, -} from '@zenstackhq/runtime'; +} from '@zenstackhq/orm'; import { ExpressionUtils, type BuiltinType, @@ -17,7 +17,7 @@ import { type GetModels, type MemberExpression, type SchemaDef, -} from '@zenstackhq/runtime/schema'; +} from '@zenstackhq/orm/schema'; import { AliasNode, BinaryOperationNode, diff --git a/packages/plugins/policy/src/types.ts b/packages/plugins/policy/src/types.ts index f4c12e13..dc042aa9 100644 --- a/packages/plugins/policy/src/types.ts +++ b/packages/plugins/policy/src/types.ts @@ -1,5 +1,5 @@ -import type { CRUD_EXT } from '@zenstackhq/runtime'; -import type { Expression } from '@zenstackhq/runtime/schema'; +import type { CRUD_EXT } from '@zenstackhq/orm'; +import type { Expression } from '@zenstackhq/orm/schema'; /** * Access policy kind. diff --git a/packages/plugins/policy/src/utils.ts b/packages/plugins/policy/src/utils.ts index 8a62458f..321a2191 100644 --- a/packages/plugins/policy/src/utils.ts +++ b/packages/plugins/policy/src/utils.ts @@ -1,5 +1,5 @@ -import type { BaseCrudDialect } from '@zenstackhq/runtime'; -import { ExpressionUtils, type Expression, type SchemaDef } from '@zenstackhq/runtime/schema'; +import type { BaseCrudDialect } from '@zenstackhq/orm'; +import { ExpressionUtils, type Expression, type SchemaDef } from '@zenstackhq/orm/schema'; import type { OperationNode } from 'kysely'; import { AliasNode, diff --git a/packages/sdk/src/ts-schema-generator.ts b/packages/sdk/src/ts-schema-generator.ts index 9c393bd5..c2a02435 100644 --- a/packages/sdk/src/ts-schema-generator.ts +++ b/packages/sdk/src/ts-schema-generator.ts @@ -118,7 +118,7 @@ export class TsSchemaGenerator { : []), ]), ), - ts.factory.createStringLiteral('@zenstackhq/runtime/schema'), + ts.factory.createStringLiteral('@zenstackhq/orm/schema'), ); statements.push(runtimeImportDecl); @@ -1116,7 +1116,7 @@ export class TsSchemaGenerator { // generate: import { schema as $schema, type SchemaType as $Schema } from './schema'; statements.push(this.generateSchemaImport(model, true, true)); - // generate: import type { ModelResult as $ModelResult } from '@zenstackhq/runtime'; + // generate: import type { ModelResult as $ModelResult } from '@zenstackhq/orm'; statements.push( ts.factory.createImportDeclaration( undefined, @@ -1140,7 +1140,7 @@ export class TsSchemaGenerator { : []), ]), ), - ts.factory.createStringLiteral('@zenstackhq/runtime'), + ts.factory.createStringLiteral('@zenstackhq/orm'), ), ); @@ -1289,7 +1289,7 @@ export class TsSchemaGenerator { // generate: import { SchemaType as $Schema } from './schema'; statements.push(this.generateSchemaImport(model, false, true)); - // generate: import { CreateArgs as $CreateArgs, ... } from '@zenstackhq/runtime'; + // generate: import { CreateArgs as $CreateArgs, ... } from '@zenstackhq/orm'; const inputTypes = [ 'FindManyArgs', 'FindUniqueArgs', @@ -1318,7 +1318,7 @@ export class TsSchemaGenerator { OmitInput: 'Omit', }; - // generate: import { CreateArgs as $CreateArgs, ... } from '@zenstackhq/runtime'; + // generate: import { CreateArgs as $CreateArgs, ... } from '@zenstackhq/orm'; statements.push( ts.factory.createImportDeclaration( undefined, @@ -1335,11 +1335,11 @@ export class TsSchemaGenerator { ), ), ), - ts.factory.createStringLiteral('@zenstackhq/runtime'), + ts.factory.createStringLiteral('@zenstackhq/orm'), ), ); - // generate: import { type SelectIncludeOmit as $SelectIncludeOmit, type SimplifiedModelResult as $SimplifiedModelResult } from '@zenstackhq/runtime'; + // generate: import { type SelectIncludeOmit as $SelectIncludeOmit, type SimplifiedModelResult as $SimplifiedModelResult } from '@zenstackhq/orm'; statements.push( ts.factory.createImportDeclaration( undefined, @@ -1359,7 +1359,7 @@ export class TsSchemaGenerator { ), ]), ), - ts.factory.createStringLiteral('@zenstackhq/runtime'), + ts.factory.createStringLiteral('@zenstackhq/orm'), ), ); diff --git a/packages/server/package.json b/packages/server/package.json index dde668d9..59145c55 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@zenstackhq/common-helpers": "workspace:*", - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "decimal.js": "catalog:", "superjson": "^2.2.3", "ts-pattern": "catalog:" diff --git a/packages/server/src/api/rpc/index.ts b/packages/server/src/api/rpc/index.ts index 28cb017b..c454615b 100644 --- a/packages/server/src/api/rpc/index.ts +++ b/packages/server/src/api/rpc/index.ts @@ -5,8 +5,8 @@ import { RejectedByPolicyError, ZenStackError, type ClientContract, -} from '@zenstackhq/runtime'; -import type { SchemaDef } from '@zenstackhq/runtime/schema'; +} from '@zenstackhq/orm'; +import type { SchemaDef } from '@zenstackhq/orm/schema'; import SuperJSON from 'superjson'; import type { ApiHandler, LogConfig, RequestContext, Response } from '../../types'; import { log, registerCustomSerializers } from '../utils'; diff --git a/packages/server/src/express/middleware.ts b/packages/server/src/express/middleware.ts index 27cc9347..43ccf88f 100644 --- a/packages/server/src/express/middleware.ts +++ b/packages/server/src/express/middleware.ts @@ -1,5 +1,5 @@ -import type { ClientContract } from '@zenstackhq/runtime'; -import type { SchemaDef } from '@zenstackhq/runtime/schema'; +import type { ClientContract } from '@zenstackhq/orm'; +import type { SchemaDef } from '@zenstackhq/orm/schema'; import type { Handler, Request, Response } from 'express'; import type { ApiHandler } from '../types'; diff --git a/packages/server/src/types.ts b/packages/server/src/types.ts index 66ef7774..1d2b4321 100644 --- a/packages/server/src/types.ts +++ b/packages/server/src/types.ts @@ -1,5 +1,5 @@ -import type { ClientContract } from '@zenstackhq/runtime'; -import type { SchemaDef } from '@zenstackhq/runtime/schema'; +import type { ClientContract } from '@zenstackhq/orm'; +import type { SchemaDef } from '@zenstackhq/orm/schema'; /** * Log levels diff --git a/packages/server/test/api/rpc.test.ts b/packages/server/test/api/rpc.test.ts index 532d4ca2..19e44ca0 100644 --- a/packages/server/test/api/rpc.test.ts +++ b/packages/server/test/api/rpc.test.ts @@ -1,5 +1,5 @@ -import { ClientContract } from '@zenstackhq/runtime'; -import { SchemaDef } from '@zenstackhq/runtime/schema'; +import { ClientContract } from '@zenstackhq/orm'; +import { SchemaDef } from '@zenstackhq/orm/schema'; import { createPolicyTestClient, createTestClient } from '@zenstackhq/testtools'; import Decimal from 'decimal.js'; import SuperJSON from 'superjson'; diff --git a/packages/tanstack-query/package.json b/packages/tanstack-query/package.json index 5ddd136a..94bf33d3 100644 --- a/packages/tanstack-query/package.json +++ b/packages/tanstack-query/package.json @@ -25,7 +25,7 @@ } }, "dependencies": { - "@zenstackhq/runtime": "workspace:*" + "@zenstackhq/orm": "workspace:*" }, "devDependencies": { "@zenstackhq/eslint-config": "workspace:*", diff --git a/packages/tanstack-query/src/react.ts b/packages/tanstack-query/src/react.ts index c87115d5..9c36163c 100644 --- a/packages/tanstack-query/src/react.ts +++ b/packages/tanstack-query/src/react.ts @@ -5,8 +5,8 @@ import type { UseQueryOptions, UseQueryResult, } from '@tanstack/react-query'; -import type { CreateArgs, FindArgs, ModelResult, SelectSubset } from '@zenstackhq/runtime'; -import type { GetModels, SchemaDef } from '@zenstackhq/runtime/schema'; +import type { CreateArgs, FindArgs, ModelResult, SelectSubset } from '@zenstackhq/orm'; +import type { GetModels, SchemaDef } from '@zenstackhq/orm/schema'; export type toHooks = { [Model in GetModels as Uncapitalize]: ToModelHooks; diff --git a/packages/testtools/package.json b/packages/testtools/package.json index 13d9f87d..44204ed1 100644 --- a/packages/testtools/package.json +++ b/packages/testtools/package.json @@ -33,7 +33,7 @@ "dependencies": { "@zenstackhq/common-helpers": "workspace:*", "@zenstackhq/language": "workspace:*", - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "@zenstackhq/sdk": "workspace:*", "@zenstackhq/plugin-policy": "workspace:*", "glob": "^11.0.2", diff --git a/packages/testtools/src/client.ts b/packages/testtools/src/client.ts index de819363..f6ea4b8d 100644 --- a/packages/testtools/src/client.ts +++ b/packages/testtools/src/client.ts @@ -1,8 +1,8 @@ import { invariant } from '@zenstackhq/common-helpers'; import type { Model } from '@zenstackhq/language/ast'; import { PolicyPlugin } from '@zenstackhq/plugin-policy'; -import { ZenStackClient, type ClientContract, type ClientOptions } from '@zenstackhq/runtime'; -import type { SchemaDef } from '@zenstackhq/runtime/schema'; +import { ZenStackClient, type ClientContract, type ClientOptions } from '@zenstackhq/orm'; +import type { SchemaDef } from '@zenstackhq/orm/schema'; import { PrismaSchemaGenerator } from '@zenstackhq/sdk'; import SQLite from 'better-sqlite3'; import { PostgresDialect, SqliteDialect, type LogEvent } from 'kysely'; diff --git a/packages/testtools/src/project.ts b/packages/testtools/src/project.ts index 0a795c6b..9ea3478b 100644 --- a/packages/testtools/src/project.ts +++ b/packages/testtools/src/project.ts @@ -21,7 +21,7 @@ export function createTestProject(zmodelContent?: string) { } // in addition, symlink zenstack packages - const zenstackPackages = ['language', 'sdk', 'runtime', 'cli']; + const zenstackPackages = ['language', 'sdk', 'orm', 'cli']; fs.mkdirSync(path.join(workDir, 'node_modules/@zenstackhq')); for (const pkg of zenstackPackages) { fs.symlinkSync( diff --git a/packages/testtools/src/vitest-ext.ts b/packages/testtools/src/vitest-ext.ts index 06b1709b..6eef39b5 100644 --- a/packages/testtools/src/vitest-ext.ts +++ b/packages/testtools/src/vitest-ext.ts @@ -1,4 +1,4 @@ -import { InputValidationError, NotFoundError, RejectedByPolicyError } from '@zenstackhq/runtime'; +import { InputValidationError, NotFoundError, RejectedByPolicyError } from '@zenstackhq/orm'; import { expect } from 'vitest'; function isPromise(value: any) { diff --git a/packages/zod/package.json b/packages/zod/package.json index 9b0f4576..ec458769 100644 --- a/packages/zod/package.json +++ b/packages/zod/package.json @@ -25,7 +25,7 @@ } }, "dependencies": { - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "ts-pattern": "catalog:" }, "devDependencies": { diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts index a74ad446..8211af36 100644 --- a/packages/zod/src/index.ts +++ b/packages/zod/src/index.ts @@ -1,4 +1,4 @@ -import type { FieldDef, GetModels, SchemaDef } from '@zenstackhq/runtime/schema'; +import type { FieldDef, GetModels, SchemaDef } from '@zenstackhq/orm/schema'; import { match, P } from 'ts-pattern'; import { z, ZodType } from 'zod'; import type { SelectSchema } from './types'; diff --git a/packages/zod/src/types.ts b/packages/zod/src/types.ts index 878aef87..249c6de9 100644 --- a/packages/zod/src/types.ts +++ b/packages/zod/src/types.ts @@ -1,4 +1,4 @@ -import type { FieldType, GetModels, ScalarFields, SchemaDef } from '@zenstackhq/runtime/schema'; +import type { FieldType, GetModels, ScalarFields, SchemaDef } from '@zenstackhq/orm/schema'; import type { ZodBoolean, ZodNumber, ZodObject, ZodString, ZodUnknown } from 'zod'; export type SelectSchema> = ZodObject<{ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bfe83846..7682fa7b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -138,9 +138,9 @@ importers: '@zenstackhq/eslint-config': specifier: workspace:* version: link:../config/eslint-config - '@zenstackhq/runtime': + '@zenstackhq/orm': specifier: workspace:* - version: link:../runtime + version: link:../orm '@zenstackhq/testtools': specifier: workspace:* version: link:../testtools @@ -277,38 +277,7 @@ importers: specifier: 'catalog:' version: 0.2.3 - packages/plugins/policy: - dependencies: - '@zenstackhq/common-helpers': - specifier: workspace:* - version: link:../../common-helpers - '@zenstackhq/runtime': - specifier: workspace:* - version: link:../../runtime - kysely: - specifier: 'catalog:' - version: 0.27.6 - ts-pattern: - specifier: 'catalog:' - version: 5.7.1 - devDependencies: - '@types/better-sqlite3': - specifier: ^7.6.13 - version: 7.6.13 - '@types/pg': - specifier: ^8.0.0 - version: 8.11.11 - '@zenstackhq/eslint-config': - specifier: workspace:* - version: link:../../config/eslint-config - '@zenstackhq/typescript-config': - specifier: workspace:* - version: link:../../config/typescript-config - '@zenstackhq/vitest-config': - specifier: workspace:* - version: link:../../config/vitest-config - - packages/runtime: + packages/orm: dependencies: '@paralleldrive/cuid2': specifier: ^2.2.2 @@ -376,11 +345,42 @@ importers: version: link:../config/vitest-config tsx: specifier: ^4.19.2 - version: 4.19.2 + version: 4.20.3 zod: specifier: ~3.25.0 version: 3.25.76 + packages/plugins/policy: + dependencies: + '@zenstackhq/common-helpers': + specifier: workspace:* + version: link:../../common-helpers + '@zenstackhq/orm': + specifier: workspace:* + version: link:../../orm + kysely: + specifier: 'catalog:' + version: 0.27.6 + ts-pattern: + specifier: 'catalog:' + version: 5.7.1 + devDependencies: + '@types/better-sqlite3': + specifier: ^7.6.13 + version: 7.6.13 + '@types/pg': + specifier: ^8.0.0 + version: 8.11.11 + '@zenstackhq/eslint-config': + specifier: workspace:* + version: link:../../config/eslint-config + '@zenstackhq/typescript-config': + specifier: workspace:* + version: link:../../config/typescript-config + '@zenstackhq/vitest-config': + specifier: workspace:* + version: link:../../config/vitest-config + packages/sdk: dependencies: '@zenstackhq/common-helpers': @@ -417,9 +417,9 @@ importers: '@zenstackhq/common-helpers': specifier: workspace:* version: link:../common-helpers - '@zenstackhq/runtime': + '@zenstackhq/orm': specifier: workspace:* - version: link:../runtime + version: link:../orm decimal.js: specifier: 'catalog:' version: 10.4.3 @@ -466,9 +466,9 @@ importers: '@tanstack/react-query': specifier: ^5.0.0 version: 5.81.0(react@19.1.0) - '@zenstackhq/runtime': + '@zenstackhq/orm': specifier: workspace:* - version: link:../runtime + version: link:../orm devDependencies: '@zenstackhq/eslint-config': specifier: workspace:* @@ -485,12 +485,12 @@ importers: '@zenstackhq/language': specifier: workspace:* version: link:../language + '@zenstackhq/orm': + specifier: workspace:* + version: link:../orm '@zenstackhq/plugin-policy': specifier: workspace:* version: link:../plugins/policy - '@zenstackhq/runtime': - specifier: workspace:* - version: link:../runtime '@zenstackhq/sdk': specifier: workspace:* version: link:../sdk @@ -540,9 +540,9 @@ importers: packages/zod: dependencies: - '@zenstackhq/runtime': + '@zenstackhq/orm': specifier: workspace:* - version: link:../runtime + version: link:../orm ts-pattern: specifier: 'catalog:' version: 5.7.1 @@ -559,12 +559,12 @@ importers: samples/blog: dependencies: + '@zenstackhq/orm': + specifier: workspace:* + version: link:../../packages/orm '@zenstackhq/plugin-policy': specifier: workspace:* version: link:../../packages/plugins/policy - '@zenstackhq/runtime': - specifier: workspace:* - version: link:../../packages/runtime better-sqlite3: specifier: ^12.2.0 version: 12.2.0 @@ -596,12 +596,12 @@ importers: '@zenstackhq/language': specifier: workspace:* version: link:../../packages/language + '@zenstackhq/orm': + specifier: workspace:* + version: link:../../packages/orm '@zenstackhq/plugin-policy': specifier: workspace:* version: link:../../packages/plugins/policy - '@zenstackhq/runtime': - specifier: workspace:* - version: link:../../packages/runtime '@zenstackhq/sdk': specifier: workspace:* version: link:../../packages/sdk @@ -649,9 +649,9 @@ importers: '@zenstackhq/language': specifier: workspace:* version: link:../../packages/language - '@zenstackhq/runtime': + '@zenstackhq/orm': specifier: workspace:* - version: link:../../packages/runtime + version: link:../../packages/orm '@zenstackhq/sdk': specifier: workspace:* version: link:../../packages/sdk @@ -679,204 +679,102 @@ packages: '@chevrotain/utils@11.0.3': resolution: {integrity: sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==} - '@esbuild/aix-ppc64@0.23.1': - resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [aix] - '@esbuild/aix-ppc64@0.25.5': resolution: {integrity: sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.23.1': - resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} - engines: {node: '>=18'} - cpu: [arm64] - os: [android] - '@esbuild/android-arm64@0.25.5': resolution: {integrity: sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.23.1': - resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} - engines: {node: '>=18'} - cpu: [arm] - os: [android] - '@esbuild/android-arm@0.25.5': resolution: {integrity: sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.23.1': - resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} - engines: {node: '>=18'} - cpu: [x64] - os: [android] - '@esbuild/android-x64@0.25.5': resolution: {integrity: sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.23.1': - resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} - engines: {node: '>=18'} - cpu: [arm64] - os: [darwin] - '@esbuild/darwin-arm64@0.25.5': resolution: {integrity: sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.23.1': - resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} - engines: {node: '>=18'} - cpu: [x64] - os: [darwin] - '@esbuild/darwin-x64@0.25.5': resolution: {integrity: sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.23.1': - resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} - engines: {node: '>=18'} - cpu: [arm64] - os: [freebsd] - '@esbuild/freebsd-arm64@0.25.5': resolution: {integrity: sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.23.1': - resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} - engines: {node: '>=18'} - cpu: [x64] - os: [freebsd] - '@esbuild/freebsd-x64@0.25.5': resolution: {integrity: sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.23.1': - resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} - engines: {node: '>=18'} - cpu: [arm64] - os: [linux] - '@esbuild/linux-arm64@0.25.5': resolution: {integrity: sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.23.1': - resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} - engines: {node: '>=18'} - cpu: [arm] - os: [linux] - '@esbuild/linux-arm@0.25.5': resolution: {integrity: sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.23.1': - resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} - engines: {node: '>=18'} - cpu: [ia32] - os: [linux] - '@esbuild/linux-ia32@0.25.5': resolution: {integrity: sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.23.1': - resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} - engines: {node: '>=18'} - cpu: [loong64] - os: [linux] - '@esbuild/linux-loong64@0.25.5': resolution: {integrity: sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.23.1': - resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} - engines: {node: '>=18'} - cpu: [mips64el] - os: [linux] - '@esbuild/linux-mips64el@0.25.5': resolution: {integrity: sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.23.1': - resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} - engines: {node: '>=18'} - cpu: [ppc64] - os: [linux] - '@esbuild/linux-ppc64@0.25.5': resolution: {integrity: sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.23.1': - resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} - engines: {node: '>=18'} - cpu: [riscv64] - os: [linux] - '@esbuild/linux-riscv64@0.25.5': resolution: {integrity: sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.23.1': - resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} - engines: {node: '>=18'} - cpu: [s390x] - os: [linux] - '@esbuild/linux-s390x@0.25.5': resolution: {integrity: sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.23.1': - resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} - engines: {node: '>=18'} - cpu: [x64] - os: [linux] - '@esbuild/linux-x64@0.25.5': resolution: {integrity: sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==} engines: {node: '>=18'} @@ -889,84 +787,42 @@ packages: cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.23.1': - resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} - engines: {node: '>=18'} - cpu: [x64] - os: [netbsd] - '@esbuild/netbsd-x64@0.25.5': resolution: {integrity: sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.23.1': - resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} - engines: {node: '>=18'} - cpu: [arm64] - os: [openbsd] - '@esbuild/openbsd-arm64@0.25.5': resolution: {integrity: sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.23.1': - resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==} - engines: {node: '>=18'} - cpu: [x64] - os: [openbsd] - '@esbuild/openbsd-x64@0.25.5': resolution: {integrity: sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.23.1': - resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} - engines: {node: '>=18'} - cpu: [x64] - os: [sunos] - '@esbuild/sunos-x64@0.25.5': resolution: {integrity: sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.23.1': - resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} - engines: {node: '>=18'} - cpu: [arm64] - os: [win32] - '@esbuild/win32-arm64@0.25.5': resolution: {integrity: sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.23.1': - resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} - engines: {node: '>=18'} - cpu: [ia32] - os: [win32] - '@esbuild/win32-ia32@0.25.5': resolution: {integrity: sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.23.1': - resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} - engines: {node: '>=18'} - cpu: [x64] - os: [win32] - '@esbuild/win32-x64@0.25.5': resolution: {integrity: sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==} engines: {node: '>=18'} @@ -1818,11 +1674,6 @@ packages: resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} engines: {node: '>= 0.4'} - esbuild@0.23.1: - resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} - engines: {node: '>=18'} - hasBin: true - esbuild@0.25.5: resolution: {integrity: sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==} engines: {node: '>=18'} @@ -2002,9 +1853,6 @@ packages: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} - get-tsconfig@4.10.0: - resolution: {integrity: sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==} - get-tsconfig@4.10.1: resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==} @@ -2938,11 +2786,6 @@ packages: typescript: optional: true - tsx@4.19.2: - resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==} - engines: {node: '>=18.0.0'} - hasBin: true - tsx@4.20.3: resolution: {integrity: sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==} engines: {node: '>=18.0.0'} @@ -3209,150 +3052,78 @@ snapshots: '@chevrotain/utils@11.0.3': {} - '@esbuild/aix-ppc64@0.23.1': - optional: true - '@esbuild/aix-ppc64@0.25.5': optional: true - '@esbuild/android-arm64@0.23.1': - optional: true - '@esbuild/android-arm64@0.25.5': optional: true - '@esbuild/android-arm@0.23.1': - optional: true - '@esbuild/android-arm@0.25.5': optional: true - '@esbuild/android-x64@0.23.1': - optional: true - '@esbuild/android-x64@0.25.5': optional: true - '@esbuild/darwin-arm64@0.23.1': - optional: true - '@esbuild/darwin-arm64@0.25.5': optional: true - '@esbuild/darwin-x64@0.23.1': - optional: true - '@esbuild/darwin-x64@0.25.5': optional: true - '@esbuild/freebsd-arm64@0.23.1': - optional: true - '@esbuild/freebsd-arm64@0.25.5': optional: true - '@esbuild/freebsd-x64@0.23.1': - optional: true - '@esbuild/freebsd-x64@0.25.5': optional: true - '@esbuild/linux-arm64@0.23.1': - optional: true - '@esbuild/linux-arm64@0.25.5': optional: true - '@esbuild/linux-arm@0.23.1': - optional: true - '@esbuild/linux-arm@0.25.5': optional: true - '@esbuild/linux-ia32@0.23.1': - optional: true - '@esbuild/linux-ia32@0.25.5': optional: true - '@esbuild/linux-loong64@0.23.1': - optional: true - '@esbuild/linux-loong64@0.25.5': optional: true - '@esbuild/linux-mips64el@0.23.1': - optional: true - '@esbuild/linux-mips64el@0.25.5': optional: true - '@esbuild/linux-ppc64@0.23.1': - optional: true - '@esbuild/linux-ppc64@0.25.5': optional: true - '@esbuild/linux-riscv64@0.23.1': - optional: true - '@esbuild/linux-riscv64@0.25.5': optional: true - '@esbuild/linux-s390x@0.23.1': - optional: true - '@esbuild/linux-s390x@0.25.5': optional: true - '@esbuild/linux-x64@0.23.1': - optional: true - '@esbuild/linux-x64@0.25.5': optional: true '@esbuild/netbsd-arm64@0.25.5': optional: true - '@esbuild/netbsd-x64@0.23.1': - optional: true - '@esbuild/netbsd-x64@0.25.5': optional: true - '@esbuild/openbsd-arm64@0.23.1': - optional: true - '@esbuild/openbsd-arm64@0.25.5': optional: true - '@esbuild/openbsd-x64@0.23.1': - optional: true - '@esbuild/openbsd-x64@0.25.5': optional: true - '@esbuild/sunos-x64@0.23.1': - optional: true - '@esbuild/sunos-x64@0.25.5': optional: true - '@esbuild/win32-arm64@0.23.1': - optional: true - '@esbuild/win32-arm64@0.25.5': optional: true - '@esbuild/win32-ia32@0.23.1': - optional: true - '@esbuild/win32-ia32@0.25.5': optional: true - '@esbuild/win32-x64@0.23.1': - optional: true - '@esbuild/win32-x64@0.25.5': optional: true @@ -4188,33 +3959,6 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 - esbuild@0.23.1: - optionalDependencies: - '@esbuild/aix-ppc64': 0.23.1 - '@esbuild/android-arm': 0.23.1 - '@esbuild/android-arm64': 0.23.1 - '@esbuild/android-x64': 0.23.1 - '@esbuild/darwin-arm64': 0.23.1 - '@esbuild/darwin-x64': 0.23.1 - '@esbuild/freebsd-arm64': 0.23.1 - '@esbuild/freebsd-x64': 0.23.1 - '@esbuild/linux-arm': 0.23.1 - '@esbuild/linux-arm64': 0.23.1 - '@esbuild/linux-ia32': 0.23.1 - '@esbuild/linux-loong64': 0.23.1 - '@esbuild/linux-mips64el': 0.23.1 - '@esbuild/linux-ppc64': 0.23.1 - '@esbuild/linux-riscv64': 0.23.1 - '@esbuild/linux-s390x': 0.23.1 - '@esbuild/linux-x64': 0.23.1 - '@esbuild/netbsd-x64': 0.23.1 - '@esbuild/openbsd-arm64': 0.23.1 - '@esbuild/openbsd-x64': 0.23.1 - '@esbuild/sunos-x64': 0.23.1 - '@esbuild/win32-arm64': 0.23.1 - '@esbuild/win32-ia32': 0.23.1 - '@esbuild/win32-x64': 0.23.1 - esbuild@0.25.5: optionalDependencies: '@esbuild/aix-ppc64': 0.25.5 @@ -4481,10 +4225,6 @@ snapshots: dunder-proto: 1.0.1 es-object-atoms: 1.1.1 - get-tsconfig@4.10.0: - dependencies: - resolve-pkg-maps: 1.0.0 - get-tsconfig@4.10.1: dependencies: resolve-pkg-maps: 1.0.0 @@ -5422,13 +5162,6 @@ snapshots: - tsx - yaml - tsx@4.19.2: - dependencies: - esbuild: 0.23.1 - get-tsconfig: 4.10.0 - optionalDependencies: - fsevents: 2.3.3 - tsx@4.20.3: dependencies: esbuild: 0.25.5 diff --git a/samples/blog/README.md b/samples/blog/README.md index 9001504d..2f18ebec 100644 --- a/samples/blog/README.md +++ b/samples/blog/README.md @@ -21,7 +21,7 @@ - You can create a database client with the TypeScript schema like: ```ts - import { ZenStackClient } from '@zenstackhq/runtime'; + import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './zenstack/schema'; import SQLite from 'better-sqlite3'; import { SqliteDialect } from 'kysely'; @@ -78,7 +78,7 @@ When calling `createClient`, you need to provide implementation for the computed E.g.: ```ts -import { createClient } from '@zenstackhq/runtime'; +import { createClient } from '@zenstackhq/orm'; const db = createClient({ computedFields: { diff --git a/samples/blog/main.ts b/samples/blog/main.ts index d0c82fc0..c153fabe 100644 --- a/samples/blog/main.ts +++ b/samples/blog/main.ts @@ -1,5 +1,5 @@ import { PolicyPlugin } from '@zenstackhq/plugin-policy'; -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import SQLite from 'better-sqlite3'; import { sql, SqliteDialect } from 'kysely'; import { schema } from './zenstack/schema'; diff --git a/samples/blog/package.json b/samples/blog/package.json index e516c968..2d706ff3 100644 --- a/samples/blog/package.json +++ b/samples/blog/package.json @@ -14,7 +14,7 @@ "author": "", "license": "MIT", "dependencies": { - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "@zenstackhq/plugin-policy": "workspace:*", "better-sqlite3": "^12.2.0", "kysely": "catalog:" diff --git a/samples/blog/zenstack/input.ts b/samples/blog/zenstack/input.ts index c6e7433e..c10942b2 100644 --- a/samples/blog/zenstack/input.ts +++ b/samples/blog/zenstack/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type UserFindManyArgs = $FindManyArgs<$Schema, "User">; export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">; export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">; diff --git a/samples/blog/zenstack/models.ts b/samples/blog/zenstack/models.ts index 608e9397..2eb57fad 100644 --- a/samples/blog/zenstack/models.ts +++ b/samples/blog/zenstack/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { schema as $schema, type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm"; /** * User model */ diff --git a/samples/blog/zenstack/schema.ts b/samples/blog/zenstack/schema.ts index fa51f40f..637ec687 100644 --- a/samples/blog/zenstack/schema.ts +++ b/samples/blog/zenstack/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, type OperandExpression, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, type OperandExpression, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/e2e/orm/client-api/aggregate.test.ts b/tests/e2e/orm/client-api/aggregate.test.ts index 9c1d2a1f..520e1218 100644 --- a/tests/e2e/orm/client-api/aggregate.test.ts +++ b/tests/e2e/orm/client-api/aggregate.test.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/client-api/computed-fields.test.ts b/tests/e2e/orm/client-api/computed-fields.test.ts index 3363414b..2476b67d 100644 --- a/tests/e2e/orm/client-api/computed-fields.test.ts +++ b/tests/e2e/orm/client-api/computed-fields.test.ts @@ -102,7 +102,7 @@ model User { { extraSourceFiles: { main: ` -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; async function main() { @@ -169,7 +169,7 @@ model User { { extraSourceFiles: { main: ` -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; async function main() { diff --git a/tests/e2e/orm/client-api/count.test.ts b/tests/e2e/orm/client-api/count.test.ts index 78050b95..1168f9d6 100644 --- a/tests/e2e/orm/client-api/count.test.ts +++ b/tests/e2e/orm/client-api/count.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/create-many-and-return.test.ts b/tests/e2e/orm/client-api/create-many-and-return.test.ts index c2264444..aa9b0b90 100644 --- a/tests/e2e/orm/client-api/create-many-and-return.test.ts +++ b/tests/e2e/orm/client-api/create-many-and-return.test.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/client-api/create-many.test.ts b/tests/e2e/orm/client-api/create-many.test.ts index 961f3c36..c55f05ac 100644 --- a/tests/e2e/orm/client-api/create-many.test.ts +++ b/tests/e2e/orm/client-api/create-many.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/create.test.ts b/tests/e2e/orm/client-api/create.test.ts index 91536b0c..dcf45eda 100644 --- a/tests/e2e/orm/client-api/create.test.ts +++ b/tests/e2e/orm/client-api/create.test.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/client-api/default-values.test.ts b/tests/e2e/orm/client-api/default-values.test.ts index 73349e59..dea5a3bc 100644 --- a/tests/e2e/orm/client-api/default-values.test.ts +++ b/tests/e2e/orm/client-api/default-values.test.ts @@ -1,6 +1,6 @@ import { isCuid } from '@paralleldrive/cuid2'; -import { ZenStackClient } from '@zenstackhq/runtime'; -import { ExpressionUtils, type SchemaDef } from '@zenstackhq/runtime/schema'; +import { ZenStackClient } from '@zenstackhq/orm'; +import { ExpressionUtils, type SchemaDef } from '@zenstackhq/orm/schema'; import SQLite from 'better-sqlite3'; import { SqliteDialect } from 'kysely'; import { isValid as isValidUlid } from 'ulid'; diff --git a/tests/e2e/orm/client-api/delegate.test.ts b/tests/e2e/orm/client-api/delegate.test.ts index 8d5cfbb9..704f134d 100644 --- a/tests/e2e/orm/client-api/delegate.test.ts +++ b/tests/e2e/orm/client-api/delegate.test.ts @@ -1,6 +1,6 @@ import path from 'node:path'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema, type SchemaType } from '../schemas/delegate/schema'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/delete-many.test.ts b/tests/e2e/orm/client-api/delete-many.test.ts index d80f2f93..c7ea5530 100644 --- a/tests/e2e/orm/client-api/delete-many.test.ts +++ b/tests/e2e/orm/client-api/delete-many.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/delete.test.ts b/tests/e2e/orm/client-api/delete.test.ts index 668f3b9f..e3839532 100644 --- a/tests/e2e/orm/client-api/delete.test.ts +++ b/tests/e2e/orm/client-api/delete.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/filter.test.ts b/tests/e2e/orm/client-api/filter.test.ts index fd1335fe..290977bc 100644 --- a/tests/e2e/orm/client-api/filter.test.ts +++ b/tests/e2e/orm/client-api/filter.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/find.test.ts b/tests/e2e/orm/client-api/find.test.ts index cdf67584..ab896869 100644 --- a/tests/e2e/orm/client-api/find.test.ts +++ b/tests/e2e/orm/client-api/find.test.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; -import { InputValidationError, NotFoundError } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; +import { InputValidationError, NotFoundError } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; import { createPosts, createUser } from './utils'; diff --git a/tests/e2e/orm/client-api/group-by.test.ts b/tests/e2e/orm/client-api/group-by.test.ts index d4eb2beb..fd31131c 100644 --- a/tests/e2e/orm/client-api/group-by.test.ts +++ b/tests/e2e/orm/client-api/group-by.test.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/client-api/name-mapping.test.ts b/tests/e2e/orm/client-api/name-mapping.test.ts index 3fafc038..d95616d5 100644 --- a/tests/e2e/orm/client-api/name-mapping.test.ts +++ b/tests/e2e/orm/client-api/name-mapping.test.ts @@ -1,6 +1,6 @@ import path from 'node:path'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema, type SchemaType } from '../schemas/name-mapping/schema'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/raw-query.test.ts b/tests/e2e/orm/client-api/raw-query.test.ts index 517dfb49..7fe0ecbc 100644 --- a/tests/e2e/orm/client-api/raw-query.test.ts +++ b/tests/e2e/orm/client-api/raw-query.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/transaction.test.ts b/tests/e2e/orm/client-api/transaction.test.ts index 98f7a49c..e4f2192e 100644 --- a/tests/e2e/orm/client-api/transaction.test.ts +++ b/tests/e2e/orm/client-api/transaction.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/client-api/undefined-values.test.ts b/tests/e2e/orm/client-api/undefined-values.test.ts index 240ad1f4..d2ed52f0 100644 --- a/tests/e2e/orm/client-api/undefined-values.test.ts +++ b/tests/e2e/orm/client-api/undefined-values.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; import { createUser } from './utils'; diff --git a/tests/e2e/orm/client-api/update-many.test.ts b/tests/e2e/orm/client-api/update-many.test.ts index 5d3ae08c..61776e3e 100644 --- a/tests/e2e/orm/client-api/update-many.test.ts +++ b/tests/e2e/orm/client-api/update-many.test.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/client-api/update.test.ts b/tests/e2e/orm/client-api/update.test.ts index 6f059c5a..88001f36 100644 --- a/tests/e2e/orm/client-api/update.test.ts +++ b/tests/e2e/orm/client-api/update.test.ts @@ -1,5 +1,5 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema } from '../schemas/basic'; import { createTestClient } from '@zenstackhq/testtools'; import { createUser } from './utils'; diff --git a/tests/e2e/orm/client-api/upsert.test.ts b/tests/e2e/orm/client-api/upsert.test.ts index 49b41343..3b3cb090 100644 --- a/tests/e2e/orm/client-api/upsert.test.ts +++ b/tests/e2e/orm/client-api/upsert.test.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/client-api/utils.ts b/tests/e2e/orm/client-api/utils.ts index 11fd2090..49f189a7 100644 --- a/tests/e2e/orm/client-api/utils.ts +++ b/tests/e2e/orm/client-api/utils.ts @@ -1,4 +1,4 @@ -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import type { schema } from '../schemas/basic'; type ClientType = ClientContract; diff --git a/tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts b/tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts index 63133e65..6a64b3de 100644 --- a/tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts +++ b/tests/e2e/orm/plugin-infra/entity-mutation-hooks.test.ts @@ -1,4 +1,4 @@ -import { type ClientContract } from '@zenstackhq/runtime'; +import { type ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { DeleteQueryNode, InsertQueryNode, UpdateQueryNode } from 'kysely'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; diff --git a/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts b/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts index 8d7d0507..c6216c4a 100644 --- a/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts +++ b/tests/e2e/orm/plugin-infra/on-kysely-query.test.ts @@ -1,4 +1,4 @@ -import { type ClientContract } from '@zenstackhq/runtime'; +import { type ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { InsertQueryNode, Kysely, PrimitiveValueListNode, ValuesNode, type QueryResult } from 'kysely'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; diff --git a/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts b/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts index 90073ab5..0b74e76f 100644 --- a/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts +++ b/tests/e2e/orm/plugin-infra/on-query-hooks.test.ts @@ -1,4 +1,4 @@ -import { definePlugin, type ClientContract } from '@zenstackhq/runtime'; +import { definePlugin, type ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/policy/basic-schema-read.test.ts b/tests/e2e/orm/policy/basic-schema-read.test.ts index 40eb2bef..7464a38c 100644 --- a/tests/e2e/orm/policy/basic-schema-read.test.ts +++ b/tests/e2e/orm/policy/basic-schema-read.test.ts @@ -1,5 +1,5 @@ import { PolicyPlugin } from '@zenstackhq/plugin-policy'; -import { type ClientContract } from '@zenstackhq/runtime'; +import { type ClientContract } from '@zenstackhq/orm'; import { createTestClient } from '@zenstackhq/testtools'; import { afterEach, beforeEach, describe, expect, it } from 'vitest'; import { schema } from '../schemas/basic'; diff --git a/tests/e2e/orm/policy/crud/create.test.ts b/tests/e2e/orm/policy/crud/create.test.ts index 67b01500..6aecba29 100644 --- a/tests/e2e/orm/policy/crud/create.test.ts +++ b/tests/e2e/orm/policy/crud/create.test.ts @@ -1,5 +1,5 @@ -import { describe, expect, it } from 'vitest'; import { createPolicyTestClient } from '@zenstackhq/testtools'; +import { describe, expect, it } from 'vitest'; describe('Policy create tests', () => { it('works with scalar field check', async () => { diff --git a/tests/e2e/orm/policy/migrated/client-extensions.test.ts b/tests/e2e/orm/policy/migrated/client-extensions.test.ts index c62f49f9..980432bc 100644 --- a/tests/e2e/orm/policy/migrated/client-extensions.test.ts +++ b/tests/e2e/orm/policy/migrated/client-extensions.test.ts @@ -1,4 +1,4 @@ -import { definePlugin } from '@zenstackhq/runtime'; +import { definePlugin } from '@zenstackhq/orm'; import { createPolicyTestClient } from '@zenstackhq/testtools'; import { describe, expect, it } from 'vitest'; diff --git a/tests/e2e/orm/policy/migrated/multi-field-unique.test.ts b/tests/e2e/orm/policy/migrated/multi-field-unique.test.ts index bd2d25d0..2cc265bc 100644 --- a/tests/e2e/orm/policy/migrated/multi-field-unique.test.ts +++ b/tests/e2e/orm/policy/migrated/multi-field-unique.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import { QueryError } from '@zenstackhq/runtime'; +import { QueryError } from '@zenstackhq/orm'; import { createPolicyTestClient } from '@zenstackhq/testtools'; describe('Policy tests multi-field unique', () => { diff --git a/tests/e2e/orm/policy/migrated/todo-sample.test.ts b/tests/e2e/orm/policy/migrated/todo-sample.test.ts index a5d766e3..0a19065d 100644 --- a/tests/e2e/orm/policy/migrated/todo-sample.test.ts +++ b/tests/e2e/orm/policy/migrated/todo-sample.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it } from 'vitest'; -import type { ClientContract } from '@zenstackhq/runtime'; +import type { ClientContract } from '@zenstackhq/orm'; import { schema, type SchemaType } from '../../schemas/todo/schema'; import { createPolicyTestClient } from '@zenstackhq/testtools'; diff --git a/tests/e2e/orm/schemas/basic/input.ts b/tests/e2e/orm/schemas/basic/input.ts index e283e0c9..70de8c2e 100644 --- a/tests/e2e/orm/schemas/basic/input.ts +++ b/tests/e2e/orm/schemas/basic/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type UserFindManyArgs = $FindManyArgs<$Schema, "User">; export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">; export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">; diff --git a/tests/e2e/orm/schemas/basic/models.ts b/tests/e2e/orm/schemas/basic/models.ts index 48b8dea5..d532d7d4 100644 --- a/tests/e2e/orm/schemas/basic/models.ts +++ b/tests/e2e/orm/schemas/basic/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { schema as $schema, type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm"; export type User = $ModelResult<$Schema, "User">; export type Post = $ModelResult<$Schema, "Post">; export type Comment = $ModelResult<$Schema, "Comment">; diff --git a/tests/e2e/orm/schemas/basic/schema.ts b/tests/e2e/orm/schemas/basic/schema.ts index 93cfb4df..14e627b9 100644 --- a/tests/e2e/orm/schemas/basic/schema.ts +++ b/tests/e2e/orm/schemas/basic/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/e2e/orm/schemas/delegate/input.ts b/tests/e2e/orm/schemas/delegate/input.ts index b8df49e4..1d43c413 100644 --- a/tests/e2e/orm/schemas/delegate/input.ts +++ b/tests/e2e/orm/schemas/delegate/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type UserFindManyArgs = $FindManyArgs<$Schema, "User">; export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">; export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">; diff --git a/tests/e2e/orm/schemas/delegate/models.ts b/tests/e2e/orm/schemas/delegate/models.ts index 044f5d60..0a4350d2 100644 --- a/tests/e2e/orm/schemas/delegate/models.ts +++ b/tests/e2e/orm/schemas/delegate/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult } from "@zenstackhq/orm"; export type User = $ModelResult<$Schema, "User">; export type Comment = $ModelResult<$Schema, "Comment">; export type Asset = $ModelResult<$Schema, "Asset">; diff --git a/tests/e2e/orm/schemas/delegate/schema.ts b/tests/e2e/orm/schemas/delegate/schema.ts index ca076fa3..8767b8e1 100644 --- a/tests/e2e/orm/schemas/delegate/schema.ts +++ b/tests/e2e/orm/schemas/delegate/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/e2e/orm/schemas/delegate/typecheck.ts b/tests/e2e/orm/schemas/delegate/typecheck.ts index e9c15ed8..c6ed453f 100644 --- a/tests/e2e/orm/schemas/delegate/typecheck.ts +++ b/tests/e2e/orm/schemas/delegate/typecheck.ts @@ -1,4 +1,4 @@ -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import SQLite from 'better-sqlite3'; import { SqliteDialect } from 'kysely'; import { schema } from './schema'; diff --git a/tests/e2e/orm/schemas/name-mapping/input.ts b/tests/e2e/orm/schemas/name-mapping/input.ts index 18b092b9..6c876632 100644 --- a/tests/e2e/orm/schemas/name-mapping/input.ts +++ b/tests/e2e/orm/schemas/name-mapping/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type UserFindManyArgs = $FindManyArgs<$Schema, "User">; export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">; export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">; diff --git a/tests/e2e/orm/schemas/name-mapping/models.ts b/tests/e2e/orm/schemas/name-mapping/models.ts index b1309f7a..72654e58 100644 --- a/tests/e2e/orm/schemas/name-mapping/models.ts +++ b/tests/e2e/orm/schemas/name-mapping/models.ts @@ -6,6 +6,6 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult } from "@zenstackhq/orm"; export type User = $ModelResult<$Schema, "User">; export type Post = $ModelResult<$Schema, "Post">; diff --git a/tests/e2e/orm/schemas/name-mapping/schema.ts b/tests/e2e/orm/schemas/name-mapping/schema.ts index 984f36d1..5c27728b 100644 --- a/tests/e2e/orm/schemas/name-mapping/schema.ts +++ b/tests/e2e/orm/schemas/name-mapping/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/e2e/orm/schemas/petstore/input.ts b/tests/e2e/orm/schemas/petstore/input.ts index 6aece67e..690d1d90 100644 --- a/tests/e2e/orm/schemas/petstore/input.ts +++ b/tests/e2e/orm/schemas/petstore/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type UserFindManyArgs = $FindManyArgs<$Schema, "User">; export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">; export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">; diff --git a/tests/e2e/orm/schemas/petstore/models.ts b/tests/e2e/orm/schemas/petstore/models.ts index 6526b66c..dfa5b23e 100644 --- a/tests/e2e/orm/schemas/petstore/models.ts +++ b/tests/e2e/orm/schemas/petstore/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult } from "@zenstackhq/orm"; export type User = $ModelResult<$Schema, "User">; export type Pet = $ModelResult<$Schema, "Pet">; export type Order = $ModelResult<$Schema, "Order">; diff --git a/tests/e2e/orm/schemas/petstore/schema.ts b/tests/e2e/orm/schemas/petstore/schema.ts index 0d208b8e..747372a7 100644 --- a/tests/e2e/orm/schemas/petstore/schema.ts +++ b/tests/e2e/orm/schemas/petstore/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/e2e/orm/schemas/todo/input.ts b/tests/e2e/orm/schemas/todo/input.ts index 27c268fc..22fd5a19 100644 --- a/tests/e2e/orm/schemas/todo/input.ts +++ b/tests/e2e/orm/schemas/todo/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type SpaceFindManyArgs = $FindManyArgs<$Schema, "Space">; export type SpaceFindUniqueArgs = $FindUniqueArgs<$Schema, "Space">; export type SpaceFindFirstArgs = $FindFirstArgs<$Schema, "Space">; diff --git a/tests/e2e/orm/schemas/todo/models.ts b/tests/e2e/orm/schemas/todo/models.ts index 131c09d2..635b68de 100644 --- a/tests/e2e/orm/schemas/todo/models.ts +++ b/tests/e2e/orm/schemas/todo/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult } from "@zenstackhq/orm"; export type Space = $ModelResult<$Schema, "Space">; export type SpaceUser = $ModelResult<$Schema, "SpaceUser">; export type User = $ModelResult<$Schema, "User">; diff --git a/tests/e2e/orm/schemas/todo/schema.ts b/tests/e2e/orm/schemas/todo/schema.ts index 243e59d6..4a8f811c 100644 --- a/tests/e2e/orm/schemas/todo/schema.ts +++ b/tests/e2e/orm/schemas/todo/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/e2e/orm/schemas/typing/input.ts b/tests/e2e/orm/schemas/typing/input.ts index c7fd0f5f..13d7d458 100644 --- a/tests/e2e/orm/schemas/typing/input.ts +++ b/tests/e2e/orm/schemas/typing/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type UserFindManyArgs = $FindManyArgs<$Schema, "User">; export type UserFindUniqueArgs = $FindUniqueArgs<$Schema, "User">; export type UserFindFirstArgs = $FindFirstArgs<$Schema, "User">; diff --git a/tests/e2e/orm/schemas/typing/models.ts b/tests/e2e/orm/schemas/typing/models.ts index d5cb870c..b2fa673f 100644 --- a/tests/e2e/orm/schemas/typing/models.ts +++ b/tests/e2e/orm/schemas/typing/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { schema as $schema, type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm"; export type User = $ModelResult<$Schema, "User">; export type Post = $ModelResult<$Schema, "Post">; export type Profile = $ModelResult<$Schema, "Profile">; diff --git a/tests/e2e/orm/schemas/typing/schema.ts b/tests/e2e/orm/schemas/typing/schema.ts index d8287c0e..10c4daa7 100644 --- a/tests/e2e/orm/schemas/typing/schema.ts +++ b/tests/e2e/orm/schemas/typing/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef, type OperandExpression, ExpressionUtils } from "@zenstackhq/runtime/schema"; +import { type SchemaDef, type OperandExpression, ExpressionUtils } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "postgresql" diff --git a/tests/e2e/orm/schemas/typing/typecheck.ts b/tests/e2e/orm/schemas/typing/typecheck.ts index f183766f..9c6860e3 100644 --- a/tests/e2e/orm/schemas/typing/typecheck.ts +++ b/tests/e2e/orm/schemas/typing/typecheck.ts @@ -1,4 +1,4 @@ -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import SQLite from 'better-sqlite3'; import { SqliteDialect } from 'kysely'; import { Role, Status, type Identity, type IdentityProvider } from './models'; diff --git a/tests/e2e/package.json b/tests/e2e/package.json index c3ce7f5d..8a0b6137 100644 --- a/tests/e2e/package.json +++ b/tests/e2e/package.json @@ -15,7 +15,7 @@ "@paralleldrive/cuid2": "^2.2.2", "@zenstackhq/cli": "workspace:*", "@zenstackhq/language": "workspace:*", - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "@zenstackhq/plugin-policy": "workspace:*", "@zenstackhq/sdk": "workspace:*", "@zenstackhq/testtools": "workspace:*", diff --git a/tests/regression/package.json b/tests/regression/package.json index b675be91..0d6479a2 100644 --- a/tests/regression/package.json +++ b/tests/regression/package.json @@ -14,7 +14,7 @@ "devDependencies": { "@zenstackhq/cli": "workspace:*", "@zenstackhq/language": "workspace:*", - "@zenstackhq/runtime": "workspace:*", + "@zenstackhq/orm": "workspace:*", "@zenstackhq/sdk": "workspace:*", "@zenstackhq/typescript-config": "workspace:*", "@zenstackhq/vitest-config": "workspace:*" diff --git a/tests/regression/test/issue-204/input.ts b/tests/regression/test/issue-204/input.ts index 3916c070..d39dc0e5 100644 --- a/tests/regression/test/issue-204/input.ts +++ b/tests/regression/test/issue-204/input.ts @@ -6,8 +6,8 @@ /* eslint-disable */ import { type SchemaType as $Schema } from "./schema"; -import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/runtime"; -import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/runtime"; +import type { FindManyArgs as $FindManyArgs, FindUniqueArgs as $FindUniqueArgs, FindFirstArgs as $FindFirstArgs, CreateArgs as $CreateArgs, CreateManyArgs as $CreateManyArgs, CreateManyAndReturnArgs as $CreateManyAndReturnArgs, UpdateArgs as $UpdateArgs, UpdateManyArgs as $UpdateManyArgs, UpdateManyAndReturnArgs as $UpdateManyAndReturnArgs, UpsertArgs as $UpsertArgs, DeleteArgs as $DeleteArgs, DeleteManyArgs as $DeleteManyArgs, CountArgs as $CountArgs, AggregateArgs as $AggregateArgs, GroupByArgs as $GroupByArgs, WhereInput as $WhereInput, SelectInput as $SelectInput, IncludeInput as $IncludeInput, OmitInput as $OmitInput } from "@zenstackhq/orm"; +import type { SimplifiedModelResult as $SimplifiedModelResult, SelectIncludeOmit as $SelectIncludeOmit } from "@zenstackhq/orm"; export type FooFindManyArgs = $FindManyArgs<$Schema, "Foo">; export type FooFindUniqueArgs = $FindUniqueArgs<$Schema, "Foo">; export type FooFindFirstArgs = $FindFirstArgs<$Schema, "Foo">; diff --git a/tests/regression/test/issue-204/models.ts b/tests/regression/test/issue-204/models.ts index c03d254e..f7af584e 100644 --- a/tests/regression/test/issue-204/models.ts +++ b/tests/regression/test/issue-204/models.ts @@ -6,7 +6,7 @@ /* eslint-disable */ import { schema as $schema, type SchemaType as $Schema } from "./schema"; -import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/runtime"; +import { type ModelResult as $ModelResult, type TypeDefResult as $TypeDefResult } from "@zenstackhq/orm"; export type Foo = $ModelResult<$Schema, "Foo">; export type Configuration = $TypeDefResult<$Schema, "Configuration">; export const ShirtColor = $schema.enums.ShirtColor; diff --git a/tests/regression/test/issue-204/schema.ts b/tests/regression/test/issue-204/schema.ts index b214a272..b4ae296d 100644 --- a/tests/regression/test/issue-204/schema.ts +++ b/tests/regression/test/issue-204/schema.ts @@ -5,7 +5,7 @@ /* eslint-disable */ -import { type SchemaDef } from "@zenstackhq/runtime/schema"; +import { type SchemaDef } from "@zenstackhq/orm/schema"; export const schema = { provider: { type: "sqlite" diff --git a/tests/regression/test/v2-migrated/issue-1135.test.ts b/tests/regression/test/v2-migrated/issue-1135.test.ts index 521dd133..8de77a11 100644 --- a/tests/regression/test/v2-migrated/issue-1135.test.ts +++ b/tests/regression/test/v2-migrated/issue-1135.test.ts @@ -31,7 +31,7 @@ model Person extends Entity { { extraSourceFiles: { 'main.ts': ` -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; const db = new ZenStackClient(schema, {} as any); diff --git a/tests/regression/test/v2-migrated/issue-1763.test.ts b/tests/regression/test/v2-migrated/issue-1763.test.ts index ec571787..b7c4eeff 100644 --- a/tests/regression/test/v2-migrated/issue-1763.test.ts +++ b/tests/regression/test/v2-migrated/issue-1763.test.ts @@ -24,7 +24,7 @@ model ConcretePost extends Post { { extraSourceFiles: { main: ` -import { ZenStackClient } from '@zenstackhq/runtime'; +import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; async function test() { diff --git a/tests/regression/test/v2-migrated/issue-1857.test.ts b/tests/regression/test/v2-migrated/issue-1857.test.ts index 99c9a862..fe99eea5 100644 --- a/tests/regression/test/v2-migrated/issue-1857.test.ts +++ b/tests/regression/test/v2-migrated/issue-1857.test.ts @@ -19,7 +19,7 @@ describe('Regression for issue #1857', () => { { extraSourceFiles: { main: ` - import { ZenStackClient } from '@zenstackhq/runtime'; + import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; async function main() { diff --git a/tests/regression/test/v2-migrated/issue-1894.test.ts b/tests/regression/test/v2-migrated/issue-1894.test.ts index 0f3c3fec..8d745851 100644 --- a/tests/regression/test/v2-migrated/issue-1894.test.ts +++ b/tests/regression/test/v2-migrated/issue-1894.test.ts @@ -26,7 +26,7 @@ describe('Regression for issue #1894', () => { { extraSourceFiles: { main: ` - import { ZenStackClient } from '@zenstackhq/runtime'; + import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; async function main() { diff --git a/tests/regression/test/v2-migrated/issue-1991.test.ts b/tests/regression/test/v2-migrated/issue-1991.test.ts index 228765a4..2bc3a534 100644 --- a/tests/regression/test/v2-migrated/issue-1991.test.ts +++ b/tests/regression/test/v2-migrated/issue-1991.test.ts @@ -27,7 +27,7 @@ model FooOption { provider: 'postgresql', extraSourceFiles: { main: ` - import { ZenStackClient } from '@zenstackhq/runtime'; + import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; const db = new ZenStackClient(schema, {} as any); diff --git a/tests/regression/test/v2-migrated/issue-1994.test.ts b/tests/regression/test/v2-migrated/issue-1994.test.ts index ff065378..b778a9c3 100644 --- a/tests/regression/test/v2-migrated/issue-1994.test.ts +++ b/tests/regression/test/v2-migrated/issue-1994.test.ts @@ -53,7 +53,7 @@ describe('Regression for issue #1994', () => { { extraSourceFiles: { main: ` - import { ZenStackClient } from '@zenstackhq/runtime'; + import { ZenStackClient } from '@zenstackhq/orm'; import { schema } from './schema'; const db = new ZenStackClient(schema, {} as any);