rocket-launch-live-client 0.2.1 → 0.3.0

package/lib/esm/utils.js

@@ -3,6 +3,9 @@ const getLeadingZero = (month, offset = 0) => {
     const str = "0".concat((month + offset).toString());
     return str.slice(-2);
 };
+export const formatToRLLISODate = (date) => {
+    return date.toISOString().slice(0, 19).concat("Z");
+};
 export const apiKeyValidator = (apiKey) => {
     if (apiKey === undefined) {
         error("RLL Client requires API Key", "type");
@@ -34,112 +37,94 @@ export const optionsValidator = (options) => {
 };
 const validators = {
     string: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option === "number") {
-                resolve(option.toString());
-            }
-            if (typeof option !== "string") {
-                return reject("Must be a string");
-            }
-            if (option.length <= 0) {
-                return reject("String must have length greater than 0");
-            }
-            resolve(option);
-        });
+        if (typeof option === "number") {
+            return option.toString();
+        }
+        if (typeof option !== "string") {
+            throw "Must be a string";
+        }
+        if (option.length <= 0) {
+            throw "String must have length greater than 0";
+        }
+        return option;
     },
     boolean: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option !== "boolean") {
-                return reject("Must be a boolean");
-            }
-            resolve(option === true ? 1 : 0);
-        });
+        if (typeof option !== "boolean") {
+            throw "Must be a boolean";
+        }
+        return option === true ? 1 : 0;
     },
     number: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option === "number") {
-                return resolve(option);
-            }
-            if (typeof option !== "string" ||
-                option === "" ||
-                isNaN(Number(option))) {
-                return reject("Must be a number");
-            }
-            else {
-                resolve(Number(option));
-            }
-        });
+        if (typeof option === "number") {
+            return option;
+        }
+        if (typeof option !== "string" || option === "" || isNaN(Number(option))) {
+            throw "Must be a number";
+        }
+        else {
+            return Number(option);
+        }
     },
     countryCode: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option !== "string") {
-                return reject("Must be a string");
-            }
-            if (!isValidCountryCode(option)) {
-                return reject("Invalid country code. Country codes should follow ISO 3166-1 A2 convention, like 'US'.");
-            }
-            resolve(option);
-        });
+        if (typeof option !== "string") {
+            throw "Must be a string";
+        }
+        if (!isValidCountryCode(option)) {
+            throw "Invalid country code. Country codes should follow ISO 3166-1 A2 convention, like 'US'.";
+        }
+        return option;
     },
     stateCode: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option !== "string") {
-                return reject("Must be a string");
-            }
-            if (!isValidStateCode(option)) {
-                return reject("Invalid United States State Code. State Codes should follow ISO 3166-2 convention, like 'FL'.");
-            }
-            resolve(option);
-        });
+        if (typeof option !== "string") {
+            throw "Must be a string";
+        }
+        if (!isValidStateCode(option)) {
+            throw "Invalid United States State Code. State Codes should follow ISO 3166-2 convention, like 'FL'.";
+        }
+        return option;
     },
     cosparId: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option !== "string") {
-                return reject("Must be a string");
-            }
-            if (!option.match(/^\d{4}\-\d{3}$/g)) {
-                return reject("Cospar IDs must be in the format of YYYY-NNN (eg. 2023-123)");
-            }
-            resolve(option);
-        });
+        if (typeof option !== "string") {
+            throw "Must be a string";
+        }
+        if (!option.match(/^\d{4}\-\d{3}$/g)) {
+            throw "Cospar IDs must be in the format of YYYY-NNN (eg. 2023-123)";
+        }
+        return option;
     },
     shortDate: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option === "string" || option instanceof Date) {
-                let date;
-                if (typeof option === "string") {
-                    const parsed = Date.parse(option);
-                    if (isNaN(parsed)) {
-                        return reject("Must be an ISO 8601 Date String");
-                    }
-                    date = new Date(parsed);
-                }
-                else {
-                    date = option;
-                }
-                resolve(`${date.getUTCFullYear()}-${getLeadingZero(date.getUTCMonth(), 1)}-${getLeadingZero(date.getUTCDate())}`);
+        if (typeof option !== "string" && !(option instanceof Date)) {
+            throw "Must be a JavaScript Date Object or ISO 8601 Date String";
+        }
+        let date;
+        if (typeof option === "string") {
+            const parsed = Date.parse(option);
+            if (isNaN(parsed)) {
+                throw "Must be an ISO 8601 Date String";
             }
-            return reject("Must be a JavaScript Date Object or ISO 8601 Date String");
-        });
+            date = new Date(parsed);
+        }
+        else {
+            date = option;
+        }
+        return `${date.getUTCFullYear()}-${getLeadingZero(date.getUTCMonth(), 1)}-${getLeadingZero(date.getUTCDate())}`;
     },
     isoDate: (option) => {
-        return new Promise((resolve, reject) => {
-            if (typeof option === "string" || option instanceof Date) {
-                let date;
-                if (typeof option === "string") {
-                    const parsed = Date.parse(option);
-                    if (isNaN(parsed)) {
-                        return reject("Must be an ISO 8601 Date String");
-                    }
-                    date = new Date(parsed);
-                }
-                else {
-                    date = option;
-                }
-                resolve(date.toISOString().slice(0, 19).concat("Z"));
+        if (typeof option !== "string" && !(option instanceof Date)) {
+            throw "Must be a JavaScript Date Object or ISO 8601 Date String";
+        }
+        let date;
+        if (typeof option === "string") {
+            const parsed = Date.parse(option);
+            if (isNaN(parsed)) {
+                throw "Must be an ISO 8601 Date String";
             }
-            return reject("Must be a JavaScript Date Object or ISO 8601 Date String");
-        });
+            date = new Date(parsed);
+        }
+        else {
+            date = option;
+        }
+        return formatToRLLISODate(date);
     },
 };
 const optionsMap = {
@@ -199,9 +184,18 @@ const optionsMap = {
 };
 export const queryOptionsValidator = (resource, options) => {
     const params = new URLSearchParams();
-    const paramsPromises = [];
-    if (!options) {
-        return Promise.resolve(params);
+    if (options === undefined) {
+        return params;
+    }
+    if (typeof options === "string" ||
+        typeof options === "number" ||
+        typeof options === "boolean" ||
+        typeof options === "bigint" ||
+        typeof options === "symbol" ||
+        typeof options === "function" ||
+        options === null ||
+        Array.isArray(options)) {
+        error("Invalid type for query options. Must be an object.");
     }
     if ((options.id || "slug" in options || "cospar_id" in options) &&
         Object.keys(options).length > 1) {
@@ -216,14 +210,15 @@ export const queryOptionsValidator = (resource, options) => {
             warn(`Parameter "${option}" is undefined and will be ignored.`);
             continue;
         }
-        const promise = optionsMap[resource][option](options[option])
-            .then((o) => params.set(option, o))
-            .catch((err) => {
-            throw `Malformed query parameter for resource "${resource}" and parameter: "${option}": ${err}.`;
-        });
-        paramsPromises.push(promise);
+        try {
+            const o = optionsMap[resource][option](options[option]);
+            params.set(option, o);
+        }
+        catch (err) {
+            error(`Malformed query parameter for resource "${resource}" and parameter: "${option}": ${err}.`, "type");
+        }
     }
-    return Promise.all(paramsPromises).then(() => params);
+    return params;
 };
 export const warn = (msg) => console.warn(`[RLL Client]: ${msg}`);
 export const error = (msg, type = "error") => {

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "rocket-launch-live-client",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "A Node.JS client for interacting with the RocketLaunch.Live API",
   "types": "./lib/cjs/types/index.d.ts",
   "main": "./lib/cjs/index.js",
   "scripts": {
     "clear": "rm -rf ./lib",
-    "dev": "nodemon ./lib/test.js --ignore 'lib/**' -e ts --exec \"npm run compile\"",
-    "compile": "npm run clear && tsc && node ./lib/test.js",
     "build": "npm run clear && npm run build:esm && npm run build:cjs",
     "build:esm": "tsc -p ./configs/tsconfig.esm.json && mv lib/esm/index.js lib/esm/index.mjs",
     "build:cjs": "tsc -p ./configs/tsconfig.cjs.json",
-    "start": "node ./lib/test.js",
     "prepublish": "npm run build",
     "test": "mocha",
     "test:watch": "mocha --watch"