posthog-node 3.6.0 → 3.6.2

package/lib/posthog-core/src/utils.d.ts

@@ -6,7 +6,6 @@ export interface RetriableOptions {
     retryCheck?: (err: any) => boolean;
 }
 export declare function retriable<T>(fn: () => Promise<T>, props?: RetriableOptions): Promise<T>;
-export declare function generateUUID(globalThis?: any): string;
 export declare function currentTimestamp(): number;
 export declare function currentISOTime(): string;
 export declare function safeSetTimeout(fn: () => void, timeout: number): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "posthog-node",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "PostHog Node.js integration",
   "repository": {
     "type": "git",

package/src/feature-flags.ts

@@ -532,13 +532,9 @@ function matchProperty(
       }
     }
     case 'is_date_after':
-    case 'is_date_before':
-    case 'is_relative_date_before':
-    case 'is_relative_date_after': {
-      let parsedDate = null
-      if (['is_relative_date_before', 'is_relative_date_after'].includes(operator)) {
-        parsedDate = relativeDateParseForFeatureFlagMatching(String(value))
-      } else {
+    case 'is_date_before': {
+      let parsedDate = relativeDateParseForFeatureFlagMatching(String(value))
+      if (parsedDate == null) {
         parsedDate = convertToDateTime(value)
       }
 
@@ -546,7 +542,7 @@ function matchProperty(
         throw new InconclusiveMatchError(`Invalid date: ${value}`)
       }
       const overrideDate = convertToDateTime(overrideValue)
-      if (['is_date_before', 'is_relative_date_before'].includes(operator)) {
+      if (['is_date_before'].includes(operator)) {
         return overrideDate < parsedDate
       }
       return overrideDate > parsedDate
@@ -691,7 +687,7 @@ function convertToDateTime(value: string | number | (string | number)[] | Date):
 }
 
 function relativeDateParseForFeatureFlagMatching(value: string): Date | null {
-  const regex = /^(?<number>[0-9]+)(?<interval>[a-z])$/
+  const regex = /^-?(?<number>[0-9]+)(?<interval>[a-z])$/
   const match = value.match(regex)
   const parsedDt = new Date(new Date().toISOString())
 

package/src/posthog-node.ts

@@ -460,7 +460,7 @@ export class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     personProperties?: Record<string, string>,
     groupProperties?: Record<string, Record<string, string>>
   ): { allPersonProperties: Record<string, string>; allGroupProperties: Record<string, Record<string, string>> } {
-    const allPersonProperties = { $current_distinct_id: distinctId, ...(personProperties || {}) }
+    const allPersonProperties = { distinct_id: distinctId, ...(personProperties || {}) }
 
     const allGroupProperties: Record<string, Record<string, string>> = {}
     if (groups) {

package/test/feature-flags.spec.ts

@@ -354,7 +354,7 @@ describe('local evaluation', () => {
           distinct_id: 'some-distinct-id_outside_rollout?',
           groups: {},
           person_properties: {
-            $current_distinct_id: 'some-distinct-id_outside_rollout?',
+            distinct_id: 'some-distinct-id_outside_rollout?',
             region: 'USA',
             email: 'a@b.com',
           },
@@ -376,7 +376,7 @@ describe('local evaluation', () => {
           token: 'TEST_API_KEY',
           distinct_id: 'some-distinct-id',
           groups: {},
-          person_properties: { $current_distinct_id: 'some-distinct-id', doesnt_matter: '1' },
+          person_properties: { distinct_id: 'some-distinct-id', doesnt_matter: '1' },
           group_properties: {},
           geoip_disable: true,
         }),
@@ -2054,7 +2054,7 @@ describe('match properties', () => {
   it('with relative date operators', () => {
     jest.setSystemTime(new Date('2022-05-01'))
 
-    const property_a = { key: 'key', value: '6h', operator: 'is_relative_date_before' }
+    const property_a = { key: 'key', value: '-6h', operator: 'is_date_before' }
     expect(matchProperty(property_a, { key: '2022-03-01' })).toBe(true)
     expect(matchProperty(property_a, { key: '2022-04-30' })).toBe(true)
 
@@ -2073,58 +2073,53 @@ describe('match properties', () => {
     // however js understands numbers as date offsets from utc epoch
     expect(() => matchProperty(property_a, { key: 1 })).not.toThrow(InconclusiveMatchError)
 
-    const property_b = { key: 'key', value: '1h', operator: 'is_relative_date_after' }
+    const property_b = { key: 'key', value: '1h', operator: 'is_date_after' }
     expect(matchProperty(property_b, { key: '2022-05-02' })).toBe(true)
     expect(matchProperty(property_b, { key: '2022-05-30' })).toBe(true)
     expect(matchProperty(property_b, { key: new Date(2022, 4, 30) })).toBe(true)
     expect(matchProperty(property_b, { key: new Date('2022-05-30') })).toBe(true)
     expect(matchProperty(property_b, { key: '2022-04-30' })).toBe(false)
 
-    // # Invalid flag property
-    const property_c = { key: 'key', value: 1234, operator: 'is_relative_date_after' }
-    expect(() => matchProperty(property_c, { key: '2022-05-30' })).toThrow(InconclusiveMatchError)
-    expect(() => matchProperty(property_c, { key: 1 })).toThrow(InconclusiveMatchError)
-
     // # Try all possible relative dates
-    const property_e = { key: 'key', value: '1h', operator: 'is_relative_date_before' }
+    const property_e = { key: 'key', value: '1h', operator: 'is_date_before' }
     expect(matchProperty(property_e, { key: '2022-05-01 00:00:00' })).toBe(false)
     expect(matchProperty(property_e, { key: '2022-04-30 22:00:00' })).toBe(true)
 
-    const property_f = { key: 'key', value: '1d', operator: 'is_relative_date_before' }
+    const property_f = { key: 'key', value: '-1d', operator: 'is_date_before' }
     expect(matchProperty(property_f, { key: '2022-04-29 23:59:00 GMT' })).toBe(true)
     expect(matchProperty(property_f, { key: '2022-04-30 00:00:01 GMT' })).toBe(false)
 
-    const property_g = { key: 'key', value: '1w', operator: 'is_relative_date_before' }
+    const property_g = { key: 'key', value: '1w', operator: 'is_date_before' }
     expect(matchProperty(property_g, { key: '2022-04-23 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_g, { key: '2022-04-24 00:00:00 GMT' })).toBe(false)
     expect(matchProperty(property_g, { key: '2022-04-24 00:00:01 GMT' })).toBe(false)
 
-    const property_h = { key: 'key', value: '1m', operator: 'is_relative_date_before' }
+    const property_h = { key: 'key', value: '1m', operator: 'is_date_before' }
     expect(matchProperty(property_h, { key: '2022-03-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_h, { key: '2022-04-05 00:00:00 GMT' })).toBe(false)
 
-    const property_i = { key: 'key', value: '1y', operator: 'is_relative_date_before' }
+    const property_i = { key: 'key', value: '-1y', operator: 'is_date_before' }
     expect(matchProperty(property_i, { key: '2021-04-28 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_i, { key: '2021-05-01 00:00:01 GMT' })).toBe(false)
 
-    const property_j = { key: 'key', value: '122h', operator: 'is_relative_date_after' }
+    const property_j = { key: 'key', value: '122h', operator: 'is_date_after' }
     expect(matchProperty(property_j, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_j, { key: '2022-04-23 01:00:00 GMT' })).toBe(false)
 
-    const property_k = { key: 'key', value: '2d', operator: 'is_relative_date_after' }
+    const property_k = { key: 'key', value: '2d', operator: 'is_date_after' }
     expect(matchProperty(property_k, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_k, { key: '2022-04-29 00:00:01 GMT' })).toBe(true)
     expect(matchProperty(property_k, { key: '2022-04-29 00:00:00 GMT' })).toBe(false)
 
-    const property_l = { key: 'key', value: '02w', operator: 'is_relative_date_after' }
+    const property_l = { key: 'key', value: '02w', operator: 'is_date_after' }
     expect(matchProperty(property_l, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_l, { key: '2022-04-16 00:00:00 GMT' })).toBe(false)
 
-    const property_m = { key: 'key', value: '1m', operator: 'is_relative_date_after' }
+    const property_m = { key: 'key', value: '-1m', operator: 'is_date_after' }
     expect(matchProperty(property_m, { key: '2022-04-01 00:00:01 GMT' })).toBe(true)
     expect(matchProperty(property_m, { key: '2022-04-01 00:00:00 GMT' })).toBe(false)
 
-    const property_n = { key: 'key', value: '1y', operator: 'is_relative_date_after' }
+    const property_n = { key: 'key', value: '1y', operator: 'is_date_after' }
     expect(matchProperty(property_n, { key: '2022-05-01 00:00:00 GMT' })).toBe(true)
     expect(matchProperty(property_n, { key: '2021-05-01 00:00:01 GMT' })).toBe(true)
     expect(matchProperty(property_n, { key: '2021-05-01 00:00:00 GMT' })).toBe(false)

package/test/posthog-node.spec.ts

@@ -4,7 +4,7 @@ jest.mock('../src/fetch')
 import fetch from '../src/fetch'
 import { anyDecideCall, anyLocalEvalCall, apiImplementation } from './feature-flags.spec'
 import { waitForPromises, wait } from '../../posthog-core/test/test-utils/test-utils'
-import { generateUUID } from 'posthog-core/src/utils'
+import { randomUUID } from 'crypto'
 
 jest.mock('../package.json', () => ({ version: '1.2.3' }))
 
@@ -194,7 +194,7 @@ describe('PostHog Node.js', () => {
 
     it('should allow overriding uuid', async () => {
       expect(mockedFetch).toHaveBeenCalledTimes(0)
-      const uuid = generateUUID()
+      const uuid = randomUUID()
       posthog.capture({ event: 'custom-time', distinctId: '123', uuid })
       await waitForPromises()
       jest.runOnlyPendingTimers()
@@ -1035,7 +1035,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: { company: 'id:5', instance: 'app.posthog.com' },
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
               x1: 'y1',
             },
             group_properties: {
@@ -1051,7 +1051,7 @@ describe('PostHog Node.js', () => {
 
       await posthog.getFeatureFlag('random_key', 'some_id', {
         groups: { company: 'id:5', instance: 'app.posthog.com' },
-        personProperties: { $current_distinct_id: 'override' },
+        personProperties: { distinct_id: 'override' },
         groupProperties: { company: { $group_key: 'group_override' } },
       })
       jest.runOnlyPendingTimers()
@@ -1064,7 +1064,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: { company: 'id:5', instance: 'app.posthog.com' },
             person_properties: {
-              $current_distinct_id: 'override',
+              distinct_id: 'override',
             },
             group_properties: {
               company: { $group_key: 'group_override' },
@@ -1094,7 +1094,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: {},
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: {},
             geoip_disable: true,
@@ -1118,7 +1118,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: { company: 'id:5' },
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: { company: { $group_key: 'id:5' } },
             geoip_disable: true,
@@ -1138,7 +1138,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: {},
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: {},
             geoip_disable: true,
@@ -1159,7 +1159,7 @@ describe('PostHog Node.js', () => {
             distinct_id: 'some_id',
             groups: {},
             person_properties: {
-              $current_distinct_id: 'some_id',
+              distinct_id: 'some_id',
             },
             group_properties: {},
             geoip_disable: true,