refactor: extract a runtime schema package

packages/orm/package.json

@@ -63,6 +63,7 @@
     },
     "dependencies": {
         "@paralleldrive/cuid2": "^2.2.2",
+        "@zenstackhq/schema": "workspace:*",
         "@zenstackhq/common-helpers": "workspace:*",
         "decimal.js": "catalog:",
         "json-stable-stringify": "^1.3.0",
@@ -92,8 +93,6 @@
         "@types/pg": "^8.0.0",
         "@types/toposort": "^2.0.7",
         "@zenstackhq/eslint-config": "workspace:*",
-        "@zenstackhq/language": "workspace:*",
-        "@zenstackhq/sdk": "workspace:*",
         "@zenstackhq/typescript-config": "workspace:*",
         "@zenstackhq/vitest-config": "workspace:*",
         "tsx": "^4.19.2",

packages/orm/src/client/client-impl.ts

@@ -11,9 +11,14 @@ import {
     type KyselyProps,
 } from 'kysely';
 import type { GetModels, ProcedureDef, SchemaDef } from '../schema';
-import type { AuthType } from '../schema/auth';
 import type { UnwrapTuplePromises } from '../utils/type-utils';
-import type { ClientConstructor, ClientContract, ModelOperations, TransactionIsolationLevel } from './contract';
+import type {
+    AuthType,
+    ClientConstructor,
+    ClientContract,
+    ModelOperations,
+    TransactionIsolationLevel,
+} from './contract';
 import { AggregateOperationHandler } from './crud/operations/aggregate';
 import type { AllCrudOperation, CoreCrudOperation } from './crud/operations/base';
 import { BaseOperationHandler } from './crud/operations/base';

packages/orm/src/client/contract.ts

@@ -1,6 +1,5 @@
 import type Decimal from 'decimal.js';
 import { type GetModels, type IsDelegateModel, type ProcedureDef, type SchemaDef } from '../schema';
-import type { AuthType } from '../schema/auth';
 import type { OrUndefinedIf, Simplify, UnwrapTuplePromises } from '../utils/type-utils';
 import type { TRANSACTION_UNSUPPORTED_METHODS } from './constants';
 import type {
@@ -803,3 +802,14 @@ export type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sc
 >;
 
 //#endregion
+
+//#region Supporting types
+
+export type AuthType<Schema extends SchemaDef> =
+    string extends GetModels<Schema>
+        ? Record<string, unknown>
+        : Schema['authType'] extends GetModels<Schema>
+          ? Partial<ModelResult<Schema, Schema['authType']>>
+          : never;
+
+//#endregion

packages/orm/src/client/crud/validator/utils.ts

@@ -7,7 +7,7 @@ import type {
     FieldExpression,
     MemberExpression,
     UnaryExpression,
-} from '@zenstackhq/sdk/schema';
+} from '@zenstackhq/schema';
 import Decimal from 'decimal.js';
 import { match, P } from 'ts-pattern';
 import { z } from 'zod';

packages/orm/src/schema.ts

@@ -0,0 +1,2 @@
+export * from '@zenstackhq/schema';
+export type { OperandExpression } from 'kysely';

packages/orm/tsup.config.ts

@@ -3,7 +3,7 @@ import { defineConfig } from 'tsup';
 export default defineConfig({
     entry: {
         index: 'src/index.ts',
-        schema: 'src/schema/index.ts',
+        schema: 'src/schema.ts',
         helpers: 'src/helpers.ts',
     },
     outDir: 'dist',

packages/schema/eslint.config.js

@@ -0,0 +1,4 @@
+import config from '@zenstackhq/eslint-config/base.js';
+
+/** @type {import("eslint").Linter.Config} */
+export default config;

packages/schema/package.json

@@ -0,0 +1,37 @@
+{
+    "name": "@zenstackhq/schema",
+    "version": "3.0.0-beta.14",
+    "description": "ZenStack Runtime Schema",
+    "type": "module",
+    "scripts": {
+        "build": "tsc --noEmit && tsup-node",
+        "watch": "tsup-node --watch",
+        "lint": "eslint src --ext ts",
+        "pack": "pnpm pack"
+    },
+    "keywords": [],
+    "author": "ZenStack Team",
+    "license": "MIT",
+    "files": [
+        "dist"
+    ],
+    "exports": {
+        ".": {
+            "import": {
+                "types": "./dist/index.d.ts",
+                "default": "./dist/index.js"
+            },
+            "require": {
+                "types": "./dist/index.d.cts",
+                "default": "./dist/index.cjs"
+            }
+        }
+    },
+    "dependencies": {
+        "decimal.js": "catalog:"
+    },
+    "devDependencies": {
+        "@zenstackhq/eslint-config": "workspace:*",
+        "@zenstackhq/typescript-config": "workspace:*"
+    }
+}

packages/orm/src/schema/expression.ts → packages/schema/src/expression-utils.ts

@@ -11,8 +11,11 @@ import type {
     ThisExpression,
     UnaryExpression,
     UnaryOperator,
-} from '.';
+} from './expression';
 
+/**
+ * Utility functions to create and work with Expression objects
+ */
 export const ExpressionUtils = {
     literal: (value: string | number | boolean): LiteralExpression => {
         return {

packages/sdk/src/schema/index.ts → packages/schema/src/index.ts

@@ -1,4 +1,3 @@
 export type * from './expression';
+export * from './expression-utils';
 export type * from './schema';
-
-export type { OperandExpression } from 'kysely';

packages/schema/tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "extends": "@zenstackhq/typescript-config/base.json",
+    "compilerOptions": {
+        "noUnusedLocals": false
+    },
+    "include": ["src/**/*.ts"]
+}

packages/schema/tsup.config.ts

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

packages/sdk/package.json

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

packages/sdk/tsup.config.ts

@@ -3,7 +3,6 @@ import { defineConfig } from 'tsup';
 export default defineConfig({
     entry: {
         index: 'src/index.ts',
-        schema: 'src/schema/index.ts',
     },
     outDir: 'dist',
     splitting: false,

packages/testtools/package.json

@@ -33,6 +33,7 @@
     "dependencies": {
         "@zenstackhq/common-helpers": "workspace:*",
         "@zenstackhq/language": "workspace:*",
+        "@zenstackhq/schema": "workspace:*",
         "@zenstackhq/orm": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",
         "@zenstackhq/plugin-policy": "workspace:*",

packages/testtools/src/schema.ts

@@ -1,6 +1,6 @@
 import { invariant } from '@zenstackhq/common-helpers';
 import { TsSchemaGenerator } from '@zenstackhq/sdk';
-import type { SchemaDef } from '@zenstackhq/sdk/schema';
+import type { SchemaDef } from '@zenstackhq/schema';
 import { execSync } from 'node:child_process';
 import crypto from 'node:crypto';
 import fs from 'node:fs';

tests/e2e/orm/schemas/basic/helper.ts

@@ -1,4 +1,4 @@
-import type { DataSourceProviderType } from '@zenstackhq/sdk/schema';
+import type { DataSourceProviderType } from '@zenstackhq/schema';
 import { schema } from './schema';
 
 export function getSchema<ProviderType extends DataSourceProviderType>(type: ProviderType) {

tests/e2e/package.json

@@ -15,6 +15,7 @@
         "@paralleldrive/cuid2": "^2.2.2",
         "@zenstackhq/cli": "workspace:*",
         "@zenstackhq/language": "workspace:*",
+        "@zenstackhq/schema": "workspace:*",
         "@zenstackhq/orm": "workspace:*",
         "@zenstackhq/plugin-policy": "workspace:*",
         "@zenstackhq/sdk": "workspace:*",