@jitsu/js 1.9.4 → 1.9.6

package/__tests__/playwright/integration.test.ts

@@ -214,8 +214,8 @@ test("jitsu-queue-callbacks", async ({ browser }) => {
   expect(requestLog.length).toBe(3);
 });
 
-test("url-bug", async ({ browser }) => {
-  clearRequestLog();
+// Skip this test because jitsu-js no longer relies on canonical URL
+test.skip("url-bug", async ({ browser, context }) => {
   //tests a bug in getanalytics.io where the url without slash provided by
   //<link rel="canonical" ../> causes incorrect page path
   const browserContext = await browser.newContext();

package/dist/analytics-plugin.d.ts

@@ -26,6 +26,5 @@ export type DeviceOptions = AnalyticsPluginDescriptor | InternalPluginDescriptor
 export type JitsuPluginConfig = JitsuOptions & {
     storageWrapper?: (persistentStorage: PersistentStorage) => PersistentStorage;
 };
-declare const jitsuAnalyticsPlugin: (pluginConfig?: JitsuPluginConfig) => AnalyticsPlugin;
+export declare const jitsuAnalyticsPlugin: (pluginConfig?: JitsuPluginConfig) => AnalyticsPlugin;
 export declare function randomId(hashString?: string | undefined): string;
-export default jitsuAnalyticsPlugin;

package/dist/jitsu.cjs.js

@@ -1328,6 +1328,17 @@ function fixPath(path) {
     }
     return path;
 }
+const hashRegex = /#.*$/;
+/**
+ * for compatibility with path produced by analytics.js
+ * @param url
+ */
+function urlPath(url) {
+    const regex = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/g;
+    const matches = regex.exec(url);
+    const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
+    return "/" + pathMatch;
+}
 function adjustPayload(payload, config, storage, s2s) {
     var _a, _b;
     const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
@@ -1335,8 +1346,9 @@ function adjustPayload(payload, config, storage, s2s) {
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
     const properties = payload.properties || {};
-    if (properties.path) {
-        properties.path = fixPath(properties.path);
+    if (payload.type === "page" && url) {
+        properties.url = url.replace(hashRegex, "");
+        properties.path = fixPath(urlPath(url));
     }
     const customContext = ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || {};
     (_b = payload.properties) === null || _b === void 0 ? true : delete _b.context;
@@ -1831,6 +1843,7 @@ exports.emptyAnalytics = emptyAnalytics;
 exports.emptyRuntime = emptyRuntime;
 exports.isInBrowser = isInBrowser;
 exports.jitsuAnalytics = jitsuAnalytics;
+exports.jitsuAnalyticsPlugin = jitsuAnalyticsPlugin;
 exports.parseQuery = parseQuery;
 exports.randomId = randomId;
 exports.windowRuntime = windowRuntime;

package/dist/jitsu.d.ts

@@ -1,5 +1,4 @@
 import type { AnalyticsInterface } from "@jitsu/protocols/analytics";
-import type { AnalyticsPlugin } from "analytics";
 type JitsuOptions = {
     /**
      * API Key. Optional. If not set, Jitsu will send event to the server without auth, and server
@@ -74,5 +73,4 @@ type RuntimeFacade = {
     pageTitle(): string | undefined;
 };
 export declare function jitsuAnalytics(opts: JitsuOptions): AnalyticsInterface;
-export declare const jitsuAnalyticsPlugin: AnalyticsPlugin;
 export { AnalyticsInterface, JitsuOptions, PersistentStorage, RuntimeFacade };

package/dist/jitsu.es.js

@@ -1326,6 +1326,17 @@ function fixPath(path) {
     }
     return path;
 }
+const hashRegex = /#.*$/;
+/**
+ * for compatibility with path produced by analytics.js
+ * @param url
+ */
+function urlPath(url) {
+    const regex = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/g;
+    const matches = regex.exec(url);
+    const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
+    return "/" + pathMatch;
+}
 function adjustPayload(payload, config, storage, s2s) {
     var _a, _b;
     const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
@@ -1333,8 +1344,9 @@ function adjustPayload(payload, config, storage, s2s) {
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
     const properties = payload.properties || {};
-    if (properties.path) {
-        properties.path = fixPath(properties.path);
+    if (payload.type === "page" && url) {
+        properties.url = url.replace(hashRegex, "");
+        properties.path = fixPath(urlPath(url));
     }
     const customContext = ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || {};
     (_b = payload.properties) === null || _b === void 0 ? true : delete _b.context;
@@ -1825,4 +1837,4 @@ function uuid() {
     return u;
 }
 
-export { emptyAnalytics, emptyRuntime, isInBrowser, jitsuAnalytics, parseQuery, randomId, windowRuntime };
+export { emptyAnalytics, emptyRuntime, isInBrowser, jitsuAnalytics, jitsuAnalyticsPlugin, parseQuery, randomId, windowRuntime };

package/dist/web/p.js.txt

@@ -1329,6 +1329,17 @@
       }
       return path;
   }
+  const hashRegex = /#.*$/;
+  /**
+   * for compatibility with path produced by analytics.js
+   * @param url
+   */
+  function urlPath(url) {
+      const regex = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/g;
+      const matches = regex.exec(url);
+      const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
+      return "/" + pathMatch;
+  }
   function adjustPayload(payload, config, storage, s2s) {
       var _a, _b;
       const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
@@ -1336,8 +1347,9 @@
       const parsedUrl = safeCall(() => new URL(url), undefined);
       const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
       const properties = payload.properties || {};
-      if (properties.path) {
-          properties.path = fixPath(properties.path);
+      if (payload.type === "page" && url) {
+          properties.url = url.replace(hashRegex, "");
+          properties.path = fixPath(urlPath(url));
       }
       const customContext = ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || {};
       (_b = payload.properties) === null || _b === void 0 ? true : delete _b.context;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "1.9.4",
+  "version": "1.9.6",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -34,8 +34,8 @@
     "rollup": "^3.2.5",
     "ts-jest": "29.0.5",
     "typescript": "^5.3.3",
-    "@jitsu/protocols": "1.9.4",
-    "jsondiffpatch": "1.9.4"
+    "@jitsu/protocols": "1.9.6",
+    "jsondiffpatch": "1.9.6"
   },
   "dependencies": {
     "analytics": "0.8.9"

package/src/analytics-plugin.ts

@@ -334,6 +334,19 @@ function fixPath(path: string): string {
   return path;
 }
 
+const hashRegex = /#.*$/;
+
+/**
+ * for compatibility with path produced by analytics.js
+ * @param url
+ */
+function urlPath(url) {
+  const regex = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/g;
+  const matches = regex.exec(url);
+  const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
+  return "/" + pathMatch;
+}
+
 function adjustPayload(
   payload: any,
   config: JitsuOptions,
@@ -346,8 +359,9 @@ function adjustPayload(
   const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
   const properties = payload.properties || {};
 
-  if (properties.path) {
-    properties.path = fixPath(properties.path);
+  if (payload.type === "page" && url) {
+    properties.url = url.replace(hashRegex, "");
+    properties.path = fixPath(urlPath(url));
   }
 
   const customContext = payload.properties?.context || {};
@@ -646,7 +660,7 @@ async function send(
 export type JitsuPluginConfig = JitsuOptions & {
   storageWrapper?: (persistentStorage: PersistentStorage) => PersistentStorage;
 };
-const jitsuAnalyticsPlugin = (pluginConfig: JitsuPluginConfig = {}): AnalyticsPlugin => {
+export const jitsuAnalyticsPlugin = (pluginConfig: JitsuPluginConfig = {}): AnalyticsPlugin => {
   const instanceConfig = {
     ...defaultConfig,
     ...pluginConfig,
@@ -761,5 +775,3 @@ function hash(str: string, seed: number = 0): number {
 
   return 4294967296 * (2097151 & h2) + (h1 >>> 0);
 }
-
-export default jitsuAnalyticsPlugin;

package/src/index.ts

@@ -1,6 +1,6 @@
 import Analytics from "analytics";
 import { AnalyticsInterface, JitsuOptions, PersistentStorage, RuntimeFacade } from "./jitsu";
-import jitsuAnalyticsPlugin, { emptyRuntime, isInBrowser, windowRuntime } from "./analytics-plugin";
+import { jitsuAnalyticsPlugin, emptyRuntime, isInBrowser, windowRuntime } from "./analytics-plugin";
 import { Callback, DispatchedEvent, ID, JSONObject, Options } from "@jitsu/protocols/analytics";
 
 export default function parse(input) {

package/src/jitsu.ts

@@ -1,5 +1,4 @@
 import type { AnalyticsInterface } from "@jitsu/protocols/analytics";
-import type { AnalyticsPlugin } from "analytics";
 
 type JitsuOptions = {
   /**
@@ -84,6 +83,4 @@ type RuntimeFacade = {
 
 export declare function jitsuAnalytics(opts: JitsuOptions): AnalyticsInterface;
 
-export declare const jitsuAnalyticsPlugin: AnalyticsPlugin;
-
 export { AnalyticsInterface, JitsuOptions, PersistentStorage, RuntimeFacade };