From 3595bf35902e8f24cec1ff3f032c02ea875f1687 Mon Sep 17 00:00:00 2001
From: Phil Kunz <gitlab@philkunz.com>
Date: Fri, 28 Jul 2017 17:33:28 +0200
Subject: [PATCH] fix module testimport recognition

---
 dist/mod02/index.js | 17 ++++++++---------
 ts/mod02/index.ts   | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/dist/mod02/index.js b/dist/mod02/index.js
index 8516c6e..f24ac8a 100644
--- a/dist/mod02/index.js
+++ b/dist/mod02/index.js
@@ -30,15 +30,6 @@ let tap = function (configArg) {
      */
     let testableFilesSmartstream = new plugins.smartstream.Smartstream([
         plugins.smartgulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
-        plugins.gulpFunction.forEach((fileArg) => __awaiter(this, void 0, void 0, function* () {
-            let stringToModify = fileArg.contents.toString();
-            let testRegex = /\/\/\smodule\stestimport\nimport[a-zA-Z0-9\*\s]*\sfrom\s'(..\/ts\/index)'/;
-            let replacer = (match, group1, offset, completeString) => {
-                return match.replace(group1, '../dist/index');
-            };
-            fileArg.setContentsFromString(stringToModify.replace(testRegex, replacer));
-            return fileArg;
-        })),
         plugins.gulpSourcemaps.init(),
         plugins.gulpTypeScript({
             target: 'ES5',
@@ -58,6 +49,14 @@ let tap = function (configArg) {
      */
     let testFilesSmartstream = new plugins.smartstream.Smartstream([
         plugins.smartgulp.src([plugins.path.join(paths.cwd, 'test/*.ts')]),
+        plugins.gulpFunction.forEach((fileArg) => __awaiter(this, void 0, void 0, function* () {
+            let stringToModify = fileArg.contents.toString();
+            let testRegex = /\/\/\smodule\stestimport\nimport[a-zA-Z0-9\*\s]*\sfrom\s'(..\/ts\/index)'/;
+            let replacer = (match, group1, offset, completeString) => {
+                return match.replace(group1, '../dist/index');
+            };
+            fileArg.contents = Buffer.from(stringToModify.replace(testRegex, replacer));
+        })),
         plugins.gulpSourcemaps.init(),
         plugins.gulpTypeScript({
             target: 'ES5',
diff --git a/ts/mod02/index.ts b/ts/mod02/index.ts
index 3b16424..884fc02 100644
--- a/ts/mod02/index.ts
+++ b/ts/mod02/index.ts
@@ -29,15 +29,6 @@ let tap = function (configArg: INpmtsConfig) {
    */
   let testableFilesSmartstream = new plugins.smartstream.Smartstream([
     plugins.smartgulp.src([ plugins.path.join(paths.cwd, './ts/**/*.ts') ]),
-    plugins.gulpFunction.forEach(async (fileArg: Smartfile) => {
-      let stringToModify = fileArg.contents.toString()
-      let testRegex = /\/\/\smodule\stestimport\nimport[a-zA-Z0-9\*\s]*\sfrom\s'(..\/ts\/index)'/
-      let replacer = (match, group1, offset, completeString: string) => {
-        return match.replace(group1, '../dist/index')
-      }
-      fileArg.setContentsFromString(stringToModify.replace(testRegex, replacer))
-      return fileArg
-    }),
     plugins.gulpSourcemaps.init(),
     plugins.gulpTypeScript({
       target: 'ES5',
@@ -58,6 +49,14 @@ let tap = function (configArg: INpmtsConfig) {
    */
   let testFilesSmartstream = new plugins.smartstream.Smartstream([
     plugins.smartgulp.src([ plugins.path.join(paths.cwd, 'test/*.ts') ]),
+    plugins.gulpFunction.forEach(async (fileArg: Smartfile) => {
+      let stringToModify = fileArg.contents.toString()
+      let testRegex = /\/\/\smodule\stestimport\nimport[a-zA-Z0-9\*\s]*\sfrom\s'(..\/ts\/index)'/
+      let replacer = (match: string, group1: string, offset: number, completeString: string) => {
+        return match.replace(group1, '../dist/index')
+      }
+      fileArg.contents = Buffer.from(stringToModify.replace(testRegex, replacer))
+    }),
     plugins.gulpSourcemaps.init(),
     plugins.gulpTypeScript({
       target: 'ES5',