1.0.76

.gitlab-ci.yml

@@ -12,40 +12,36 @@ stages:
   - release
   - metadata
 
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
+
+# ====================
+# security stage
+# ====================
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 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
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
+    - lossless
     - 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 --only=dev
+    - npmci command pnpm audit --audit-level=high --dev
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -56,7 +52,6 @@ auditDevDependencies:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
@@ -67,7 +62,6 @@ testStable:
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci command npm run build
@@ -96,10 +90,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -119,11 +112,9 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

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

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');
+import * as tsrun from '@gitzone/tsrun';
-cliTool.runCli();
+tsrun.runPath('./cli.child.js', import.meta.url);

contribute.md

@@ -1,3 +0,0 @@
-# How to contribute
-
-Start with `tstest.classes.tstest.ts` to understand whats happening

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.51",
+  "version": "1.0.76",
   "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,26 @@
     "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 --allowimplicitany  --skiplibcheck)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.66",
-    "tslint": "^6.1.3",
+    "@types/node": "^20.4.2"
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.78",
+    "@apiglobal/typedserver": "^2.0.65",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsbundle": "^2.0.8",
-    "@pushrocks/consolecolor": "^2.0.1",
+    "@gitzone/tsrun": "^1.2.43",
-    "@pushrocks/smartbrowser": "^1.0.17",
+    "@push.rocks/consolecolor": "^2.0.1",
-    "@pushrocks/smartdelay": "^2.0.10",
+    "@push.rocks/smartbrowser": "^2.0.5",
-    "@pushrocks/smartexpress": "^3.0.76",
+    "@push.rocks/smartdelay": "^3.0.2",
-    "@pushrocks/smartfile": "^8.0.0",
+    "@push.rocks/smartfile": "^10.0.28",
-    "@pushrocks/smartlog": "^2.0.39",
+    "@push.rocks/smartlog": "^3.0.3",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@pushrocks/smartshell": "^2.0.25",
+    "@push.rocks/smartshell": "^3.0.3",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@push.rocks/tapbundle": "^5.0.12",
-    "@types/figures": "^3.0.1",
+    "figures": "^5.0.0"
-    "figures": "^3.0.0"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -25,9 +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 { expect, tap } from '@push.rocks/tapbundle';
-import * as tstest from '../ts/index';
+import * as tstest from '../ts/index.js';
 
 tap.test('prepare test', async () => {});
 

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@gitzone/tstest',
+  version: '1.0.76',
+  description: 'a test utility to run tests that match test/**/*.ts'
+}

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 { coloredString as cs } from '@push.rocks/consolecolor';
 
-import { TapParser } from './tstest.classes.tap.parser';
+import { TapParser } from './tstest.classes.tap.parser.js';
-import * as logPrefixes from './tstest.logprefixes';
+import * as logPrefixes from './tstest.logprefixes.js';
 
 export class TapCombinator {
   tapParserStore: TapParser[] = [];

ts/tstest.classes.tap.parser.ts

@@ -1,12 +1,12 @@
 import { ChildProcess } from 'child_process';
-import { coloredString as cs } from '@pushrocks/consolecolor';
+import { coloredString as cs } from '@push.rocks/consolecolor';
 
 // ============
 // combines different tap test files to an overall result
 // ============
-import * as plugins from './tstest.plugins';
+import * as plugins from './tstest.plugins.js';
-import { TapTestResult } from './tstest.classes.tap.testresult';
+import { TapTestResult } from './tstest.classes.tap.testresult.js';
-import * as logPrefixes from './tstest.logprefixes';
+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 plugins from './tstest.plugins.js';
-import * as paths from './tstest.paths';
+import * as paths from './tstest.paths.js';
-import { Smartfile } from '@pushrocks/smartfile';
+import { Smartfile } from '@push.rocks/smartfile';
 
 // tap related stuff
-import { TapCombinator } from './tstest.classes.tap.combinator';
+import { TapCombinator } from './tstest.classes.tap.combinator.js';
-import { TapParser } from './tstest.classes.tap.parser';
+import { TapParser } from './tstest.classes.tap.parser.js';
-import { TapTestResult } from './tstest.classes.tap.testresult';
+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 plugins from './tstest.plugins.js';
-import * as paths from './tstest.paths';
+import * as paths from './tstest.paths.js';
-import * as logPrefixes from './tstest.logprefixes';
+import * as logPrefixes from './tstest.logprefixes.js';
 
-import { coloredString as cs } from '@pushrocks/consolecolor';
+import { coloredString as cs } from '@push.rocks/consolecolor';
 
-import { TestDirectory } from './tstest.classes.testdirectory';
+import { TestDirectory } from './tstest.classes.testdirectory.js';
-import { TapCombinator } from './tstest.classes.tap.combinator';
+import { TapCombinator } from './tstest.classes.tap.combinator.js';
-import { TapParser } from './tstest.classes.tap.parser';
+import { TapParser } from './tstest.classes.tap.parser.js';
 
 export class TsTest {
   public testDir: TestDirectory;
@@ -41,15 +41,15 @@ export class TsTest {
         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`
+            `not running testfile ${fileNameArg}, since we are CI and file name includes '.nonci.' tag`
           );
           console.log('!!!!!!!!!!!');
           break;
-        case fileNameArg.endsWith('.browser.ts'):
+        case fileNameArg.endsWith('.browser.ts') || fileNameArg.endsWith('.browser.nonci.ts'):
           const tapParserBrowser = await this.runInChrome(fileNameArg);
           tapCombinator.addTapParser(tapParserBrowser);
           break;
-        case fileNameArg.endsWith('.both.ts'):
+        case fileNameArg.endsWith('.both.ts') || fileNameArg.endsWith('.both.nonci.ts'):
           console.log('>>>>>>> TEST PART 1: chrome');
           const tapParserBothBrowser = await this.runInChrome(fileNameArg);
           tapCombinator.addTapParser(tapParserBothBrowser);
@@ -99,17 +99,19 @@ export class TsTest {
     const bundleFilePath = plugins.path.join(tsbundleCacheDirPath, bundleFileName);
 
     // lets bundle the test
-    await plugins.smartfile.fs.ensureDir(tsbundleCacheDirPath);
+    await plugins.smartfile.fs.ensureEmptyDir(tsbundleCacheDirPath);
-    await this.tsbundleInstance.buildTest(fileNameArg, bundleFilePath, 'parcel');
+    await this.tsbundleInstance.build(process.cwd(), fileNameArg, bundleFilePath, {
+      bundler: 'esbuild',
+    });
 
     // lets create a server
-    const server = new plugins.smartexpress.Server({
+    const server = new plugins.typedserver.servertools.Server({
       cors: true,
       port: 3007,
     });
     server.addRoute(
       '/test',
-      new plugins.smartexpress.Handler('GET', async (req, res) => {
+      new plugins.typedserver.servertools.Handler('GET', async (req, res) => {
         res.type('.html');
         res.write(`
         <html>
@@ -124,7 +126,7 @@ export class TsTest {
         res.end();
       })
     );
-    server.addRoute('*', new plugins.smartexpress.HandlerStatic(tsbundleCacheDirPath));
+    server.addRoute('*', new plugins.typedserver.servertools.HandlerStatic(tsbundleCacheDirPath));
     await server.start();
 
     // lets do the browser bit
@@ -132,9 +134,9 @@ 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 = [];
+          const stringArray: string[] = [];
 
           if (typeof obj === 'object' && typeof obj.toString === 'function') {
             stringArray.push(obj.toString());
@@ -198,8 +200,11 @@ export class TsTest {
           console.error(err);
         }
 
-        if (globalThis.tapbundleDeferred && globalThis.tapbundleDeferred.promise) {
+        if (
-          await globalThis.tapbundleDeferred.promise;
+          (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,5 +1,5 @@
-import * as plugins from './tstest.plugins';
+import * as plugins from './tstest.plugins.js';
-import { coloredString as cs } from '@pushrocks/consolecolor';
+import { coloredString as cs } from '@push.rocks/consolecolor';
 
 export const TapPrefix = cs(`::TAP::`, 'pink', 'black');
 export const TapErrorPrefix = cs(` !!!TAP PROTOCOL ERROR!!! `, 'red', '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

@@ -3,21 +3,26 @@ import * as path from 'path';
 
 export { path };
 
-// @pushrocks scope
+// @apiglobal scope
-import * as consolecolor from '@pushrocks/consolecolor';
+import * as typedserver from '@apiglobal/typedserver';
-import * as smartbrowser from '@pushrocks/smartbrowser';
+
-import * as smartexpress from '@pushrocks/smartexpress';
+export {
-import * as smartdelay from '@pushrocks/smartdelay';
+  typedserver
-import * as smartfile from '@pushrocks/smartfile';
+}
-import * as smartlog from '@pushrocks/smartlog';
+
-import * as smartpromise from '@pushrocks/smartpromise';
+// @push.rocks scope
-import * as smartshell from '@pushrocks/smartshell';
+import * as consolecolor from '@push.rocks/consolecolor';
-import * as tapbundle from '@pushrocks/tapbundle';
+import * as smartbrowser from '@push.rocks/smartbrowser';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartfile from '@push.rocks/smartfile';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartshell from '@push.rocks/smartshell';
+import * as tapbundle from '@push.rocks/tapbundle';
 
 export {
   consolecolor,
   smartbrowser,
-  smartexpress,
   smartdelay,
   smartfile,
   smartlog,
@@ -32,6 +37,6 @@ import * as tsbundle from '@gitzone/tsbundle';
 export { tsbundle };
 
 // sindresorhus
-import * as figures from 'figures';
+import figures from 'figures';
 
 export { figures };

tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}