1.0.66

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -19,23 +22,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +66,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +77,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +97,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "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"
+      "type": "node-terminal"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

cli.child.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+import * as cliTool from './ts/index.js';
+cliTool.runCli();

cli.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-const cliTool = require('./dist_ts/index');
+const cliTool = await import('./dist_ts/index.js');
 cliTool.runCli();

cli.ts.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 process.env.CLI_CALL = 'true';
-require('@gitzone/tsrun');
-const cliTool = require('./ts/index');
-cliTool.runCli();
+
+import * as tsrun from '@gitzone/tsrun';
+tsrun.runPath('./cli.child.js', import.meta.url);

npmextra.json

@@ -9,7 +9,7 @@
       "githost": "gitlab.com",
       "gitscope": "gitzone",
       "gitrepo": "tstest",
-      "shortDescription": "a test utility to run tests that match test/**/*.ts",
+      "description": "a test utility to run tests that match test/**/*.ts",
       "npmPackagename": "@gitzone/tstest",
       "license": "MIT"
     }

package.json

@@ -1,10 +1,11 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.47",
+  "version": "1.0.66",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "bin": {
@@ -15,27 +16,27 @@
     "prepareTest": "git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install",
     "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/ --web",
     "cleanUp": "rm -rf .nogit/sandbox-npmts",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web --skiplibcheck)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.48",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsbundle": "^1.0.91",
+    "@gitzone/tsrun": "^1.2.31",
     "@pushrocks/consolecolor": "^2.0.1",
-    "@pushrocks/smartbrowser": "^1.0.17",
-    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartexpress": "^3.0.76",
-    "@pushrocks/smartfile": "^8.0.0",
-    "@pushrocks/smartlog": "^2.0.39",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartshell": "^2.0.25",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/smartbrowser": "^1.0.22",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartexpress": "^3.0.108",
+    "@pushrocks/smartfile": "^9.0.6",
+    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartshell": "^2.0.30",
+    "@pushrocks/tapbundle": "^4.0.8",
     "@types/figures": "^3.0.1",
-    "figures": "^3.0.0"
+    "figures": "^4.0.0"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -25,10 +25,29 @@ Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20W
 
 ## Usage
 
-## Contribution
+## cli usage
 
-We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+lets assume we have a directory called test/ where all our tests arae defined. Simply type
 
+```
+tstest test/
+```
+
+to run all tests.
+
+## Syntax
+
+tstest supports tap syntax. In other words your testfiles are run in a subprocess, and the console output contains trigger messages for tstest to determine test status. Inside your testfile you should use `@pushrocks/tapbundle` for the best results.
+
+## Environments
+
+tstest supports different environments:
+
+- a testfile called `test-something.node.ts` will be run in node
+- a testfile called `test-something.chrome.ts` will be run in chrome environment (bundled through parcel and run through puppeteer)
+- a testfile called `test-something.both.ts` will be run in node an chrome, which is good for isomorphic packages.
+
+> note: there is alpha support for the deno environment by naming a file test-something.deno.ts
 
 ## Contribution
 

test/test.ts

@@ -1,5 +1,5 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as tstest from '../ts/index';
+import * as tstest from '../ts/index.js';
 
 tap.test('prepare test', async () => {});
 

ts/index.ts

@@ -1,6 +1,10 @@
-import { TsTest } from './tstest.classes.tstest';
+import { TsTest } from './tstest.classes.tstest.js';
 
 export const runCli = async () => {
+  if (!process.argv[2]) {
+    console.error('You must specify a test directory as argument. Please try again.');
+    process.exit(1);
+  }
   const tsTestInstance = new TsTest(process.cwd(), process.argv[2]);
   await tsTestInstance.run();
 };

ts/tstest.classes.tap.combinator.ts

@@ -1,11 +1,11 @@
 // ============
 // combines different tap test files to an overall result
 // ============
-import * as plugins from './tstest.plugins';
+import * as plugins from './tstest.plugins.js';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
-import { TapParser } from './tstest.classes.tap.parser';
-import * as logPrefixes from './tstest.logprefixes';
+import { TapParser } from './tstest.classes.tap.parser.js';
+import * as logPrefixes from './tstest.logprefixes.js';
 
 export class TapCombinator {
   tapParserStore: TapParser[] = [];

ts/tstest.classes.tap.parser.ts

@@ -4,9 +4,9 @@ import { coloredString as cs } from '@pushrocks/consolecolor';
 // ============
 // combines different tap test files to an overall result
 // ============
-import * as plugins from './tstest.plugins';
-import { TapTestResult } from './tstest.classes.tap.testresult';
-import * as logPrefixes from './tstest.logprefixes';
+import * as plugins from './tstest.plugins.js';
+import { TapTestResult } from './tstest.classes.tap.testresult.js';
+import * as logPrefixes from './tstest.logprefixes.js';
 
 export class TapParser {
   testStore: TapTestResult[] = [];

ts/tstest.classes.tap.testresult.ts

@@ -1,7 +1,7 @@
 // ============
 // combines different tap test files to an overall result
 // ============
-import * as plugins from './tstest.plugins';
+import * as plugins from './tstest.plugins.js';
 
 export class TapTestResult {
   testLogBuffer = Buffer.from('');

ts/tstest.classes.testdirectory.ts

@@ -1,11 +1,11 @@
-import * as plugins from './tstest.plugins';
-import * as paths from './tstest.paths';
+import * as plugins from './tstest.plugins.js';
+import * as paths from './tstest.paths.js';
 import { Smartfile } from '@pushrocks/smartfile';
 
 // tap related stuff
-import { TapCombinator } from './tstest.classes.tap.combinator';
-import { TapParser } from './tstest.classes.tap.parser';
-import { TapTestResult } from './tstest.classes.tap.testresult';
+import { TapCombinator } from './tstest.classes.tap.combinator.js';
+import { TapParser } from './tstest.classes.tap.parser.js';
+import { TapTestResult } from './tstest.classes.tap.testresult.js';
 
 export class TestDirectory {
   /**

ts/tstest.classes.tstest.ts

@@ -1,12 +1,12 @@
-import * as plugins from './tstest.plugins';
-import * as paths from './tstest.paths';
-import * as logPrefixes from './tstest.logprefixes';
+import * as plugins from './tstest.plugins.js';
+import * as paths from './tstest.paths.js';
+import * as logPrefixes from './tstest.logprefixes.js';
 
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
-import { TestDirectory } from './tstest.classes.testdirectory';
-import { TapCombinator } from './tstest.classes.tap.combinator';
-import { TapParser } from './tstest.classes.tap.parser';
+import { TestDirectory } from './tstest.classes.testdirectory.js';
+import { TapCombinator } from './tstest.classes.tap.combinator.js';
+import { TapParser } from './tstest.classes.tap.parser.js';
 
 export class TsTest {
   public testDir: TestDirectory;
@@ -38,26 +38,33 @@ export class TsTest {
     const tapCombinator = new TapCombinator(); // lets create the TapCombinator
     for (const fileNameArg of fileNamesToRun) {
       switch (true) {
+        case process.env.CI && fileNameArg.includes('.nonci.'):
+          console.log('!!!!!!!!!!!');
+          console.log(
+            `not running testfile ${fileNameArg}, sinc we are CI and file name includes '.nonci.' tag`
+          );
+          console.log('!!!!!!!!!!!');
+          break;
         case fileNameArg.endsWith('.browser.ts'):
           const tapParserBrowser = await this.runInChrome(fileNameArg);
           tapCombinator.addTapParser(tapParserBrowser);
           break;
         case fileNameArg.endsWith('.both.ts'):
-            console.log('>>>>>>> TEST PART 1: chrome');
-            const tapParserBothBrowser = await this.runInChrome(fileNameArg);
-            tapCombinator.addTapParser(tapParserBothBrowser);
-            console.log(cs(`|`.repeat(16), 'cyan'));
-            console.log(''); // force new line
-            console.log('>>>>>>> TEST PART 2: node');
-            const tapParserBothNode = await this.runInNode(fileNameArg);
-            tapCombinator.addTapParser(tapParserBothBrowser);
-            break;
+          console.log('>>>>>>> TEST PART 1: chrome');
+          const tapParserBothBrowser = await this.runInChrome(fileNameArg);
+          tapCombinator.addTapParser(tapParserBothBrowser);
+          console.log(cs(`|`.repeat(16), 'cyan'));
+          console.log(''); // force new line
+          console.log('>>>>>>> TEST PART 2: node');
+          const tapParserBothNode = await this.runInNode(fileNameArg);
+          tapCombinator.addTapParser(tapParserBothNode);
+          break;
         default:
           const tapParserNode = await this.runInNode(fileNameArg);
           tapCombinator.addTapParser(tapParserNode);
           break;
       }
-      
+
       console.log(cs(`^`.repeat(16), 'cyan'));
       console.log(''); // force new line
     }
@@ -93,7 +100,7 @@ export class TsTest {
 
     // lets bundle the test
     await plugins.smartfile.fs.ensureDir(tsbundleCacheDirPath);
-    await this.tsbundleInstance.buildTest(fileNameArg, bundleFilePath, 'parcel');
+    await this.tsbundleInstance.buildTest(process.cwd(), fileNameArg, bundleFilePath, 'rollup');
 
     // lets create a server
     const server = new plugins.smartexpress.Server({
@@ -125,7 +132,7 @@ export class TsTest {
     const evaluation = await this.smartbrowserInstance.evaluateOnPage(
       `http://localhost:3007/test?bundleName=${bundleFileName}`,
       async () => {
-        const convertToText = (obj) => {
+        const convertToText = (obj: any): string => {
           // create an array that will later be joined into a string.
           const stringArray = [];
 
@@ -191,8 +198,11 @@ export class TsTest {
           console.error(err);
         }
 
-        if (globalThis.tapbundleDeferred && globalThis.tapbundleDeferred.promise) {
-          await globalThis.tapbundleDeferred.promise;
+        if (
+          (globalThis as any).tapbundleDeferred &&
+          (globalThis as any).tapbundleDeferred.promise
+        ) {
+          await (globalThis as any).tapbundleDeferred.promise;
         } else {
           console.log('Error: Could not find tapbundle Deferred');
         }

ts/tstest.logprefixes.ts

@@ -1,4 +1,4 @@
-import * as plugins from './tstest.plugins';
+import * as plugins from './tstest.plugins.js';
 import { coloredString as cs } from '@pushrocks/consolecolor';
 
 export const TapPrefix = cs(`::TAP::`, 'pink', 'black');

ts/tstest.paths.ts

@@ -1,5 +1,5 @@
-import * as plugins from './tstest.plugins';
+import * as plugins from './tstest.plugins.js';
 
 export const cwd = process.cwd();
 export const testDir = plugins.path.join(cwd, './test/');
-export const binDirectory = plugins.path.join(cwd, 'node_modules/.bin');
+export const binDirectory = plugins.path.join(cwd, './node_modules/.bin');

ts/tstest.plugins.ts

@@ -32,6 +32,6 @@ import * as tsbundle from '@gitzone/tsbundle';
 export { tsbundle };
 
 // sindresorhus
-import * as figures from 'figures';
+import figures from 'figures';
 
 export { figures };