@qrvey/utils 1.12.0-3 → 1.12.0-4

package/dist/cjs/services/api/Charts.api.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const Request_1 = __importDefault(require("../helpers/Request"));
+const Request_1 = require("../helpers/Request");
 const CHART_ENDPOINT_1 = require("../constants/CHART_ENDPOINT");
 const UCHART_ENDPOINT_1 = require("../constants/UCHART_ENDPOINT");
 const UCHART_PAGINATION_ENDPOINT_1 = require("../constants/UCHART_PAGINATION_ENDPOINT");
@@ -23,7 +20,7 @@ class ChartsApi {
             data.logic = data.filters;
             delete data.filters;
         }
-        return Request_1.default.post(Object.assign(Object.assign({}, this.config), { endpoint: newEndpoint ? UCHART_ENDPOINT_1.UCHART_ENDPOINT : CHART_ENDPOINT_1.CHART_ENDPOINT, signal }), newEndpoint ? "" : "/results", data);
+        return Request_1.Request.post(Object.assign(Object.assign({}, this.config), { endpoint: newEndpoint ? UCHART_ENDPOINT_1.UCHART_ENDPOINT : CHART_ENDPOINT_1.CHART_ENDPOINT, signal }), newEndpoint ? "" : "/results", data);
     }
     getResultsPagination(data, ignoreSignal = false) {
         const signal = ignoreSignal ? undefined : this.createSignal();
@@ -31,7 +28,7 @@ class ChartsApi {
             data.logic = data.filters;
             delete data.filters;
         }
-        return Request_1.default.post(Object.assign(Object.assign({}, this.config), { endpoint: UCHART_PAGINATION_ENDPOINT_1.UCHART_PAGINATION_ENDPOINT, signal }), "", data);
+        return Request_1.Request.post(Object.assign(Object.assign({}, this.config), { endpoint: UCHART_PAGINATION_ENDPOINT_1.UCHART_PAGINATION_ENDPOINT, signal }), "", data);
     }
 }
 exports.default = ChartsApi;

package/dist/cjs/services/api/getAllQrveys.api.js

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllQrveys = void 0;
 const QRVEY_ENDPOINT_1 = require("../constants/QRVEY_ENDPOINT");
-const Request_1 = __importDefault(require("../helpers/Request"));
+const Request_1 = require("../helpers/Request");
 /**
  * Request function for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
  * @param config Configuration
  * @param params  Object for getting precise data
  */
 function getAllQrveys(config, params) {
-    return Request_1.default.post(Object.assign(Object.assign({}, config), { endpoint: QRVEY_ENDPOINT_1.QRVEY_ENDPOINT }), "/all", params);
+    return Request_1.Request.post(Object.assign(Object.assign({}, config), { endpoint: QRVEY_ENDPOINT_1.QRVEY_ENDPOINT }), "/all", params);
 }
 exports.getAllQrveys = getAllQrveys;

package/dist/cjs/services/api/getDatasetColumns.api.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetColumns = void 0;
 const CHART_ENDPOINT_1 = require("../constants/CHART_ENDPOINT");
-const Request_1 = __importDefault(require("../helpers/Request"));
+const Request_1 = require("../helpers/Request");
 const BDatasetsToUIDatasets_adapter_1 = require("../adapters/BDatasetsToUIDatasets.adapter");
 const getDefaultQuestionListOptionsAttributes_1 = require("../helpers/getDefaultQuestionListOptionsAttributes");
 const localization_1 = require("../../format/localization");
@@ -16,7 +13,7 @@ const localization_1 = require("../../format/localization");
  */
 function getDatasetColumns(config, qrveyid) {
     const lang = (0, localization_1.chooseLang)(config);
-    return Request_1.default.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT_1.CHART_ENDPOINT }), "/question/list", {
+    return Request_1.Request.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT_1.CHART_ENDPOINT }), "/question/list", {
         optionsAttributes: (0, getDefaultQuestionListOptionsAttributes_1.getDefaultQuestionListOptionsAttributes)(),
         extend: true,
     }, { lang })

package/dist/cjs/services/api/getDatasetsByIds.api.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDatasetsByIds = void 0;
-const Request_1 = __importDefault(require("../helpers/Request"));
+const Request_1 = require("../helpers/Request");
 const BDatasetsToUIDatasets_adapter_1 = require("../adapters/BDatasetsToUIDatasets.adapter");
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const localization_1 = require("../../format/localization");
@@ -18,7 +15,7 @@ const QUESTION_LIST_BULK_ENDPOINT_1 = require("../constants/QUESTION_LIST_BULK_E
 function getDatasetsByIds(config, qrveyids = []) {
     if (Array.isArray(qrveyids) && !(0, isEmpty_1.isEmpty)(qrveyids)) {
         const lang = (0, localization_1.chooseLang)(config);
-        return Request_1.default.post(Object.assign(Object.assign({}, config), { endpoint: QUESTION_LIST_BULK_ENDPOINT_1.QUESTION_LIST_BULK_ENDPOINT }), "", {
+        return Request_1.Request.post(Object.assign(Object.assign({}, config), { endpoint: QUESTION_LIST_BULK_ENDPOINT_1.QUESTION_LIST_BULK_ENDPOINT }), "", {
             optionsAttributes: (0, getDefaultQuestionListOptionsAttributes_1.getDefaultQuestionListOptionsAttributes)(),
             qrveyids,
         }, { lang })

package/dist/cjs/services/api/getModel.api.js

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModel = void 0;
-const Request_1 = __importDefault(require("../helpers/Request"));
+const Request_1 = require("../helpers/Request");
 const localization_1 = require("../../format/localization");
 const MODEL_ENDPOINT_1 = require("../constants/MODEL_ENDPOINT");
 const BModelToUIModel_adapter_1 = require("../adapters/BModelToUIModel.adapter");
 function getModel(config, params) {
     const lang = (0, localization_1.chooseLang)(config);
     const data = { lang, logic: config.logic || [] };
-    return Request_1.default.post(Object.assign(Object.assign({}, config), { endpoint: MODEL_ENDPOINT_1.ANALYTIQ_ENDPOINT }), "", data, Object.assign(Object.assign({}, params), { lang })).then(BModelToUIModel_adapter_1.BModelToUIModel);
+    return Request_1.Request.post(Object.assign(Object.assign({}, config), { endpoint: MODEL_ENDPOINT_1.ANALYTIQ_ENDPOINT }), "", data, Object.assign(Object.assign({}, params), { lang })).then(BModelToUIModel_adapter_1.BModelToUIModel);
 }
 exports.getModel = getModel;

package/dist/cjs/services/helpers/Request.d.ts

@@ -1,4 +1,4 @@
-export default class Request {
+export declare class Request {
     static checkStatus(response: any): Promise<any>;
     static hasQvToken(config: any): boolean;
     static getQvToken(config: any): any;
@@ -6,6 +6,7 @@ export default class Request {
     static hasApiKey(config: any): boolean;
     static getApiKey(config: any): any;
     static makeUrl(config: any, url: any, params?: any): string;
+    private static getApiUrl;
     static parseUrl: (url: any, config: any) => string;
     static requestConfig(reqData: any): any;
     static resolveRequest(reqData: any): Promise<any>;

package/dist/cjs/services/helpers/Request.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Request = void 0;
 const numericOffsetToISO_1 = require("../../dates/adapters/numericOffsetToISO");
 const isEmpty_1 = require("../../general/mix/isEmpty");
 const getAttribute_1 = require("../../general/object/getAttribute");
@@ -44,18 +45,30 @@ class Request {
     static makeUrl(config, url, params) {
         let _url = url;
         _url += typeof params === "object" ? (0, serialize_1.serialize)(params) : "";
-        if (config.endpoint) {
+        if (!(0, isEmpty_1.isEmpty)(config.endpoint)) {
             const endpoint = config.endpoint;
-            const version = `v${endpoint.version || 4}`;
-            const api = this.hasQvToken(config) || this.hasApiKey(config) ? "devapi" : "api";
+            const version = `/v${endpoint.version || 4}`;
+            const admin = endpoint.admin ? "/admin" : "";
+            const api = Request.getApiUrl(config);
             const user = (0, getAttribute_1.getAttribute)(config, "user_id") || this.hasQvToken(config)
                 ? "/user/:user_id"
                 : "";
-            const base = `/${api}/${version}${user}`;
+            const base = `${admin}${api}${version}${user}`;
             _url = (config.domain || "") + base + endpoint.uri + _url;
         }
         return this.parseUrl(_url, config);
     }
+    static getApiUrl(config) {
+        const endpoint = config.endpoint || {};
+        if (endpoint.noApi)
+            return "";
+        const isDevApi = !(0, isEmpty_1.isEmpty)(endpoint.devApi) && endpoint.devApi;
+        return isDevApi ||
+            ((0, isEmpty_1.isEmpty)(endpoint.devApi) &&
+                (this.hasQvToken(config) || this.hasApiKey(config)))
+            ? "/devapi"
+            : "/api";
+    }
     static requestConfig(reqData) {
         const cfg = {
             method: reqData.type,
@@ -103,5 +116,5 @@ class Request {
         return this.resolveRequest({ config, url, type: "POST", data, params });
     }
 }
+exports.Request = Request;
 Request.parseUrl = (url, config) => (0, parseUrl_1.parseUrl)(url, (key) => (0, getAttribute_1.getAttribute)(config, key));
-exports.default = Request;

package/dist/cjs/services/interfaces/IEndpointConfig.d.ts

@@ -1,4 +1,7 @@
 export interface IEndpointConfig {
+    noApi?: boolean;
+    admin?: boolean;
+    devApi?: boolean;
     uri: string;
     version?: number;
 }

package/dist/services/api/Charts.api.js

@@ -1,4 +1,4 @@
-import Request from "../helpers/Request";
+import { Request } from "../helpers/Request";
 import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
 import { UCHART_ENDPOINT } from "../constants/UCHART_ENDPOINT";
 import { UCHART_PAGINATION_ENDPOINT } from "../constants/UCHART_PAGINATION_ENDPOINT";

package/dist/services/api/getAllQrveys.api.js

@@ -1,5 +1,5 @@
 import { QRVEY_ENDPOINT } from "../constants/QRVEY_ENDPOINT";
-import Request from "../helpers/Request";
+import { Request } from "../helpers/Request";
 /**
  * Request function for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
  * @param config Configuration

package/dist/services/api/getDatasetColumns.api.js

@@ -1,5 +1,5 @@
 import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
-import Request from "../helpers/Request";
+import { Request } from "../helpers/Request";
 import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
 import { getDefaultQuestionListOptionsAttributes } from "../helpers/getDefaultQuestionListOptionsAttributes";
 import { chooseLang } from "../../format/localization";

package/dist/services/api/getDatasetsByIds.api.js

@@ -1,4 +1,4 @@
-import Request from "../helpers/Request";
+import { Request } from "../helpers/Request";
 import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
 import { isEmpty } from "../../general/mix/isEmpty";
 import { chooseLang } from "../../format/localization";

package/dist/services/api/getModel.api.js

@@ -1,4 +1,4 @@
-import Request from "../helpers/Request";
+import { Request } from "../helpers/Request";
 import { chooseLang } from "../../format/localization";
 import { ANALYTIQ_ENDPOINT } from "../constants/MODEL_ENDPOINT";
 import { BModelToUIModel } from "../adapters/BModelToUIModel.adapter";

package/dist/services/helpers/Request.d.ts

@@ -1,4 +1,4 @@
-export default class Request {
+export declare class Request {
     static checkStatus(response: any): Promise<any>;
     static hasQvToken(config: any): boolean;
     static getQvToken(config: any): any;
@@ -6,6 +6,7 @@ export default class Request {
     static hasApiKey(config: any): boolean;
     static getApiKey(config: any): any;
     static makeUrl(config: any, url: any, params?: any): string;
+    private static getApiUrl;
     static parseUrl: (url: any, config: any) => string;
     static requestConfig(reqData: any): any;
     static resolveRequest(reqData: any): Promise<any>;

package/dist/services/helpers/Request.js

@@ -12,7 +12,7 @@ import { isEmpty } from "../../general/mix/isEmpty";
 import { getAttribute } from "../../general/object/getAttribute";
 import { serialize } from "../../general/object/serialize";
 import { parseUrl } from "../../general/string/parseUrl";
-class Request {
+export class Request {
     static checkStatus(response) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!response.ok)
@@ -42,18 +42,30 @@ class Request {
     static makeUrl(config, url, params) {
         let _url = url;
         _url += typeof params === "object" ? serialize(params) : "";
-        if (config.endpoint) {
+        if (!isEmpty(config.endpoint)) {
             const endpoint = config.endpoint;
-            const version = `v${endpoint.version || 4}`;
-            const api = this.hasQvToken(config) || this.hasApiKey(config) ? "devapi" : "api";
+            const version = `/v${endpoint.version || 4}`;
+            const admin = endpoint.admin ? "/admin" : "";
+            const api = Request.getApiUrl(config);
             const user = getAttribute(config, "user_id") || this.hasQvToken(config)
                 ? "/user/:user_id"
                 : "";
-            const base = `/${api}/${version}${user}`;
+            const base = `${admin}${api}${version}${user}`;
             _url = (config.domain || "") + base + endpoint.uri + _url;
         }
         return this.parseUrl(_url, config);
     }
+    static getApiUrl(config) {
+        const endpoint = config.endpoint || {};
+        if (endpoint.noApi)
+            return "";
+        const isDevApi = !isEmpty(endpoint.devApi) && endpoint.devApi;
+        return isDevApi ||
+            (isEmpty(endpoint.devApi) &&
+                (this.hasQvToken(config) || this.hasApiKey(config)))
+            ? "/devapi"
+            : "/api";
+    }
     static requestConfig(reqData) {
         const cfg = {
             method: reqData.type,
@@ -102,4 +114,3 @@ class Request {
     }
 }
 Request.parseUrl = (url, config) => parseUrl(url, (key) => getAttribute(config, key));
-export default Request;

package/dist/services/interfaces/IEndpointConfig.d.ts

@@ -1,4 +1,7 @@
 export interface IEndpointConfig {
+    noApi?: boolean;
+    admin?: boolean;
+    devApi?: boolean;
     uri: string;
     version?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.12.0-3",
+  "version": "1.12.0-4",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",