Fix schema naming to prevent duplicate documentation

- Renamed QueryFilterSchema to DataEngineFilterSchema
- Renamed QueryOptionsSchema to DataEngineQueryOptionsSchema
- Updated all imports in objectql and runtime packages
- This prevents the doc generator from creating duplicate files in data/
- Confirmed data-engine.zod.ts should remain in spec/system (infrastructure layer)
- All tests passing

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

content/docs/references/data/data-engine.mdx

@@ -12,8 +12,8 @@ description: Filter protocol schemas
 ## TypeScript Usage
 
 ```typescript
-import { ComparisonOperatorSchema, EqualityOperatorSchema, FieldOperatorsSchema, FieldReferenceSchema, FilterConditionSchema, NormalizedFilterSchema, RangeOperatorSchema, SetOperatorSchema, SpecialOperatorSchema, StringOperatorSchema } from '@objectstack/spec/data';
-import type { ComparisonOperator, EqualityOperator, FieldOperators, FieldReference, FilterCondition, NormalizedFilter, RangeOperator, SetOperator, SpecialOperator, StringOperator } from '@objectstack/spec/data';
+import { ComparisonOperatorSchema, EqualityOperatorSchema, FieldOperatorsSchema, FieldReferenceSchema, FilterConditionSchema, NormalizedFilterSchema, QueryFilterSchema, RangeOperatorSchema, SetOperatorSchema, SpecialOperatorSchema, StringOperatorSchema } from '@objectstack/spec/data';
+import type { ComparisonOperator, EqualityOperator, FieldOperators, FieldReference, FilterCondition, NormalizedFilter, QueryFilter, RangeOperator, SetOperator, SpecialOperator, StringOperator } from '@objectstack/spec/data';
 
 // Validate data
 const result = ComparisonOperatorSchema.parse(data);
@@ -94,6 +94,16 @@ const result = ComparisonOperatorSchema.parse(data);
 
 ---
 
+## QueryFilter
+
+### Properties
+
+| Property | Type | Required | Description |
+| :--- | :--- | :--- | :--- |
+| **where** | `any` | optional |  |
+
+---
+
 ## RangeOperator
 
 ### Properties

content/docs/references/data/filter.mdx

@@ -12,8 +12,8 @@ description: Data Engine protocol schemas
 ## TypeScript Usage
 
 ```typescript
-import { DataEngineSchema, QueryFilterSchema, QueryOptionsSchema } from '@objectstack/spec/system';
-import type { DataEngine, QueryFilter, QueryOptions } from '@objectstack/spec/system';
+import { DataEngineSchema, DataEngineFilterSchema, DataEngineQueryOptionsSchema } from '@objectstack/spec/system';
+import type { DataEngine, DataEngineFilter, DataEngineQueryOptions } from '@objectstack/spec/system';
 
 // Validate data
 const result = DataEngineSchema.parse(data);
@@ -32,21 +32,21 @@ Data Engine Interface
 
 ---
 
-## QueryFilter
+## DataEngineFilter
 
-Query filter conditions
+Data Engine query filter conditions
 
 ---
 
-## QueryOptions
+## DataEngineQueryOptions
 
-Query options for find operations
+Query options for IDataEngine.find() operations
 
 ### Properties
 
 | Property | Type | Required | Description |
 | :--- | :--- | :--- | :--- |
-| **filter** | `Record<string, any>` | optional | Query filter conditions |
+| **filter** | `Record<string, any>` | optional | Data Engine query filter conditions |
 | **select** | `string[]` | optional |  |
 | **sort** | `Record<string, Enum<'1' \| '-1' \| 'asc' \| 'desc'>>` | optional |  |
 | **limit** | `number` | optional |  |

content/docs/references/system/data-engine.mdx

@@ -1,7 +1,7 @@
 import { QueryAST, HookContext } from '@objectstack/spec/data';
 import { ObjectStackManifest } from '@objectstack/spec/system';
 import { DriverInterface, DriverOptions } from '@objectstack/spec/system';
-import { IDataEngine, QueryOptions } from '@objectstack/spec/system';
+import { IDataEngine, DataEngineQueryOptions } from '@objectstack/spec/system';
 import { SchemaRegistry } from './registry';
 
 // Export Registry for consumers
@@ -224,14 +224,14 @@ export class ObjectQL implements IDataEngine {
    * @param query - Query options (IDataEngine format)
    * @returns Promise resolving to array of records
    */
-  async find(object: string, query?: QueryOptions): Promise<any[]> {
+  async find(object: string, query?: DataEngineQueryOptions): Promise<any[]> {
     const driver = this.getDriver(object);
 
-    // Convert QueryOptions to QueryAST
+    // Convert DataEngineQueryOptions to QueryAST
     let ast: QueryAST = { object };
 
     if (query) {
-      // Map QueryOptions to QueryAST
+      // Map DataEngineQueryOptions to QueryAST
       if (query.filter) {
         ast.where = query.filter;
       }

packages/objectql/src/index.ts

@@ -5,4 +5,4 @@
  * This provides backward compatibility for imports from @objectstack/runtime.
  */
 
-export type { IDataEngine, QueryOptions, QueryFilter } from '@objectstack/spec/system';
+export type { IDataEngine, DataEngineQueryOptions, DataEngineFilter } from '@objectstack/spec/system';

packages/runtime/src/interfaces/data-engine.ts

@@ -5,7 +5,7 @@
  * and IDataEngine interfaces without depending on concrete implementations.
  */
 
-import { IHttpServer, IDataEngine, RouteHandler, IHttpRequest, IHttpResponse, Middleware, QueryOptions } from './index.js';
+import { IHttpServer, IDataEngine, RouteHandler, IHttpRequest, IHttpResponse, Middleware, DataEngineQueryOptions } from './index.js';
 
 /**
  * Example: Mock HTTP Server Plugin
@@ -77,7 +77,7 @@ class MockDataEngine implements IDataEngine {
         return record;
     }
 
-    async find(objectName: string, query?: QueryOptions): Promise<any[]> {
+    async find(objectName: string, query?: DataEngineQueryOptions): Promise<any[]> {
         const objectStore = this.store.get(objectName);
         if (!objectStore) {
             return [];

packages/runtime/src/test-interfaces.ts

@@ -1,10 +1,10 @@
 {
-  "$ref": "#/definitions/QueryFilter",
+  "$ref": "#/definitions/DataEngineFilter",
   "definitions": {
-    "QueryFilter": {
+    "DataEngineFilter": {
       "type": "object",
       "additionalProperties": {},
-      "description": "Query filter conditions"
+      "description": "Data Engine query filter conditions"
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"

…spec/json-schema/system/QueryFilter.json …json-schema/system/DataEngineFilter.jsonpackages/spec/json-schema/system/QueryFilter.json renamed to packages/spec/json-schema/system/DataEngineFilter.json packages/spec/json-schema/system/QueryFilter.json renamed to packages/spec/json-schema/system/DataEngineFilter.json

@@ -1,13 +1,13 @@
 {
-  "$ref": "#/definitions/QueryOptions",
+  "$ref": "#/definitions/DataEngineQueryOptions",
   "definitions": {
-    "QueryOptions": {
+    "DataEngineQueryOptions": {
       "type": "object",
       "properties": {
         "filter": {
           "type": "object",
           "additionalProperties": {},
-          "description": "Query filter conditions"
+          "description": "Data Engine query filter conditions"
         },
         "select": {
           "type": "array",
@@ -41,7 +41,7 @@
         }
       },
       "additionalProperties": false,
-      "description": "Query options for find operations"
+      "description": "Query options for IDataEngine.find() operations"
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"

…pec/json-schema/system/QueryOptions.json …chema/system/DataEngineQueryOptions.jsonpackages/spec/json-schema/system/QueryOptions.json renamed to packages/spec/json-schema/system/DataEngineQueryOptions.json packages/spec/json-schema/system/QueryOptions.json renamed to packages/spec/json-schema/system/DataEngineQueryOptions.json

@@ -12,16 +12,17 @@ import { z } from 'zod';
  */
 
 /**
- * Query filter conditions
+ * Data Engine Query filter conditions
+ * Simple key-value filter structure for IDataEngine.find() operations
  */
-export const QueryFilterSchema = z.record(z.any()).describe('Query filter conditions');
+export const DataEngineFilterSchema = z.record(z.any()).describe('Data Engine query filter conditions');
 
 /**
- * Query options for find operations
+ * Query options for IDataEngine.find() operations
  */
-export const QueryOptionsSchema = z.object({
+export const DataEngineQueryOptionsSchema = z.object({
   /** Filter conditions */
-  filter: QueryFilterSchema.optional(),
+  filter: DataEngineFilterSchema.optional(),
   /** Fields to select */
   select: z.array(z.string()).optional(),
   /** Sort order */
@@ -32,7 +33,7 @@ export const QueryOptionsSchema = z.object({
   skip: z.number().optional(),
   /** Maximum number of results (OData-style, takes precedence over limit if both specified) */
   top: z.number().optional(),
-}).describe('Query options for find operations');
+}).describe('Query options for IDataEngine.find() operations');
 
 /**
  * Data Engine Interface Schema
@@ -93,14 +94,14 @@ export const DataEngineSchema = z.object({
 /**
  * TypeScript types derived from schemas
  */
-export type QueryFilter = z.infer<typeof QueryFilterSchema>;
-export type QueryOptions = z.infer<typeof QueryOptionsSchema>;
+export type DataEngineFilter = z.infer<typeof DataEngineFilterSchema>;
+export type DataEngineQueryOptions = z.infer<typeof DataEngineQueryOptionsSchema>;
 
 // Define the TypeScript interface manually for better type safety
 // Zod function schema doesn't handle optional parameters well
 export interface IDataEngine {
   insert(objectName: string, data: any): Promise<any>;
-  find(objectName: string, query?: QueryOptions): Promise<any[]>;
+  find(objectName: string, query?: DataEngineQueryOptions): Promise<any[]>;
   update(objectName: string, id: any, data: any): Promise<any>;
   delete(objectName: string, id: any): Promise<boolean>;
 }