fix(core): update
This commit is contained in:
		
							
								
								
									
										24
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										24
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,4 +1,22 @@ | |||||||
| node_modules/ |  | ||||||
| public/ |  | ||||||
| coverage/ |  | ||||||
| .nogit/ | .nogit/ | ||||||
|  |  | ||||||
|  | # artifacts | ||||||
|  | coverage/ | ||||||
|  | public/ | ||||||
|  | pages/ | ||||||
|  |  | ||||||
|  | # installs | ||||||
|  | node_modules/ | ||||||
|  |  | ||||||
|  | # caches | ||||||
|  | .yarn/ | ||||||
|  | .cache/ | ||||||
|  | .rpt2_cache | ||||||
|  |  | ||||||
|  | # builds | ||||||
|  | dist/ | ||||||
|  | dist_web/ | ||||||
|  | dist_serve/ | ||||||
|  | dist_ts_web/ | ||||||
|  |  | ||||||
|  | # custom | ||||||
| @@ -1,5 +1,5 @@ | |||||||
| # gitzone standard | # gitzone ci_default | ||||||
| image: hosttoday/ht-docker-node:npmci | image: registry.gitlab.com/hosttoday/ht-docker-node:npmci | ||||||
|  |  | ||||||
| cache: | cache: | ||||||
|   paths: |   paths: | ||||||
| @@ -34,48 +34,11 @@ snyk: | |||||||
|   - docker |   - docker | ||||||
|   - notpriv |   - 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 | # test stage | ||||||
| # ==================== | # ==================== | ||||||
|  |  | ||||||
| testLTS: | testStable: | ||||||
|   stage: test |  | ||||||
|   script: |  | ||||||
|   - npmci npm prepare |  | ||||||
|   - npmci node install lts |  | ||||||
|   - npmci npm install |  | ||||||
|   - npmci npm test |  | ||||||
|   coverage: /\d+.?\d+?\%\s*coverage/ |  | ||||||
|   tags: |  | ||||||
|   - docker |  | ||||||
|   - notpriv |  | ||||||
|      |  | ||||||
| testSTABLE: |  | ||||||
|   stage: test |   stage: test | ||||||
|   script: |   script: | ||||||
|   - npmci npm prepare |   - npmci npm prepare | ||||||
| @@ -85,12 +48,24 @@ testSTABLE: | |||||||
|   coverage: /\d+.?\d+?\%\s*coverage/ |   coverage: /\d+.?\d+?\%\s*coverage/ | ||||||
|   tags: |   tags: | ||||||
|   - docker |   - docker | ||||||
|  |   - priv | ||||||
|  |  | ||||||
|  | testBuild: | ||||||
|  |   stage: test | ||||||
|  |   script: | ||||||
|  |   - npmci npm prepare | ||||||
|  |   - npmci node install lts | ||||||
|  |   - npmci npm install | ||||||
|  |   - npmci command npm run build | ||||||
|  |   coverage: /\d+.?\d+?\%\s*coverage/ | ||||||
|  |   tags: | ||||||
|  |   - docker | ||||||
|   - notpriv |   - notpriv | ||||||
|  |  | ||||||
| release: | release: | ||||||
|   stage: release |   stage: release | ||||||
|   script: |   script: | ||||||
|   - npmci node install stable |   - npmci node install lts | ||||||
|   - npmci npm publish |   - npmci npm publish | ||||||
|   only: |   only: | ||||||
|   - tags |   - tags | ||||||
| @@ -103,19 +78,11 @@ release: | |||||||
| # ==================== | # ==================== | ||||||
| codequality: | codequality: | ||||||
|   stage: metadata |   stage: metadata | ||||||
|   image: docker:stable |  | ||||||
|   allow_failure: true |   allow_failure: true | ||||||
|   services: |  | ||||||
|     - docker:stable-dind |  | ||||||
|   script: |   script: | ||||||
|     - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') |     - npmci command npm install -g tslint typescript | ||||||
|     - docker run |     - npmci npm install | ||||||
|         --env SOURCE_CODE="$PWD" |     - npmci command "tslint -c tslint.json ./ts/**/*.ts" | ||||||
|         --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] |  | ||||||
|   tags: |   tags: | ||||||
|   - docker |   - docker | ||||||
|   - priv |   - priv | ||||||
| @@ -131,13 +98,15 @@ trigger: | |||||||
|   - notpriv |   - notpriv | ||||||
|  |  | ||||||
| pages: | pages: | ||||||
|   image: hosttoday/ht-docker-node:npmci |   image: hosttoday/ht-docker-dbase:npmci | ||||||
|  |   services: | ||||||
|  |    - docker:stable-dind | ||||||
|   stage: metadata |   stage: metadata | ||||||
|   script: |   script: | ||||||
|     - npmci command npm install -g typedoc typescript |     - npmci command npm install -g @gitzone/tsdoc | ||||||
|     - npmci npm prepare |     - npmci npm prepare | ||||||
|     - npmci npm install |     - npmci npm install | ||||||
|     - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ |     - npmci command tsdoc | ||||||
|   tags: |   tags: | ||||||
|     - docker |     - docker | ||||||
|     - notpriv |     - notpriv | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ do more with data | |||||||
| [](https://snyk.io/test/npm/@pushrocks/smartdata) | [](https://snyk.io/test/npm/@pushrocks/smartdata) | ||||||
| [](https://nodejs.org/dist/latest-v10.x/docs/api/) | [](https://nodejs.org/dist/latest-v10.x/docs/api/) | ||||||
| [](https://nodejs.org/dist/latest-v10.x/docs/api/) | [](https://nodejs.org/dist/latest-v10.x/docs/api/) | ||||||
| [](http://standardjs.com/) | [](https://prettier.io/) | ||||||
|  |  | ||||||
| ## Usage | ## Usage | ||||||
|  |  | ||||||
| @@ -118,6 +118,6 @@ So you don't need to install any additional types when importing smartdata. | |||||||
| For further information read the linked docs at the top of this readme. | For further information read the linked docs at the top of this readme. | ||||||
|  |  | ||||||
| > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) | > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) | ||||||
| | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html) | | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy) | ||||||
|  |  | ||||||
| [](https://maintainedby.lossless.com) | [](https://maintainedby.lossless.com) | ||||||
|   | |||||||
							
								
								
									
										15
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								package.json
									
									
									
									
									
								
							| @@ -43,5 +43,16 @@ | |||||||
|     "mongodb-memory-server": "^5.2.0", |     "mongodb-memory-server": "^5.2.0", | ||||||
|     "tslint": "^5.19.0", |     "tslint": "^5.19.0", | ||||||
|     "tslint-config-prettier": "^1.18.0" |     "tslint-config-prettier": "^1.18.0" | ||||||
|   } |   }, | ||||||
| } |   "files": [ | ||||||
|  |     "ts/*", | ||||||
|  |     "ts_web/*", | ||||||
|  |     "dist/*", | ||||||
|  |     "dist_web/*", | ||||||
|  |     "dist_ts_web/*", | ||||||
|  |     "assets/*", | ||||||
|  |     "cli.js", | ||||||
|  |     "npmextra.json", | ||||||
|  |     "readme.md" | ||||||
|  |   ] | ||||||
|  | } | ||||||
| @@ -55,10 +55,10 @@ tap.test('should establish a connection to the rethink Db cluster', async () => | |||||||
| class Car extends smartdata.SmartDataDbDoc<Car> { | class Car extends smartdata.SmartDataDbDoc<Car> { | ||||||
|   @smartdata.unI() |   @smartdata.unI() | ||||||
|   public index: string = smartunique.shortId(); |   public index: string = smartunique.shortId(); | ||||||
|    |  | ||||||
|   @smartdata.svDb() |   @smartdata.svDb() | ||||||
|   public color: string; |   public color: string; | ||||||
|    |  | ||||||
|   @smartdata.svDb() |   @smartdata.svDb() | ||||||
|   public brand: string; |   public brand: string; | ||||||
|  |  | ||||||
| @@ -91,7 +91,6 @@ tap.test('expect to get instance of Car and update it', async () => { | |||||||
|   expect(myCar.color).to.equal('red'); |   expect(myCar.color).to.equal('red'); | ||||||
|   myCar.color = 'blue'; |   myCar.color = 'blue'; | ||||||
|   await myCar.save(); |   await myCar.save(); | ||||||
|  |  | ||||||
| }); | }); | ||||||
|  |  | ||||||
| tap.test('should be able to update an instance of car', async () => {}); | tap.test('should be able to update an instance of car', async () => {}); | ||||||
|   | |||||||
| @@ -130,7 +130,11 @@ export class SmartdataCollection<T> { | |||||||
|       updateableObject[key] = saveableObject[key]; |       updateableObject[key] = saveableObject[key]; | ||||||
|     } |     } | ||||||
|     console.log(updateableObject); |     console.log(updateableObject); | ||||||
|     this.mongoDbCollection.updateOne(identifiableObject, { $set: updateableObject }, {upsert: true}); |     this.mongoDbCollection.updateOne( | ||||||
|  |       identifiableObject, | ||||||
|  |       { $set: updateableObject }, | ||||||
|  |       { upsert: true } | ||||||
|  |     ); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   public async delete(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> { |   public async delete(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user