3.0.0

.gitignore

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

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -19,22 +22,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+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 snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +66,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +77,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,11 +97,12 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  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
@@ -108,11 +122,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable 
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.snyk

@@ -1,4 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.3
-ignore: {}
-patch: {}

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.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", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Lossless GmbH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

npmextra.json

@@ -1,16 +1,16 @@
 {
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smarthash",
-      "shortDescription": "simplifies access to node hash functions",
+      "description": "simplifies access to node hash functions",
       "npmPackagename": "@pushrocks/smarthash",
       "license": "MIT"
     }
   },
   "npmci": {
-    "npmAccessLevel": "public",
-    "npmRegistryUrl": "verdaccio.lossless.one"
+    "npmAccessLevel": "public"
   }
 }

package.json

@@ -1,17 +1,14 @@
 {
   "name": "@pushrocks/smarthash",
-  "version": "2.1.5",
+  "version": "3.0.0",
   "private": false,
   "description": "simplified access to node hash functions",
-  "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)"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/pushrocks/nodehash.git"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web)",
+    "buildDocs": "tsdoc"
   },
   "keywords": [
     "pushrocks",
@@ -24,34 +21,33 @@
   ],
   "author": "Lossless GmbH",
   "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/pushrocks/nodehash/issues"
-  },
-  "homepage": "https://github.com/pushrocks/nodehash#readme",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^12.12.17",
-    "tslint": "^5.20.1",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tstest": "^1.0.71",
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^18.0.0"
   },
   "dependencies": {
-    "@pushrocks/smartjson": "^3.0.9",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@types/through2": "^2.0.34",
-    "through2": "^3.0.1"
+    "@pushrocks/smartjson": "^5.0.1",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@types/through2": "^2.0.36",
+    "through2": "^4.0.2"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
-  ]
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ],
+  "type": "module"
 }

readme.md

@@ -8,13 +8,20 @@ simplifies access to node hash functions
 * [docs (typedoc)](https://pushrocks.gitlab.io/smarthash/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smarthash/badges/master/build.svg)](https://gitlab.com/pushrocks/smarthash/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smarthash/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smarthash/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smarthash.svg)](https://www.npmjs.com/package/@pushrocks/smarthash)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smarthash/badge.svg)](https://snyk.io/test/npm/@pushrocks/smarthash)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smarthash/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smarthash/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smarthash)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smarthash)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smarthash)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smarthash)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smarthash)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 

test/test.ts

@@ -1,55 +1,55 @@
 import { tap, expect } from '@pushrocks/tapbundle';
-import fs = require('fs');
+import * as fs from 'fs';
 
-import * as smarthash from '../ts/index';
+import * as smarthash from '../ts/index.js';
 
 tap.test('sha256FromStringSync should convert a String to sha256 hash synchronously', async () => {
   const testHash = smarthash.sha256FromStringSync('test');
   const testHash2 = smarthash.sha256FromStringSync('testString');
   const testHash3 = smarthash.sha256FromStringSync('test');
-  expect(testHash).to.equal(testHash3);
-  expect(testHash).to.not.equal('test');
+  expect(testHash).toEqual(testHash3);
+  expect(testHash).not.toEqual('test');
 });
 
 tap.test('sha256fromStringSync should convert a String to sha256 hash synchronously', async () => {
   const resultString = await smarthash.sha256FromString('test');
   const compareString = smarthash.sha256FromStringSync('test');
-  expect(resultString).to.equal(compareString);
+  expect(resultString).toEqual(compareString);
 });
 
-tap.test('sha256fromStream should convert a Stream to sha256', async tools => {
+tap.test('sha256fromStream should convert a Stream to sha256', async (tools) => {
   const readStream = fs.createReadStream('./test/testImageForHash.jpg');
   const resultString: string = await smarthash.sha256FromStream(readStream);
-  expect(resultString).to.equal('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c');
+  expect(resultString).toEqual('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c');
 });
 
 tap.test('sha256fromFile should convert a Stream to sha256', async () => {
   const resultString = await smarthash.sha256FromFile('./test/testImageForHash.jpg');
-  expect(resultString).to.equal('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c');
+  expect(resultString).toEqual('45b80413ed93acb495691186ce61850449439f9183352b9bff96d5533fa1046c');
 });
 
 tap.test('should produce reproducible hash from Object', async () => {
   const hash1 = await smarthash.sha265FromObject({
     hithere: 1,
-    wow: 'two'
+    wow: 'two',
   });
 
   const hash2 = await smarthash.sha265FromObject({
     wow: 'two',
-    hithere: 1
+    hithere: 1,
   });
 
   const hash3 = await smarthash.sha265FromObject({
     wow: 'twoe',
-    hithere: 1
+    hithere: 1,
   });
-  expect(hash1).to.equal(hash2);
-  expect(hash1).to.not.equal(hash3);
+  expect(hash1).toEqual(hash2);
+  expect(hash1).not.toEqual(hash3);
 });
 
 tap.test('should create md5hash from string', async () => {
   const md5Hash = await smarthash.md5FromString('hellothere');
-  expect(md5Hash).to.equal('c6f7c372641dd25e0fddf0215375561f');
+  expect(md5Hash).toEqual('c6f7c372641dd25e0fddf0215375561f');
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smarthash',
+  version: '3.0.0',
+  description: 'simplified access to node hash functions'
+}

ts/index.ts

@@ -1,4 +1,4 @@
-import * as plugins from './nodehash.plugins';
+import * as plugins from './nodehash.plugins.js';
 
-export * from './nodehash.sha256';
-export * from './nodehash.md5';
+export * from './nodehash.sha256.js';
+export * from './nodehash.md5.js';

ts/nodehash.helpers.ts

@@ -1,12 +1,12 @@
-import * as plugins from './nodehash.plugins';
+import * as plugins from './nodehash.plugins.js';
 
-export const hashStreamPipeStop = resolveFuntion => {
+export const hashStreamPipeStop = (resolveFuntion) => {
   const forEach = (chunk: Buffer, enc, cb) => {
     resolveFuntion(chunk.toString('utf8'));
     cb(null, chunk);
   };
 
-  const atEnd = cb => {
+  const atEnd = (cb) => {
     cb();
   };
 

ts/nodehash.md5.ts

@@ -1,8 +1,5 @@
-import * as plugins from './nodehash.plugins';
+import * as plugins from './nodehash.plugins.js';
 
 export const md5FromString = async (stringToHash: string) => {
-  return plugins.crypto
-    .createHash('md5')
-    .update(stringToHash)
-    .digest('hex');
+  return plugins.crypto.createHash('md5').update(stringToHash).digest('hex');
 };

ts/nodehash.sha256.ts

@@ -1,5 +1,5 @@
-import * as plugins from './nodehash.plugins';
-import * as helpers from './nodehash.helpers';
+import * as plugins from './nodehash.plugins.js';
+import * as helpers from './nodehash.helpers.js';
 
 /**
  * creates sha256 Hash from Stream
@@ -26,7 +26,7 @@ export const sha256FromFile = async (filePath: string): Promise<string> => {
 /**
  * Computes sha256 Hash from String synchronously
  */
-export let sha256FromStringSync = (stringArg): string => {
+export const sha256FromStringSync = (stringArg: string): string => {
   const hash = plugins.crypto.createHash('sha256');
   hash.update(stringArg);
   return hash.digest('hex');
@@ -42,11 +42,21 @@ export const sha256FromString = async (stringArg: string): Promise<string> => {
   return hashResult;
 };
 
+/**
+ * Computes sha256 Hash from String
+ */
+export const sha256FromBuffer = async (bufferArg: Buffer): Promise<string> => {
+  const hash = plugins.crypto.createHash('sha256');
+  hash.update(bufferArg);
+  const hashResult = hash.digest('hex');
+  return hashResult;
+};
+
 /**
  * computes sha265 Hash from Object
  */
 export const sha265FromObject = async (objectArg: any): Promise<string> => {
-  const stringifiedObject = plugins.smartjson.Smartjson.stringify(objectArg, {});
+  const stringifiedObject = plugins.smartjson.stringify(objectArg);
   const hashResult = await sha256FromString(stringifiedObject);
   return hashResult;
 };

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"
-}