posthog-node 3.4.0 → 3.6.0

package/lib/index.d.ts

@@ -45,7 +45,10 @@ declare type PostHogFetchOptions = {
     body?: string;
     signal?: AbortSignal;
 };
-declare type PosthogCaptureOptions = {
+declare type PostHogCaptureOptions = {
+    /** If provided overrides the auto-generated event ID */
+    uuid?: string;
+    /** If provided overrides the auto-generated timestamp */
     timestamp?: Date;
     disableGeoip?: boolean;
 };
@@ -108,9 +111,9 @@ declare abstract class PostHogCoreStateless {
     private captureMode;
     private removeDebugCallback?;
     private debugMode;
-    private pendingPromises;
     private disableGeoip;
     private _optoutOverride;
+    private pendingPromises;
     protected _events: SimpleEventEmitter;
     protected _flushTimer?: any;
     protected _retryOptions: RetriableOptions;
@@ -128,20 +131,21 @@ declare abstract class PostHogCoreStateless {
     on(event: string, cb: (...args: any[]) => void): () => void;
     debug(enabled?: boolean): void;
     private buildPayload;
+    protected addPendingPromise(promise: Promise<any>): void;
     /***
      *** TRACKING
      ***/
-    protected identifyStateless(distinctId: string, properties?: PostHogEventProperties, options?: PosthogCaptureOptions): this;
+    protected identifyStateless(distinctId: string, properties?: PostHogEventProperties, options?: PostHogCaptureOptions): this;
     protected captureStateless(distinctId: string, event: string, properties?: {
         [key: string]: any;
-    }, options?: PosthogCaptureOptions): this;
+    }, options?: PostHogCaptureOptions): this;
     protected aliasStateless(alias: string, distinctId: string, properties?: {
         [key: string]: any;
-    }, options?: PosthogCaptureOptions): this;
+    }, options?: PostHogCaptureOptions): this;
     /***
      *** GROUPS
      ***/
-    protected groupIdentifyStateless(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PosthogCaptureOptions, distinctId?: string, eventProperties?: PostHogEventProperties): this;
+    protected groupIdentifyStateless(groupType: string, groupKey: string | number, groupProperties?: PostHogEventProperties, options?: PostHogCaptureOptions, distinctId?: string, eventProperties?: PostHogEventProperties): this;
     /***
      *** FEATURE FLAGS
      ***/
@@ -158,7 +162,7 @@ declare abstract class PostHogCoreStateless {
     /***
      *** QUEUEING AND FLUSHING
      ***/
-    protected enqueue(type: string, _message: any, options?: PosthogCaptureOptions): void;
+    protected enqueue(type: string, _message: any, options?: PostHogCaptureOptions): void;
     flushAsync(): Promise<any>;
     flush(callback?: (err?: any, data?: any) => void): void;
     private fetchWithRetry;
@@ -166,16 +170,17 @@ declare abstract class PostHogCoreStateless {
     shutdown(): void;
 }
 
-interface IdentifyMessageV1 {
+interface IdentifyMessage {
     distinctId: string;
     properties?: Record<string | number, any>;
     disableGeoip?: boolean;
 }
-interface EventMessageV1 extends IdentifyMessageV1 {
+interface EventMessage extends IdentifyMessage {
     event: string;
     groups?: Record<string, string | number>;
     sendFeatureFlags?: boolean;
     timestamp?: Date;
+    uuid?: string;
 }
 interface GroupIdentifyMessage {
     groupType: string;
@@ -196,7 +201,7 @@ declare type PostHogNodeV1 = {
      * @param groups OPTIONAL | object of what groups are related to this event, example: { company: 'id:5' }. Can be used to analyze companies instead of users.
      * @param sendFeatureFlags OPTIONAL | Used with experiments. Determines whether to send feature flag values with the event.
      */
-    capture({ distinctId, event, properties, groups, sendFeatureFlags }: EventMessageV1): void;
+    capture({ distinctId, event, properties, groups, sendFeatureFlags }: EventMessage): void;
     /**
      * @description Identify lets you add metadata on your users so you can more easily identify who they are in PostHog,
      * and even do things like segment users by these properties.
@@ -204,7 +209,7 @@ declare type PostHogNodeV1 = {
      * @param distinctId which uniquely identifies your user
      * @param properties with a dict with any key: value pairs
      */
-    identify({ distinctId, properties }: IdentifyMessageV1): void;
+    identify({ distinctId, properties }: IdentifyMessage): void;
     /**
      * @description To marry up whatever a user does before they sign up or log in with what they do after you need to make an alias call.
      * This will allow you to answer questions like "Which marketing channels leads to users churning after a month?"
@@ -328,8 +333,8 @@ declare class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     enable(): void;
     disable(): void;
     debug(enabled?: boolean): void;
-    capture({ distinctId, event, properties, groups, sendFeatureFlags, timestamp, disableGeoip }: EventMessageV1): void;
-    identify({ distinctId, properties, disableGeoip }: IdentifyMessageV1): void;
+    capture({ distinctId, event, properties, groups, sendFeatureFlags, timestamp, disableGeoip, uuid, }: EventMessage): void;
+    identify({ distinctId, properties, disableGeoip }: IdentifyMessage): void;
     alias(data: {
         distinctId: string;
         alias: string;
@@ -377,6 +382,7 @@ declare class PostHog extends PostHogCoreStateless implements PostHogNodeV1 {
     reloadFeatureFlags(): Promise<void>;
     shutdown(): void;
     shutdownAsync(): Promise<void>;
+    private addLocalPersonAndGroupProperties;
 }
 
 /**

package/lib/index.esm.js

@@ -154,7 +154,7 @@ function __spreadArray(to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 }
 
-var version = "3.4.0";
+var version = "3.6.0";
 
 var PostHogPersistedProperty;
 (function (PostHogPersistedProperty) {
@@ -747,8 +747,8 @@ var PostHogCoreStateless = /** @class */ (function () {
     function PostHogCoreStateless(apiKey, options) {
         var _a, _b, _c, _d, _e;
         this.debugMode = false;
-        this.pendingPromises = {};
         this.disableGeoip = true;
+        this.pendingPromises = {};
         // internal
         this._events = new SimpleEventEmitter();
         assert(apiKey, "You must pass your PostHog project's api key.");
@@ -806,6 +806,14 @@ var PostHogCoreStateless = /** @class */ (function () {
             properties: __assign(__assign({}, (payload.properties || {})), this.getCommonEventProperties()),
         };
     };
+    PostHogCoreStateless.prototype.addPendingPromise = function (promise) {
+        var _this = this;
+        var promiseUUID = generateUUID();
+        this.pendingPromises[promiseUUID] = promise;
+        promise.finally(function () {
+            delete _this.pendingPromises[promiseUUID];
+        });
+    };
     /***
      *** TRACKING
      ***/
@@ -856,6 +864,7 @@ var PostHogCoreStateless = /** @class */ (function () {
         if (extraPayload === void 0) { extraPayload = {}; }
         return __awaiter(this, void 0, void 0, function () {
             var url, fetchOptions;
+            var _this = this;
             return __generator(this, function (_a) {
                 url = "".concat(this.host, "/decide/?v=3");
                 fetchOptions = {
@@ -866,7 +875,7 @@ var PostHogCoreStateless = /** @class */ (function () {
                 return [2 /*return*/, this.fetchWithRetry(url, fetchOptions)
                         .then(function (response) { return response.json(); })
                         .catch(function (error) {
-                        console.error('Error fetching feature flags', error);
+                        _this._events.emit('error', error);
                         return undefined;
                     })];
             });
@@ -1003,7 +1012,7 @@ var PostHogCoreStateless = /** @class */ (function () {
             this._events.emit(type, "Library is disabled. Not sending event. To re-enable, call posthog.optIn()");
             return;
         }
-        var message = __assign(__assign({}, _message), { type: type, library: this.getLibraryId(), library_version: this.getLibraryVersion(), timestamp: (options === null || options === void 0 ? void 0 : options.timestamp) ? options === null || options === void 0 ? void 0 : options.timestamp : currentISOTime() });
+        var message = __assign(__assign({}, _message), { type: type, library: this.getLibraryId(), library_version: this.getLibraryVersion(), timestamp: (options === null || options === void 0 ? void 0 : options.timestamp) ? options === null || options === void 0 ? void 0 : options.timestamp : currentISOTime(), uuid: (options === null || options === void 0 ? void 0 : options.uuid) ? options.uuid : generateUUID(globalThis) });
         var addGeoipDisableProperty = (_a = options === null || options === void 0 ? void 0 : options.disableGeoip) !== null && _a !== void 0 ? _a : this.disableGeoip;
         if (addGeoipDisableProperty) {
             if (!message.properties) {
@@ -1053,14 +1062,11 @@ var PostHogCoreStateless = /** @class */ (function () {
             batch: messages,
             sent_at: currentISOTime(),
         };
-        var promiseUUID = generateUUID();
         var done = function (err) {
             if (err) {
                 _this._events.emit('error', err);
             }
             callback === null || callback === void 0 ? void 0 : callback(err, messages);
-            // remove promise from pendingPromises
-            delete _this.pendingPromises[promiseUUID];
             _this._events.emit('flush', messages);
         };
         // Don't set the user agent if we're not on a browser. The latest spec allows
@@ -1086,12 +1092,11 @@ var PostHogCoreStateless = /** @class */ (function () {
                 body: payload,
             };
         var requestPromise = this.fetchWithRetry(url, fetchOptions);
-        this.pendingPromises[promiseUUID] = requestPromise;
-        requestPromise
+        this.addPendingPromise(requestPromise
             .then(function () { return done(); })
             .catch(function (err) {
             done(err);
-        });
+        }));
     };
     PostHogCoreStateless.prototype.fetchWithRetry = function (url, options, retryOptions) {
         var _a;
@@ -1145,7 +1150,7 @@ var PostHogCoreStateless = /** @class */ (function () {
                         clearTimeout(this._flushTimer);
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 4, , 5]);
+                        _a.trys.push([1, 5, , 6]);
                         return [4 /*yield*/, this.flushAsync()];
                     case 2:
                         _a.sent();
@@ -1153,18 +1158,31 @@ var PostHogCoreStateless = /** @class */ (function () {
                                 return x.catch(function () {
                                     // ignore errors as we are shutting down and can't deal with them anyways.
                                 });
-                            }))];
+                            }))
+                            // flush again to make sure we send all events, some of which might've been added
+                            // while we were waiting for the pending promises to resolve
+                            // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+                        ];
                     case 3:
                         _a.sent();
-                        return [3 /*break*/, 5];
+                        // flush again to make sure we send all events, some of which might've been added
+                        // while we were waiting for the pending promises to resolve
+                        // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+                        return [4 /*yield*/, this.flushAsync()];
                     case 4:
+                        // flush again to make sure we send all events, some of which might've been added
+                        // while we were waiting for the pending promises to resolve
+                        // For example, see sendFeatureFlags in posthog-node/src/posthog-node.ts::capture
+                        _a.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
                         e_2 = _a.sent();
                         if (!isPostHogFetchError(e_2)) {
                             throw e_2;
                         }
                         console.error('Error while shutting down PostHog', e_2);
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -1756,6 +1774,8 @@ function () {
   };
 
   FeatureFlagsPoller.prototype.getFeatureFlag = function (key, distinctId, groups, personProperties, groupProperties) {
+    var _a;
+
     if (groups === void 0) {
       groups = {};
     }
@@ -1769,17 +1789,17 @@ function () {
     }
 
     return __awaiter(this, void 0, void 0, function () {
-      var response, featureFlag, _i, _a, flag;
+      var response, featureFlag, _i, _b, flag;
 
-      return __generator(this, function (_b) {
-        switch (_b.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
             return [4
             /*yield*/
             , this.loadFeatureFlags()];
 
           case 1:
-            _b.sent();
+            _c.sent();
 
             response = undefined;
             featureFlag = undefined;
@@ -1790,8 +1810,8 @@ function () {
               , response];
             }
 
-            for (_i = 0, _a = this.featureFlags; _i < _a.length; _i++) {
-              flag = _a[_i];
+            for (_i = 0, _b = this.featureFlags; _i < _b.length; _i++) {
+              flag = _b[_i];
 
               if (key === flag.key) {
                 featureFlag = flag;
@@ -1812,7 +1832,7 @@ function () {
                     console.debug("InconclusiveMatchError when computing flag locally: ".concat(key, ": ").concat(e));
                   }
                 } else if (e instanceof Error) {
-                  console.error("Error computing flag locally: ".concat(key, ": ").concat(e));
+                  (_a = this.onError) === null || _a === void 0 ? void 0 : _a.call(this, new Error("Error computing flag locally: ".concat(key, ": ").concat(e)));
                 }
               }
             }
@@ -1988,12 +2008,18 @@ function () {
       var groupName = this.groupTypeMapping[String(aggregation_group_type_index)];
 
       if (!groupName) {
-        console.warn("[FEATURE FLAGS] Unknown group type index ".concat(aggregation_group_type_index, " for feature flag ").concat(flag.key));
+        if (this.debugMode) {
+          console.warn("[FEATURE FLAGS] Unknown group type index ".concat(aggregation_group_type_index, " for feature flag ").concat(flag.key));
+        }
+
         throw new InconclusiveMatchError('Flag has unknown group type index');
       }
 
       if (!(groupName in groups)) {
-        console.warn("[FEATURE FLAGS] Can't compute group feature flag: ".concat(flag.key, " without group names passed in"));
+        if (this.debugMode) {
+          console.warn("[FEATURE FLAGS] Can't compute group feature flag: ".concat(flag.key, " without group names passed in"));
+        }
+
         return false;
       }
 
@@ -2170,15 +2196,15 @@ function () {
   };
 
   FeatureFlagsPoller.prototype._loadFeatureFlags = function () {
-    var _a;
+    var _a, _b;
 
     return __awaiter(this, void 0, void 0, function () {
       var res, responseJson, err_1;
 
       var _this = this;
 
-      return __generator(this, function (_b) {
-        switch (_b.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
             if (this.poller) {
               clearTimeout(this.poller);
@@ -2188,17 +2214,17 @@ function () {
             this.poller = setTimeout(function () {
               return _this._loadFeatureFlags();
             }, this.pollingInterval);
-            _b.label = 1;
+            _c.label = 1;
 
           case 1:
-            _b.trys.push([1, 4,, 5]);
+            _c.trys.push([1, 4,, 5]);
 
             return [4
             /*yield*/
             , this._requestFeatureFlagDefinitions()];
 
           case 2:
-            res = _b.sent();
+            res = _c.sent();
 
             if (res && res.status === 401) {
               throw new ClientError("Your personalApiKey is invalid. Are you sure you're not using your Project API key? More information: https://posthog.com/docs/api/overview");
@@ -2217,10 +2243,10 @@ function () {
             , res.json()];
 
           case 3:
-            responseJson = _b.sent();
+            responseJson = _c.sent();
 
             if (!('flags' in responseJson)) {
-              console.error("Invalid response when getting feature flags: ".concat(JSON.stringify(responseJson)));
+              (_a = this.onError) === null || _a === void 0 ? void 0 : _a.call(this, new Error("Invalid response when getting feature flags: ".concat(JSON.stringify(responseJson))));
             }
 
             this.featureFlags = responseJson.flags || [];
@@ -2235,11 +2261,11 @@ function () {
             , 5];
 
           case 4:
-            err_1 = _b.sent(); // if an error that is not an instance of ClientError is thrown
+            err_1 = _c.sent(); // if an error that is not an instance of ClientError is thrown
             // we silently ignore the error when reloading feature flags
 
             if (err_1 instanceof ClientError) {
-              (_a = this.onError) === null || _a === void 0 ? void 0 : _a.call(this, err_1);
+              (_b = this.onError) === null || _b === void 0 ? void 0 : _b.call(this, err_1);
             }
 
             return [3
@@ -2720,48 +2746,103 @@ function (_super) {
         groups = _a.groups,
         sendFeatureFlags = _a.sendFeatureFlags,
         timestamp = _a.timestamp,
-        disableGeoip = _a.disableGeoip;
+        disableGeoip = _a.disableGeoip,
+        uuid = _a.uuid;
 
     var _capture = function (props) {
       _super.prototype.captureStateless.call(_this, distinctId, event, props, {
         timestamp: timestamp,
-        disableGeoip: disableGeoip
+        disableGeoip: disableGeoip,
+        uuid: uuid
       });
-    };
+    }; // :TRICKY: If we flush, or need to shut down, to not lose events we want this promise to resolve before we flush
 
-    if (sendFeatureFlags) {
-      _super.prototype.getFeatureFlagsStateless.call(this, distinctId, groups, undefined, undefined, disableGeoip).then(function (flags) {
-        var featureVariantProperties = {};
 
-        if (flags) {
-          for (var _i = 0, _a = Object.entries(flags); _i < _a.length; _i++) {
-            var _b = _a[_i],
-                feature = _b[0],
-                variant = _b[1];
+    var capturePromise = Promise.resolve().then(function () {
+      return __awaiter(_this, void 0, void 0, function () {
+        var groupsWithStringValues, _i, _a, _b, key, value;
 
-            if (variant !== false) {
-              featureVariantProperties["$feature/".concat(feature)] = variant;
-            }
+        var _c, _d;
+
+        return __generator(this, function (_e) {
+          switch (_e.label) {
+            case 0:
+              if (!sendFeatureFlags) return [3
+              /*break*/
+              , 2];
+              return [4
+              /*yield*/
+              , _super.prototype.getFeatureFlagsStateless.call(this, distinctId, groups, undefined, undefined, disableGeoip)];
+
+            case 1:
+              // If we are sending feature flags, we need to make sure we have the latest flags
+              return [2
+              /*return*/
+              , _e.sent()];
+
+            case 2:
+              if (!((((_d = (_c = this.featureFlagsPoller) === null || _c === void 0 ? void 0 : _c.featureFlags) === null || _d === void 0 ? void 0 : _d.length) || 0) > 0)) return [3
+              /*break*/
+              , 4];
+              groupsWithStringValues = {};
+
+              for (_i = 0, _a = Object.entries(groups || {}); _i < _a.length; _i++) {
+                _b = _a[_i], key = _b[0], value = _b[1];
+                groupsWithStringValues[key] = String(value);
+              }
+
+              return [4
+              /*yield*/
+              , this.getAllFlags(distinctId, {
+                groups: groupsWithStringValues,
+                disableGeoip: disableGeoip,
+                onlyEvaluateLocally: true
+              })];
+
+            case 3:
+              return [2
+              /*return*/
+              , _e.sent()];
+
+            case 4:
+              return [2
+              /*return*/
+              , {}];
           }
+        });
+      });
+    }).then(function (flags) {
+      // Derive the relevant flag properties to add
+      var additionalProperties = {};
+
+      if (flags) {
+        for (var _i = 0, _a = Object.entries(flags); _i < _a.length; _i++) {
+          var _b = _a[_i],
+              feature = _b[0],
+              variant = _b[1];
+          additionalProperties["$feature/".concat(feature)] = variant;
         }
+      }
 
-        var activeFlags = Object.keys(flags || {}).filter(function (flag) {
-          return (flags === null || flags === void 0 ? void 0 : flags[flag]) !== false;
-        });
+      var activeFlags = Object.keys(flags || {}).filter(function (flag) {
+        return (flags === null || flags === void 0 ? void 0 : flags[flag]) !== false;
+      });
 
-        var flagProperties = __assign({
-          $active_feature_flags: activeFlags || undefined
-        }, featureVariantProperties);
+      if (activeFlags.length > 0) {
+        additionalProperties['$active_feature_flags'] = activeFlags;
+      }
 
-        _capture(__assign(__assign(__assign({}, properties), {
-          $groups: groups
-        }), flagProperties));
-      });
-    } else {
-      _capture(__assign(__assign({}, properties), {
+      return additionalProperties;
+    }).catch(function () {
+      // Something went wrong getting the flag info - we should capture the event anyways
+      return {};
+    }).then(function (additionalProperties) {
+      // No matter what - capture the event
+      _capture(__assign(__assign(__assign({}, additionalProperties), properties), {
         $groups: groups
       }));
-    }
+    });
+    this.addPendingPromise(capturePromise);
   };
 
   PostHog.prototype.identify = function (_a) {
@@ -2788,15 +2869,18 @@ function (_super) {
     var _a;
 
     return __awaiter(this, void 0, void 0, function () {
-      var _b, groups, personProperties, groupProperties, disableGeoip, _c, onlyEvaluateLocally, sendFeatureFlagEvents, response, flagWasLocallyEvaluated, featureFlagReportedKey;
+      var _b, groups, disableGeoip, _c, onlyEvaluateLocally, sendFeatureFlagEvents, personProperties, groupProperties, adjustedProperties, response, flagWasLocallyEvaluated, featureFlagReportedKey;
 
       var _d;
 
       return __generator(this, function (_e) {
         switch (_e.label) {
           case 0:
-            _b = options || {}, groups = _b.groups, personProperties = _b.personProperties, groupProperties = _b.groupProperties, disableGeoip = _b.disableGeoip;
-            _c = options || {}, onlyEvaluateLocally = _c.onlyEvaluateLocally, sendFeatureFlagEvents = _c.sendFeatureFlagEvents; // set defaults
+            _b = options || {}, groups = _b.groups, disableGeoip = _b.disableGeoip;
+            _c = options || {}, onlyEvaluateLocally = _c.onlyEvaluateLocally, sendFeatureFlagEvents = _c.sendFeatureFlagEvents, personProperties = _c.personProperties, groupProperties = _c.groupProperties;
+            adjustedProperties = this.addLocalPersonAndGroupProperties(distinctId, groups, personProperties, groupProperties);
+            personProperties = adjustedProperties.allPersonProperties;
+            groupProperties = adjustedProperties.allGroupProperties; // set defaults
 
             if (onlyEvaluateLocally == undefined) {
               onlyEvaluateLocally = false;
@@ -2863,13 +2947,16 @@ function (_super) {
     var _a;
 
     return __awaiter(this, void 0, void 0, function () {
-      var _b, groups, personProperties, groupProperties, disableGeoip, _c, onlyEvaluateLocally, response, payloadWasLocallyEvaluated;
+      var _b, groups, disableGeoip, _c, onlyEvaluateLocally, personProperties, groupProperties, adjustedProperties, response, payloadWasLocallyEvaluated;
 
       return __generator(this, function (_d) {
         switch (_d.label) {
           case 0:
-            _b = options || {}, groups = _b.groups, personProperties = _b.personProperties, groupProperties = _b.groupProperties, disableGeoip = _b.disableGeoip;
-            _c = options || {}, onlyEvaluateLocally = _c.onlyEvaluateLocally, _c.sendFeatureFlagEvents;
+            _b = options || {}, groups = _b.groups, disableGeoip = _b.disableGeoip;
+            _c = options || {}, onlyEvaluateLocally = _c.onlyEvaluateLocally, _c.sendFeatureFlagEvents, personProperties = _c.personProperties, groupProperties = _c.groupProperties;
+            adjustedProperties = this.addLocalPersonAndGroupProperties(distinctId, groups, personProperties, groupProperties);
+            personProperties = adjustedProperties.allPersonProperties;
+            groupProperties = adjustedProperties.allGroupProperties;
             response = undefined;
             if (!!matchValue) return [3
             /*break*/
@@ -2989,13 +3076,16 @@ function (_super) {
     var _a;
 
     return __awaiter(this, void 0, void 0, function () {
-      var _b, groups, personProperties, groupProperties, disableGeoip, onlyEvaluateLocally, localEvaluationResult, featureFlags, featureFlagPayloads, fallbackToDecide, remoteEvaluationResult;
+      var _b, groups, disableGeoip, _c, onlyEvaluateLocally, personProperties, groupProperties, adjustedProperties, localEvaluationResult, featureFlags, featureFlagPayloads, fallbackToDecide, remoteEvaluationResult;
 
-      return __generator(this, function (_c) {
-        switch (_c.label) {
+      return __generator(this, function (_d) {
+        switch (_d.label) {
           case 0:
-            _b = options || {}, groups = _b.groups, personProperties = _b.personProperties, groupProperties = _b.groupProperties, disableGeoip = _b.disableGeoip;
-            onlyEvaluateLocally = (options || {}).onlyEvaluateLocally; // set defaults
+            _b = options || {}, groups = _b.groups, disableGeoip = _b.disableGeoip;
+            _c = options || {}, onlyEvaluateLocally = _c.onlyEvaluateLocally, personProperties = _c.personProperties, groupProperties = _c.groupProperties;
+            adjustedProperties = this.addLocalPersonAndGroupProperties(distinctId, groups, personProperties, groupProperties);
+            personProperties = adjustedProperties.allPersonProperties;
+            groupProperties = adjustedProperties.allGroupProperties; // set defaults
 
             if (onlyEvaluateLocally == undefined) {
               onlyEvaluateLocally = false;
@@ -3006,7 +3096,7 @@ function (_super) {
             , (_a = this.featureFlagsPoller) === null || _a === void 0 ? void 0 : _a.getAllFlagsAndPayloads(distinctId, groups, personProperties, groupProperties)];
 
           case 1:
-            localEvaluationResult = _c.sent();
+            localEvaluationResult = _d.sent();
             featureFlags = {};
             featureFlagPayloads = {};
             fallbackToDecide = true;
@@ -3025,10 +3115,10 @@ function (_super) {
             , _super.prototype.getFeatureFlagsAndPayloadsStateless.call(this, distinctId, groups, personProperties, groupProperties, disableGeoip)];
 
           case 2:
-            remoteEvaluationResult = _c.sent();
+            remoteEvaluationResult = _d.sent();
             featureFlags = __assign(__assign({}, featureFlags), remoteEvaluationResult.flags || {});
             featureFlagPayloads = __assign(__assign({}, featureFlagPayloads), remoteEvaluationResult.payloads || {});
-            _c.label = 3;
+            _d.label = 3;
 
           case 3:
             return [2
@@ -3093,6 +3183,28 @@ function (_super) {
     });
   };
 
+  PostHog.prototype.addLocalPersonAndGroupProperties = function (distinctId, groups, personProperties, groupProperties) {
+    var allPersonProperties = __assign({
+      $current_distinct_id: distinctId
+    }, personProperties || {});
+
+    var allGroupProperties = {};
+
+    if (groups) {
+      for (var _i = 0, _a = Object.keys(groups); _i < _a.length; _i++) {
+        var groupName = _a[_i];
+        allGroupProperties[groupName] = __assign({
+          $group_key: groups[groupName]
+        }, (groupProperties === null || groupProperties === void 0 ? void 0 : groupProperties[groupName]) || {});
+      }
+    }
+
+    return {
+      allPersonProperties: allPersonProperties,
+      allGroupProperties: allGroupProperties
+    };
+  };
+
   return PostHog;
 }(PostHogCoreStateless);