Updates

dist/index.d.ts

@@ -8,7 +8,7 @@ declare global {
 /**
  * Imports
  */
-import get from "./utils/get";
+import get from "./utils/get/index";
 import post from "./utils/post";
 import getSchema from "./utils/get-schema";
 import uploadImage from "./utils/upload-image";

dist/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * Imports
  */
-const get_1 = __importDefault(require("./utils/get"));
+const index_1 = __importDefault(require("./utils/get/index"));
 const post_1 = __importDefault(require("./utils/post"));
 const get_schema_1 = __importDefault(require("./utils/get-schema"));
 const upload_image_1 = __importDefault(require("./utils/upload-image"));
@@ -82,7 +82,7 @@ const sql = {
  * Main Export
  */
 const datasquirel = {
-    get: get_1.default,
+    get: index_1.default,
     post: post_1.default,
     media,
     user,

dist/utils/get.d.ts

@@ -1,22 +0,0 @@
-import { GetReturn, ServerQueryParam } from "../package-shared/types";
-export type ApiGetQueryObject = {
-    query: ServerQueryParam;
-    table: string;
-    dbFullName?: string;
-};
-type Param = {
-    key?: string;
-    db?: string;
-    query: string | ApiGetQueryObject;
-    queryValues?: string[];
-    tableName?: string;
-    useLocal?: boolean;
-    user_id?: string | number;
-    debug?: boolean;
-};
-export type ApiGetParams = Param;
-/**
- * # Make a get request to Datasquirel API
- */
-export default function get({ key, db, query, queryValues, tableName, useLocal, user_id, debug, }: Param): Promise<GetReturn>;
-export {};

dist/utils/get.js

@@ -1,146 +0,0 @@
-"use strict";
-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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = get;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const grab_host_names_1 = __importDefault(require("../package-shared/utils/grab-host-names"));
-const get_1 = __importDefault(require("../package-shared/functions/api/query/get"));
-const serialize_query_1 = __importDefault(require("../package-shared/utils/serialize-query"));
-const sql_generator_1 = __importDefault(require("../package-shared/functions/dsql/sql/sql-generator"));
-/**
- * # Make a get request to Datasquirel API
- */
-function get(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ key, db, query, queryValues, tableName, useLocal, user_id, debug, }) {
-        const grabedHostNames = (0, grab_host_names_1.default)();
-        const { host, port, scheme } = grabedHostNames;
-        /**
-         * Check for local DB settings
-         *
-         * @description Look for local db settings in `.env` file and by pass the http request if available
-         */
-        const { DSQL_DB_HOST, DSQL_DB_USERNAME, DSQL_DB_PASSWORD, DSQL_DB_NAME } = process.env;
-        if ((DSQL_DB_HOST === null || DSQL_DB_HOST === void 0 ? void 0 : DSQL_DB_HOST.match(/./)) &&
-            (DSQL_DB_USERNAME === null || DSQL_DB_USERNAME === void 0 ? void 0 : DSQL_DB_USERNAME.match(/./)) &&
-            (DSQL_DB_PASSWORD === null || DSQL_DB_PASSWORD === void 0 ? void 0 : DSQL_DB_PASSWORD.match(/./)) &&
-            (DSQL_DB_NAME === null || DSQL_DB_NAME === void 0 ? void 0 : DSQL_DB_NAME.match(/./)) &&
-            useLocal) {
-            /** @type {import("../package-shared/types").DSQL_DatabaseSchemaType | undefined} */
-            let dbSchema;
-            try {
-                const localDbSchemaPath = path_1.default.resolve(process.cwd(), "dsql.schema.json");
-                dbSchema = JSON.parse(fs_1.default.readFileSync(localDbSchemaPath, "utf8"));
-            }
-            catch (error) { }
-            if (debug) {
-                console.log("apiGet:Running Locally ...");
-            }
-            return yield (0, get_1.default)({
-                dbFullName: DSQL_DB_NAME,
-                query,
-                queryValues,
-                tableName,
-                dbSchema,
-                useLocal,
-                debug,
-            });
-        }
-        /**
-         * Make https request
-         *
-         * @description make a request to datasquirel.com
-         */
-        const httpResponse = yield new Promise((resolve, reject) => {
-            const queryGenObject = typeof query == "string"
-                ? undefined
-                : (0, sql_generator_1.default)({
-                    tableName: query.table,
-                    genObject: query.query,
-                    dbFullName: query.dbFullName || "__db",
-                });
-            const queryObject = {
-                db: process.env.DSQL_API_DB_NAME || String(db),
-                query: typeof query == "string"
-                    ? String(query
-                        .replace(/\n|\r|\n\r/g, "")
-                        .replace(/ {2,}/g, " "))
-                    : (queryGenObject === null || queryGenObject === void 0 ? void 0 : queryGenObject.string) || "",
-                queryValues: typeof query == "string"
-                    ? queryValues
-                        ? JSON.stringify(queryValues)
-                        : undefined
-                    : (queryGenObject === null || queryGenObject === void 0 ? void 0 : queryGenObject.values)
-                        ? JSON.stringify(queryGenObject.values)
-                        : undefined,
-                tableName,
-                debug,
-            };
-            if (debug) {
-                console.log("apiGet:queryObject", queryObject);
-            }
-            const queryString = (0, serialize_query_1.default)(Object.assign({}, queryObject));
-            if (debug) {
-                console.log("apiGet:queryString", queryString);
-            }
-            let path = `/api/query/${user_id || grabedHostNames.user_id}/get${queryString}`;
-            if (debug) {
-                console.log("apiGet:path", path);
-            }
-            const requestObject = {
-                method: "GET",
-                headers: {
-                    "Content-Type": "application/json",
-                    Authorization: key ||
-                        process.env.DSQL_READ_ONLY_API_KEY ||
-                        process.env.DSQL_FULL_ACCESS_API_KEY ||
-                        process.env.DSQL_API_KEY,
-                },
-                port,
-                hostname: host,
-                path,
-            };
-            scheme
-                .request(requestObject, 
-            /**
-             * Callback Function
-             *
-             * @description https request callback
-             */
-            (response) => {
-                var str = "";
-                response.on("data", function (chunk) {
-                    str += chunk;
-                });
-                response.on("end", function () {
-                    try {
-                        resolve(JSON.parse(str));
-                    }
-                    catch ( /** @type {any} */error) {
-                        reject({
-                            error: error.message,
-                            result: str,
-                        });
-                    }
-                });
-                response.on("error", (err) => {
-                    console.log("DSQL get Error,", err.message);
-                    resolve(null);
-                });
-            })
-                .end();
-        });
-        return httpResponse;
-    });
-}

index.ts

@@ -10,7 +10,7 @@ declare global {
 /**
  * Imports
  */
-import get from "./utils/get";
+import get from "./utils/get/index";
 import post from "./utils/post";
 import getSchema from "./utils/get-schema";
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "3.8.1",
+    "version": "3.8.2",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {