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.5",
+  "version": "3.2.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@pushrocks/tapbundle",
   "private": false,
-  "version": "3.2.5",
+  "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 --web)"
@@ -39,7 +39,8 @@
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

test/test.browser.ts

@@ -8,7 +8,7 @@ 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(50);
 });
 
@@ -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(100);

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,
       })
     );
   }
@@ -85,7 +85,9 @@ export class Tap {
   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;
+    smartenvInstance.isBrowser
+      ? (globalThis.tapbundleDeferred = plugins.smartpromise.defer())
+      : null;
 
     // lets continue with running the tests
     const promiseArray: Array<Promise<any>> = [];
@@ -142,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...');