@auxilium/datalynk-client 0.6.4 → 0.6.6

package/dist/index.cjs

@@ -1830,6 +1830,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.slice = slice;
       this.promise = promise;
     }
+    /**
+     * Catch promise errors
+     */
+    catch(callback) {
+      return this.promise.catch(callback);
+    }
     /**
      * Log the raw result to the console for inspection
      */
@@ -1844,6 +1850,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       let resp = await this.promise;
       return resp.failed;
     }
+    /**
+     * Catch promise errors
+     */
+    finally(callback) {
+      return this.promise.finally(callback);
+    }
     /**
      * Fields that were ignored (Perms or readonly)
      */
@@ -1884,6 +1896,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       let resp = await this.promise;
       return resp.rows;
     }
+    /**
+     * Handle as normal request
+     */
+    then(success, error) {
+      return this.promise.then(success, error);
+    }
     /**
      * Get the raw promise
      */
@@ -1906,8 +1924,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param {Api} api Api to send the requests through
      */
     constructor(slice, api) {
-      __publicField(this, "context");
-      __publicField(this, "filterFn");
       __publicField(this, "operation");
       __publicField(this, "request", {});
       /** Unsubscribe from changes, undefined if not subscribed */
@@ -1965,31 +1981,16 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     /**
      * Compile the request and send it
      *
-     * @returns {SlicePromise<T>} The promise with helper methods
+     * @param {ApiRequestOptions} options API Request options
+     * @return {SlicePromise<T>}
      */
-    exec() {
+    exec(options) {
+      if (!this.operation) throw new Error("No operation chosen");
       this.request.slice = this.slice;
-      return new SlicePromise(this, this.api.request({ [this.operation]: this.request }));
+      return new SlicePromise(this, this.api.request({ [this.operation]: this.request }, options));
     }
-    /**
-     * Whitelist fields by passing an array of keys or alias fields by using a map
-     *
-     * @param {object} aliasKeyVals List of properties to whitelist and what to rename them to
-     */
-    fields(aliasKeyVals) {
-      this.request.fields = Array.isArray(aliasKeyVals) ? aliasKeyVals.reduce((acc, key) => ({ ...acc, [key]: key }), {}) : aliasKeyVals;
-      return this;
-    }
-    /**
-     * Experimental! Use a callback to filter the results of a query remotely. The callback and context are
-     * stringified and sent to the server to be executed
-     *
-     * @param {function} fn Function to run rows against to filter
-     * @param {object} context The context to get variable values from, 'this' should always be passed
-     */
-    filter(fn, context) {
-      this.filterFn = fn;
-      this.context = context;
+    fields(keys) {
+      this.request.fields = Array.isArray(keys) ? keys.reduce((acc, key) => ({ ...acc, [key]: key }), {}) : keys;
       return this;
     }
     /**

package/dist/index.mjs

@@ -1826,6 +1826,12 @@ class SlicePromise {
     this.slice = slice;
     this.promise = promise;
   }
+  /**
+   * Catch promise errors
+   */
+  catch(callback) {
+    return this.promise.catch(callback);
+  }
   /**
    * Log the raw result to the console for inspection
    */
@@ -1840,6 +1846,12 @@ class SlicePromise {
     let resp = await this.promise;
     return resp.failed;
   }
+  /**
+   * Catch promise errors
+   */
+  finally(callback) {
+    return this.promise.finally(callback);
+  }
   /**
    * Fields that were ignored (Perms or readonly)
    */
@@ -1880,6 +1892,12 @@ class SlicePromise {
     let resp = await this.promise;
     return resp.rows;
   }
+  /**
+   * Handle as normal request
+   */
+  then(success, error) {
+    return this.promise.then(success, error);
+  }
   /**
    * Get the raw promise
    */
@@ -1902,8 +1920,6 @@ class Slice {
    * @param {Api} api Api to send the requests through
    */
   constructor(slice, api) {
-    __publicField(this, "context");
-    __publicField(this, "filterFn");
     __publicField(this, "operation");
     __publicField(this, "request", {});
     /** Unsubscribe from changes, undefined if not subscribed */
@@ -1961,31 +1977,16 @@ class Slice {
   /**
    * Compile the request and send it
    *
-   * @returns {SlicePromise<T>} The promise with helper methods
+   * @param {ApiRequestOptions} options API Request options
+   * @return {SlicePromise<T>}
    */
-  exec() {
+  exec(options) {
+    if (!this.operation) throw new Error("No operation chosen");
     this.request.slice = this.slice;
-    return new SlicePromise(this, this.api.request({ [this.operation]: this.request }));
+    return new SlicePromise(this, this.api.request({ [this.operation]: this.request }, options));
   }
-  /**
-   * Whitelist fields by passing an array of keys or alias fields by using a map
-   *
-   * @param {object} aliasKeyVals List of properties to whitelist and what to rename them to
-   */
-  fields(aliasKeyVals) {
-    this.request.fields = Array.isArray(aliasKeyVals) ? aliasKeyVals.reduce((acc, key) => ({ ...acc, [key]: key }), {}) : aliasKeyVals;
-    return this;
-  }
-  /**
-   * Experimental! Use a callback to filter the results of a query remotely. The callback and context are
-   * stringified and sent to the server to be executed
-   *
-   * @param {function} fn Function to run rows against to filter
-   * @param {object} context The context to get variable values from, 'this' should always be passed
-   */
-  filter(fn, context) {
-    this.filterFn = fn;
-    this.context = context;
+  fields(keys) {
+    this.request.fields = Array.isArray(keys) ? keys.reduce((acc, key) => ({ ...acc, [key]: key }), {}) : keys;
     return this;
   }
   /**

package/dist/slice.d.ts

@@ -1,5 +1,5 @@
 import { BehaviorSubject } from 'rxjs';
-import { Api } from './api';
+import { Api, ApiError, ApiRequestOptions } from './api';
 import { Unsubscribe } from './socket';
 
 export interface SliceMeta {
@@ -22,6 +22,10 @@ export declare class SlicePromise<T extends SliceMeta> {
      * @param {SliceResponse<T>} promise Datalynk promise to handle
      */
     constructor(slice: Slice<T>, promise: Promise<SliceResponse<T>>);
+    /**
+     * Catch promise errors
+     */
+    catch(callback: (error: ApiError | any) => any): Promise<any>;
     /**
      * Log the raw result to the console for inspection
      */
@@ -30,6 +34,10 @@ export declare class SlicePromise<T extends SliceMeta> {
      * Fields that failed
      */
     failed(): Promise<number[]>;
+    /**
+     * Catch promise errors
+     */
+    finally(callback: () => any): Promise<SliceResponse<T>>;
     /**
      * Fields that were ignored (Perms or readonly)
      */
@@ -54,6 +62,10 @@ export declare class SlicePromise<T extends SliceMeta> {
      * All rows of data
      */
     rows(): Promise<T[]>;
+    /**
+     * Handle as normal request
+     */
+    then(success: (response: SliceResponse<T>) => any, error?: (error: ApiError | any) => any): Promise<SliceResponse<T>>;
     /**
      * Get the raw promise
      */
@@ -80,8 +92,6 @@ export interface SliceResponse<T extends SliceMeta> {
 export declare class Slice<T extends SliceMeta> {
     private slice;
     private api;
-    private context;
-    private filterFn;
     private operation;
     private request;
     /** Unsubscribe from changes, undefined if not subscribed */
@@ -126,25 +136,19 @@ export declare class Slice<T extends SliceMeta> {
     /**
      * Compile the request and send it
      *
-     * @returns {SlicePromise<T>} The promise with helper methods
+     * @param {ApiRequestOptions} options API Request options
+     * @return {SlicePromise<T>}
      */
-    exec(): SlicePromise<T>;
+    exec(options?: ApiRequestOptions): SlicePromise<T>;
     /**
      * Whitelist fields by passing an array of keys or alias fields by using a map
      *
-     * @param {object} aliasKeyVals List of properties to whitelist and what to rename them to
+     * @param {object} whitelist Either a list of keys to whitelist or a map of keys to rename
      */
-    fields(aliasKeyVals: string[] | {
+    fields(whitelist: string[]): Slice<T>;
+    fields(alias: {
         [key: string]: string | object;
     }): Slice<T>;
-    /**
-     * Experimental! Use a callback to filter the results of a query remotely. The callback and context are
-     * stringified and sent to the server to be executed
-     *
-     * @param {function} fn Function to run rows against to filter
-     * @param {object} context The context to get variable values from, 'this' should always be passed
-     */
-    filter(fn: (row: T, index: number, arr: T[]) => boolean, context: object): this;
     /**
      * Set the request type to insert
      *

package/dist/slice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slice.d.ts","sourceRoot":"","sources":["../src/slice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"slice.d.ts","sourceRoot":"","sources":["../src/slice.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@auxilium/datalynk-client",
 	"description": "Datalynk client library",
 	"repository": "https://gitlab.auxiliumgroup.com/auxilium/datalynk/datalynk-client",
-	"version": "0.6.4",
+	"version": "0.6.6",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",