prepare 6.2.1 release

.eslintrc.yaml

@@ -75,6 +75,12 @@ rules:
     - error
     - props: true
 
+  # https://eslint.org/docs/rules/no-restricted-syntax
+  no-restricted-syntax:
+    - error
+    - selector: ForInStatement
+      message: avoid for...in which can pick up properties from prototypes; use for...of, or plain for if you need array indices
+
   # https://eslint.org/docs/rules/no-return-assign
   no-return-assign: error
 

.ldrelease/config.yml

@@ -1,8 +1,10 @@
+version: 2
+
 repo:
   public: node-server-sdk
   private: node-server-sdk-private
 
-releasableBranches:
+branches:
   - name: master
     description: 6.x
   - name: 5.x
@@ -11,11 +13,14 @@ publications:
   - url: https://www.npmjs.com/package/launchdarkly-node-server-sdk
     description: npm
 
-template:
-  name: npm
+jobs:
+  - docker:
+      image: node:12-buster
+    template:
+      name: npm
 
 documentation:
-  githubPages: true
+  gitHubPages: true
   title: LaunchDarkly Server-Side Node SDK
 
 sdk:

big_segments.js

@@ -37,7 +37,7 @@ function BigSegmentStoreManager(store, config, logger) {
     return lastStatus;
   };
 
-  // Called by the evaluator when it needs to get the big segment membership state for a user.
+  // Called by the evaluator when it needs to get the Big Segment membership state for a user.
   //
   // If there is a cached membership state for the user, it returns the cached state. Otherwise,
   // it converts the user key into the hash string used by the BigSegmentStore, queries the store,
@@ -59,7 +59,7 @@ function BigSegmentStoreManager(store, config, logger) {
         }
         cache.set(userKey, membership);
       } catch (e) {
-        logger.error('Big segment store membership query returned error: ' + e);
+        logger.error('Big Segment store membership query returned error: ' + e);
         return [null, 'STORE_ERROR'];
       }
       cache.set(userKey, membership);
@@ -78,18 +78,18 @@ function BigSegmentStoreManager(store, config, logger) {
       lastStatus = { available: false, stale: false };
       return;
     }
-    logger.debug('Querying big segment store status');
+    logger.debug('Querying Big Segment store status');
     let newStatus;
     try {
       const metadata = await store.getMetadata();
       newStatus = { available: true, stale: !metadata || !metadata.lastUpToDate || isStale(metadata.lastUpToDate) };
     } catch (e) {
-      logger.error('Big segment store status query returned error: ' + e);
+      logger.error('Big Segment store status query returned error: ' + e);
       newStatus = { available: false, stale: false };
     }
     if (!lastStatus || lastStatus.available !== newStatus.available || lastStatus.stale !== newStatus.stale) {
       logger.debug(
-        'Big segment store status changed from %s to %s',
+        'Big Segment store status changed from %s to %s',
         JSON.stringify(lastStatus),
         JSON.stringify(newStatus)
       );

caching_store_wrapper.js

@@ -195,8 +195,8 @@ function CachingStoreWrapper(underlyingStore, ttl, description) {
     if (!cache) {
       return;
     }
-    for (const kindNamespace in dataKind) {
-      cache.del(allCacheKey(dataKind[kindNamespace]));
+    for (const eachKind of Object.values(dataKind)) {
+      cache.del(allCacheKey(eachKind));
     }
   }
 

evaluator.js

@@ -250,7 +250,7 @@ function segmentMatchUser(segment, user, queries, stateOut, cb) {
   }
 
   if (!segment.generation) {
-    // Big segment queries can only be done if the generation is known. If it's unset,
+    // Big Segment queries can only be done if the generation is known. If it's unset,
     // that probably means the data store was populated by an older SDK that doesn't know
     // about the generation property and therefore dropped it from the JSON data. We'll treat
     // that as a "not configured" condition.
@@ -261,7 +261,7 @@ function segmentMatchUser(segment, user, queries, stateOut, cb) {
   if (stateOut.bigSegmentsStatus) {
     // We've already done the query at some point during the flag evaluation and stored
     // the result (if any) in stateOut.bigSegmentsMembership, so we don't need to do it
-    // again. Even if multiple big segments are being referenced, the membership includes
+    // again. Even if multiple Big Segments are being referenced, the membership includes
     // *all* of the user's segment memberships.
     return cb(bigSegmentMatchUser(stateOut.bigSegmentsMembership, segment, user));
   }
@@ -461,7 +461,7 @@ function sha1Hex(input) {
 }
 
 function makeBigSegmentRef(segment) {
-  // The format of big segment references is independent of what store implementation is being
+  // The format of Big Segment references is independent of what store implementation is being
   // used; the store implementation receives only this string and does not know the details of
   // the data model. The Relay Proxy will use the same format when writing to the store.
   return segment.key + '.g' + segment.generation;

event_summarizer.js

@@ -37,8 +37,7 @@ function EventSummarizer() {
 
   es.getSummary = () => {
     const flagsOut = {};
-    for (const i in counters) {
-      const c = counters[i];
+    for (const c of Object.values(counters)) {
       let flag = flagsOut[c.key];
       if (!flag) {
         flag = {

feature_store.js

@@ -44,12 +44,9 @@ function InMemoryFeatureStore() {
     const results = {};
     const items = allData[kind.namespace] || {};
 
-    for (const key in items) {
-      if (Object.hasOwnProperty.call(items, key)) {
-        const item = items[key];
-        if (item && !item.deleted) {
-          results[key] = item;
-        }
+    for (const [key, item] of Object.entries(items)) {
+      if (item && !item.deleted) {
+        results[key] = item;
       }
     }
 

feature_store_event_wrapper.js

@@ -29,11 +29,9 @@ function NamespacedDataSet() {
   }
 
   function enumerate(callback) {
-    for (const ns in itemsByNamespace) {
-      const items = itemsByNamespace[ns];
+    for (const [ns, items] of Object.entries(itemsByNamespace)) {
       const keys = Object.keys(items).sort(); // sort to make tests determinate
-      for (const i in keys) {
-        const key = keys[i];
+      for (const key of keys) {
         callback(ns, key, items[key]);
       }
     }
@@ -138,16 +136,14 @@ function FeatureStoreEventWrapper(featureStore, emitter) {
   function computeDependencies(kind, item) {
     const ret = NamespacedDataSet();
     if (kind === dataKind.features) {
-      for (const i in item.prerequisites || []) {
-        ret.set(dataKind.features.namespace, item.prerequisites[i].key, true);
+      for (const prereq of item.prerequisites || []) {
+        ret.set(dataKind.features.namespace, prereq.key, true);
       }
-      for (const i in item.rules || []) {
-        const rule = item.rules[i];
-        for (const j in rule.clauses || []) {
-          const clause = rule.clauses[j];
+      for (const rule of item.rules || []) {
+        for (const clause of rule.clauses || []) {
           if (clause.op === 'segmentMatch') {
-            for (const k in clause.values) {
-              ret.set(dataKind.segments.namespace, clause.values[k], true);
+            for (const value of clause.values) {
+              ret.set(dataKind.segments.namespace, value, true);
             }
           }
         }
@@ -168,22 +164,21 @@ function FeatureStoreEventWrapper(featureStore, emitter) {
         featureStore.init(newData, () => {
           dependencyTracker.reset();
 
-          for (const namespace in newData) {
-            const items = newData[namespace];
+          for (const [namespace, items] of Object.entries(newData)) {
             const kind = dataKind[namespace];
-            for (const key in items) {
+            for (const key of Object.keys(items || {})) {
               const item = items[key];
               dependencyTracker.updateDependenciesFrom(namespace, key, computeDependencies(kind, item));
             }
           }
 
           if (checkForChanges) {
             const updatedItems = NamespacedDataSet();
-            for (const namespace in newData) {
+            for (const namespace of Object.keys(newData)) {
               const oldDataForKind = oldData[namespace];
               const newDataForKind = newData[namespace];
               const mergedData = Object.assign({}, oldDataForKind, newDataForKind);
-              for (const key in mergedData) {
+              for (const key of Object.keys(mergedData)) {
                 addIfModified(
                   namespace,
                   key,