From df01b54ba6290425c4057d46abc62a41382c2830 Mon Sep 17 00:00:00 2001
From: "kebler.net" <kebler.net@gmail.com>
Date: Sat, 24 Apr 2021 19:23:51 -0700
Subject: [PATCH] 1.1.0 move to native esm

---
 README.md                        |  2 +-
 package.json                     | 10 +++++-----
 test/{merge.js => test.merge.js} | 27 +++++++++++++++++----------
 3 files changed, 23 insertions(+), 16 deletions(-)
 rename test/{merge.js => test.merge.js} (68%)

diff --git a/README.md b/README.md
index 948c3ac..f2bc560 100644
--- a/README.md
+++ b/README.md
@@ -62,4 +62,4 @@ rect.color = "red"
 Credits
 -------
 
-aggregation 2015-2019  by Dr. Ralf S. Engelschall (http://engelschall.com/)
+thx to aggregation 2015-2019  by Dr. Ralf S. Engelschall (http://engelschall.com/)
diff --git a/package.json b/package.json
index a7799aa..ee48c94 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "@uci-utils/class-merge",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Function to merge classes when making an extended class",
   "main": "src/merge.js",
+  "type": "module",
   "scripts": {
-    "test": "./node_modules/.bin/mocha -r esm --timeout 30000",
-    "testd": "UCI_ENV=dev ./node_modules/.bin/nodemon --exec './node_modules/.bin/mocha -r esm --timeout 30000' || exit 0"
+    "test": "./node_modules/.bin/mocha --timeout 30000",
+    "testd": "UCI_ENV=dev ./node_modules/.bin/nodemon --exec './node_modules/.bin/mocha --timeout 30000' || exit 0"
   },
   "author": "David Kebler",
   "license": "MIT",
@@ -26,8 +27,7 @@
   "homepage": "https://github.com/uCOMmandIt/uci-utils/class-merge#readme",
   "devDependencies": {
     "chai": "^4.2.0",
-    "chai-eventemitter": "^1.1.1",
-    "esm": "^3.2.25",
+    "chai-eventemitter2": "^0.2.1",
     "mocha": "^7.0.1",
     "nodemon": "^2.0.2"
   }
diff --git a/test/merge.js b/test/test.merge.js
similarity index 68%
rename from test/merge.js
rename to test/test.merge.js
index 40ad26c..91d00d0 100644
--- a/test/merge.js
+++ b/test/test.merge.js
@@ -1,9 +1,9 @@
 import merge from '../src/merge.js'
 import chai, { expect }  from 'chai'
-import eventemitter  from 'chai-eventemitter'
+import eventemitter  from 'chai-eventemitter2'
 import { EventEmitter as Emitter } from 'events'
 
-chai.use(eventemitter)
+chai.use(eventemitter())
 
 
 describe('Class Merge', function () {
@@ -43,14 +43,21 @@ describe('Class Merge', function () {
 
   })
 
-  it('Should handle more complex mixin', function () {
-    // rect.on('test',(data)=>expect(data).to.be.equal('some data'))
-    // rect.emit('test','some data')
-    expect(function(){ rect.emit('test', 'some data') }).to.emitFrom(rect, 'test', 'some data')
+  it('Should handle more complex mixin, i.e. with eventEmitter', function () {
+  
+    expect(rect).to.be.an.eventEmitter
+    expect(rect)
+      .to.emit('foo')
+      .to.emit('bar', {count: 2})
+      .to.emit('baz', {withArgs: ['X', 'Y', 'Z']})
+      .to.emit('error', {count: 0})
+      .on(() =>
+      {
+        rect.emit('foo')
+        rect.emit('bar')
+        rect.emit('bar')
+        rect.emit('baz', 'X', 'Y', 'Z')
+      })
   })
 
-
-
-
-
 })