wip

Author: silesky

packages/signals/signals-integration-tests/src/tests/signals-vanilla/network-signals-fetch.test.ts

@@ -54,20 +54,23 @@ test.describe('network signals - fetch', () => {
       (el) => el.properties!.data.action === 'request'
     )
     expect(requests).toHaveLength(1)
-    expect(requests[0].properties!.data).toMatchObject({
+    expect(requests[0].properties!.data).toEqual({
       action: 'request',
       url: 'http://localhost/test',
+      method: 'POST',
       data: { key: 'value' },
     })
 
     const responses = networkEvents.filter(
       (el) => el.properties!.data.action === 'response'
     )
     expect(responses).toHaveLength(1)
-    expect(responses[0].properties!.data).toMatchObject({
+    expect(responses[0].properties!.data).toEqual({
       action: 'response',
       url: 'http://localhost/test',
       data: { foo: 'test' },
+      statusCode: 200,
+      ok: true,
     })
   })
 
@@ -176,6 +179,8 @@ test.describe('network signals - fetch', () => {
         action: 'response',
         url: 'http://localhost/test',
         data: { errorMsg: 'foo' },
+        statusCode: 400,
+        ok: false,
       })
       expect(responses).toHaveLength(1)
     })
@@ -213,6 +218,8 @@ test.describe('network signals - fetch', () => {
         action: 'response',
         url: 'http://localhost/test',
         data: 'foo',
+        statusCode: 400,
+        ok: false,
       })
       expect(responses).toHaveLength(1)
     })

packages/signals/signals-runtime/editor/mobile-editor.d.ts

@@ -18,10 +18,12 @@ type JSONObject = {
 };
 type JSONArray = JSONValue[];
 interface SegmentEvent {
-	type: EventType;
-	[key: string]: any;
+	/**
+	 * @example 'track' | 'page' | 'screen' | 'identify' | 'group' | 'alias'
+	 */
+	type: string;
+	[key: string]: unknown;
 }
-type EventType = "track" | "page" | "screen" | "identify" | "group" | "alias";
 type SignalTypes = Signal["type"];
 type NavigationAction = "forward" | "backward" | "modal" | "entering" | "leaving" | "page" | "popup";
 type NetworkAction = "request" | "response";
@@ -57,7 +59,6 @@ interface NetworkData {
 }
 interface NetworkSignal extends RawSignal<"network"> {
 	data: NetworkData;
-	[key: string]: unknown;
 }
 interface LocalData {
 	action: LocalDataAction;
@@ -77,6 +78,8 @@ interface InstrumentationData {
 interface InstrumentationSignal extends RawSignal<"instrumentation"> {
 	data: InstrumentationData;
 }
+interface MobileSignalsRuntime extends ISignalsRuntime<Signal> {
+}
 
 
 

packages/signals/signals-runtime/editor/web-editor.d.ts

@@ -18,10 +18,12 @@ type JSONObject = {
 };
 type JSONArray = JSONValue[];
 interface SegmentEvent {
-	type: EventType;
-	[key: string]: any;
+	/**
+	 * @example 'track' | 'page' | 'screen' | 'identify' | 'group' | 'alias'
+	 */
+	type: string;
+	[key: string]: unknown;
 }
-type EventType = "track" | "page" | "screen" | "identify" | "group" | "alias";
 type SignalTypes = Signal["type"];
 interface RawSignal<T extends SignalTypes, Data> extends BaseSignal {
 	type: T;
@@ -80,6 +82,8 @@ interface NetworkRequestData extends BaseNetworkData {
 interface NetworkResponseData extends BaseNetworkData {
 	action: "response";
 	url: string;
+	statusCode: number;
+	ok: boolean;
 }
 type NetworkData = NetworkRequestData | NetworkResponseData;
 type NetworkSignal = RawSignal<"network", NetworkData>;
@@ -88,10 +92,12 @@ interface UserDefinedSignalData {
 }
 type UserDefinedSignal = RawSignal<"userDefined", UserDefinedSignalData>;
 type Signal = InteractionSignal | NavigationSignal | InstrumentationSignal | NetworkSignal | UserDefinedSignal;
+interface WebSignalsRuntime extends ISignalsRuntime<Signal> {
+}
 
 
 
-declare const signals: ISignalsRuntime<Signal>
+declare const signals: WebSignalsRuntime
 declare const SignalType: {
   Interaction: 'interaction'
   Navigation: 'navigation'

packages/signals/signals-runtime/src/shared/shared-types.ts

@@ -21,14 +21,9 @@ export type JSONObject = { [member: string]: JSONValue }
 export type JSONArray = JSONValue[]
 
 export interface SegmentEvent {
-  type: EventType // e.g 'track'
-  [key: string]: any
+  /**
+   * @example 'track' | 'page' | 'screen' | 'identify' | 'group' | 'alias'
+   */
+  type: string
+  [key: string]: unknown
 }
-
-export type EventType =
-  | 'track'
-  | 'page'
-  | 'screen'
-  | 'identify'
-  | 'group'
-  | 'alias'

packages/signals/signals/src/core/emitter/index.ts

@@ -1,6 +1,6 @@
 import { Emitter } from '@segment/analytics-generic-utils'
 import { logger } from '../../lib/logger'
-import { Signal } from '../../types'
+import { Signal } from '@segment/analytics-signals-runtime'
 
 export interface EmitSignal {
   emit: (signal: Signal) => void

packages/signals/signals/src/core/processor/sandbox.ts

@@ -1,9 +1,9 @@
 import { logger } from '../../lib/logger'
 import { createWorkerBox, WorkerBoxAPI } from '../../lib/workerbox'
 import { resolvers } from './arg-resolvers'
-import { AnalyticsRuntimePublicApi, Signal, AnalyticsEnums } from '../../types'
+import { AnalyticsRuntimePublicApi, AnalyticsEnums } from '../../types'
 import { replaceBaseUrl } from '../../lib/replace-base-url'
-import { SignalsRuntime } from '@segment/analytics-signals-runtime'
+import { SignalsRuntime, Signal } from '@segment/analytics-signals-runtime'
 
 export type MethodName =
   | 'page'

packages/signals/signals/src/index.ts

@@ -4,10 +4,9 @@
  */
 export { SignalsPlugin } from './plugin/signals-plugin'
 export { Signals } from './core/signals'
-
+export type { Signal } from '@segment/analytics-signals-runtime'
 export type {
   ProcessSignal,
   AnalyticsRuntimePublicApi,
   SignalsPluginSettingsConfig,
-  Signal,
 } from './types'