From e515f91088a232026fa7487b4a230f8dcf54face Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Mon, 10 Feb 2020 21:08:52 +0000 Subject: [PATCH] fix(core): update --- .gitlab-ci.yml | 87 +++++++++++++++++++++++-------------------- .vscode/settings.json | 26 +++++++++++++ npmextra.json | 1 + package.json | 14 +++---- readme.md | 7 +++- test/test.ts | 6 ++- ts/index.ts | 2 +- 7 files changed, 92 insertions(+), 51 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6159b7..a95dfb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,16 @@ # gitzone ci_default image: registry.gitlab.com/hosttoday/ht-docker-node:npmci -variables: - GIT_STRATEGY: clone 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 @@ -20,21 +18,23 @@ stages: mirror: stage: security script: - - npmci git mirror + - npmci git mirror tags: - - docker - - notpriv + - lossless + - docker + - notpriv snyk: + image: registry.gitlab.com/hosttoday/ht-docker-node:snyk stage: security script: - npmci npm prepare - - npmci command npm install -g snyk - npmci command npm install --ignore-scripts - npmci command snyk test tags: - - docker - - notpriv + - lossless + - docker + - notpriv # ==================== # test stage @@ -43,37 +43,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 lts - - 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 lts - - npmci npm publish + - npmci node install stable + - npmci npm publish only: - - tags + - tags tags: - - docker - - notpriv + - lossless + - docker + - notpriv # ==================== # metadata stage @@ -83,33 +86,35 @@ codequality: allow_failure: true script: - npmci command npm install -g tslint typescript + - npmci npm prepare - 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:18-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: @@ -117,5 +122,5 @@ pages: artifacts: expire_in: 1 week paths: - - public + - public allow_failure: true diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..01d2b8d --- /dev/null +++ b/.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"] + } + } + } + } + } + } + ] +} diff --git a/npmextra.json b/npmextra.json index 1e36b54..bc2dd51 100644 --- a/npmextra.json +++ b/npmextra.json @@ -1,5 +1,6 @@ { "gitzone": { + "projectType": "npm", "module": { "githost": "gitlab.com", "gitscope": "apiglobal", diff --git a/package.json b/package.json index 8cdf77e..3fbc008 100644 --- a/package.json +++ b/package.json @@ -22,14 +22,14 @@ }, "dependencies": {}, "files": [ - "ts/*", - "ts_web/*", - "dist/*", - "dist_web/*", - "dist_ts_web/*", - "assets/*", + "ts/**/*", + "ts_web/**/*", + "dist/**/*", + "dist_web/**/*", + "dist_ts_web/**/*", + "assets/**/*", "cli.js", "npmextra.json", "readme.md" ] -} +} \ No newline at end of file diff --git a/readme.md b/readme.md index 5025425..b65faec 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ interfaces for making typed requests * [docs (typedoc)](https://apiglobal.gitlab.io/typedrequest-interfaces/) ## Status for master -[![build status](https://gitlab.com/apiglobal/typedrequest-interfaces/badges/master/build.svg)](https://gitlab.com/apiglobal/typedrequest-interfaces/commits/master) +[![pipeline status](https://gitlab.com/apiglobal/typedrequest-interfaces/badges/master/pipeline.svg)](https://gitlab.com/apiglobal/typedrequest-interfaces/commits/master) [![coverage report](https://gitlab.com/apiglobal/typedrequest-interfaces/badges/master/coverage.svg)](https://gitlab.com/apiglobal/typedrequest-interfaces/commits/master) [![npm downloads per month](https://img.shields.io/npm/dm/@apiglobal/typedrequest-interfaces.svg)](https://www.npmjs.com/package/@apiglobal/typedrequest-interfaces) [![Known Vulnerabilities](https://snyk.io/test/npm/@apiglobal/typedrequest-interfaces/badge.svg)](https://snyk.io/test/npm/@apiglobal/typedrequest-interfaces) @@ -18,6 +18,11 @@ interfaces for making typed requests ## Usage + +## 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) diff --git a/test/test.ts b/test/test.ts index 786aeaf..53ec853 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,7 +1,11 @@ import { expect, tap } from '@pushrocks/tapbundle'; import * as typedrequestInterfaces from '../ts/index'; -interface IRequestSample extends typedrequestInterfaces.implementsTR { +interface IRequestSample + extends typedrequestInterfaces.implementsTR< + typedrequestInterfaces.ITypedRequest, + IRequestSample + > { method: 'hey'; request: {}; response: {}; diff --git a/ts/index.ts b/ts/index.ts index 1fb5d30..792ca29 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -2,7 +2,7 @@ export interface ITypedRequest { method: string; request: object; response: object; - error?: { text: string, data: any }; + error?: { text: string; data: any }; retry?: { waitForMs: number; reason: string;