diff --git a/.gitignore b/.gitignore index 9cf65f6..91c0db0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,22 @@ -node_modules/ -pages/ -public/ +.nogit/ + +# artifacts coverage/ -.nogit/ \ No newline at end of file +public/ +pages/ + +# installs +node_modules/ + +# caches +.yarn/ +.cache/ +.rpt2_cache + +# builds +dist/ +dist_web/ +dist_serve/ +dist_ts_web/ + +# custom \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0dfb491..938529d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ -# gitzone standard -image: hosttoday/ht-docker-node:npmci +# gitzone ci_default +image: registry.gitlab.com/hosttoday/ht-docker-node:npmci cache: paths: @@ -34,31 +34,6 @@ snyk: - docker - notpriv -sast: - stage: security - image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci - variables: - DOCKER_DRIVER: overlay2 - allow_failure: true - services: - - docker:stable-dind - script: - - npmci npm prepare - - npmci npm install - - npmci command npm run build - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}" - --volume "$PWD:/code" - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code - artifacts: - reports: - sast: gl-sast-report.json - tags: - - docker - - priv - # ==================== # test stage # ==================== @@ -74,14 +49,14 @@ testLTS: tags: - docker - notpriv - -testSTABLE: + +testBuild: stage: test script: - npmci npm prepare - - npmci node install stable + - npmci node install lts - npmci npm install - - npmci npm test + - npmci command npm run build coverage: /\d+.?\d+?\%\s*coverage/ tags: - docker @@ -90,7 +65,7 @@ testSTABLE: release: stage: release script: - - npmci node install stable + - npmci node install lts - npmci npm publish only: - tags @@ -103,19 +78,11 @@ release: # ==================== codequality: stage: metadata - image: docker:stable allow_failure: true - services: - - docker:stable-dind script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - artifacts: - paths: [codeclimate.json] + - npmci command npm install -g tslint typescript + - npmci npm install + - npmci command "tslint -c tslint.json ./ts/**/*.ts" tags: - docker - priv @@ -131,13 +98,15 @@ trigger: - notpriv pages: - image: hosttoday/ht-docker-node:npmci + image: hosttoday/ht-docker-dbase:npmci + services: + - docker:18-dind stage: metadata script: - - npmci command npm install -g typedoc typescript + - npmci command npm install -g @gitzone/tsdoc - npmci npm prepare - npmci npm install - - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ + - npmci command tsdoc tags: - docker - notpriv diff --git a/package.json b/package.json index f9e2e6b..3d71979 100644 --- a/package.json +++ b/package.json @@ -36,5 +36,16 @@ "@types/minimatch": "^3.0.3", "minimatch": "^3.0.4", "symbol-tree": "^3.2.2" - } -} + }, + "files": [ + "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/test/test.timedaggregator.ts b/test/test.timedaggregator.ts index 74d92ce..3d72bd7 100644 --- a/test/test.timedaggregator.ts +++ b/test/test.timedaggregator.ts @@ -8,10 +8,10 @@ import * as lik from '../ts/index'; let testTimedAggregator: lik.TimedAggregtor; -tap.test('should create a timed aggregaotor', async (tools) => { +tap.test('should create a timed aggregaotor', async tools => { testTimedAggregator = new lik.TimedAggregtor({ aggregationIntervalInMillis: 1000, - functionForAggregation: (aggregation) => { + functionForAggregation: aggregation => { console.log(aggregation); } }); diff --git a/ts/lik.timedaggregator.ts b/ts/lik.timedaggregator.ts index 89a383f..f4fcd0c 100644 --- a/ts/lik.timedaggregator.ts +++ b/ts/lik.timedaggregator.ts @@ -11,11 +11,10 @@ export class TimedAggregtor { constructor(optionsArg: ITimedAggregatorOptions) { this.options = optionsArg; - } private aggregationTimer: plugins.smarttime.Timer; - private checkAggregationStatus () { + private checkAggregationStatus() { const addAggregationTimer = () => { this.aggregationTimer = new plugins.smarttime.Timer(this.options.aggregationIntervalInMillis); this.aggregationTimer.completed.then(() => { @@ -39,4 +38,4 @@ export class TimedAggregtor { this.storageArray.push(aggregationArg); this.checkAggregationStatus(); } -}; \ No newline at end of file +}