@wishknish/knishio-client-ts 0.7.2 → 0.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wishknish/knishio-client-ts",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "productName": "Knish.IO TypeScript SDK Client",
   "description": "TypeScript implementation of the Knish.IO SDK to consume Knish.IO GraphQL APIs with enhanced type safety.",
   "license": "GPL-3.0-or-later",
@@ -20,11 +20,11 @@
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "browser": "./dist/index.iife.js",
+  "browser": "./dist/index.js",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "browser": "./dist/index.iife.js",
+      "browser": "./dist/index.js",
       "import": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"

package/src/KnishIOClient.ts

@@ -121,7 +121,8 @@ import type {
   CellSlug,
   MetaType,
   MetaId,
-  BatchId
+  BatchId,
+  MetaFilter
 } from '@/types'
 
 /**
@@ -849,7 +850,7 @@ export default class KnishIOClient {
     queryArgs = null,
     count = null,
     countBy = null,
-    throughAtom = null,
+    throughAtom = true,
     values = null,
     keys = null,
     atomValues = null
@@ -860,7 +861,7 @@ export default class KnishIOClient {
     value?: string | null
     latest?: boolean | null
     fields?: string[] | null
-    filter?: string | null
+    filter?: MetaFilter[] | null
     queryArgs?: Record<string, any> | null
     count?: number | null
     countBy?: string | null
@@ -872,47 +873,38 @@ export default class KnishIOClient {
     this.log('info', `KnishIOClient::queryMeta() - Querying metaType: ${metaType}, metaId: ${metaId}...`)
 
     let query: Query
+    let variables: Record<string, any>
 
-    if (throughAtom === true) {
+    if (throughAtom) {
       query = this.createQuery(QueryMetaTypeViaAtom)
+      variables = QueryMetaTypeViaAtom.createVariables({
+        metaType,
+        metaId,
+        key,
+        value,
+        latest,
+        filter,
+        queryArgs,
+        countBy,
+        values,
+        keys,
+        atomValues,
+        cellSlug: this.getCellSlug()
+      })
     } else {
       query = this.createQuery(QueryMetaType)
-    }
-
-    const variables: Record<string, any> = {
-      metaType: metaType.toUpperCase(),
-      metaId
-    }
-
-    if (filter !== null) {
-      variables.filter = filter
-    }
-    if (latest !== null) {
-      variables.latest = latest
-    }
-    if (key !== null) {
-      variables.key = key
-    }
-    if (value !== null) {
-      variables.value = value
-    }
-    if (queryArgs !== null) {
-      variables.queryArgs = queryArgs
-    }
-    if (count !== null) {
-      variables.count = count
-    }
-    if (countBy !== null) {
-      variables.countBy = countBy
-    }
-    if (values !== null) {
-      variables.values = values
-    }
-    if (keys !== null) {
-      variables.keys = keys
-    }
-    if (atomValues !== null) {
-      variables.atomValues = atomValues
+      variables = QueryMetaType.createVariables({
+        metaType,
+        metaId,
+        key,
+        value,
+        latest,
+        filter,
+        queryArgs,
+        count,
+        countBy,
+        cellSlug: this.getCellSlug()
+      })
     }
 
     return this.executeQuery(query, variables) as Promise<Response>
@@ -1008,42 +1000,43 @@ export default class KnishIOClient {
     metaId?: string | null
     indexes?: number[] | null
     index?: number | null
-    filter?: string | null
+    filter?: MetaFilter[] | null
     latest?: boolean | null
     queryArgs?: Record<string, any> | null
   } = {}): Promise<Response> {
+    this.log('info', 'KnishIOClient::queryAtom() - Querying atom instances')
+
     const query = this.createQuery(QueryAtom)
 
-    const variables: Record<string, any> = {}
-
-    // Add all non-null parameters to variables
-    if (molecularHashes !== null) variables.molecularHashes = molecularHashes
-    if (molecularHash !== null) variables.molecularHash = molecularHash
-    if (bundleHashes !== null) variables.bundleHashes = bundleHashes
-    if (bundleHash !== null) variables.bundleHash = bundleHash
-    if (positions !== null) variables.positions = positions
-    if (position !== null) variables.position = position
-    if (walletAddresses !== null) variables.walletAddresses = walletAddresses
-    if (walletAddress !== null) variables.walletAddress = walletAddress
-    if (isotopes !== null) variables.isotopes = isotopes
-    if (isotope !== null) variables.isotope = isotope
-    if (tokenSlugs !== null) variables.tokenSlugs = tokenSlugs
-    if (tokenSlug !== null) variables.tokenSlug = tokenSlug
-    if (cellSlugs !== null) variables.cellSlugs = cellSlugs
-    if (cellSlug !== null) variables.cellSlug = cellSlug
-    if (batchIds !== null) variables.batchIds = batchIds
-    if (batchId !== null) variables.batchId = batchId
-    if (values !== null) variables.values = values
-    if (value !== null) variables.value = value
-    if (metaTypes !== null) variables.metaTypes = metaTypes
-    if (metaType !== null) variables.metaType = metaType
-    if (metaIds !== null) variables.metaIds = metaIds
-    if (metaId !== null) variables.metaId = metaId
-    if (indexes !== null) variables.indexes = indexes
-    if (index !== null) variables.index = index
-    if (filter !== null) variables.filter = filter
-    if (latest !== null) variables.latest = latest
-    if (queryArgs !== null) variables.queryArgs = queryArgs
+    const variables = QueryAtom.createVariables({
+      molecularHashes,
+      molecularHash,
+      bundleHashes,
+      bundleHash,
+      positions,
+      position,
+      walletAddresses,
+      walletAddress,
+      isotopes,
+      isotope,
+      tokenSlugs,
+      tokenSlug,
+      cellSlugs,
+      cellSlug,
+      batchIds,
+      batchId,
+      values,
+      value,
+      metaTypes,
+      metaType,
+      metaIds,
+      metaId,
+      indexes,
+      index,
+      filter,
+      latest,
+      queryArgs
+    })
 
     return this.executeQuery(query, variables) as Promise<Response>
   }

package/src/index.ts

@@ -479,16 +479,7 @@ export const DevUtils = process.env.NODE_ENV === 'development' ? {
 // COMPATIBILITY WITH JAVASCRIPT SDK
 // =============================================================================
 
-/**
- * Legacy export names for compatibility with JavaScript SDK
- * These maintain the exact same naming convention
- */
-export {
-  // Core exports (matching JS SDK exactly)
-  shake256 as default, // The JS SDK doesn't export a default, but this maintains compatibility
-}
-
-// Maintain exact export structure as JS SDK index.js
+// Maintain exact export structure as JS SDK index.js (named exports only)
 export const KnishIO = {
   shake256,
   generateSecret,

package/src/libraries/GraphQLClient.ts

@@ -58,8 +58,7 @@ import { pipe, subscribe } from 'wonka'
 import type {
   GraphQLClient as IGraphQLClient,
   GraphQLRequest,
-  GraphQLResponse,
-  GraphQLVariables
+  GraphQLResponse
 } from '@/types'
 import type Wallet from '@/core/Wallet'
 
@@ -157,42 +156,38 @@ export default class GraphQLClient implements IGraphQLClient {
     })
   }
 
-  async query<TResult = unknown, TVariables = GraphQLVariables>(
-    request: GraphQLRequest,
-    variables?: TVariables
+  async query<TResult = unknown>(
+    request: GraphQLRequest
   ): Promise<GraphQLResponse<TResult>> {
-    const finalVariables = (variables || request.variables || {}) as Record<string, any>
-    const result = await this.$__client.query(request.query, finalVariables).toPromise()
+    const { query, variables } = request
+    const result = await this.$__client.query(query, variables || {}).toPromise()
     return this.formatResponse<TResult>(result)
   }
 
-  async mutation<TResult = unknown, TVariables = GraphQLVariables>(
-    request: GraphQLRequest,
-    variables?: TVariables
+  async mutation<TResult = unknown>(
+    request: GraphQLRequest
   ): Promise<GraphQLResponse<TResult>> {
-    const finalVariables = (variables || request.variables || {}) as Record<string, any>
+    const { query, variables } = request
     // Support both query and mutation properties for backward compatibility
-    const mutationString = (request as any).mutation || request.query
-    const result = await this.$__client.mutation(mutationString, finalVariables).toPromise()
+    const mutationString = (request as any).mutation || query
+    const result = await this.$__client.mutation(mutationString, variables || {}).toPromise()
     return this.formatResponse<TResult>(result)
   }
 
   // Alias for mutation() to match JS SDK interface
-  async mutate<TResult = unknown, TVariables = GraphQLVariables>(
-    request: GraphQLRequest,
-    variables?: TVariables
+  async mutate<TResult = unknown>(
+    request: GraphQLRequest
   ): Promise<GraphQLResponse<TResult>> {
-    return this.mutation<TResult, TVariables>(request, variables)
+    return this.mutation<TResult>(request)
   }
 
-  async *subscription<TResult = unknown, TVariables = GraphQLVariables>(
-    request: GraphQLRequest,
-    variables?: TVariables
+  async *subscription<TResult = unknown>(
+    request: GraphQLRequest
   ): AsyncIterableIterator<GraphQLResponse<TResult>> {
-    const finalVariables = (variables || request.variables || {}) as Record<string, any>
+    const { query, variables } = request
 
     // Create subscription stream
-    const subscription = this.$__client.subscription(request.query, finalVariables)
+    const subscription = this.$__client.subscription(query, variables || {})
 
     // Convert wonka stream to async iterator
     const results: GraphQLResponse<TResult>[] = []

package/src/query/Query.ts

@@ -151,12 +151,12 @@ export default class Query {
   /**
    * Executes the Query and returns a Response
    */
-  async execute({ 
-    variables = {}, 
-    context = {} 
-  }: { 
-    variables?: Record<string, any>
-    context?: Record<string, any> 
+  async execute({
+    variables = null,
+    context = {}
+  }: {
+    variables?: Record<string, any> | null
+    context?: Record<string, any>
   } = {}): Promise<Response | null> {
     this.$__request = this.createQuery({ variables })
 

package/src/query/QueryAtom.ts

@@ -156,33 +156,33 @@ export default class QueryAtom extends Query {
     latest,
     queryArgs
   }: {
-    molecularHashes?: string[]
-    molecularHash?: string
-    bundleHashes?: string[]
-    bundleHash?: string
-    positions?: string[]
-    position?: string
-    walletAddresses?: string[]
-    walletAddress?: string
-    isotopes?: string[]
-    isotope?: string
-    tokenSlugs?: string[]
-    tokenSlug?: string
-    cellSlugs?: string[]
-    cellSlug?: string
-    batchIds?: string[]
-    batchId?: string
-    values?: string[]
-    value?: string | number
-    metaTypes?: string[]
-    metaType?: string
-    metaIds?: string[]
-    metaId?: string
-    indexes?: number[]
-    index?: number
-    filter?: object[]
-    latest?: boolean
-    queryArgs?: object
+    molecularHashes?: string[] | null
+    molecularHash?: string | null
+    bundleHashes?: string[] | null
+    bundleHash?: string | null
+    positions?: string[] | null
+    position?: string | null
+    walletAddresses?: string[] | null
+    walletAddress?: string | null
+    isotopes?: string[] | null
+    isotope?: string | null
+    tokenSlugs?: string[] | null
+    tokenSlug?: string | null
+    cellSlugs?: string[] | null
+    cellSlug?: string | null
+    batchIds?: string[] | null
+    batchId?: string | null
+    values?: string[] | null
+    value?: string | number | null
+    metaTypes?: string[] | null
+    metaType?: string | null
+    metaIds?: string[] | null
+    metaId?: string | null
+    indexes?: number[] | null
+    index?: number | null
+    filter?: object[] | null
+    latest?: boolean | null
+    queryArgs?: object | null
   }): Record<string, any> {
     if (molecularHash) {
       molecularHashes = molecularHashes || []

package/src/query/QueryMetaType.ts

@@ -114,7 +114,7 @@ export default class QueryMetaType extends Query {
     latest?: boolean | null
     filter?: any | null
     queryArgs?: any | null
-    count?: string | null
+    count?: string | number | null
     countBy?: string | null
     cellSlug?: string | null
   } = {}): Record<string, any> {

package/src/response/Response.ts

@@ -95,6 +95,17 @@ export default class Response implements UniversalResponse<any> {
       throw new InvalidResponseException()
     }
 
+    // Check for GraphQL errors array
+    if (this.$__response.errors && Array.isArray(this.$__response.errors) && this.$__response.errors.length > 0) {
+      const errorMessage = this.$__response.errors[0].message || 'Unknown GraphQL error'
+
+      if (errorMessage.includes('Unauthenticated')) {
+        throw new UnauthenticatedException('Unauthenticated request')
+      }
+
+      throw new InvalidResponseException(`GraphQL Error: ${errorMessage}`)
+    }
+
     this.init()
   }
 
@@ -113,9 +124,14 @@ export default class Response implements UniversalResponse<any> {
       return this.response()
     }
 
+    // Check if response has data field
+    if (!this.response().data) {
+      throw new InvalidResponseException('Response has no data field')
+    }
+
     // Check key & return custom data from the response
     if (!Dot.has(this.response(), this.dataKey)) {
-      throw new InvalidResponseException()
+      throw new InvalidResponseException(`Missing expected field: ${this.dataKey}`)
     }
 
     return Dot.get(this.response(), this.dataKey)

package/src/schemas/index.ts

@@ -248,6 +248,17 @@ export const RequestTokensParamsSchema = z.object({
   meta: z.union([MetaDataSchema, z.null()]).optional()
 }).strict()
 
+// =============================================================================
+// FILTER SCHEMAS
+// =============================================================================
+
+export const MetaFilterSchema = z.object({
+  key: z.string(),
+  value: z.string(),
+  comparison: z.string().optional(),
+  criterion: z.string().optional()
+}).strict()
+
 // =============================================================================
 // QUERY PARAMETER SCHEMAS
 // =============================================================================
@@ -265,7 +276,7 @@ export const MetaQueryParamsSchema = z.object({
   key: z.union([z.string(), z.null()]).optional(),
   value: z.union([z.string(), z.null()]).optional(),
   latest: z.union([z.boolean(), z.null()]).optional(),
-  filter: z.union([z.string(), z.null()]).optional(),
+  filter: z.union([z.array(MetaFilterSchema), z.null()]).optional(),
   queryArgs: z.union([z.record(z.unknown()), z.null()]).optional(),
   count: z.union([z.number().int().min(1), z.null()]).optional(),
   countBy: z.union([z.string(), z.null()]).optional(),

package/src/types/client.ts

@@ -58,7 +58,8 @@ import type {
   MetaId,
   CellSlug,
   MetaData,
-  BaseResponse
+  BaseResponse,
+  MetaFilter
 } from './index'
 
 // =============================================================================
@@ -237,7 +238,7 @@ export interface MetaQueryOptions {
   key?: string | null
   value?: string | null
   latest?: boolean | null
-  filter?: string | null
+  filter?: MetaFilter[] | null
   queryArgs?: Record<string, unknown> | null
   count?: number | null
   countBy?: string | null

package/src/types/graphql.ts

@@ -59,7 +59,8 @@ import type {
   MetaId,
   CellSlug,
   AtomIsotope,
-  MetaData
+  MetaData,
+  MetaFilter
 } from './index'
 
 // =============================================================================
@@ -173,7 +174,7 @@ export interface QueryMetaTypeVariables {
   key?: string | null
   value?: string | null
   latest?: boolean | null
-  filter?: string | null
+  filter?: MetaFilter[] | null
   queryArgs?: Record<string, unknown> | null
   count?: number | null
   countBy?: string | null

package/src/types/index.ts

@@ -284,6 +284,21 @@ export interface RequestTokensParams {
   meta?: MetaData | null
 }
 
+// =============================================================================
+// FILTER TYPES
+// =============================================================================
+
+/**
+ * MetaFilter interface for filtering meta queries
+ * Matches the GraphQL MetaFilter input type from the server
+ */
+export interface MetaFilter {
+  key: string
+  value: string
+  comparison?: string  // '=', '<', '>', '<=', '>=', '!='
+  criterion?: string
+}
+
 // =============================================================================
 // QUERY PARAMETER TYPES
 // =============================================================================
@@ -301,7 +316,7 @@ export interface MetaQueryParams {
   key?: string | null
   value?: string | null
   latest?: boolean | null
-  filter?: string | null
+  filter?: MetaFilter[] | null
   queryArgs?: Record<string, unknown> | null
   count?: number | null
   countBy?: string | null