Refactor imports to use QueryAST and SortNode from @objectql/types for consistency across drivers

hotlong · hotlong · commit 002e817407b8 · 2026-02-05T21:02:05.000+08:00
diff --git a/packages/drivers/fs/src/index.ts b/packages/drivers/fs/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/localstorage/src/index.ts b/packages/drivers/localstorage/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/memory/src/index.ts b/packages/drivers/memory/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/mongo/src/index.ts b/packages/drivers/mongo/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/redis/src/index.ts b/packages/drivers/redis/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/sdk/src/index.ts b/packages/drivers/sdk/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/sql/src/index.ts b/packages/drivers/sql/src/index.ts
@@ -1,7 +1,6 @@
 import { Data, System as SystemSpec } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+import { QueryAST, SortNode } from '@objectql/types';
 type DriverInterface = z.infer<typeof Data.DriverInterface>;
 /**
  * ObjectQL
diff --git a/packages/drivers/utils/src/query-ast.ts b/packages/drivers/utils/src/query-ast.ts
@@ -8,8 +8,7 @@
  */
 
 import { Data } from '@objectstack/spec';
-import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
+import { QueryAST } from '@objectql/types';
 type SortNode = typeof Data.SortNode;
 
 /**
diff --git a/packages/foundation/core/src/index.ts b/packages/foundation/core/src/index.ts
@@ -16,9 +16,9 @@ export type { ObjectStackProtocolImplementation } from '@objectstack/objectql';
 // Export ObjectStack spec types for driver development
 import { Data, System } from '@objectstack/spec';
 import { z } from 'zod';
-export type QueryAST = z.infer<typeof Data.QueryAST>;
-export type DriverInterface = z.infer<typeof Data.DriverInterface>;
-export type DriverOptions = z.infer<typeof Data.DriverOptions>;
+export { QueryAST } from '@objectql/types';
+export type DriverInterface = z.infer<typeof Data.DriverInterfaceSchema>;
+export type DriverOptions = z.infer<typeof Data.DriverOptionsSchema>;
 
 export * from './gateway';
 
diff --git a/packages/foundation/core/src/query/filter-translator.ts b/packages/foundation/core/src/query/filter-translator.ts
@@ -9,7 +9,7 @@
 import type { Filter } from '@objectql/types';
 import { Data } from '@objectstack/spec';
 import { z } from 'zod';
-type FilterCondition = z.infer<typeof Data.FilterCondition>;
+type FilterCondition = z.infer<typeof Data.FilterConditionSchema>;
 import { ObjectQLError } from '@objectql/types';
 
 /**
diff --git a/packages/foundation/core/src/query/query-analyzer.ts b/packages/foundation/core/src/query/query-analyzer.ts
@@ -7,9 +7,7 @@
  */
 
 import type { UnifiedQuery, ObjectConfig, MetadataRegistry } from '@objectql/types';
-import { Data } from '@objectstack/spec';
-import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
+import { QueryAST } from '@objectql/types';
 import { QueryService, QueryOptions } from './query-service';
 
 /**
diff --git a/packages/foundation/core/src/query/query-builder.ts b/packages/foundation/core/src/query/query-builder.ts
@@ -6,18 +6,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type { UnifiedQuery } from '@objectql/types';
-import { Data } from '@objectstack/spec';
-import { z } from 'zod';
+import type { UnifiedQuery, QueryAST } from '@objectql/types';
+// import { QueryAST } from './types'; (Removed)
 
 // Local QueryAST type extension to include all properties we need
-type QueryASTBase = z.infer<typeof Data.QueryAST>;
-interface QueryAST extends QueryASTBase {
-    top?: number;
-    expand?: Record<string, any>;
-    aggregations?: any[];
-    having?: any;
-}
+// interface QueryAST extends Data.QueryAST {
+//    top?: number;
+//    expand?: Record<string, any>;
+//    aggregations?: any[];
+//    having?: any;
+// }
 
 import { FilterTranslator } from './filter-translator';
 
diff --git a/packages/foundation/core/src/query/query-service.ts b/packages/foundation/core/src/query/query-service.ts
@@ -13,9 +13,7 @@ import type {
     Filter,
     MetadataRegistry
 } from '@objectql/types';
-import { Data } from '@objectstack/spec';
-import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
+import { QueryAST } from '@objectql/types';
 import { QueryBuilder } from './query-builder';
 import { QueryCompiler } from '../optimizations/QueryCompiler';
 
diff --git a/packages/foundation/core/src/repository.ts b/packages/foundation/core/src/repository.ts
@@ -6,12 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { ObjectQLContext, IObjectQL, ObjectConfig, Driver, UnifiedQuery, ActionContext, HookAPI, RetrievalHookContext, MutationHookContext, UpdateHookContext, ValidationContext, ValidationError, ValidationRuleResult, FormulaContext, Filter } from '@objectql/types';
+import { ObjectQLContext, IObjectQL, ObjectConfig, Driver, UnifiedQuery, ActionContext, HookAPI, RetrievalHookContext, MutationHookContext, UpdateHookContext, ValidationContext, ValidationError, ValidationRuleResult, FormulaContext, Filter, QueryAST } from '@objectql/types';
 import type { ObjectKernel } from '@objectstack/runtime';
 import { Data } from '@objectstack/spec';
 import { z } from 'zod';
-type QueryAST = z.infer<typeof Data.QueryAST>;
-type SortNode = z.infer<typeof Data.SortNode>;
+type SortNode = z.infer<typeof Data.SortNodeSchema>;
 
 export class ObjectRepository {
 
diff --git a/packages/foundation/types/src/query.ts b/packages/foundation/types/src/query.ts
@@ -107,3 +107,12 @@ export interface UnifiedQuery {
     /** Enable distinct results */
     distinct?: boolean;
 }
+
+/**
+ * Standard QueryAST definition to resolve type inference issues from spec.
+ */
+export interface QueryAST extends UnifiedQuery {
+    object?: string;
+    joins?: any[];
+    [key: string]: any;
+}
