@xyo-network/api 2.38.9 → 2.38.11

package/dist/esm/User/Api.d.ts

@@ -19,14 +19,14 @@ export declare class XyoUserApi extends XyoApiBase {
     }, import("@xyo-network/payload").XyoPayloadFindFilter, {
         root: string;
         apiDomain: string; /** @field Password of the user [in] */
-        userid?: string | undefined;
-        jwtToken?: string | undefined;
         apiKey?: string | undefined;
-        query?: string | undefined;
         compressionThreshold?: number | undefined;
-        throwFailure?: boolean | undefined;
-        throwError?: boolean | undefined;
+        jwtToken?: string | undefined;
+        query?: string | undefined;
         reportableParent?: import("..").XyoApiReportable | undefined;
+        throwError?: boolean | undefined;
+        throwFailure?: boolean | undefined;
+        userid?: string | undefined;
         onError?: ((error: import("..").XyoApiError<any, any>, depth: number) => void) | undefined;
         /** @field Password of the user [in] */
         onFailure?: ((response: import("..").XyoApiResponse<unknown, unknown>, depth: number) => void) | undefined; /** @field Token to access the API as that user [out] */

package/dist/esm/models/Api/Config.d.ts

@@ -2,24 +2,24 @@ import { XyoApiReportable } from './Reportable';
 interface XyoApiConfig extends XyoApiReportable {
     /** @description The domain where the api is located */
     apiDomain: string;
-    /** @deprecated use the jwtToken instead*/
-    userid?: string;
-    /** @description The jwtToken of the currently logged in user */
-    jwtToken?: string;
     /** @description The apiKey used for authentication */
     apiKey?: string;
-    /** @description The location in the API tree where this API object is mounted */
-    root?: string;
-    /** @description The query string, if any, that is added to the end of every request */
-    query?: string;
     /** @description Threshold for Content-Size to cause automatic gzip of request body [default = 1024] */
     compressionThreshold?: number;
-    /** @description Throw on failures */
-    throwFailure?: boolean;
-    /** @description Throw on error */
-    throwError?: boolean;
+    /** @description The jwtToken of the currently logged in user */
+    jwtToken?: string;
+    /** @description The query string, if any, that is added to the end of every request */
+    query?: string;
     /** @description Parent that should also report events from this api */
     reportableParent?: XyoApiReportable;
+    /** @description The location in the API tree where this API object is mounted */
+    root?: string;
+    /** @description Throw on error */
+    throwError?: boolean;
+    /** @description Throw on failures */
+    throwFailure?: boolean;
+    /** @deprecated use the jwtToken instead*/
+    userid?: string;
 }
 export type { XyoApiConfig };
 //# sourceMappingURL=Config.d.ts.map

package/dist/esm/models/Api/Config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/models/Api/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,UAAU,YAAa,SAAQ,gBAAgB;IAC7C,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAA;IAEjB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,gEAAgE;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,uFAAuF;IACvF,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,uGAAuG;IACvG,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAE7B,qCAAqC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAA;IAEtB,kCAAkC;IAClC,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;CACpC;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../../../src/models/Api/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,UAAU,YAAa,SAAQ,gBAAgB;IAC7C,uDAAuD;IACvD,SAAS,EAAE,MAAM,CAAA;IAEjB,sDAAsD;IACtD,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,uGAAuG;IACvG,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAE7B,gEAAgE;IAChE,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB,uFAAuF;IACvF,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IAEnC,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,kCAAkC;IAClC,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB,qCAAqC;IACrC,YAAY,CAAC,EAAE,OAAO,CAAA;IAEtB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,YAAY,EAAE,YAAY,EAAE,CAAA"}

package/dist/esm/models/Archive.d.ts

@@ -5,8 +5,8 @@ export declare type ExpirationWindow = 'create' | 'read';
 export interface XyoAccessControl {
     access?: Record<AccessType, AccessLevel>;
     expiration?: {
-        window?: ExpirationWindow;
         delay?: number;
+        window?: ExpirationWindow;
     };
 }
 export interface XyoAccessControls {
@@ -19,7 +19,7 @@ export interface XyoAccessControls {
     schema?: Record<string, XyoAccessControl>;
 }
 export interface XyoArchive extends XyoArchivePath {
-    user?: string;
     accessControl?: XyoAccessControl | boolean;
+    user?: string;
 }
 //# sourceMappingURL=Archive.d.ts.map

package/dist/esm/models/Archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Archive.d.ts","sourceRoot":"","sources":["../../../src/models/Archive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,oBAAY,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAA;AACvD,oBAAY,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAA;AAC9D,oBAAY,gBAAgB,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;IACxC,UAAU,CAAC,EAAE;QACX,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACF;AAED,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;CAC1C;AAED,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAA;CAC3C"}
+{"version":3,"file":"Archive.d.ts","sourceRoot":"","sources":["../../../src/models/Archive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,oBAAY,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAA;AACvD,oBAAY,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAA;AAC9D,oBAAY,gBAAgB,GAAG,QAAQ,GAAG,MAAM,CAAA;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;IACxC,UAAU,CAAC,EAAE;QACX,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,gBAAgB,CAAA;KAC1B,CAAA;CACF;AAED,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;CAC1C;AAED,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,aAAa,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAA;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAA;CACd"}

package/package.json

@@ -11,14 +11,14 @@
   "dependencies": {
     "@xylabs/assert": "^2.6.9",
     "@xylabs/delay": "^2.6.9",
-    "@xyo-network/account": "^2.38.9",
-    "@xyo-network/archivist": "^2.38.9",
-    "@xyo-network/boundwitness": "^2.38.9",
-    "@xyo-network/core": "^2.38.9",
-    "@xyo-network/diviner": "^2.38.9",
-    "@xyo-network/module": "^2.38.9",
-    "@xyo-network/payload": "^2.38.9",
-    "@xyo-network/schema-payload-plugin": "^2.38.9",
+    "@xyo-network/account": "^2.38.11",
+    "@xyo-network/archivist": "^2.38.11",
+    "@xyo-network/boundwitness": "^2.38.11",
+    "@xyo-network/core": "^2.38.11",
+    "@xyo-network/diviner": "^2.38.11",
+    "@xyo-network/module": "^2.38.11",
+    "@xyo-network/payload": "^2.38.11",
+    "@xyo-network/schema-payload-plugin": "^2.38.11",
     "tslib": "^2.4.0"
   },
   "peerDependencies": {
@@ -65,5 +65,5 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.38.9"
+  "version": "2.38.11"
 }

package/src/Archivist/XyoRemoteArchivist.spec.ts

@@ -1,3 +1,4 @@
+import { XyoArchivistWrapper } from '@xyo-network/archivist'
 import { PayloadWrapper } from '@xyo-network/payload'
 
 import { XyoApiConfig } from '../models'
@@ -25,4 +26,8 @@ test('XyoRemoteArchivist', async () => {
   console.log(`getResult: ${JSON.stringify(getResult)}`)
   expect(getResult.length).toBe(1)
   expect(getResult[0]?.schema).toBe(payload.schema)
+
+  const wrapper = new XyoArchivistWrapper(archivist)
+  const findResult = await wrapper.find()
+  expect(findResult.length).toBe(20)
 })

package/src/Archivist/XyoRemoteArchivist.ts

@@ -83,16 +83,19 @@ export class XyoRemoteArchivist extends XyoArchivist<XyoRemoteArchivistConfig> {
 
   public override async find<R extends XyoPayload = XyoPayload>(filter: XyoPayloadFindFilter): Promise<R[]> {
     try {
-      const [payloads = [], { error: payloadError }] = await this.api.archive(this.archive).payload.find(filter, 'tuple')
-      if (payloadError?.length) {
-        throw new RemoteArchivistError('find', payloadError, 'payloads')
+      const [payloads = [], payloadEnvelope, payloadResponse] = await this.api.archive(this.archive).payload.find(filter, 'tuple')
+      if (payloadEnvelope?.error?.length) {
+        throw new RemoteArchivistError('find', payloadEnvelope.error.shift(), 'payloads')
       }
-      const [blocks = [], response, error] = await this.api.archive(this.archive).block.find(filter, 'tuple')
-      if (error?.status >= 400) {
-        throw new RemoteArchivistError('find', `${error.statusText} [${error.status}]`)
+      if (payloadResponse?.status >= 300) {
+        throw new RemoteArchivistError('find', `Invalid payload status [${payloadResponse.status}]`, 'payloads')
       }
-      if (response?.error?.length) {
-        throw new RemoteArchivistError('find', response?.error)
+      const [blocks = [], blockEnvelope, blockResponse] = await this.api.archive(this.archive).block.find(filter, 'tuple')
+      if (blockEnvelope?.error?.length) {
+        throw new RemoteArchivistError('find', blockEnvelope.error.shift(), 'payloads')
+      }
+      if (blockResponse?.status >= 300) {
+        throw new RemoteArchivistError('find', `Invalid block status [${blockResponse.status}]`, 'payloads')
       }
       return payloads.concat(blocks) as R[]
     } catch (ex) {

package/src/Base.ts

@@ -22,34 +22,36 @@ export class XyoApiBase<C extends XyoApiConfig = XyoApiConfig> implements XyoApi
     this.axios = new Axios(this.axiosConfig())
   }
 
-  private axiosHeaders(): RawAxiosRequestHeaders {
-    const axiosHeaders: RawAxiosRequestHeaders = { ...this.headers }
-    axiosHeaders['Accept'] = 'application/json, text/plain, *.*'
-    axiosHeaders['Content-Type'] = 'application/json'
-    return axiosHeaders
+  public get authenticated() {
+    return !!this.config.apiKey || !!this.config.jwtToken
   }
 
-  private axiosConfig(): AxiosRequestConfig {
-    return {
-      headers: this.axiosHeaders(),
-      transformRequest: (data, headers) => {
-        const json = JSON.stringify(data)
-        if (headers && data) {
-          if (json.length > (this.config.compressionThreshold ?? 1024)) {
-            headers['Content-Encoding'] = 'gzip'
-            return gzip(JSON.stringify(data)).buffer
-          }
-        }
-        return JSON.stringify(data)
-      },
-      transformResponse: (data) => {
-        try {
-          return JSON.parse(data)
-        } catch (ex) {
-          return null
-        }
-      },
+  protected get headers(): Record<string, string> {
+    const headers: Record<string, string> = {}
+    if (this.config.jwtToken) {
+      headers.Authorization = `Bearer ${this.config.jwtToken}`
     }
+    if (this.config.apiKey) {
+      headers['x-api-key'] = this.config.apiKey
+    }
+    return headers
+  }
+
+  protected get query() {
+    return this.config.query ?? ''
+  }
+
+  protected get root() {
+    return this.config.root ?? '/'
+  }
+
+  private static resolveResponse<T>(result?: XyoApiResponse<XyoApiEnvelope<T>>) {
+    return [result?.data?.data, result?.data, result] as XyoApiResponseTuple<T>
+  }
+
+  private static shapeResponse<T = unknown>(response: XyoApiResponse<XyoApiEnvelope<T>> | undefined, responseType?: XyoApiResponseType) {
+    const resolvedResponse = XyoApiBase.resolveResponse(response)
+    return responseType === 'tuple' ? resolvedResponse : resolvedResponse[0]
   }
 
   onError(error: XyoApiError, depth = 0) {
@@ -67,20 +69,24 @@ export class XyoApiBase<C extends XyoApiConfig = XyoApiConfig> implements XyoApi
     this.config.onSuccess?.(response, depth)
   }
 
-  protected get root() {
-    return this.config.root ?? '/'
-  }
-
-  protected get query() {
-    return this.config.query ?? ''
-  }
-
-  private resolveRoot() {
-    return `${this.config.apiDomain}${this.root}`
+  protected async deleteEndpoint<T = unknown>(endPoint?: string): Promise<XyoApiResponseBody<T>>
+  protected async deleteEndpoint<T = unknown>(endPoint?: string, responseType?: 'body'): Promise<XyoApiResponseBody<T>>
+  protected async deleteEndpoint<T = unknown>(endPoint?: string, responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
+  protected async deleteEndpoint<T = unknown>(endPoint = '', responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
+    const response = await this.monitorResponse<T>(async () => {
+      return await this.axios.delete<XyoApiEnvelope<T>, XyoApiResponse<XyoApiEnvelope<T>>>(`${this.resolveRoot()}${endPoint}${this.query}`)
+    })
+    return XyoApiBase.shapeResponse<T>(response, responseType)
   }
 
-  private static resolveResponse<T>(result?: XyoApiResponse<XyoApiEnvelope<T>>) {
-    return [result?.data?.data, result?.data, result] as XyoApiResponseTuple<T>
+  protected async getEndpoint<T = unknown>(endPoint?: string): Promise<XyoApiResponseBody<T>>
+  protected async getEndpoint<T = unknown>(endPoint?: string, responseType?: 'body'): Promise<XyoApiResponseBody<T>>
+  protected async getEndpoint<T = unknown>(endPoint?: string, responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
+  protected async getEndpoint<T = unknown>(endPoint = '', responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
+    const response = await this.monitorResponse<T>(async () => {
+      return await this.axios.get<XyoApiEnvelope<T>, XyoApiResponse<XyoApiEnvelope<T>>>(`${this.resolveRoot()}${endPoint}${this.query}`)
+    })
+    return XyoApiBase.shapeResponse<T>(response, responseType)
   }
 
   protected handleMonitorResponseError<T>(error: XyoApiError, trapAxiosException: boolean) {
@@ -112,16 +118,6 @@ export class XyoApiBase<C extends XyoApiConfig = XyoApiConfig> implements XyoApi
     }
   }
 
-  protected async getEndpoint<T = unknown>(endPoint?: string): Promise<XyoApiResponseBody<T>>
-  protected async getEndpoint<T = unknown>(endPoint?: string, responseType?: 'body'): Promise<XyoApiResponseBody<T>>
-  protected async getEndpoint<T = unknown>(endPoint?: string, responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
-  protected async getEndpoint<T = unknown>(endPoint = '', responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
-    const response = await this.monitorResponse<T>(async () => {
-      return await this.axios.get<XyoApiEnvelope<T>, XyoApiResponse<XyoApiEnvelope<T>>>(`${this.resolveRoot()}${endPoint}${this.query}`)
-    })
-    return XyoApiBase.shapeResponse<T>(response, responseType)
-  }
-
   protected async postEndpoint<T = unknown, D = unknown>(endPoint?: string, data?: D): Promise<XyoApiResponseBody<T>>
   protected async postEndpoint<T = unknown, D = unknown>(endPoint?: string, data?: D, responseType?: 'body'): Promise<XyoApiResponseBody<T>>
   protected async postEndpoint<T = unknown, D = unknown>(endPoint?: string, data?: D, responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
@@ -150,33 +146,37 @@ export class XyoApiBase<C extends XyoApiConfig = XyoApiConfig> implements XyoApi
     return XyoApiBase.shapeResponse<T>(response, responseType)
   }
 
-  protected async deleteEndpoint<T = unknown>(endPoint?: string): Promise<XyoApiResponseBody<T>>
-  protected async deleteEndpoint<T = unknown>(endPoint?: string, responseType?: 'body'): Promise<XyoApiResponseBody<T>>
-  protected async deleteEndpoint<T = unknown>(endPoint?: string, responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
-  protected async deleteEndpoint<T = unknown>(endPoint = '', responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
-    const response = await this.monitorResponse<T>(async () => {
-      return await this.axios.delete<XyoApiEnvelope<T>, XyoApiResponse<XyoApiEnvelope<T>>>(`${this.resolveRoot()}${endPoint}${this.query}`)
-    })
-    return XyoApiBase.shapeResponse<T>(response, responseType)
-  }
-
-  private static shapeResponse<T = unknown>(response: XyoApiResponse<XyoApiEnvelope<T>> | undefined, responseType?: XyoApiResponseType) {
-    const resolvedResponse = XyoApiBase.resolveResponse(response)
-    return responseType === 'tuple' ? resolvedResponse : resolvedResponse[0]
+  private axiosConfig(): AxiosRequestConfig {
+    return {
+      headers: this.axiosHeaders(),
+      transformRequest: (data, headers) => {
+        const json = JSON.stringify(data)
+        if (headers && data) {
+          if (json.length > (this.config.compressionThreshold ?? 1024)) {
+            headers['Content-Encoding'] = 'gzip'
+            return gzip(JSON.stringify(data)).buffer
+          }
+        }
+        return JSON.stringify(data)
+      },
+      transformResponse: (data) => {
+        try {
+          return JSON.parse(data)
+        } catch (ex) {
+          return null
+        }
+      },
+    }
   }
 
-  protected get headers(): Record<string, string> {
-    const headers: Record<string, string> = {}
-    if (this.config.jwtToken) {
-      headers.Authorization = `Bearer ${this.config.jwtToken}`
-    }
-    if (this.config.apiKey) {
-      headers['x-api-key'] = this.config.apiKey
-    }
-    return headers
+  private axiosHeaders(): RawAxiosRequestHeaders {
+    const axiosHeaders: RawAxiosRequestHeaders = { ...this.headers }
+    axiosHeaders['Accept'] = 'application/json, text/plain, *.*'
+    axiosHeaders['Content-Type'] = 'application/json'
+    return axiosHeaders
   }
 
-  public get authenticated() {
-    return !!this.config.apiKey || !!this.config.jwtToken
+  private resolveRoot() {
+    return `${this.config.apiDomain}${this.root}`
   }
 }

package/src/Diviner/LocationDiviner/ApiConfig.ts

@@ -1,6 +1,6 @@
 export interface ApiConfig {
   apiDomain: string
-  userid?: string
-  jwtToken?: string
   apiKey?: string
+  jwtToken?: string
+  userid?: string
 }

package/src/Diviner/LocationDiviner/Queries/LocationHeatmapQuery/LocationHeatmapQuery.ts

@@ -7,9 +7,9 @@ export type LocationHeatmapAnswerSchema = 'network.xyo.location.heatmap.answer'
 export const locationHeatmapAnswerSchema: LocationHeatmapAnswerSchema = 'network.xyo.location.heatmap.answer'
 
 export type LocationHeatmapQuery = {
+  schema: LocationWitnessSchema
   startTime?: string
   stopTime?: string
-  schema: LocationWitnessSchema
 }
 
 export const isLocationHeatmapQuery = (query: Record<string, unknown>): query is LocationHeatmapQuery => {

package/src/Diviner/LocationDiviner/Queries/LocationQuadkeyHeatmapQuery/LocationQuadkeyHeatmapQuery.ts

@@ -5,9 +5,9 @@ export const locationQuadkeyHeatmapQuerySchema: LocationQuadkeyHeatmapQuerySchem
 export type LocationQuadkeyHeatmapAnswerSchema = 'network.xyo.location.heatmap.quadkey.answer'
 export const locationQuadkeyHeatmapAnswerSchema: LocationQuadkeyHeatmapAnswerSchema = 'network.xyo.location.heatmap.quadkey.answer'
 export type LocationQuadkeyHeatmapQuery = {
+  schema: LocationWitnessSchema
   startTime?: string
   stopTime?: string
-  schema: LocationWitnessSchema
 }
 
 export const isLocationQuadkeyHeatmapQuery = (query: Record<string, unknown>): query is LocationQuadkeyHeatmapQuery => {

package/src/Diviner/LocationDiviner/Queries/LocationQueryCreationRequest.ts

@@ -8,12 +8,12 @@ export interface LocationQueryCreationRequest<
   TSchema extends LocationQuerySchema = LocationQuerySchema,
   TQuery extends Record<string, unknown> = Record<string, unknown>,
 > {
-  sourceArchivist: XyoApiConfig
-  sourceArchive: string
-  resultArchivist: XyoApiConfig
+  query: TQuery
   resultArchive: string
+  resultArchivist: XyoApiConfig
   schema: TSchema
-  query: TQuery
+  sourceArchive: string
+  sourceArchivist: XyoApiConfig
 }
 
 export type LocationTimeRangeQueryCreationRequest = LocationQueryCreationRequest<LocationTimeRangeQuerySchema, LocationTimeRangeQuery>

package/src/Diviner/LocationDiviner/Queries/LocationTimeRangeQuery/LocationTimeRangePointProperties.ts

@@ -1,8 +1,8 @@
 import { LocationWitnessSchema } from '../../Witnesses'
 
 export interface LocationTimeRangePointProperties {
-  schema: LocationWitnessSchema
   _archive: string
   _client: string
   _timestamp: number
+  schema: LocationWitnessSchema
 }

package/src/Diviner/LocationDiviner/Queries/LocationTimeRangeQuery/LocationTimeRangeQuery.ts

@@ -7,9 +7,10 @@ export type LocationTimeRangeAnswerSchema = 'network.xyo.location.range.answer'
 export const LocationTimeRangeAnswerSchema: LocationTimeRangeAnswerSchema = 'network.xyo.location.range.answer'
 
 export type LocationTimeRangeQuery = {
+  schema: LocationWitnessSchema
   startTime?: string
   stopTime?: string
-  schema: LocationWitnessSchema
+
   // TODO: Bounding rectangle, etc.
 }
 

package/src/Diviner/LocationDiviner/models.ts

@@ -1,4 +1,4 @@
 export interface GetLocationQueryResponse {
-  queryHash: string
   answerHash?: string
+  queryHash: string
 }

package/src/Diviner/RemoteDivinerError.ts

@@ -1,8 +1,8 @@
 export class RemoteDivinerError extends Error {
+  isRemoteDivinerError = true
   constructor(action: string, error: Error['cause'], message?: string) {
     super(`Remote Diviner [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
   }
-  isRemoteDivinerError = true
   static isRemoteDivinerError(error: unknown): RemoteDivinerError | undefined {
     return (error as RemoteDivinerError).isRemoteDivinerError ? (error as RemoteDivinerError) : undefined
   }

package/src/Diviner/XyoRemoteDivinerConfig.ts

@@ -6,7 +6,7 @@ export type XyoRemoteDivinerConfigSchema = 'network.xyo.diviner.remote.config'
 export const XyoRemoteDivinerConfigSchema: XyoRemoteDivinerConfigSchema = 'network.xyo.diviner.remote.config'
 
 export type XyoRemoteDivinerConfig = XyoDivinerConfig & {
-  schema: XyoRemoteDivinerConfigSchema
   api?: XyoArchivistApi
   archive?: string
+  schema: XyoRemoteDivinerConfigSchema
 }

package/src/Simple.ts

@@ -12,15 +12,15 @@ export class XyoApiSimple<
   Q extends XyoApiSimpleQuery = XyoApiSimpleQuery,
   C extends XyoApiConfig = XyoApiConfig,
 > extends XyoApiBase<C> {
-  public async get(): Promise<XyoApiResponseBody<T>>
-  public async get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>
-  public async get(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
-  public async get(responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
+  public async delete(): Promise<XyoApiResponseBody<T>>
+  public async delete(responseType?: 'body'): Promise<XyoApiResponseBody<T>>
+  public async delete(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
+  public async delete(responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
     switch (responseType) {
       case 'tuple':
-        return await this.getEndpoint(undefined, 'tuple')
+        return await this.deleteEndpoint(undefined, 'tuple')
       default:
-        return await this.getEndpoint(undefined)
+        return await this.deleteEndpoint(undefined)
     }
   }
 
@@ -36,6 +36,18 @@ export class XyoApiSimple<
     }
   }
 
+  public async get(): Promise<XyoApiResponseBody<T>>
+  public async get(responseType?: 'body'): Promise<XyoApiResponseBody<T>>
+  public async get(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
+  public async get(responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
+    switch (responseType) {
+      case 'tuple':
+        return await this.getEndpoint(undefined, 'tuple')
+      default:
+        return await this.getEndpoint(undefined)
+    }
+  }
+
   public async post(data?: D): Promise<XyoApiResponseBody<T>>
   public async post(data?: D, responseType?: 'body'): Promise<XyoApiResponseBody<T>>
   public async post(data?: D, responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
@@ -59,16 +71,4 @@ export class XyoApiSimple<
         return await this.putEndpoint(undefined, data)
     }
   }
-
-  public async delete(): Promise<XyoApiResponseBody<T>>
-  public async delete(responseType?: 'body'): Promise<XyoApiResponseBody<T>>
-  public async delete(responseType?: 'tuple'): Promise<XyoApiResponseTuple<T>>
-  public async delete(responseType?: XyoApiResponseType): Promise<XyoApiResponseTupleOrBody<T>> {
-    switch (responseType) {
-      case 'tuple':
-        return await this.deleteEndpoint(undefined, 'tuple')
-      default:
-        return await this.deleteEndpoint(undefined)
-    }
-  }
 }

package/src/models/Api/Config.ts

@@ -4,32 +4,32 @@ interface XyoApiConfig extends XyoApiReportable {
   /** @description The domain where the api is located */
   apiDomain: string
 
-  /** @deprecated use the jwtToken instead*/
-  userid?: string
-
-  /** @description The jwtToken of the currently logged in user */
-  jwtToken?: string
-
   /** @description The apiKey used for authentication */
   apiKey?: string
 
-  /** @description The location in the API tree where this API object is mounted */
-  root?: string
+  /** @description Threshold for Content-Size to cause automatic gzip of request body [default = 1024] */
+  compressionThreshold?: number
+
+  /** @description The jwtToken of the currently logged in user */
+  jwtToken?: string
 
   /** @description The query string, if any, that is added to the end of every request */
   query?: string
 
-  /** @description Threshold for Content-Size to cause automatic gzip of request body [default = 1024] */
-  compressionThreshold?: number
+  /** @description Parent that should also report events from this api */
+  reportableParent?: XyoApiReportable
 
-  /** @description Throw on failures */
-  throwFailure?: boolean
+  /** @description The location in the API tree where this API object is mounted */
+  root?: string
 
   /** @description Throw on error */
   throwError?: boolean
 
-  /** @description Parent that should also report events from this api */
-  reportableParent?: XyoApiReportable
+  /** @description Throw on failures */
+  throwFailure?: boolean
+
+  /** @deprecated use the jwtToken instead*/
+  userid?: string
 }
 
 export type { XyoApiConfig }

package/src/models/Archive.ts

@@ -7,8 +7,8 @@ export type ExpirationWindow = 'create' | 'read'
 export interface XyoAccessControl {
   access?: Record<AccessType, AccessLevel>
   expiration?: {
-    window?: ExpirationWindow
     delay?: number
+    window?: ExpirationWindow
   }
 }
 
@@ -23,6 +23,6 @@ export interface XyoAccessControls {
 }
 
 export interface XyoArchive extends XyoArchivePath {
-  user?: string
   accessControl?: XyoAccessControl | boolean
+  user?: string
 }