@arkiv-network/sdk 0.8.1-dev.1 → 0.9.0-next.2

package/src/query/index.ts

@@ -1,22 +1,32 @@
-export type { StrValue } from "../attr"
+export type { StrValue } from "../schema"
 export type { Entity, RpcSelect } from "../types"
+export type { QueryBuilderBase } from "./builderBase"
+export { CountQueryBuilder } from "./countBuilder"
 export type { QueryRequest, QueryResponse } from "./engine"
 export { MAX_LIMIT, runQuery } from "./engine"
 export type { QueryErrorKind } from "./errors"
 export { InvalidPredicateError, QueryError, UnsupportedOperatorError } from "./errors"
 export type {
   AndNode,
+  AttributeRef,
+  BetweenNode,
   ComparisonNode,
   ComparisonOperator,
   ExistsNode,
   Expression,
   NotNode,
   OrNode,
+  PredicateValue,
+  RefsOf,
+  SchemaRef,
   StartsWithNode,
+  SystemAttributeRef,
   TypeOfNode,
 } from "./expression"
 export {
   and,
+  between,
+  checkAgainstSchema,
   eq,
   exists,
   gt,
@@ -30,13 +40,25 @@ export {
   render,
   startsWith,
 } from "./expression"
+export type { FromOptions } from "./queryBuilder"
 export { SelectQueryBuilder } from "./queryBuilder"
 export { QueryResult } from "./queryResult"
 export type {
-  EntitySelection,
+  ColumnValue,
+  DynamicSelection,
   FullEntity,
-  ProjectedEntity,
+  FullRow,
+  KnownSystemFields,
+  NonEmptySelection,
+  PartialRow,
+  Projection,
+  ResultOf,
+  Row,
   SelectArg,
+  Selected,
+  Selection,
   SelectionFields,
+  SelectionOf,
+  SystemField,
 } from "./selection"
-export { toRpcSelect } from "./selection"
+export { projectSelection, SYSTEM_FIELDS, toRow, toRpcSelect } from "./selection"

package/src/query/injection.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "bun:test"
-import { addr, bytes32, dec, i32, key, str, u256 } from "../attr"
-import { InvalidAttributeNameError, InvalidValueError } from "../attr/errors"
+import { addr, bytes32, dec, i32, key, str, u256 } from "../schema"
+import { InvalidAttributeNameError, InvalidValueError } from "../schema/errors"
 import { and, eq, exists, gt, startsWith } from "./expression"
 import { toRpcSelect } from "./selection"
 
@@ -138,14 +138,8 @@ describe("the assembled query", () => {
 
 describe("the selection", () => {
   it("checks named attributes rather than forwarding them", () => {
-    expect(() => toRpcSelect({ key: true, attributes: { "a' OR '1": true } })).toThrow(
-      InvalidAttributeNameError,
-    )
-    expect(() => toRpcSelect({ key: true, attributes: { "a--b": true } })).toThrow(
-      InvalidAttributeNameError,
-    )
-    expect(toRpcSelect({ key: true, attributes: { ok: true } })).toMatchObject({
-      attributes: { ok: true },
-    })
+    expect(() => toRpcSelect({ $key: true, "a' OR '1": true })).toThrow(InvalidAttributeNameError)
+    expect(() => toRpcSelect({ $key: true, "a--b": true })).toThrow(InvalidAttributeNameError)
+    expect(toRpcSelect({ $key: true, ok: true })).toMatchObject({ attributes: { ok: true } })
   })
 })