ESM compatibility issues

danieljbruce · danieljbruce · commit e47d1fe11f56 · 2025-03-28T15:44:06.000-04:00
Replace dot prop with methods. Fix the issues with long and downgrade escapeStringRegexp.
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "arrify": "^2.0.0",
     "concat-stream": "^2.0.0",
     "dot-prop": "^6.0.0",
-    "escape-string-regexp": "^4.0.0",
+    "escape-string-regexp": "3.0.0",
     "extend": "^3.0.2",
     "google-gax": "^4.0.3",
     "grpc-gcp": "^1.0.1",
diff --git a/src/index.ts b/src/index.ts
@@ -648,8 +648,8 @@ export class Bigtable {
             'A cluster was provided with both `encryption` and `key` defined.'
           );
         }
-        ClusterUtils.validateClusterMetadata(cluster);
-        clusters[cluster.id!] =
+        ClusterUtils.validateClusterMetadata(cluster as ClusterInfo);
+        clusters[(cluster as ClusterInfo).id!] =
           ClusterUtils.getClusterBaseConfigWithFullLocation(
             cluster,
             this.projectId,
diff --git a/src/mutation.ts b/src/mutation.ts
@@ -14,7 +14,7 @@
 
 import arrify = require('arrify');
 import * as is from 'is';
-import * as Long from 'long';
+const Long = require('long');
 
 import {google as btTypes} from '../protos/protos';
 
diff --git a/src/row-data-utils.ts b/src/row-data-utils.ts
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const dotProp = require('dot-prop');
+import * as dotProp from 'dot-prop';
 import {Filter, RawFilter} from './filter';
 import {
   CreateRulesCallback,
@@ -46,6 +46,41 @@ export interface RowProperties {
   reqOpts: TabularApiSurfaceRequest;
 }
 
+function getNestedValue(obj: any, path: any) {
+  if (!obj || typeof obj !== 'object' || !path) {
+    return undefined;
+  }
+
+  const keys = path.split('.');
+  let current = obj;
+
+  for (const key of keys) {
+    if (current && typeof current === 'object' && key in current) {
+      current = current[key];
+    } else {
+      return undefined; // Path not found
+    }
+  }
+
+  return current;
+}
+
+function getValueFromData(data: any, column: any) {
+  const path = column.replace(':', '.');
+  const nestedValue = getNestedValue(data, path);
+
+  if (
+    Array.isArray(nestedValue) &&
+    nestedValue.length > 0 &&
+    nestedValue[0] &&
+    'value' in nestedValue[0]
+  ) {
+    return nestedValue[0].value;
+  }
+
+  return undefined; // Or handle the case where the path or structure is not as expected
+}
+
 /**
  * RowDataUtils is a class containing functionality needed by the Row and
  * AuthorizedView classes. Its static methods need to be contained in a class
@@ -247,7 +282,7 @@ class RowDataUtils {
         return;
       }
       const data = this.formatFamilies_Util(resp!.row!.families!);
-      const value = dotProp.get(data, column.replace(':', '.'))[0].value;
+      const value = getValueFromData(data, column);
 
       callback(null, value, resp);
     });
diff --git a/test/chunktransformer.ts b/test/chunktransformer.ts
@@ -14,7 +14,7 @@
 
 import * as assert from 'assert';
 import {describe, it, before, beforeEach, afterEach} from 'mocha';
-import * as Long from 'long';
+const Long = require('long');
 import * as proxyquire from 'proxyquire';
 import * as sn from 'sinon';
 
diff --git a/test/mutation.ts b/test/mutation.ts
@@ -14,9 +14,10 @@
 
 import * as assert from 'assert';
 import {beforeEach, describe, it, afterEach} from 'mocha';
-import * as Long from 'long';
 import * as sinon from 'sinon';
 
+const Long = require('long');
+
 import {IMutateRowRequest, Mutation, IMutation} from '../src/mutation.js';
 
 const sandbox = sinon.createSandbox();
