@auxilium/datalynk-client 1.0.19 → 1.0.20

package/dist/files.d.ts

@@ -21,7 +21,6 @@ export interface UploadedFile {
  */
 export declare class Files {
     private readonly api;
-    readonly url: string;
     constructor(api: Api);
     /**
      * Associate an existing file with an existing row

package/dist/files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED;;GAEG;AACH,qBAAa,KAAK;IAGL,OAAO,CAAC,QAAQ,CAAC,GAAG;IAFhC,QAAQ,CAAC,GAAG,EAAG,MAAM,CAAA;gBAEQ,GAAG,EAAE,GAAG;IAIrC;;;;;;;;;OASG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;IAC9G,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,GAAG;QAAC,qBAAqB,EAAE;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,EAAE,CAAA;SAAC,CAAA;KAAC;IAOrL;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM;IAI9C;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,EAAE,EAAE,SAAS,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAyB5I"}
+{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../src/files.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,uBAAuB;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;CACb;AAED;;GAEG;AACH,qBAAa,KAAK;IACL,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,GAAG;IAErC;;;;;;;;;OASG;IACH,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;IAC9G,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,GAAG;QAAC,qBAAqB,EAAE;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,EAAE,CAAA;SAAC,CAAA;KAAC;IAOrL;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM;IAI9C;;;;;OAKG;IACH,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,EAAE,EAAE,SAAS,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAuB5I"}

package/dist/index.cjs

@@ -36,6 +36,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       return value;
     }, space);
   }
+  function makeArray(value) {
+    return Array.isArray(value) ? value : [value];
+  }
   function contrast(background) {
     const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /[0-9a-fA-F]{2}/g : /[0-9a-fA-F]/g);
     if (!exploded || (exploded == null ? void 0 : exploded.length) < 3) return "black";
@@ -1994,9 +1997,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   }
   class Files {
     constructor(api) {
-      __publicField(this, "url");
       this.api = api;
-      this.url = `${this.api.url}file`;
     }
     associate(fileIds, slice, row, field, execute = true) {
       const req = { [`${execute ? "!" : "$"}/tools/file/update`]: { slice, row, field, ids: fileIds } };
@@ -2011,7 +2012,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @return {string} URL file can be viewed at
      */
     get(id, ignoreToken) {
-      return `${this.url}?id=${id}${ignoreToken ? "" : `&token=${this.api.token}`}`;
+      return `${this.api.url}file?id=${id}${ignoreToken ? "" : `&token=${this.api.token}`}`;
     }
     /**
      * Upload file(s) to the API & optionally associate them with a row
@@ -2020,20 +2021,18 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
      * @param {{slice: number, row: any, field: string, pk?: string}} associate Row to associate with
      */
     upload(files, associate) {
-      let f = [];
-      if (files instanceof FileList) f = Array.from(files);
-      else f = Array.isArray(files) ? files : [files];
+      let f = files instanceof FileList ? Array.from(files) : makeArray(files);
       return Promise.all(f.map((file) => {
         const data = new FormData();
-        data.append("", file, file.name);
-        return fetch(this.url, {
+        data.append("uploadedfiles[]", file, file.name);
+        return fetch(`${this.api.url}upload.php`, {
           method: "POST",
           headers: clean({ "Authorization": this.api.token ? `Bearer ${this.api.token}` : "" }),
           body: data
         }).then(async (resp) => {
           const data2 = await resp.json().catch(() => ({}));
           if (!resp.ok || data2["error"]) throw Object.assign(errorFromCode(resp.status, data2.error) || {}, data2);
-          return resp;
+          return data2.files.uploadedfiles[0];
         });
       })).then(async (files2) => {
         if (associate) {
@@ -2696,7 +2695,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       } });
     }
   }
-  const version = "1.0.19";
+  const version = "1.0.20";
   class Api {
     /**
      * Connect to Datalynk & send requests

package/dist/index.mjs

@@ -32,6 +32,9 @@ function JSONSanitize(obj, space) {
     return value;
   }, space);
 }
+function makeArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
 function contrast(background) {
   const exploded = background == null ? void 0 : background.match(background.length >= 6 ? /[0-9a-fA-F]{2}/g : /[0-9a-fA-F]/g);
   if (!exploded || (exploded == null ? void 0 : exploded.length) < 3) return "black";
@@ -1990,9 +1993,7 @@ class Auth {
 }
 class Files {
   constructor(api) {
-    __publicField(this, "url");
     this.api = api;
-    this.url = `${this.api.url}file`;
   }
   associate(fileIds, slice, row, field, execute = true) {
     const req = { [`${execute ? "!" : "$"}/tools/file/update`]: { slice, row, field, ids: fileIds } };
@@ -2007,7 +2008,7 @@ class Files {
    * @return {string} URL file can be viewed at
    */
   get(id, ignoreToken) {
-    return `${this.url}?id=${id}${ignoreToken ? "" : `&token=${this.api.token}`}`;
+    return `${this.api.url}file?id=${id}${ignoreToken ? "" : `&token=${this.api.token}`}`;
   }
   /**
    * Upload file(s) to the API & optionally associate them with a row
@@ -2016,20 +2017,18 @@ class Files {
    * @param {{slice: number, row: any, field: string, pk?: string}} associate Row to associate with
    */
   upload(files, associate) {
-    let f = [];
-    if (files instanceof FileList) f = Array.from(files);
-    else f = Array.isArray(files) ? files : [files];
+    let f = files instanceof FileList ? Array.from(files) : makeArray(files);
     return Promise.all(f.map((file) => {
       const data = new FormData();
-      data.append("", file, file.name);
-      return fetch(this.url, {
+      data.append("uploadedfiles[]", file, file.name);
+      return fetch(`${this.api.url}upload.php`, {
         method: "POST",
         headers: clean({ "Authorization": this.api.token ? `Bearer ${this.api.token}` : "" }),
         body: data
       }).then(async (resp) => {
         const data2 = await resp.json().catch(() => ({}));
         if (!resp.ok || data2["error"]) throw Object.assign(errorFromCode(resp.status, data2.error) || {}, data2);
-        return resp;
+        return data2.files.uploadedfiles[0];
       });
     })).then(async (files2) => {
       if (associate) {
@@ -2692,7 +2691,7 @@ class Superuser {
     } });
   }
 }
-const version = "1.0.19";
+const version = "1.0.20";
 class Api {
   /**
    * Connect to Datalynk & send requests

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": "1.0.19",
+	"version": "1.0.20",
 	"author": "Zak Timson <zaktimson@gmail.com>",
 	"private": false,
 	"main": "./dist/index.cjs",