3.2.7

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -24,13 +24,14 @@ mirror:
     - docker
     - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -9,6 +9,7 @@
     }
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/tapbundle",
-  "version": "3.2.2",
+  "version": "3.2.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1145,9 +1145,9 @@
       }
     },
     "@gitzone/tstest": {
-      "version": "1.0.35",
-      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.35.tgz",
-      "integrity": "sha512-Eij/Cgxs/YGDtQ0NSndp0sT97ugwcQGUt9y2QzWgntTb0IY+HTZCxLTD00Xn9m5CRevUO5sB4dyRp0GGDtC5wA==",
+      "version": "1.0.36",
+      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.36.tgz",
+      "integrity": "sha512-afyZQeCgpEs+/X4aqwbg8fBQcjfMe/Ir3Jmj/TDFGDXjwhmNGx93AasiOALjpFRTQ5foRYB9SqDKgVv6c3cKVQ==",
       "dev": true,
       "requires": {
         "@gitzone/tsbundle": "^1.0.72",
@@ -1323,7 +1323,6 @@
       "version": "4.0.10",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartenv/-/smartenv-4.0.10.tgz",
       "integrity": "sha512-b9jJbBSaOl0nlujyEu/0q5lkOFSMmfcOwPGb3pYrF1B37O15qmVpuqYwA5T8BXj8A6y+oA2bwrrtDzQ7hYp1zg==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartparam": "^1.1.6",
         "@pushrocks/smartpromise": "^3.0.6",
@@ -1700,7 +1699,6 @@
       "version": "1.1.6",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartparam/-/smartparam-1.1.6.tgz",
       "integrity": "sha512-1El/F2QTWYDGy4Nh6vz9Ry1JVg1FEeyexB7Uvi4zHElpXYVxwso6xImRTLj+SW50JAg7nwEZ+ljkzTG9XvnwWA==",
-      "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^3.0.6",
         "is-promise": "^2.1.0",
@@ -2108,8 +2106,7 @@
     "@types/node": {
       "version": "14.0.19",
       "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-14.0.19.tgz",
-      "integrity": "sha512-yf3BP/NIXF37BjrK5klu//asUWitOEoUP5xE1mhSUjazotwJ/eJDgEmMQNlOeWOVv72j24QQ+3bqXHE++CFGag==",
-      "dev": true
+      "integrity": "sha512-yf3BP/NIXF37BjrK5klu//asUWitOEoUP5xE1mhSUjazotwJ/eJDgEmMQNlOeWOVv72j24QQ+3bqXHE++CFGag=="
     },
     "@types/parcel-bundler": {
       "version": "1.12.1",
@@ -2616,8 +2613,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://verdaccio.lossless.one/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -2786,7 +2782,6 @@
       "version": "1.1.11",
       "resolved": "https://verdaccio.lossless.one/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -3435,8 +3430,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://verdaccio.lossless.one/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -6558,8 +6552,7 @@
     "is-promise": {
       "version": "2.2.2",
       "resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-      "dev": true
+      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
     },
     "is-reference": {
       "version": "1.2.1",
@@ -7245,7 +7238,6 @@
       "version": "3.0.4",
       "resolved": "https://verdaccio.lossless.one/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pushrocks/tapbundle",
   "private": false,
-  "version": "3.2.2",
+  "version": "3.2.7",
   "description": "tap bundled for tapbuffer",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -21,6 +21,7 @@
   "homepage": "https://gitlab.com/pushrocks/tapbundle#README",
   "dependencies": {
     "@pushrocks/smartdelay": "^2.0.9",
+    "@pushrocks/smartenv": "^4.0.10",
     "@pushrocks/smartpromise": "^3.0.2",
     "@pushrocks/smarttime": "^3.0.19",
     "smartchai": "^2.0.1"
@@ -28,7 +29,7 @@
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.24",
     "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.35",
+    "@gitzone/tstest": "^1.0.36",
     "@types/node": "^14.0.19",
     "randomstring": "^1.1.5",
     "tslint": "^6.1.2",
@@ -38,7 +39,8 @@
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

test/test.browser.ts

@@ -8,8 +8,8 @@ const test1 = tap.test('my first test -> expect true to be true', async () => {
   return expect(true).to.be.true;
 });
 
-const test2 = tap.test('my second test', async tools => {
-  await tools.delayFor(1000);
+const test2 = tap.test('my second test', async (tools) => {
+  await tools.delayFor(50);
 });
 
 const test3 = tap.test(
@@ -17,26 +17,24 @@ const test3 = tap.test(
   async () => {
     expect((await test1).hrtMeasurement.milliSeconds < (await test2).hrtMeasurement.milliSeconds).to
       .be.true;
-    expect((await test2).hrtMeasurement.milliSeconds > 1000).to.be.true;
+    expect((await test2).hrtMeasurement.milliSeconds > 10).to.be.true;
   }
 );
 
-const test4 = tap.skip.test('my 4th test -> should fail', async tools => {
+const test4 = tap.skip.test('my 4th test -> should fail', async (tools) => {
   tools.allowFailure();
   expect(false).to.be.true;
 });
 
-const test5 = tap.test('my 5th test -> should pass in about 500ms', async tools => {
+const test5 = tap.test('my 5th test -> should pass in about 500ms', async (tools) => {
   tools.timeout(1000);
   await tools.delayFor(500);
 });
 
-const test6 = tap.skip.test('my 6th test -> should fail after 1000ms', async tools => {
+const test6 = tap.skip.test('my 6th test -> should fail after 1000ms', async (tools) => {
   tools.allowFailure();
   tools.timeout(1000);
-  await tools.delayFor(2000);
+  await tools.delayFor(100);
 });
 
-tap.start().catch(err => {
-  console.log(err);
-});
+tap.start();

test/test.iterationleak.ts

@@ -1,7 +1,7 @@
 import { tap, expect } from '../ts/index';
 import * as randomstring from 'randomstring';
 
-const test1 = tap.test('my first test -> expect true to be true', async tools => {
+const test1 = tap.test('my first test -> expect true to be true', async (tools) => {
   await tools.checkIterationLeak(async () => {
     const domain = randomstring.generate(1000);
   });
@@ -9,7 +9,7 @@ const test1 = tap.test('my first test -> expect true to be true', async tools =>
 
 const outsideArray = [];
 
-const test2 = tap.test('should throw', async tools => {
+const test2 = tap.test('should throw', async (tools) => {
   const err = await tools.returnError(async () => {
     await tools.checkIterationLeak(async () => {
       outsideArray.push(randomstring.generate(1000));

test/test.ts

@@ -2,13 +2,13 @@ import { tap, expect } from '../ts/index';
 
 tap.preTask('hi there', async () => {
   console.log('this is a pretask');
-})
+});
 
 const test1 = tap.test('my first test -> expect true to be true', async () => {
   return expect(true).to.be.true;
 });
 
-const test2 = tap.test('my second test', async tools => {
+const test2 = tap.test('my second test', async (tools) => {
   await tools.delayFor(1000);
 });
 
@@ -21,17 +21,17 @@ const test3 = tap.test(
   }
 );
 
-const test4 = tap.skip.test('my 4th test -> should fail', async tools => {
+const test4 = tap.skip.test('my 4th test -> should fail', async (tools) => {
   tools.allowFailure();
   expect(false).to.be.true;
 });
 
-const test5 = tap.test('my 5th test -> should pass in about 500ms', async tools => {
+const test5 = tap.test('my 5th test -> should pass in about 500ms', async (tools) => {
   tools.timeout(1000);
   await tools.delayFor(500);
 });
 
-const test6 = tap.skip.test('my 6th test -> should fail after 1000ms', async tools => {
+const test6 = tap.skip.test('my 6th test -> should fail after 1000ms', async (tools) => {
   tools.allowFailure();
   tools.timeout(1000);
   await tools.delayFor(2000);

ts/tapbundle.classes.pretask.ts

@@ -1,7 +1,6 @@
 import * as plugins from './tapbundle.plugins';
 import { TapTools } from './tapbundle.classes.taptools';
 
-
 export interface IPreTaskFunction {
   (tapTools?: TapTools): Promise<any>;
 }
@@ -15,8 +14,8 @@ export class PreTask {
     this.preTaskFunction = preTaskFunctionArg;
   }
 
-  public async run () {
+  public async run() {
     console.log(`::__PRETASK: ${this.description}`);
     await this.preTaskFunction(new TapTools(null));
   }
-}
+}

ts/tapbundle.classes.tap.ts

@@ -14,7 +14,7 @@ export class Tap {
     },
     testParallel: (descriptionArg: string, functionArg: ITestFunction) => {
       console.log(`skipped test: ${descriptionArg}`);
-    }
+    },
   };
 
   /**
@@ -23,7 +23,7 @@ export class Tap {
   public only = {
     test: (descriptionArg: string, testFunctionArg: ITestFunction) => {
       this.test(descriptionArg, testFunctionArg, 'only');
-    }
+    },
   };
 
   private _tapPreTasks: PreTask[] = [];
@@ -43,7 +43,7 @@ export class Tap {
     const localTest = new TapTest({
       description: testDescription,
       testFunction,
-      parallel: false
+      parallel: false,
     });
     if (modeArg === 'normal') {
       this._tapTests.push(localTest);
@@ -53,7 +53,7 @@ export class Tap {
     return localTest;
   }
 
-  public preTask (descriptionArg: string, functionArg: IPreTaskFunction) {
+  public preTask(descriptionArg: string, functionArg: IPreTaskFunction) {
     this._tapPreTasks.push(new PreTask(descriptionArg, functionArg));
   }
 
@@ -74,7 +74,7 @@ export class Tap {
       new TapTest({
         description: testDescription,
         testFunction,
-        parallel: true
+        parallel: true,
       })
     );
   }
@@ -83,6 +83,13 @@ export class Tap {
    * starts the test evaluation
    */
   public async start(optionsArg?: { throwOnError: boolean }) {
+    // lets set the tapbundle promise
+    const smartenvInstance = new plugins.smartenv.Smartenv();
+    smartenvInstance.isBrowser
+      ? (globalThis.tapbundleDeferred = plugins.smartpromise.defer())
+      : null;
+
+    // lets continue with running the tests
     const promiseArray: Array<Promise<any>> = [];
 
     // safeguard against empty test array
@@ -137,7 +144,10 @@ export class Tap {
     }
 
     if (optionsArg && optionsArg.throwOnError && failReasons.length > 0) {
-      process.exit(1);
+      if (!smartenvInstance.isBrowser) process.exit(1);
+    }
+    if (smartenvInstance.isBrowser) {
+      globalThis.tapbundleDeferred.resolve();
     }
   }
 

ts/tapbundle.classes.taptest.ts

@@ -42,7 +42,6 @@ export class TapTest {
     this.testKey = testKeyArg;
     const testNumber = testKeyArg + 1;
     try {
-      
       await this.testFunction(this.tapTools);
       if (this.status === 'timeout') {
         throw new Error('Test succeeded, but timed out...');

ts/tapbundle.plugins.ts

@@ -1,8 +1,9 @@
 // pushrocks
 import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartenv from '@pushrocks/smartenv';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export { smartdelay, smartpromise };
+export { smartdelay, smartenv, smartpromise };
 
 // third party
 /* import * as leakage from 'leakage';