Replace identifier library with nanoid (#1318)

Author: underoot

package-lock.json

@@ -71,7 +71,7 @@
     "@mapbox/geojson-normalize": "^0.0.1",
     "@mapbox/point-geometry": "^0.1.0",
     "fast-deep-equal": "^3.1.3",
-    "hat": "0.0.3"
+    "nanoid": "^5.0.9"
   },
   "files": [
     "src",

package.json

@@ -1,6 +1,6 @@
 import isEqual from 'fast-deep-equal';
 import normalize from '@mapbox/geojson-normalize';
-import hat from 'hat';
+import {generateID} from './lib/id.js';
 import featuresAt from './lib/features_at.js';
 import stringSetsAreEqual from './lib/string_sets_are_equal.js';
 import * as Constants from './constants.js';
@@ -78,7 +78,7 @@ export default function(ctx, api) {
     const featureCollection = JSON.parse(JSON.stringify(normalize(geojson)));
 
     const ids = featureCollection.features.map((feature) => {
-      feature.id = feature.id || hat();
+      feature.id = feature.id || generateID();
 
       if (feature.geometry === null) {
         throw new Error('Invalid geometry: null');

src/api.js

@@ -1,11 +1,11 @@
-import hat from 'hat';
+import {generateID} from '../lib/id.js';
 import * as Constants from '../constants.js';
 
 const Feature = function(ctx, geojson) {
   this.ctx = ctx;
   this.properties = geojson.properties || {};
   this.coordinates = geojson.geometry.coordinates;
-  this.id = geojson.id || hat();
+  this.id = geojson.id || generateID();
   this.type = geojson.geometry.type;
 };
 

src/feature_types/feature.js

@@ -1,4 +1,4 @@
-import hat from 'hat';
+import {generateID} from '../lib/id.js';
 import Feature from './feature.js';
 import * as Constants from '../constants.js';
 
@@ -33,7 +33,7 @@ MultiFeature.prototype = Object.create(Feature.prototype);
 MultiFeature.prototype._coordinatesToFeatures = function(coordinates) {
   const Model = this.model.bind(this);
   return coordinates.map(coords => new Model(this.ctx, {
-    id: hat(),
+    id: generateID(),
     type: Constants.geojsonTypes.FEATURE,
     properties: {},
     geometry: {

src/feature_types/multi_feature.js

@@ -0,0 +1,7 @@
+import {customAlphabet} from 'nanoid/non-secure';
+
+const nanoid = customAlphabet('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', 32);
+
+export function generateID() {
+  return nanoid();
+}

src/lib/id.js

@@ -33,6 +33,15 @@ afterEach(() => {
   deleteSpy = null;
 });
 
+test('Draw.add', async (t) => {
+  await t.test('should generate unique ID', () => {
+    const [id] = Draw.add(getGeoJSON('point'));
+
+    assert.equal(typeof id, 'string', 'valid string id returned on add');
+    assert.equal(id.length, 32, 'valid string id length');
+  });
+});
+
 test('Draw.getFeatureIdsAt', async () => {
   const feature = getGeoJSON('point');
   const [id] = Draw.add(feature);

test/api.test.js

@@ -1,11 +1,20 @@
-import hat from 'hat';
+import {generateID} from '../../src/lib/id.js';
 import getGeoJSON from './get_geojson.js';
 
-const hatRack = hat.rack();
+const usedIds = new Set();
+
+export function generateUniqueID() {
+  let id = generateID();
+  while (usedIds.has(id)) {
+    id = generateID();
+  }
+  usedIds.add(id);
+  return id;
+}
 
 export default function createFeature(featureType) {
   const feature = Object.assign({
-    id: hatRack(),
+    id: generateUniqueID(),
     properties: {}
   }, getGeoJSON(featureType));
   feature.toGeoJSON = () => feature;