chore: update @objectstack dependencies to version 1.0.6 across protocols and lockfile

hotlong · hotlong · commit 2fa8537f7d19 · 2026-02-05T21:44:00.000+08:00
diff --git a/package.json b/package.json
@@ -32,9 +32,9 @@
     "@objectql/protocol-graphql": "workspace:*",
     "@objectql/protocol-json-rpc": "workspace:*",
     "@objectql/protocol-odata-v4": "workspace:*",
-    "@objectstack/cli": "1.0.5",
-    "@objectstack/core": "1.0.5",
-    "@objectstack/plugin-hono-server": "^1.0.5",
+    "@objectstack/cli": "1.0.6",
+    "@objectstack/core": "1.0.6",
+    "@objectstack/plugin-hono-server": "^1.0.6",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.10.0",
     "@types/supertest": "^6.0.3",
diff --git a/packages/drivers/excel/package.json b/packages/drivers/excel/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@objectql/driver-memory": "workspace:*",
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "exceljs": "^4.4.0",
     "zod": "^4.3.6"
   },
diff --git a/packages/drivers/fs/package.json b/packages/drivers/fs/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "@objectql/driver-memory": "workspace:*",
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^4.3.6"
   },
   "devDependencies": {
diff --git a/packages/drivers/localstorage/package.json b/packages/drivers/localstorage/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@objectql/driver-memory": "workspace:*",
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^4.3.6"
   },
   "devDependencies": {
diff --git a/packages/drivers/memory/package.json b/packages/drivers/memory/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "mingo": "^7.1.1",
     "zod": "^4.3.6"
   },
diff --git a/packages/drivers/mongo/package.json b/packages/drivers/mongo/package.json
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "mongodb": "^5.9.2"
   },
   "devDependencies": {
diff --git a/packages/drivers/redis/package.json b/packages/drivers/redis/package.json
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "redis": "^4.6.0",
     "zod": "^4.3.6"
   },
diff --git a/packages/drivers/sdk/package.json b/packages/drivers/sdk/package.json
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^4.3.6"
   },
   "devDependencies": {
diff --git a/packages/drivers/sql/package.json b/packages/drivers/sql/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "knex": "^3.1.0",
     "nanoid": "^3.3.11",
     "zod": "^4.3.6"
diff --git a/packages/drivers/utils/package.json b/packages/drivers/utils/package.json
@@ -18,7 +18,7 @@
   "license": "MIT",
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^4.3.6"
   },
   "devDependencies": {
diff --git a/packages/foundation/core/package.json b/packages/foundation/core/package.json
@@ -25,10 +25,10 @@
     "@objectql/plugin-formula": "workspace:*",
     "@objectql/plugin-validator": "workspace:*",
     "@objectql/types": "workspace:*",
-    "@objectstack/core": "^1.0.5",
-    "@objectstack/objectql": "^1.0.5",
-    "@objectstack/runtime": "^1.0.5",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
+    "@objectstack/objectql": "^1.0.6",
+    "@objectstack/runtime": "^1.0.6",
+    "@objectstack/spec": "^1.0.6",
     "js-yaml": "^4.1.0",
     "zod": "^4.3.6"
   },
diff --git a/packages/foundation/core/src/query/filter-translator.ts b/packages/foundation/core/src/query/filter-translator.ts
@@ -9,7 +9,6 @@
 import type { Filter } from '@objectql/types';
 import { Data } from '@objectstack/spec';
 import { z } from 'zod';
-type FilterCondition = z.infer<typeof Data.FilterConditionSchema>;
 import { ObjectQLError } from '@objectql/types';
 
 /**
@@ -26,7 +25,7 @@ export class FilterTranslator {
     /**
      * Translate filters from ObjectQL format to ObjectStack FilterCondition format
      */
-    translate(filters?: Filter): FilterCondition | undefined {
+    translate(filters?: Filter): Filter | undefined {
         if (!filters) {
             return undefined;
         }
@@ -37,6 +36,6 @@ export class FilterTranslator {
         }
 
         // Both ObjectQL Filter and ObjectStack FilterCondition use the same format now
-        return filters as unknown as FilterCondition;
+        return filters;
     }
 }
diff --git a/packages/foundation/platform-node/package.json b/packages/foundation/platform-node/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@objectql/core": "workspace:*",
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "fast-glob": "^3.3.2",
     "js-yaml": "^4.1.1"
   },
diff --git a/packages/foundation/plugin-formula/package.json b/packages/foundation/plugin-formula/package.json
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/core": "^1.0.5",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/packages/foundation/plugin-security/package.json b/packages/foundation/plugin-security/package.json
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/core": "^1.0.5",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/packages/foundation/plugin-validator/package.json b/packages/foundation/plugin-validator/package.json
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/core": "^1.0.5",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/packages/foundation/types/package.json b/packages/foundation/types/package.json
@@ -27,7 +27,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@objectstack/spec": "^1.0.5"
+    "@objectstack/spec": "^1.0.6"
   },
   "devDependencies": {
     "ts-json-schema-generator": "^2.4.0",
diff --git a/packages/foundation/types/src/query.ts b/packages/foundation/types/src/query.ts
@@ -8,23 +8,35 @@
 
 import { Data } from '@objectstack/spec';
 import { z } from 'zod';
-type FilterCondition = z.infer<typeof Data.FilterCondition>;
+
+// Re-export Filter definitions from Spec
+export type Filter = z.infer<typeof Data.FilterCondition>;
+
+// Re-export Sort definitions from Spec
+export type SortNode = z.infer<typeof Data.SortNodeSchema>;
+
+// Re-export Aggregation definitions from Spec
+export type AggregationFunctionType = z.infer<typeof Data.AggregationFunction>;
+export type AggregationNode = z.infer<typeof Data.AggregationNodeSchema>;
 
 /**
- * Modern Query Filter using @objectstack/spec FilterCondition
- * 
- * Supports MongoDB/Prisma-style object-based syntax:
- * - Implicit equality: { field: value }
- * - Explicit operators: { field: { $eq: value, $gt: 10 } }
- * - Logical operators: { $and: [...], $or: [...] }
- * - String operators: { name: { $contains: "text" } }
- * - Range operators: { age: { $gte: 18, $lte: 65 } }
- * - Set operators: { status: { $in: ["active", "pending"] } }
- * - Null checks: { field: { $null: true } }
+ * Unified Query Interface - Standard Protocol Format
  * 
- * Note: $not operator is not supported. Use $ne for field-level negation.
+ * Uses @objectstack/spec QuerySchema inference directly.
+ * We make 'object' optional because in many contexts (like Repository.find), 
+ * the object is implicit.
  */
-export type Filter = FilterCondition;
+type SpecQuery = z.infer<typeof Data.QuerySchema>;
+
+export interface UnifiedQuery extends Omit<SpecQuery, 'object'> {
+    object?: string;
+}
+
+/**
+ * Standard QueryAST definition.
+ * Aliased to UnifiedQuery for backward compatibility and consistency.
+ */
+export type QueryAST = UnifiedQuery;
 
 // Legacy types - Deprecated, kept for temporary compatibility during migration
 /** @deprecated Use AggregationFunctionType instead */
@@ -36,83 +48,3 @@ export interface AggregateOption {
     field: string;
     alias?: string;
 }
-
-/**
- * Sort Node - Standard Protocol Format
- * Represents an "Order By" clause.
- */
-export interface SortNode {
-    /** Field name to sort by */
-    field: string;
-    /** Sort direction - defaults to 'asc' */
-    order: 'asc' | 'desc';
-}
-
-/**
- * Aggregation Function - Standard Protocol Format
- */
-export type AggregationFunctionType = 'count' | 'sum' | 'avg' | 'min' | 'max' | 'count_distinct' | 'array_agg' | 'string_agg';
-
-/**
- * Aggregation Node - Standard Protocol Format
- * Represents an aggregated field with function.
- */
-export interface AggregationNode {
-    /** Aggregation function to apply */
-    function: AggregationFunctionType;
-    /** Field to aggregate (optional for count) */
-    field?: string;
-    /** Alias for the result field */
-    alias: string;
-    /** Apply DISTINCT to the field before aggregation */
-    distinct?: boolean;
-    /** Optional filter condition for this aggregation */
-    filter?: Filter;
-}
-
-/**
- * Unified Query Interface - Standard Protocol Format
- * 
- * Uses @objectstack/spec QueryAST format directly.
- * This is the single source of truth for query structure.
- */
-export interface UnifiedQuery {
-    /** Field selection - specify which fields to return */
-    fields?: string[];
-    
-    /** Filter conditions using standard FilterCondition syntax (was: filters) */
-    where?: Filter;
-    
-    /** Sort order - array of SortNode objects (was: sort as tuples) */
-    orderBy?: SortNode[];
-    
-    /** Pagination - number of records to skip (was: skip) */
-    offset?: number;
-    
-    /** Pagination - maximum number of records to return */
-    limit?: number;
-    
-    /** Relation expansion - load related records */
-    expand?: Record<string, UnifiedQuery>;
-    
-    /** Aggregation - group by fields */
-    groupBy?: string[];
-    
-    /** Aggregation - aggregate functions to apply (was: aggregate with func) */
-    aggregations?: AggregationNode[];
-    
-    /** Filter for aggregated results (HAVING clause) */
-    having?: Filter;
-    
-    /** 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;
-}
diff --git a/packages/protocols/graphql/package.json b/packages/protocols/graphql/package.json
@@ -22,7 +22,7 @@
     "@as-integrations/express4": "^1.1.2",
     "@graphql-tools/schema": "^10.0.2",
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "cors": "^2.8.5",
     "dataloader": "^2.2.2",
     "express": "^4.18.2",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@objectql/driver-memory": "workspace:*",
     "@objectql/protocol-tck": "workspace:*",
-    "@objectstack/core": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/ws": "^8.5.10",
diff --git a/packages/protocols/json-rpc/package.json b/packages/protocols/json-rpc/package.json
@@ -18,13 +18,13 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@objectql/driver-memory": "workspace:*",
     "@objectql/protocol-tck": "workspace:*",
-    "@objectstack/core": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
     "typescript": "^5.3.3",
     "vitest": "^1.0.4"
   },
diff --git a/packages/protocols/odata-v4/package.json b/packages/protocols/odata-v4/package.json
@@ -18,13 +18,13 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@objectql/driver-memory": "workspace:*",
     "@objectql/protocol-tck": "workspace:*",
-    "@objectstack/core": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
     "typescript": "^5.3.3",
     "vitest": "^1.0.4"
   },
diff --git a/packages/protocols/rest/package.json b/packages/protocols/rest/package.json
@@ -17,15 +17,15 @@
   },
   "dependencies": {
     "@objectql/types": "workspace:*",
-    "@objectstack/spec": "^1.0.5",
+    "@objectstack/spec": "^1.0.6",
     "js-yaml": "^4.1.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@objectql/driver-memory": "workspace:^",
     "@objectql/protocol-tck": "workspace:*",
-    "@objectstack/core": "^1.0.5",
-    "@objectstack/runtime": "^1.0.5",
+    "@objectstack/core": "^1.0.6",
+    "@objectstack/runtime": "^1.0.6",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.10.0",
     "typescript": "^5.3.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
