@vizzly/api-client 0.0.33 → 0.0.35

package/dist/index.d.ts

@@ -5,5 +5,6 @@ export * from './models/VizzlyQueryEngineApi';
 export * from './models/Authentication';
 export * from './models/ImplementationStrategy';
 export * from './models/VizzlyApiClientLogger';
+export * from './models/Path';
 export * from './types';
 export * as Errors from './errors';

package/dist/index.js

@@ -34,5 +34,6 @@ __exportStar(require("./models/VizzlyQueryEngineApi"), exports);
 __exportStar(require("./models/Authentication"), exports);
 __exportStar(require("./models/ImplementationStrategy"), exports);
 __exportStar(require("./models/VizzlyApiClientLogger"), exports);
+__exportStar(require("./models/Path"), exports);
 __exportStar(require("./types"), exports);
 exports.Errors = __importStar(require("./errors"));

package/dist/models/Api.d.ts

@@ -6,5 +6,6 @@ export declare class Api {
     protected auth: Authentication;
     constructor(auth: Authentication, host: string, extraHeaders?: () => {});
     execute<ResponseBody>(request: Request<any>): Promise<Response<ResponseBody>>;
+    originApp(): string;
     getAuth(): Authentication;
 }

package/dist/models/Api.js

@@ -16,6 +16,7 @@ exports.Api = void 0;
 const isomorphic_fetch_1 = __importDefault(require("isomorphic-fetch"));
 const Monitor_1 = require("./Monitor");
 const VizzlyApiClientLogger_1 = require("./VizzlyApiClientLogger");
+const Path_1 = require("./Path");
 class Api {
     constructor(auth, host, extraHeaders = () => ({})) {
         this.host = host;
@@ -27,11 +28,11 @@ class Api {
             var _a, _b;
             const authHeaders = this.auth.buildAuthHeaders(request.acceptedAuthParams);
             const customHeaders = Object.assign(Object.assign({}, (request.headers || {})), (this.extraHeaders() || {}));
-            const path = `${this.host}${request.path}`;
+            const path = Path_1.Path.buildPath(this.host, request.path);
             const timedFetch = Monitor_1.Monitor.timeRequest(request.method, path, isomorphic_fetch_1.default);
             const res = yield timedFetch(path, {
                 method: request.method,
-                headers: Object.assign(Object.assign({ 'Content-Type': 'application/json', Accept: 'application/json', 'Vizzly-User-Agent': `${VizzlyApiClientLogger_1.VizzlyApiClientLogger.UserAgentProduct} (Using client ${(_a = require('../../package.json')) === null || _a === void 0 ? void 0 : _a.version})` }, authHeaders), customHeaders),
+                headers: Object.assign(Object.assign({ 'Content-Type': 'application/json', Accept: 'application/json', 'Vizzly-User-Agent': `${VizzlyApiClientLogger_1.VizzlyApiClientLogger.UserAgentProduct}${this.originApp()} (Using client ${(_a = require('../../package.json')) === null || _a === void 0 ? void 0 : _a.version})` }, authHeaders), customHeaders),
                 redirect: 'follow',
                 referrerPolicy: 'no-referrer',
                 body: request.body ? JSON.stringify(request.body) : null,
@@ -47,6 +48,17 @@ class Api {
             return { body: body, status: res.status, headers: res.headers };
         });
     }
+    originApp() {
+        const isServer = !(typeof window != 'undefined' && window.document);
+        if (isServer) {
+            const testApp = process.env['NODE_ENV'] === 'test' ? 'tests' : '';
+            const origin = process.env['VIZZLY_ORIGIN_APP'] || testApp || '';
+            if (origin == '')
+                return '';
+            return ` (${origin})`;
+        }
+        return '';
+    }
     getAuth() {
         return this.auth;
     }

package/dist/models/Path.d.ts

@@ -0,0 +1,9 @@
+export declare class Path {
+    static removeAnyWrappingForwardSlash(str: string): string;
+    static baseIsValid(base: string): boolean;
+    static buildPath(basePath: string, route: string): string;
+    static addQueryParam(absoluteUrl: string, key: string, value: string): string;
+    static hasHashtag(absoluteUrl: string): boolean;
+    static setVizzlyHashtagValue(absoluteUrl: string, value: string): string;
+    static getVizzlyHashtagValue(absoluteUrl: string): string | null;
+}

package/dist/models/Path.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Path = void 0;
+class Path {
+    static removeAnyWrappingForwardSlash(str) {
+        if (str.startsWith('/')) {
+            return Path.removeAnyWrappingForwardSlash(str.slice(1));
+        }
+        if (str.endsWith('/')) {
+            return Path.removeAnyWrappingForwardSlash(str.slice(0, -1));
+        }
+        return str;
+    }
+    static baseIsValid(base) {
+        return base.startsWith('https://') || base.startsWith('http://') || base.startsWith('.');
+    }
+    static buildPath(basePath, route) {
+        const trimmedBase = Path.removeAnyWrappingForwardSlash(basePath);
+        const trimmedRoute = Path.removeAnyWrappingForwardSlash(route);
+        const prefix = Path.baseIsValid(basePath) ? '' : '/';
+        if (trimmedBase == '' && trimmedRoute == '')
+            return '/';
+        if (trimmedRoute == '')
+            return `${prefix}${trimmedBase}`;
+        if (trimmedBase != '' && trimmedRoute != '')
+            return `${prefix}${trimmedBase}/${trimmedRoute}`;
+        return `${prefix}${trimmedRoute}`;
+    }
+    static addQueryParam(absoluteUrl, key, value) {
+        const [beforeHash, afterHash] = absoluteUrl.split('#');
+        const [before, after] = beforeHash.split('?');
+        var searchParams = new URLSearchParams(after);
+        searchParams.set(key, value);
+        var newUrlWithQueryParam = before + '?' + searchParams.toString() + (afterHash ? `#${afterHash}` : '');
+        return newUrlWithQueryParam;
+    }
+    static hasHashtag(absoluteUrl) {
+        return absoluteUrl.includes('#');
+    }
+    static setVizzlyHashtagValue(absoluteUrl, value) {
+        return `${absoluteUrl}#vizzly_${value}`;
+    }
+    static getVizzlyHashtagValue(absoluteUrl) {
+        return absoluteUrl.split('#vizzly_')[1] || null;
+    }
+}
+exports.Path = Path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizzly/api-client",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "private": false,
   "license": "NONE",
   "source": "src/index.ts",