fix(zod): cyclic dependency

Author: Azzerty23

packages/orm/package.json

@@ -18,7 +18,8 @@
         "build": "tsc --noEmit && tsdown",
         "watch": "tsdown --watch",
         "lint": "eslint src --ext ts",
-        "pack": "pnpm pack"
+        "pack": "pnpm pack",
+        "test:generate": "tsx ../../scripts/test-generate.ts . --generate-models=true"
     },
     "keywords": [],
     "files": [

packages/orm/src/client/crud-types.ts

@@ -18,7 +18,6 @@ import type {
     GetModelFieldType,
     GetModels,
     GetSubModels,
-    GetTypeDefField,
     GetTypeDefFields,
     GetTypeDefFieldType,
     GetTypeDefs,
@@ -33,6 +32,7 @@ import type {
     SchemaDef,
     TypeDefFieldIsArray,
     TypeDefFieldIsOptional,
+    TypeDefResult,
     UpdatedAtInfo,
 } from '@zenstackhq/schema';
 import type {
@@ -44,7 +44,6 @@ import type {
     Optional,
     OrArray,
     OrUndefinedIf,
-    PartialIf,
     Simplify,
     TypeMap,
     ValueOfPotentialTuple,
@@ -291,31 +290,7 @@ export type SimplifiedPlainResult<
     ExtResult extends ExtResultBase<Schema> = {},
 > = Simplify<ModelResult<Schema, Model, Args, Options, false, false, ExtResult>>;
 
-export type TypeDefResult<
-    Schema extends SchemaDef,
-    TypeDef extends GetTypeDefs<Schema>,
-    Partial extends boolean = false,
-> = PartialIf<
-    Optional<
-        {
-            [Key in GetTypeDefFields<Schema, TypeDef>]: MapFieldDefType<
-                Schema,
-                GetTypeDefField<Schema, TypeDef, Key>,
-                Partial
-            >;
-        },
-        // optionality
-        Partial extends true
-            ? never
-            : keyof {
-                  [Key in GetTypeDefFields<Schema, TypeDef> as TypeDefFieldIsOptional<Schema, TypeDef, Key> extends true
-                      ? Key
-                      : never]: true;
-              }
-    >,
-    Partial
-> &
-    Record<string, unknown>;
+export type { TypeDefResult } from '@zenstackhq/schema';
 
 export type BatchResult = { count: number };
 

packages/orm/src/common-types.ts

@@ -1,6 +1,4 @@
-export type JsonValue = string | number | boolean | JsonObject | JsonArray;
-export type JsonObject = { [key: string]: JsonValue | null };
-export type JsonArray = Array<JsonValue | null>;
+export type { JsonArray, JsonObject, JsonValue } from '@zenstackhq/schema';
 export type JsonNullValues = DbNull | JsonNull | AnyNull;
 
 export class DbNullClass {

packages/orm/src/utils/type-utils.ts

@@ -1,5 +1,5 @@
 import type Decimal from 'decimal.js';
-import type { JsonObject, JsonValue } from '../common-types';
+import type { JsonObject, JsonValue } from '@zenstackhq/schema';
 
 export type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;