@sheet2db/sdk 1.0.3 → 1.0.5

package/README.md

@@ -7,7 +7,7 @@
 ## Installation
 
 ```bash
-npm install sheet2db
+npm install @sheet2db/sdk
 ```
 
 ## Configuration Options

package/dist/index.d.ts

@@ -77,7 +77,7 @@ export type CreateSheetOptions = {
 export type DeleteSheetOptions = {
     sheet: string;
 };
-export default class Sheet2DB {
+export declare class Sheet2DB {
     private readonly options;
     private apiEndpoint;
     private fetchFn;

package/dist/index.js

@@ -1,48 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Sheet2DB = void 0;
 let fetchFunction;
 if (typeof window !== 'undefined' && typeof window.fetch !== 'undefined') {
     // We are in a browser environment
@@ -50,12 +8,10 @@ if (typeof window !== 'undefined' && typeof window.fetch !== 'undefined') {
 }
 else {
     // We are in a Node.js environment
-    //@ts-ignore
-    fetchFunction = (...args) => __awaiter(void 0, void 0, void 0, function* () {
-        const fetch = yield Promise.resolve().then(() => __importStar(require('node-fetch')));
-        //@ts-ignore
-        return fetch.default(...args);
-    });
+    fetchFunction = async (...args) => {
+        const fetch = global.fetch;
+        return fetch.apply(null, args);
+    };
 }
 class Sheet2DB {
     constructor(options) {
@@ -63,41 +19,47 @@ class Sheet2DB {
         this.apiEndpoint = "https://api.sheet2db.com";
         this.fetchFn = options.fetchFn || fetchFunction;
     }
-    fetch(path_1) {
-        return __awaiter(this, arguments, void 0, function* (path, method = "GET", queryParams, body) {
-            let endpoint = new URL(this.options.version, this.apiEndpoint);
-            let headers = { "Content-Type": "application/json" };
-            if (this.options.mode === 'connectionId') {
-                endpoint.pathname = `/${this.options.connectionId}${path}`;
-                if (this.options.basicAuth) {
-                    let authorization = Buffer.from(`${this.options.basicAuth.username}:${this.options.basicAuth.password}`).toString('base64');
-                    headers["Authorization"] = `Basic ${authorization}`;
-                }
-                else if (this.options.jwtAuth) {
-                    headers["Authorization"] = `Bearer ${this.options.jwtAuth.bearerToken}`;
-                }
+    async fetch(path, method = "GET", queryParams, body) {
+        let endpoint = new URL(this.options.version, this.apiEndpoint);
+        let headers = { "Content-Type": "application/json" };
+        if (this.options.mode === 'connectionId') {
+            endpoint.pathname = `${endpoint.pathname}/${this.options.connectionId}${path}`;
+            if (this.options.basicAuth) {
+                let authorization = Buffer.from(`${this.options.basicAuth.username}:${this.options.basicAuth.password}`).toString('base64');
+                headers["Authorization"] = `Basic ${authorization}`;
             }
-            else {
-                endpoint.pathname = `/${this.options.apiKey}${path}`;
-                endpoint.searchParams.set("__id", this.options.spreadsheetId);
+            else if (this.options.jwtAuth) {
+                headers["Authorization"] = `Bearer ${this.options.jwtAuth.bearerToken}`;
             }
-            if (queryParams) {
+        }
+        else {
+            endpoint.pathname = `${endpoint.pathname}/${this.options.apiKey}${path}`;
+            endpoint.searchParams.set("__id", this.options.spreadsheetId);
+        }
+        if (queryParams) {
+            if (typeof queryParams != 'string') {
                 queryParams.forEach((value, key) => {
                     endpoint.searchParams.append(key, value);
                 });
             }
-            const response = yield this.fetchFn(endpoint.toString(), {
-                headers,
-                method,
-                body: body ? JSON.stringify(body) : undefined
-            });
-            if (response.ok) {
-                return response.json();
-            }
             else {
-                throw new Error(yield response.text());
+                endpoint.search = queryParams;
+                if (this.options.mode == 'apikey') {
+                    endpoint.searchParams.set("__id", this.options.spreadsheetId);
+                }
             }
+        }
+        const response = await this.fetchFn(endpoint.toString(), {
+            headers,
+            method,
+            body: body ? JSON.stringify(body) : undefined
         });
+        if (response.ok) {
+            return response.json();
+        }
+        else {
+            throw new Error(await response.text());
+        }
     }
     ReadContent(options) {
         const query = new URLSearchParams(options);
@@ -122,49 +84,46 @@ class Sheet2DB {
         if (options.sheet) {
             path = `${path}/${options.sheet}`;
         }
-        const query = new URLSearchParams({ query: options.query });
-        return this.fetch(path, "GET", query);
+        return this.fetch(path, "GET", encodeURIComponent(options.query));
     }
     Insert(options) {
-        const { data } = options, queryParams = __rest(options, ["data"]);
+        const { data, ...queryParams } = options;
         const query = new URLSearchParams(queryParams);
         return this.fetch('/', "POST", query, data);
     }
     UpdateRow(options) {
-        const { row, data } = options, queryParams = __rest(options, ["row", "data"]);
+        const { row, data, ...queryParams } = options;
         const query = new URLSearchParams(queryParams);
         return this.fetch(`/row/${row}`, "PATCH", query, data);
     }
     UpdateWithQuery(options) {
-        const { sheet, data, query: q } = options;
+        const { sheet, data, query } = options;
         let path = '';
         if (sheet) {
             path = `/${sheet}`;
         }
-        const query = new URLSearchParams({ query: q });
-        return this.fetch(path, "PATCH", query, data);
+        return this.fetch(path, "PATCH", encodeURIComponent(query), data);
     }
     BatchUpdate(options) {
         const { batches, sheet } = options;
-        let path = '';
+        let path = '/batch';
         if (sheet) {
-            path = `/${sheet}`;
+            path = path + '/' + sheet;
         }
         return this.fetch(path, "PATCH", undefined, batches);
     }
     DeleteRow(options) {
-        const { row } = options, queryParams = __rest(options, ["row"]);
+        const { row, ...queryParams } = options;
         const query = new URLSearchParams(queryParams);
-        return this.fetch(`/${row}`, "DELETE", query);
+        return this.fetch(`/row/${row}`, "DELETE", query);
     }
     DeleteWithQuery(options) {
-        const { query: search, sheet } = options;
-        const query = new URLSearchParams({ query: search });
+        const { query, sheet } = options;
         let path = '';
         if (sheet) {
             path = `/${sheet}`;
         }
-        return this.fetch(path, "DELETE", query);
+        return this.fetch(path, "DELETE", encodeURIComponent(query));
     }
     Clear(options) {
         const path = `/clear/${options.sheet}`;
@@ -179,4 +138,4 @@ class Sheet2DB {
         return this.fetch(path, "DELETE");
     }
 }
-exports.default = Sheet2DB;
+exports.Sheet2DB = Sheet2DB;

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@sheet2db/sdk",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "test": "jest",
-    "build":"tsc"
+    "build":"tsc",
+    "prepublish": "tsc"
   },
   "exports":{
     ".":{
       "import":"./dist/index.js",
-      "require":"./dist/index.cjs"
+      "require":"./dist/index.js"
     }
   },
   "author": "",

package/src/index.ts

@@ -7,7 +7,7 @@ if (typeof window !== 'undefined' && typeof window.fetch !== 'undefined') {
     // We are in a Node.js environment
     fetchFunction = async (...args) => {
         const fetch = global.fetch;
-        return fetch(...args);
+        return fetch.apply(null,args)
     };
 }
 
@@ -102,7 +102,7 @@ export type DeleteSheetOptions = {
     sheet: string;
 };
 
-export default class Sheet2DB {
+export class Sheet2DB {
 
     private apiEndpoint: string = "https://api.sheet2db.com";
     // private apiEndpoint: string = "http://localhost:8787";

package/tests/index.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from '@jest/globals';
-import Sheet2DB, {
+import {
+    Sheet2DB,
     Sheet2DBOptions,
     ReadOptions,
     GetKeysOptions,

package/tsconfig.json

@@ -1,16 +1,11 @@
 {
-    "compilerOptions": {
-      "target": "ES6",
-      "module": "CommonJS",
-      "moduleResolution": "node",
-      "outDir": "./dist",
-      "rootDir": "./src",
-      "strict": true,
-      "esModuleInterop": true,
-      "skipLibCheck": true,
-      "declaration": true
-    },
-    "include": ["src/**/*"],
-    "exclude": ["node_modules"]
-  }
-  
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2019",
+    "declaration": true,
+    "outDir": "./dist"
+  },
+  "include": [
+    "src/**/*"
+  ]
+}

package/dist/index.cjs.d.ts

@@ -1,2 +0,0 @@
-import Sheet2DB from "./index.js";
-export = Sheet2DB;

package/dist/index.cjs.js

@@ -1,6 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const index_js_1 = __importDefault(require("./index.js"));
-module.exports = index_js_1.default;

package/src/index.cjs.ts

@@ -1,2 +0,0 @@
-import Sheet2DB from "./index.js";
-export = Sheet2DB