replace bind()

mscdex · mscdex · commit d0225d1ab90a · 2016-12-28T02:36:54.000-05:00
diff --git a/build/build.js b/build/build.js
@@ -42,7 +42,11 @@ function processFile (inputLoc, out, replacements) {
 
     data = data.toString()
     replacements.forEach(function (replacement) {
-      data = data.replace.apply(data, replacement)
+      const regexp = replacement[0]
+      var arg2 = replacement[1]
+      if (typeof arg2 === 'function')
+        arg2 = arg2.bind(data)
+      data = data.replace(regexp, arg2)
     })
     if (inputLoc.slice(-3) === '.js') {
       const transformed = babel.transform(data, {
diff --git a/build/files.js b/build/files.js
@@ -183,6 +183,23 @@ const headRegexp = /(^module.exports = \w+;?)/m
     /if \(typeof Symbol === 'function' && Symbol\.hasInstance\) \{/,
     `if (typeof Symbol === 'function' && Symbol.hasInstance && typeof Function.prototype[Symbol.hasInstance] === 'function') {`
   ]
+  , removeOnWriteBind = [
+    /onwrite\.bind\([^)]+?\)/,
+    `function(er) { onwrite(stream, er); }`
+  ]
+  , removeCorkedFinishBind = [
+    /onCorkedFinish\.bind\([^)]+?\)/,
+    function (match) {
+      const code = this
+      var src = /^function onCorkedFinish[^{]*?\{([\s\S]+?\r?\n)\}/m.exec(code)
+      src = src[1].trim().replace(/corkReq/g, 'this').replace(/(\r?\n)/mg, '  $1')
+      return `(err) => {\n${src}\n}`
+    }
+  ]
+  , removeOnCorkedFinish = [
+    /^function onCorkedFinish[\s\S]+?\r?\n\}/m,
+    ''
+  ]
 
 module.exports['_stream_duplex.js'] = [
     requireReplacement
@@ -261,6 +278,9 @@ module.exports['_stream_writable.js'] = [
   , bufferShimFix
   , bufferStaticMethods
   , fixInstanceCheck
+  , removeOnWriteBind
+  , removeCorkedFinishBind
+  , removeOnCorkedFinish
 ]
 module.exports['internal/streams/BufferList.js'] = [
     bufferShimFix
