3.0.14

.gitignore

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

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,21 +18,24 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - 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:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -41,37 +44,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci command npm run build
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -85,30 +91,31 @@ codequality:
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -116,5 +123,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.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

@@ -4,6 +4,7 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "tsclass",

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@tsclass/tsclass",
-  "version": "2.0.11",
+  "version": "3.0.14",
   "private": false,
   "description": "common classes for TypeScript",
-  "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"
@@ -24,22 +24,23 @@
   },
   "homepage": "https://github.com/tsclass/tsclass#readme",
   "dependencies": {
-    "@pushrocks/tapbundle": "^3.0.13"
+    "@pushrocks/tapbundle": "^3.2.1"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.22",
     "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.27",
-    "tslint": "^5.20.0",
+    "@gitzone/tstest": "^1.0.28",
+    "tslint": "^6.1.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -8,7 +8,7 @@ common classes for TypeScript
 * [docs (typedoc)](https://tsclass.gitlab.io/tsclass/)
 
 ## Status for master
-[![build status](https://gitlab.com/tsclass/tsclass/badges/master/build.svg)](https://gitlab.com/tsclass/tsclass/commits/master)
+[![pipeline status](https://gitlab.com/tsclass/tsclass/badges/master/pipeline.svg)](https://gitlab.com/tsclass/tsclass/commits/master)
 [![coverage report](https://gitlab.com/tsclass/tsclass/badges/master/coverage.svg)](https://gitlab.com/tsclass/tsclass/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/@tsclass/tsclass.svg)](https://www.npmjs.com/package/@tsclass/tsclass)
 [![Known Vulnerabilities](https://snyk.io/test/npm/@tsclass/tsclass/badge.svg)](https://snyk.io/test/npm/@tsclass/tsclass)
@@ -49,6 +49,10 @@ class myOwnInvoice implements IInvoice {
 
 > The modules in bold letters exist as own modules and can be used seperately
 
+## Contribution
+
+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). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.node.ts

@@ -3,7 +3,7 @@ import { tap, expect } from '@pushrocks/tapbundle';
 import * as tsclass from '../ts/index';
 
 tap.test('should assign a correct type', async () => {
-  let contact: tsclass.IContact;
+  let contact: tsclass.business.IContact;
 });
 
 tap.start();

ts/business/company.ts

@@ -1,5 +1,4 @@
-import { IContact } from '..';
-import { IDate } from '..';
+import { business, general } from '..';
 
 /**
  * describes a company's lifecycle state
@@ -11,8 +10,8 @@ export type TCompanyStatus = 'planed' | 'founding' | 'active' | 'liquidation' |
  */
 export interface ICompany {
   name: string;
-  foundedDate: IDate;
-  closedDate: IDate;
-  status: TCompanyStatus;
-  contact: IContact;
+  foundedDate: general.IDate;
+  closedDate: general.IDate;
+  status: business.TCompanyStatus;
+  contact: business.IContact;
 }

ts/business/contact.ts

@@ -1,4 +1,4 @@
-import { IAddress } from '..';
+import { business } from '..';
 
 export type TContactSalutation = 'Mr' | 'Ms' | 'Mrs';
 
@@ -16,11 +16,16 @@ export interface IContact {
   name: string;
   surname?: string;
   legalEntity?: string;
-  address: IAddress;
+  address: business.IAddress;
   description: string;
   customerNumber?: string;
-
   email?: string;
+
+  logoUrl?: string;
+  website?: string;
+  facebookUrl?: string;
+  twitterUrl?: string;
+
   phone?: string;
   fax?: string;
 

ts/container/container.ts

@@ -0,0 +1,5 @@
+export interface IContainer {
+  registryUrl: string;
+  tag: string;
+  version: string;
+}

ts/container/index.ts

@@ -0,0 +1,2 @@
+export * from './container';
+export * from './volumemount';

ts/container/volumemount.ts

@@ -0,0 +1,4 @@
+export interface IVolumeMount {
+  hostFsPath: string;
+  containerFsPath: string;
+}

ts/content/article.ts

@@ -1,4 +1,4 @@
-import { IAuthor } from '..';
+import { content } from '..';
 
 export interface IArticle {
   /**
@@ -9,7 +9,7 @@ export interface IArticle {
   /**
    * the Author of an article
    */
-  author: IAuthor;
+  author: content.IAuthor;
 
   /**
    * the content of an article

ts/content/author.ts

@@ -1,5 +1,4 @@
-import { IDate } from '..';
-import { IArticle } from '..';
+import { general, content } from '..';
 
 export interface IAuthor {
   /**
@@ -15,10 +14,10 @@ export interface IAuthor {
   /**
    * the birthday of an author
    */
-  birthday: IDate;
+  birthday: general.IDate;
 
   /**
    * articles of an author
    */
-  articles: IArticle[];
+  articles: content.IArticle[];
 }

ts/finance/checkingaccount.ts

@@ -1,8 +1,7 @@
-import { TCurrency } from './currency';
-import { ITransaction } from './transaction';
+import { finance } from '../';
 
 export interface ICheckingAccount {
   name: string;
-  currency: TCurrency;
-  transactions: ITransaction[];
+  currency: finance.TCurrency;
+  transactions: finance.ITransaction[];
 }

ts/finance/expense.ts

@@ -1,5 +1,4 @@
-import { IInvoice } from './invoice';
-import { IContact } from '../business/contact';
+import { business } from '../';
 
 export interface IExpenseItem {
   description: string;
@@ -14,5 +13,5 @@ export interface IVoucher {
   date: Date;
   description: string;
   expenseItems: IExpenseItem[];
-  contactRef: IContact;
+  contactRef: business.IContact;
 }

ts/finance/invoice.ts

@@ -1,4 +1,4 @@
-import { IContact } from '..';
+import { business } from '..';
 
 export type TInvoiceStatus = 'draft' | 'invoice' | 'paid' | 'refunded';
 
@@ -10,8 +10,8 @@ export interface IInvoiceItem {
 }
 
 export interface IInvoice {
-  billedBy: IContact;
-  billedTo: IContact;
+  billedBy: business.IContact;
+  billedTo: business.IContact;
   status: TInvoiceStatus;
   items: IInvoiceItem[];
 }

ts/index.ts

@@ -1,21 +1,19 @@
 // Business
 import * as business from './business';
-export * from './business';
+
+// Container
+import * as container from './container';
 
 // Finance
 import * as finance from './finance';
-export * from './finance';
 
 // Content
 import * as content from './content';
-export * from './content';
 
 // General
 import * as general from './general';
-export * from './general';
 
 // Network
 import * as network from './network';
-export * from './network';
 
-export { business, finance, content, general, network };
+export { business, container, finance, content, general, network };

ts/network/cert.ts

@@ -0,0 +1,9 @@
+export interface ICert {
+  id: string;
+  domainName: string;
+  created: number;
+  validUntil: number;
+  privateKey: string;
+  publicKey: string;
+  csr: string;
+}

ts/network/dns.ts

@@ -1 +1,20 @@
-export type TDnsRecord = 'A' | 'AAAA' | 'CNAME' | 'TXT' | 'SRV' | 'LOC' | 'MX' | 'NS' | 'SPF';
+export type TDnsRecordType =
+  | 'A'
+  | 'AAAA'
+  | 'CNAME'
+  | 'LOC'
+  | 'PTR'
+  | 'MX'
+  | 'NAPTR'
+  | 'NS'
+  | 'SOA'
+  | 'SPF'
+  | 'SRV'
+  | 'TXT';
+
+export interface IDnsRecord {
+  name: string;
+  type: TDnsRecordType;
+  value: string;
+  dnsSecEnabled: boolean;
+}

ts/network/dnschallenge.ts

@@ -0,0 +1,4 @@
+export interface IDnsChallenge {
+  hostName: string;
+  challenge: string;
+}

ts/network/index.ts

@@ -1,2 +1,6 @@
-export * from './reverseproxy';
+export * from './cert';
 export * from './dns';
+export * from './dnschallenge';
+export * from './networknode';
+export * from './request';
+export * from './reverseproxy';

ts/network/networknode.ts

@@ -0,0 +1,6 @@
+export interface INetworkNode {
+  name: string;
+  ipv4: string;
+  ipv6: string;
+  securityLevel: 'private' | 'public' | 'confidential';
+}

ts/network/request.ts

@@ -0,0 +1,25 @@
+export interface ISimpleRequest {
+  headers: {};
+  parsedUrl: {
+    hash: string;
+    host: string;
+    hostname: string;
+    href: string;
+    readonly origin: string;
+    password: string;
+    pathname: string;
+    port: string;
+    protocol: string;
+    search: string;
+    readonly searchParams: URLSearchParams;
+    username: string;
+    toString: () => string;
+    toJSON(): () => string;
+  };
+}
+
+export interface ISimpleResponse {
+  headers: { [key: string]: string };
+  body: string;
+}
+export type IRenderFunction = (req: ISimpleRequest) => Promise<ISimpleResponse>;

ts/network/reverseproxy.ts

@@ -4,4 +4,9 @@ export interface IReverseProxyConfig {
   hostName: string;
   privateKey: string;
   publicKey: string;
+  authentication?: {
+    type: 'Basic';
+    user: string;
+    pass: string;
+  };
 }