Ready for publish

DimensionDev · Mar 19, 2019 · 71744eb · 71744eb
1 parent b10ceaf
commit 71744eb
Show file tree

Hide file tree

Showing 6 changed files with 383 additions and 313 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,6 @@
+.rpt2_cache
+node_modules
+.DS_Store
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/package.json b/package.json
@@ -13,15 +13,18 @@
     "lodash-es": "^4.1.2"
   },
   "scripts": {
-    "start": "npm-run-all --parallel start-tsc start-rollup",
+    "start": "npm-run-all --parallel clean start-tsc start-rollup",
     "start-tsc": "tsc --watch",
     "start-rollup": "rollup -c -w",
-    "build": "npm-run-all --parallel build-tsc build-rollup",
+    "build": "npm-run-all --parallel clean build-tsc build-rollup",
     "build-tsc": "tsc",
-    "build-rollup": "rollup -c"
+    "build-rollup": "rollup -c",
+    "clean": "rimraf ./es ./dist",
+    "prepublishOnly": "npm run build"
   },
   "devDependencies": {
     "npm-run-all": "^4.1.5",
+    "rimraf": "^2.6.3",
     "rollup": "^1.1.2",
     "rollup-plugin-commonjs": "^9.2.0",
     "rollup-plugin-node-resolve": "^4.0.0",

diff --git a/rollup.config.js b/rollup.config.js
@@ -14,13 +14,15 @@ const config = {
         nodeResolve({
             browser: true,
             preferBuiltins: false,
+            module: true,
         }),
         replace({
             'process.env.NODE_ENV': JSON.stringify('production'),
         }),
         typescript({ tsconfigOverride: { compilerOptions: { target: 'es5' } } }),
         commonjs({
             extensions: ['.js', '.ts', '.tsx'],
+            exclude: ['node_modules/lodash-es/'],
             namedExports: {
                 events: ['EventEmitter'],
             },

diff --git a/src/DOM/Watcher.ts b/src/DOM/Watcher.ts
@@ -13,7 +13,10 @@ import { DomProxy } from './Proxy'
 import { EventEmitter } from 'events'
 import { LiveSelector } from './LiveSelector'
 
-import { differenceWith, intersectionWith, uniqWith } from 'lodash-es'
+// import { differenceWith, intersectionWith, uniqWith } from 'lodash-es'
+import differenceWith from 'lodash-es/differenceWith'
+import intersectionWith from 'lodash-es/intersectionWith'
+import uniqWith from 'lodash-es/uniqWith'
 
 //#region Interface for Watcher
 type RequireNode<T, V> = T extends Element ? V : never

diff --git a/src/Extension/Async-Call.ts b/src/Extension/Async-Call.ts
@@ -104,9 +104,10 @@ export const AsyncCall = <AllCalls, OtherSide extends Partial<AllCalls>>(
         if (data.method in implementation) {
             const p = (implementation[data.method as keyof typeof implementation] as any) as ((...args: any[]) => any)
             const e = (err: Error) => {
+                if (writeToConsole) console.error(`${err.message} %c@${data.callId}\n%c${err.stack}`, 'color: gray', '')
                 mc.send('response', {
                     method: data.method,
-                    error: err && err.message ? err.message : err,
+                    error: err instanceof Error ? { message: err.message, stack: err.stack } : err,
                     return: undefined,
                     callId: data.callId,
                 })
@@ -124,7 +125,7 @@ export const AsyncCall = <AllCalls, OtherSide extends Partial<AllCalls>>(
                 const promise = p(...args)
                 if (writeToConsole)
                     console.log(
-                        `${key}.%c${data.method}%c(${args.map(() => '%o').join(', ')}%c)\n%o %c${data.callId}`,
+                        `${key}.%c${data.method}%c(${args.map(() => '%o').join(', ')}%c)\n%o %c@${data.callId}`,
                         'color: #d2c057',
                         '',
                         ...args,
@@ -143,8 +144,10 @@ export const AsyncCall = <AllCalls, OtherSide extends Partial<AllCalls>>(
         if (!resolve) return // drop this response
         map.delete(data.callId)
         if (data.error) {
-            reject(new Error(data.error))
-            if (writeToConsole) console.error(data.error)
+            const err = new Error(data.error.message)
+            reject(err)
+            if (writeToConsole)
+                console.error(`${data.error.message} %c@${data.callId}\n%c${data.error.stack}`, 'color: gray', '')
             return
         }
         transform('parse', 'return', data.method, data.return).then(resolve, reject)
@@ -158,7 +161,7 @@ export const AsyncCall = <AllCalls, OtherSide extends Partial<AllCalls>>(
         return: any
         callId: string
         method: string
-        error?: string
+        error?: { message: string; stack: string }
     }
     return new Proxy(
         {},