@auxilium/datalynk-client 0.9.12 → 1.0.2

package/dist/index.mjs

@@ -74,6 +74,106 @@ class PromiseProgress extends Promise {
     return this.from(super.finally(res));
   }
 }
+function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz) {
+  const timezones = [
+    ["IDLW", -12],
+    ["SST", -11],
+    ["HST", -10],
+    ["AKST", -9],
+    ["PST", -8],
+    ["MST", -7],
+    ["CST", -6],
+    ["EST", -5],
+    ["AST", -4],
+    ["BRT", -3],
+    ["MAT", -2],
+    ["AZOT", -1],
+    ["UTC", 0],
+    ["CET", 1],
+    ["EET", 2],
+    ["MSK", 3],
+    ["AST", 4],
+    ["PKT", 5],
+    ["IST", 5.5],
+    ["BST", 6],
+    ["ICT", 7],
+    ["CST", 8],
+    ["JST", 9],
+    ["AEST", 10],
+    ["SBT", 11],
+    ["FJT", 12],
+    ["TOT", 13],
+    ["LINT", 14]
+  ];
+  function adjustTz(date2, gmt) {
+    const currentOffset = date2.getTimezoneOffset();
+    const adjustedOffset = gmt * 60;
+    return new Date(date2.getTime() + (adjustedOffset + currentOffset) * 6e4);
+  }
+  function day(num) {
+    return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][num] || "Unknown";
+  }
+  function doy(date2) {
+    const start = /* @__PURE__ */ new Date(`${date2.getFullYear()}-01-01 0:00:00`);
+    return Math.ceil((date2.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
+  }
+  function month(num) {
+    return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][num] || "Unknown";
+  }
+  function suffix(num) {
+    if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
+    switch (num % 10) {
+      case 1:
+        return `${num}st`;
+      case 2:
+        return `${num}nd`;
+      case 3:
+        return `${num}rd`;
+      default:
+        return `${num}th`;
+    }
+  }
+  function tzOffset(offset) {
+    const hours = ~~(offset / 60);
+    const minutes = offset % 60;
+    return (offset > 0 ? "-" : "") + `${hours}:${minutes.toString().padStart(2, "0")}`;
+  }
+  if (typeof date == "number" || typeof date == "string") date = new Date(date);
+  let t;
+  if (tz == null) tz = -(date.getTimezoneOffset() / 60);
+  t = timezones.find((t2) => isNaN(tz) ? t2[0] == tz : t2[1] == tz);
+  if (!t) throw new Error(`Unknown timezone: ${tz}`);
+  date = adjustTz(date, t[1]);
+  const tokens = {
+    "YYYY": date.getFullYear().toString(),
+    "YY": date.getFullYear().toString().slice(2),
+    "MMMM": month(date.getMonth()),
+    "MMM": month(date.getMonth()).slice(0, 3),
+    "MM": (date.getMonth() + 1).toString().padStart(2, "0"),
+    "M": (date.getMonth() + 1).toString(),
+    "DDD": doy(date).toString(),
+    "DD": date.getDate().toString().padStart(2, "0"),
+    "Do": suffix(date.getDate()),
+    "D": date.getDate().toString(),
+    "dddd": day(date.getDay()),
+    "ddd": day(date.getDay()).slice(0, 3),
+    "HH": date.getHours().toString().padStart(2, "0"),
+    "H": date.getHours().toString(),
+    "hh": (date.getHours() % 12 || 12).toString().padStart(2, "0"),
+    "h": (date.getHours() % 12 || 12).toString(),
+    "mm": date.getMinutes().toString().padStart(2, "0"),
+    "m": date.getMinutes().toString(),
+    "ss": date.getSeconds().toString().padStart(2, "0"),
+    "s": date.getSeconds().toString(),
+    "SSS": date.getMilliseconds().toString().padStart(3, "0"),
+    "A": date.getHours() >= 12 ? "PM" : "AM",
+    "a": date.getHours() >= 12 ? "pm" : "am",
+    "ZZ": tzOffset(t[1] * 60).replace(":", ""),
+    "Z": tzOffset(t[1] * 60),
+    "z": typeof tz == "string" ? tz : t[0]
+  };
+  return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, (token) => tokens[token]);
+}
 class TypedEmitter {
   constructor() {
     __publicField2(this, "listeners", {});
@@ -293,6 +393,25 @@ function errorFromCode(code, message) {
       return new CustomError(message, code);
   }
 }
+class HttpResponse extends Response {
+  constructor(resp, stream) {
+    const body = [204, 205, 304].includes(resp.status) ? null : stream;
+    super(body, {
+      headers: resp.headers,
+      status: resp.status,
+      statusText: resp.statusText
+    });
+    __publicField2(this, "data");
+    __publicField2(this, "ok");
+    __publicField2(this, "redirected");
+    __publicField2(this, "type");
+    __publicField2(this, "url");
+    this.ok = resp.ok;
+    this.redirected = resp.redirected;
+    this.type = resp.type;
+    this.url = resp.url;
+  }
+}
 const _Http = class _Http2 {
   constructor(defaults = {}) {
     __publicField2(this, "interceptors", {});
@@ -321,8 +440,9 @@ const _Http = class _Http2 {
   request(opts = {}) {
     var _a;
     if (!this.url && !opts.url) throw new Error("URL needs to be set");
-    let url = (((_a = opts.url) == null ? void 0 : _a.startsWith("http")) ? opts.url : (this.url || "") + (opts.url || "")).replace(/([^:]\/)\/+/g, "$1");
-    if (opts.fragment) url.includes("#") ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : url += "#" + opts.fragment;
+    let url = ((_a = opts.url) == null ? void 0 : _a.startsWith("http")) ? opts.url : (this.url || "") + (opts.url || "");
+    url = url.replaceAll(/([^:]\/)\/+/g, "$1");
+    if (opts.fragment) url.includes("#") ? url.replace(/#.*(\?|\n)/g, (match, arg1) => `#${opts.fragment}${arg1}`) : `${url}#${opts.fragment}`;
     if (opts.query) {
       const q = Array.isArray(opts.query) ? opts.query : Object.keys(opts.query).map((k) => ({ key: k, value: opts.query[k] }));
       url += (url.includes("?") ? "&" : "?") + q.map((q2) => `${q2.key}=${q2.value}`).join("&");
@@ -364,13 +484,13 @@ const _Http = class _Http2 {
               push();
             }
           });
-          resp.data = new Response(stream);
-          if (opts.decode == null || opts.decode) {
+          resp = new HttpResponse(resp, stream);
+          if (opts.decode !== false) {
             const content = (_b = resp.headers.get("Content-Type")) == null ? void 0 : _b.toLowerCase();
-            if (content == null ? void 0 : content.includes("form")) resp.data = await resp.data.formData();
-            else if (content == null ? void 0 : content.includes("json")) resp.data = await resp.data.json();
-            else if (content == null ? void 0 : content.includes("text")) resp.data = await resp.data.text();
-            else if (content == null ? void 0 : content.includes("application")) resp.data = await resp.data.blob();
+            if (content == null ? void 0 : content.includes("form")) resp.data = await resp.formData();
+            else if (content == null ? void 0 : content.includes("json")) resp.data = await resp.json();
+            else if (content == null ? void 0 : content.includes("text")) resp.data = await resp.text();
+            else if (content == null ? void 0 : content.includes("application")) resp.data = await resp.blob();
           }
           if (resp.ok) res(resp);
           else rej(resp);
@@ -390,31 +510,13 @@ function jwtDecode(token) {
   }).join("")));
 }
 const CliEffects = {
-  CLEAR: "\x1B[0m",
-  BRIGHT: "\x1B[1m",
-  DIM: "\x1B[2m",
-  UNDERSCORE: "\x1B[4m",
-  BLINK: "\x1B[5m",
-  REVERSE: "\x1B[7m",
-  HIDDEN: "\x1B[8m"
+  CLEAR: "\x1B[0m"
 };
 const CliForeground = {
-  BLACK: "\x1B[30m",
   RED: "\x1B[31m",
-  GREEN: "\x1B[32m",
   YELLOW: "\x1B[33m",
   BLUE: "\x1B[34m",
-  MAGENTA: "\x1B[35m",
-  CYAN: "\x1B[36m",
-  LIGHT_GREY: "\x1B[37m",
-  GREY: "\x1B[90m",
-  LIGHT_RED: "\x1B[91m",
-  LIGHT_GREEN: "\x1B[92m",
-  LIGHT_YELLOW: "\x1B[93m",
-  LIGHT_BLUE: "\x1B[94m",
-  LIGHT_MAGENTA: "\x1B[95m",
-  LIGHT_CYAN: "\x1B[96m",
-  WHITE: "\x1B[97m"
+  LIGHT_GREY: "\x1B[37m"
 };
 const _Logger = class _Logger2 extends TypedEmitter {
   constructor(namespace) {
@@ -458,112 +560,6 @@ const _Logger = class _Logger2 extends TypedEmitter {
   }
 };
 __publicField2(_Logger, "LOG_LEVEL", 4);
-function formatDate(format = "YYYY-MM-DD H:mm", date = /* @__PURE__ */ new Date(), tz) {
-  const timezones = [
-    ["IDLW", -12],
-    ["SST", -11],
-    ["HST", -10],
-    ["AKST", -9],
-    ["PST", -8],
-    ["MST", -7],
-    ["CST", -6],
-    ["EST", -5],
-    ["AST", -4],
-    ["BRT", -3],
-    ["MAT", -2],
-    ["AZOT", -1],
-    ["UTC", 0],
-    ["CET", 1],
-    ["EET", 2],
-    ["MSK", 3],
-    ["AST", 4],
-    ["PKT", 5],
-    ["IST", 5.5],
-    ["BST", 6],
-    ["ICT", 7],
-    ["CST", 8],
-    ["JST", 9],
-    ["AEST", 10],
-    ["SBT", 11],
-    ["FJT", 12],
-    ["TOT", 13],
-    ["LINT", 14]
-  ];
-  function adjustTz(date2, gmt) {
-    const currentOffset = date2.getTimezoneOffset();
-    const adjustedOffset = gmt * 60;
-    return new Date(date2.getTime() + (adjustedOffset + currentOffset) * 6e4);
-  }
-  function day(num) {
-    return ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][num] || "Unknown";
-  }
-  function doy(date2) {
-    const start = /* @__PURE__ */ new Date(`${date2.getFullYear()}-01-01 0:00:00`);
-    return Math.ceil((date2.getTime() - start.getTime()) / (1e3 * 60 * 60 * 24));
-  }
-  function month(num) {
-    return ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"][num] || "Unknown";
-  }
-  function suffix(num) {
-    if (num % 100 >= 11 && num % 100 <= 13) return `${num}th`;
-    switch (num % 10) {
-      case 1:
-        return `${num}st`;
-      case 2:
-        return `${num}nd`;
-      case 3:
-        return `${num}rd`;
-      default:
-        return `${num}th`;
-    }
-  }
-  function tzOffset(offset) {
-    const hours = ~~(offset / 60);
-    const minutes = offset % 60;
-    return (offset > 0 ? "-" : "") + `${hours}:${minutes.toString().padStart(2, "0")}`;
-  }
-  if (typeof date == "number" || typeof date == "string") date = new Date(date);
-  let t;
-  if (tz == null) tz = -(date.getTimezoneOffset() / 60);
-  t = timezones.find((t2) => isNaN(tz) ? t2[0] == tz : t2[1] == tz);
-  if (!t) throw new Error(`Unknown timezone: ${tz}`);
-  date = adjustTz(date, t[1]);
-  const tokens = {
-    "YYYY": date.getFullYear().toString(),
-    "YY": date.getFullYear().toString().slice(2),
-    "MMMM": month(date.getMonth()),
-    "MMM": month(date.getMonth()).slice(0, 3),
-    "MM": (date.getMonth() + 1).toString().padStart(2, "0"),
-    "M": (date.getMonth() + 1).toString(),
-    "DDD": doy(date).toString(),
-    "DD": date.getDate().toString().padStart(2, "0"),
-    "Do": suffix(date.getDate()),
-    "D": date.getDate().toString(),
-    "dddd": day(date.getDay()),
-    "ddd": day(date.getDay()).slice(0, 3),
-    "HH": date.getHours().toString().padStart(2, "0"),
-    "H": date.getHours().toString(),
-    "hh": (date.getHours() % 12 || 12).toString().padStart(2, "0"),
-    "h": (date.getHours() % 12 || 12).toString(),
-    "mm": date.getMinutes().toString().padStart(2, "0"),
-    "m": date.getMinutes().toString(),
-    "ss": date.getSeconds().toString().padStart(2, "0"),
-    "s": date.getSeconds().toString(),
-    "SSS": date.getMilliseconds().toString().padStart(3, "0"),
-    "A": date.getHours() >= 12 ? "PM" : "AM",
-    "a": date.getHours() >= 12 ? "pm" : "am",
-    "ZZ": tzOffset(t[1] * 60).replace(":", ""),
-    "Z": tzOffset(t[1] * 60),
-    "z": typeof tz == "string" ? tz : t[0]
-  };
-  return format.replace(/YYYY|YY|MMMM|MMM|MM|M|DDD|DD|Do|D|dddd|ddd|HH|H|hh|h|mm|m|ss|s|SSS|A|a|ZZ|Z|z/g, (token) => tokens[token]);
-}
-function sleep(ms) {
-  return new Promise((res) => setTimeout(res, ms));
-}
-async function sleepWhile(fn, checkInterval = 100) {
-  while (await fn()) await sleep(checkInterval);
-}
 var extendStatics = function(d, b) {
   extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
     d2.__proto__ = b2;
@@ -783,11 +779,7 @@ function execFinalizer(finalizer) {
   }
 }
 var config = {
-  onUnhandledError: null,
-  onStoppedNotification: null,
-  Promise: void 0,
-  useDeprecatedSynchronousErrorHandling: false,
-  useDeprecatedNextContext: false
+  Promise: void 0
 };
 var timeoutProvider = {
   setTimeout: function(handler, timeout) {
@@ -880,10 +872,6 @@ var Subscriber = function(_super) {
   };
   return Subscriber2;
 }(Subscription);
-var _bind = Function.prototype.bind;
-function bind(fn, thisArg) {
-  return _bind.call(fn, thisArg);
-}
 var ConsumerObserver = function() {
   function ConsumerObserver2(partialObserver) {
     this.partialObserver = partialObserver;
@@ -934,18 +922,7 @@ var SafeSubscriber = function(_super) {
         complete: complete !== null && complete !== void 0 ? complete : void 0
       };
     } else {
-      var context_1;
-      if (_this && config.useDeprecatedNextContext) {
-        context_1 = Object.create(observerOrNext);
-        context_1.unsubscribe = function() {
-          return _this.unsubscribe();
-        };
-        partialObserver = {
-          next: observerOrNext.next && bind(observerOrNext.next, context_1),
-          error: observerOrNext.error && bind(observerOrNext.error, context_1),
-          complete: observerOrNext.complete && bind(observerOrNext.complete, context_1)
-        };
-      } else {
+      {
         partialObserver = observerOrNext;
       }
     }
@@ -1675,7 +1652,7 @@ class Auth {
    * @return {Promise<boolean>} True if system administrator
    */
   async isSysAdmin() {
-    return !!(await this.api.slice("sysadmin").select().where("auth_ref", "==", "$viewer").exec().keys()).length;
+    return !!(await this.api.slice("sysadmin").select().where("auth_ref", "==", "$viewer").rows().exec()).length;
   }
   /**
    * Check if user is a table administrator
@@ -1683,7 +1660,7 @@ class Auth {
    * @return {Promise<boolean>} True if table administrator
    */
   async isTableAdmin() {
-    return !!(await this.api.slice("tableadmins").select().where("auth_ref", "==", "$viewer").exec().keys()).length;
+    return !!(await this.api.slice("tableadmins").select().where("auth_ref", "==", "$viewer").rows().exec()).length;
   }
   /**
    * Check if user is a user administrator
@@ -1691,7 +1668,7 @@ class Auth {
    * @return {Promise<boolean>} True if user administrator
    */
   async isUserAdmin() {
-    return !!(await this.api.slice("useradmins").select().where("auth_ref", "==", "$viewer").exec().keys()).length;
+    return !!(await this.api.slice("useradmins").select().where("auth_ref", "==", "$viewer").rows().exec()).length;
   }
   /**
    * Perform login and save the session token
@@ -1793,7 +1770,7 @@ class Files {
     this.url = `${this.api.url}file`;
   }
   associate(fileIds, slice, row, field, execute = true) {
-    const req = { [`${execute ? "!" : "$"}/tools/file/update`]: { row, field, slice, ids: fileIds } };
+    const req = { [`${execute ? "!" : "$"}/tools/file/update`]: { slice, row, field, ids: fileIds } };
     if (execute) return this.api.request(req);
     return req;
   }
@@ -1832,7 +1809,7 @@ class Files {
     })).then(async (files2) => {
       if (associate) {
         let id = typeof associate.row == "number" ? associate.row : associate.row[associate.pk || "id"];
-        if (!id) id = await this.api.slice(associate.slice).insert(associate.row).exec().key();
+        if (!id) id = await this.api.slice(associate.slice).insert(associate.row).id();
         await this.associate(files2.map((f2) => f2.id), associate == null ? void 0 : associate.slice, associate == null ? void 0 : associate.row, associate == null ? void 0 : associate.field);
       }
       return files2;
@@ -1992,112 +1969,6 @@ const Serializer = {
     }
   }
 };
-class SlicePromise {
-  /**
-   * An object to provide helpers for Datalynk results
-   *
-   * @param slice
-   * @param {SliceResponse<T>} promise Datalynk promise to handle
-   */
-  constructor(slice, promise) {
-    this.slice = slice;
-    this.promise = promise;
-  }
-  /**
-   * Catch promise errors
-   */
-  catch(callback) {
-    return this.promise.catch(callback);
-  }
-  /**
-   * Count rows or fetch count alias result
-   */
-  async count() {
-    var _a, _b;
-    const rows = await this.rows();
-    if (typeof ((_a = rows == null ? void 0 : rows[0]) == null ? void 0 : _a["count"]) == "number") return (_b = rows == null ? void 0 : rows[0]) == null ? void 0 : _b["count"];
-    return rows.length;
-  }
-  /**
-   * Log the raw result to the console for inspection
-   */
-  debug() {
-    this.promise.then((resp) => console.log(resp));
-    return this;
-  }
-  /**
-   * Fields that failed
-   */
-  async failed() {
-    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)
-   */
-  async ignored() {
-    let resp = await this.promise;
-    return resp["ignored-fields"];
-  }
-  /**
-   * ID of first affected row
-   */
-  async key() {
-    return (await this.keys())[0];
-  }
-  /**
-   * IDs of all affected rows
-   */
-  async keys() {
-    let resp = await this.promise;
-    return resp.keys;
-  }
-  /**
-   * Fields that were affected successfully
-   */
-  async granted() {
-    let resp = await this.promise;
-    return resp.granted;
-  }
-  /**
-   * First row of data
-   */
-  async row() {
-    return (await this.rows())[0];
-  }
-  /**
-   * All rows of data
-   */
-  async rows() {
-    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
-   */
-  toPromise() {
-    return this.promise;
-  }
-  /**
-   * Get the transaction ID
-   */
-  async transaction() {
-    let resp = await this.promise;
-    return resp.tx;
-  }
-}
 const _Slice = class _Slice {
   /**
    * An object to aid in constructing requests
@@ -2107,11 +1978,25 @@ const _Slice = class _Slice {
    */
   constructor(slice, api) {
     __publicField(this, "operation");
+    __publicField(this, "popField");
     __publicField(this, "request", {});
+    /** Log response automatically */
+    __publicField(this, "debugging");
     /** Unsubscribe from changes, undefined if not subscribed */
     __publicField(this, "unsubscribe");
     /** Cached slice data as an observable */
     __publicField(this, "cache$", new BehaviorSubject([]));
+    /**
+     * Whitelist and alias fields. Alias of `fields()`
+     * @example
+     * ```ts
+     * const id: {id: number, field2: any}[] = await new Slice<T>(12345)
+     * 		.select().alias({id: 'id', field1: 'field2'}).exec().keys();
+     * ```
+     * @param {object} aliasKeyVals List of properties to whitelist and what to rename them to
+     * @return {Slice<T>}
+     */
+    __publicField(this, "alias", this.fields);
     this.slice = slice;
     this.api = api;
   }
@@ -2125,19 +2010,13 @@ const _Slice = class _Slice {
   }
   /** Get raw API request */
   get raw() {
-    return { [this.operation]: { slice: this.slice, ...this.request } };
-  }
-  /**
-   * Whitelist and alias fields. Alias for the fields functions
-   * @example
-   * ```ts
-   * const id: {id: number, field2: any}[] = await new Slice<T>(12345)
-   * 		.select().alias({id: 'id', field1: 'field2'}).exec().keys();
-   * ```
-   * @param {object} aliasKeyVals List of properties to whitelist and what to rename them to
-   */
-  alias(aliasKeyVals) {
-    return this.fields(aliasKeyVals);
+    return clean({
+      [this.operation]: {
+        ...this.request,
+        slice: this.slice
+      },
+      "$pop": this.popField ? this.popField : void 0
+    });
   }
   /**
    * Add an 'AND' condition inside the where argument
@@ -2149,6 +2028,7 @@ const _Slice = class _Slice {
    *                 .where({field2: 2, field3: 3})
    *                 .exec().rows();
    * ```
+   * @return {Slice<T>}
    */
   and() {
     var _a;
@@ -2166,17 +2046,20 @@ const _Slice = class _Slice {
    * 					.exec().count();
    * ```
    * @param {object | string} arg Count argument
+   * @return {Slice<T>}
    */
   count(arg = "id") {
     this.operation = "$/slice/report";
     this.request.fields = { count: ["$count", typeof arg == "object" ? arg : ["$field", arg]] };
-    return this;
+    return this.pop("rows:0:count");
   }
   /**
    * Output the formed request to the console for inspection
+   * @param {boolean} enabled Enable/Disable console logging
+   * @return {Slice<T>}
    */
-  debug() {
-    console.debug(this.request);
+  debug(enabled = true) {
+    this.debugging = enabled;
     return this;
   }
   /**
@@ -2186,6 +2069,7 @@ const _Slice = class _Slice {
    * await new Slice(12345).delete(id).exec();
    * ```
    * @param {number | number[]} id ID(s) to delete
+   * @return {Slice<T>}
    */
   delete(id) {
     this.operation = "$/slice/delete";
@@ -2204,6 +2088,7 @@ const _Slice = class _Slice {
    *                 .exec().rows();
    * ```
    * @param formula Excel formula to use as where clause
+   * @return {Slice<T>}
    */
   excel(formula) {
     this.where(["$excel", formula]);
@@ -2212,17 +2097,26 @@ const _Slice = class _Slice {
   /**
    * Compile the request and send it
    * @param {ApiRequestOptions} options API Request options
-   * @return {SlicePromise<T>}
+   * @return {Promise<T = any>} API response
    */
   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 }, options));
+    return this.api.request(this.raw, options).then((resp) => {
+      if (this.debugging) console.log(resp);
+      return resp;
+    });
   }
   fields(keys) {
     this.request.fields = Array.isArray(keys) ? keys.reduce((acc, key) => ({ ...acc, [key]: key }), {}) : keys;
     return this;
   }
+  /**
+   * Unwrap response returning the first ID
+   * @return {Slice<T>}
+   */
+  id() {
+    return this.pop("rows:0:id");
+  }
   /**
    * Set the request type to insert
    * @example
@@ -2233,6 +2127,7 @@ const _Slice = class _Slice {
    * ]).exec().keys();
    * ```
    * @param {T | T[]} rows Rows to be inserted into the slice
+   * @return {Slice<T>}
    */
   insert(rows) {
     this.operation = "$/slice/xinsert";
@@ -2249,9 +2144,11 @@ const _Slice = class _Slice {
    *                 .exec().rows();
    * ```
    * @param {number} num Number of rows to return
+   * @return {Slice<T>}
    */
   limit(num) {
     this.request.limit = num;
+    return this;
   }
   /**
    * Add an 'OR' condition inside the where argument
@@ -2265,6 +2162,7 @@ const _Slice = class _Slice {
    *                 .where(['$gt', ['$field', field4], 4)
    *                 .exec().rows();
    * ```
+   * @return {Slice<T>}
    */
   or() {
     var _a;
@@ -2285,12 +2183,36 @@ const _Slice = class _Slice {
    * ```
    * @param {string} field property name
    * @param {boolean} ascending Sort in ascending or descending order
+   * @return {Slice<T>}
    */
   order(field, ascending = true) {
     if (!this.request.order) this.request.order = [];
     this.request.order.push([ascending ? "$asc" : "$desc", ["$field", field]]);
     return this;
   }
+  /**
+   * Unwrap response, returning the field
+   * @param {string} field Colon seperated path: `rows:0`
+   * @return {Slice<T>}
+   */
+  pop(field) {
+    this.popField = field;
+    return this;
+  }
+  /**
+   * Unwrap response returning the first row
+   * @return {Slice<T>}
+   */
+  row() {
+    return this.pop("rows:0");
+  }
+  /**
+   * Unwrap response returning the rows
+   * @return {Slice<T>}
+   */
+  rows() {
+    return this.pop("rows");
+  }
   /**
    * Set the request type to select
    * @example
@@ -2299,6 +2221,7 @@ const _Slice = class _Slice {
    * const row: T = new Slice<T>(12345).select(id).exec().row();
    * ```
    * @param {number | number[]} id ID(s) to select, leaving blank will return all rows
+   * @return {Slice<T>}
    */
   select(id) {
     this.operation = "$/slice/report";
@@ -2320,10 +2243,10 @@ const _Slice = class _Slice {
    */
   sync(on = true) {
     if (on) {
-      new _Slice(this.slice, this.api).select().exec().rows().then((rows) => this.cache = rows);
+      new _Slice(this.slice, this.api).select().rows().exec().then((rows) => this.cache = rows);
       if (!this.unsubscribe) this.unsubscribe = this.api.socket.sliceEvents(this.slice, (event) => {
         const ids = [...event.data.new, ...event.data.changed];
-        new _Slice(this.slice, this.api).select(ids).exec().rows().then((rows) => this.cache = [...this.cache.filter((c) => c.id != null && !ids.includes(c.id)), ...rows]);
+        new _Slice(this.slice, this.api).select(ids).rows().exec().then((rows) => this.cache = [...this.cache.filter((c) => c.id != null && !ids.includes(c.id)), ...rows]);
         this.cache = this.cache.filter((v) => v.id && !event.data.lost.includes(v.id));
       });
       return this.cache$;
@@ -2342,6 +2265,7 @@ const _Slice = class _Slice {
    * ]).exec().keys();
    * ```
    * @param {T | T[]} rows Rows to be updated, each row must have an ID
+   * @return {Slice<T>}
    */
   update(rows) {
     this.operation = "$/slice/xupdate";
@@ -2364,6 +2288,7 @@ const _Slice = class _Slice {
    * @param {string | object} field property to compare or a map of equality comparisons
    * @param {string} operator Operation to compare with. Accepts JS operators (>=, ==, !=, ...) as well as datalynk styax ($gte, $eq, $is, $not, ...)
    * @param {any} value value to compare against
+   * @return {Slice<T>}
    */
   where(field, operator, value) {
     if (this.request.where && this.request.where[0] != "$or") this.and();
@@ -2402,6 +2327,7 @@ let Slice = _Slice;
 class Socket {
   constructor(api, options = {}) {
     __publicField(this, "listeners", []);
+    // [ Callback, Re-subscribe ]
     __publicField(this, "retry");
     __publicField(this, "socket");
     __publicField(this, "open", false);
@@ -2422,9 +2348,9 @@ class Socket {
    * @param {SocketListener} fn Callback function
    * @return {Unsubscribe} Function to unsubscribe callback
    */
-  addListener(fn) {
-    this.listeners.push(fn);
-    return () => this.listeners = this.listeners.filter((l) => l != fn);
+  addListener(fn, reconnect) {
+    this.listeners.push([fn, reconnect]);
+    return () => this.listeners = this.listeners.filter((l) => l[0] != fn);
   }
   /**
    * Close socket connection
@@ -2462,11 +2388,12 @@ class Socket {
           if (payload.connected) {
             this.open = true;
             console.debug("Datalynk socket: connected");
+            this.listeners.forEach((l) => l[1]());
           } else {
             throw new Error(`Datalynk socket failed: ${payload.error}`);
           }
         } else {
-          this.listeners.forEach((l) => l(payload));
+          this.listeners.forEach((l) => l[0](payload));
         }
       };
     }
@@ -2489,15 +2416,12 @@ class Socket {
    * @return {Unsubscribe} Run returned function to unsubscribe callback
    */
   sliceEvents(slice, callback) {
-    let cancelled = false;
-    sleepWhile(() => !this.open).then(() => {
-      if (!cancelled) this.send({ onSliceEvents: slice });
-    });
+    const listen = () => this.send({ onSliceEvents: slice });
+    if (this.open) listen();
     const unsubscribe = this.addListener((event) => {
       if (event.type == "sliceEvents" && event.data.slice == slice) callback(event);
-    });
+    }, () => listen());
     return () => {
-      cancelled = true;
       this.send({ offSliceEvents: slice });
       unsubscribe();
     };
@@ -2552,9 +2476,8 @@ class Api {
     __publicField(this, "bundleOngoing", false);
     /** LocalStorage key for persisting logins */
     __publicField(this, "localStorageKey", "datalynk-token");
-    /** Pending requests */
+    /** Pending requests cache */
     __publicField(this, "pending", {});
-    // Cache for ongoing requests
     /** Authentication helpers */
     __publicField(this, "auth", new Auth(this));
     /** File helpers */
@@ -2565,9 +2488,8 @@ class Api {
     __publicField(this, "socket");
     /** Superuser helpers */
     __publicField(this, "superuser", new Superuser(this));
-    /** API endpoint */
+    /** API URL endpoint */
     __publicField(this, "url");
-    // API URL endpoint for requests
     /** API Session token */
     __publicField(this, "token$", new BehaviorSubject(null));
     this.options = options;
@@ -2647,10 +2569,21 @@ class Api {
   /**
    * Chain multiple requests to execute together
    * @param {Slice<any>} requests List of requests to chain
-   * @return {Promise<SlicePromise[]>} API Response
+   * @return {Promise<any>} API Response
    */
   chain(...requests) {
-    return this.request({ "$/tools/action_chain": requests.flatMap((r) => r instanceof Slice ? r.raw : r) });
+    const arr = requests.length == 1 && Array.isArray(requests[0]) ? requests[0] : requests;
+    return this.request({ "$/tools/action_chain": arr.map((r) => {
+      if (!(r instanceof Slice)) return r;
+      const req = r.raw;
+      Object.keys(req).forEach((key) => {
+        if (key.startsWith("$/")) {
+          req[key.replace("$", "!")] = req[key];
+          delete req[key];
+        }
+      });
+      return req;
+    }) });
   }
   /**
    * Organize multiple requests into a single mapped request
@@ -2659,11 +2592,37 @@ class Api {
    */
   chainMap(request) {
     return this.request({ "$/tools/do": [
-      ...Object.entries(request).flatMap(([key, r]) => [key, r instanceof Slice ? r.raw : r]),
+      ...Object.entries(request).flatMap(([key, r]) => {
+        if (!(r instanceof Slice)) return [key, r];
+        const req = r.raw;
+        Object.keys(req).forEach((key2) => {
+          if (key2.startsWith("$/")) {
+            req[key2.replace("$", "!")] = req[key2];
+            delete req[key2];
+          }
+        });
+        return [key, req];
+      }),
       "returnAllBoilerplate",
       { "$_": "*" }
     ] }, {});
   }
+  /**
+   * Exact same as `request` method, but logs the response in the console automatically
+   *
+   * @param {object | string} data Datalynk request as object or string
+   * @param {ApiRequestOptions} options
+   * @returns {Promise<any>} Datalynk response
+   */
+  debug(data, options = {}) {
+    return this.request(data, options).then((data2) => {
+      console.log(data2);
+      return data2;
+    }).catch((err) => {
+      console.error(err);
+      return err;
+    });
+  }
   /**
    * Send a request to Datalynk
    *
@@ -2678,7 +2637,7 @@ class Api {
    */
   request(data, options = {}) {
     data = typeof data == "string" ? { [data]: {} } : data;
-    if (options.force) {
+    if (options.noOptimize) {
       return new Promise((res, rej) => {
         this._request(data, options).then((resp) => {
           (resp == null ? void 0 : resp.error) ? rej(resp) : res(resp);
@@ -2716,27 +2675,11 @@ class Api {
    * ```
    *
    * @param {number} slice Slice number the object will target
-   * @returns {Slice<T extends SliceMeta>} Object for making requests & caching rows
+   * @returns {Slice<T = any>} Object for making requests & caching rows
    */
   slice(slice) {
     return new Slice(slice, this);
   }
-  /**
-   * Exact same as `request` method, but logs the response in the console automatically
-   *
-   * @param {object | string} data Datalynk request as object or string
-   * @param {ApiRequestOptions} options
-   * @returns {Promise<any>} Datalynk response
-   */
-  test(data, options = {}) {
-    return this.request(data, options).then((data2) => {
-      console.log(data2);
-      return data2;
-    }).catch((err) => {
-      console.error(err);
-      return err;
-    });
-  }
 }
 export {
   Api,
@@ -2746,7 +2689,6 @@ export {
   Pdf,
   Serializer,
   Slice,
-  SlicePromise,
   Socket,
   Superuser
 };