feat: isolate state instead of using a wrapper

package.json

@@ -20,14 +20,14 @@
   "main": "./dist/index.js",
   "exports": {
     "require": "./dist/index.js",
-    "import": "./wrapper.mjs"
+    "import": "./dist/esm-node/index.mjs"
   },
-  "module": "dist/esm-node/index.js",
+  "module": "./dist/esm-node/index.mjs",
   "browser": {
     "./dist/md5.js": "./dist/md5-browser.js",
     "./dist/rng.js": "./dist/rng-browser.js",
     "./dist/sha1.js": "./dist/sha1-browser.js",
-    "./dist/esm-node/index.js": "./dist/esm-browser/index.js"
+    "./dist/esm-node/index.mjs": "./dist/esm-browser/index.js"
   },
   "files": [
     "CHANGELOG.md",
@@ -38,15 +38,15 @@
     "v1.js",
     "v3.js",
     "v4.js",
-    "v5.js",
-    "wrapper.mjs"
+    "v5.js"
   ],
   "devDependencies": {
     "@babel/cli": "7.8.4",
     "@babel/core": "7.8.7",
     "@babel/preset-env": "7.8.7",
     "@commitlint/cli": "8.3.5",
     "@commitlint/config-conventional": "8.3.4",
+    "@rollup/plugin-commonjs": "11.0.2",
     "@rollup/plugin-node-resolve": "7.1.1",
     "@wdio/browserstack-service": "5.18.7",
     "@wdio/cli": "5.18.7",

rollup.config.js

@@ -1,4 +1,5 @@
 import nodeResolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import { terser } from 'rollup-plugin-terser';
 
 function chunk(input, name) {
@@ -10,7 +11,13 @@ function chunk(input, name) {
       name,
       compact: true,
     },
-    plugins: [nodeResolve({ browser: true }), terser()],
+    plugins: [
+      nodeResolve({ browser: true }),
+      commonjs({
+        extensions: ['.cjs'],
+      }),
+      terser(),
+    ],
   };
 }
 

scripts/build.sh

@@ -35,6 +35,16 @@ done
 echo "Removing browser-specific files from esm-node"
 rm -f "$DIR"/esm-node/*-browser.js
 
+for FILE in "$DIR"/esm-node/*.js
+do
+    echo "Renaming esm-node file to .mjs: $FILE"
+    mv "$FILE" "${FILE%.js}.mjs"
+done
+# Fix imports
+sed -i '' -e "s/\.js'/.mjs'/" "$DIR"/esm-node/*.mjs
+sed -i '' -e "s/\.\/v1state.cjs'/..\/v1state.cjs'/" "$DIR"/esm-node/v1.mjs
+rm -f "$DIR"/esm-node/v1state.cjs
+
 # UMD Build
 mkdir "$DIR/umd"
 rollup -c

src/v1.js

@@ -1,26 +1,20 @@
 import rng from './rng.js';
 import bytesToUuid from './bytesToUuid.js';
+import state from './v1state.cjs';
 
 // **`v1()` - Generate time-based UUID**
 //
 // Inspired by https://github.com/LiosK/UUID.js
 // and http://docs.python.org/library/uuid.html
 
-var _nodeId;
-var _clockseq;
-
-// Previous uuid creation time
-var _lastMSecs = 0;
-var _lastNSecs = 0;
-
 // See https://github.com/uuidjs/uuid for API details
 function v1(options, buf, offset) {
   var i = (buf && offset) || 0;
   var b = buf || [];
 
   options = options || {};
-  var node = options.node || _nodeId;
-  var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq;
+  var node = options.node || state._nodeId;
+  var clockseq = options.clockseq !== undefined ? options.clockseq : state._clockseq;
 
   // node and clockseq need to be initialized to random values if they're not
   // specified.  We do this lazily to minimize issues related to insufficient
@@ -29,7 +23,7 @@ function v1(options, buf, offset) {
     var seedBytes = options.random || (options.rng || rng)();
     if (node == null) {
       // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
-      node = _nodeId = [
+      node = state._nodeId = [
         seedBytes[0] | 0x01,
         seedBytes[1],
         seedBytes[2],
@@ -40,7 +34,7 @@ function v1(options, buf, offset) {
     }
     if (clockseq == null) {
       // Per 4.2.2, randomize (14 bit) clockseq
-      clockseq = _clockseq = ((seedBytes[6] << 8) | seedBytes[7]) & 0x3fff;
+      clockseq = state._clockseq = ((seedBytes[6] << 8) | seedBytes[7]) & 0x3fff;
     }
   }
 
@@ -52,10 +46,10 @@ function v1(options, buf, offset) {
 
   // Per 4.2.1.2, use count of uuid's generated during the current clock
   // cycle to simulate higher resolution clock
-  var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1;
+  var nsecs = options.nsecs !== undefined ? options.nsecs : state._lastNSecs + 1;
 
   // Time since last uuid creation (in msecs)
-  var dt = msecs - _lastMSecs + (nsecs - _lastNSecs) / 10000;
+  var dt = msecs - state._lastMSecs + (nsecs - state._lastNSecs) / 10000;
 
   // Per 4.2.1.2, Bump clockseq on clock regression
   if (dt < 0 && options.clockseq === undefined) {
@@ -64,7 +58,7 @@ function v1(options, buf, offset) {
 
   // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
   // time interval
-  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
+  if ((dt < 0 || msecs > state._lastMSecs) && options.nsecs === undefined) {
     nsecs = 0;
   }
 
@@ -73,9 +67,9 @@ function v1(options, buf, offset) {
     throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");
   }
 
-  _lastMSecs = msecs;
-  _lastNSecs = nsecs;
-  _clockseq = clockseq;
+  state._lastMSecs = msecs;
+  state._lastNSecs = nsecs;
+  state._clockseq = clockseq;
 
   // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
   msecs += 12219292800000;

src/v1state.cjs

@@ -0,0 +1,7 @@
+module.exports = exports.default = {
+  _nodeId: undefined,
+  _clockseq: undefined,
+  // Previous uuid creation time
+  _lastMSecs: 0,
+  _lastNSecs: 0,
+};