Skip to content
This repository was archived by the owner on Nov 13, 2020. It is now read-only.

Commit 820317e

Browse files
RomakitaRomakita
committed
Merge master
2 parents fbc906b + ac440a1 commit 820317e

32 files changed

+2893
-906
lines changed

‎.gitignore‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
21
### Node template
2+
.DS_Store
33
# Logs
44
logs
55
*.log
@@ -37,14 +37,19 @@ typings/
3737
# Typescript
3838
index.js
3939
index.js.map
40-
*.js
41-
*.js.map
42-
test/spec/*.js
43-
test/spec/*.js.map
40+
src/**/*.js
41+
src/**/*.js.map
42+
test/**/*.js
43+
test/**/*.js.map
44+
.npmrc
4445

4546
# Test
4647
/stdout
4748
/stderr
49+
/es6/
4850
/lib/
49-
/coverage/
50-
/dts/
51+
/dts/
52+
53+
.vscode
54+
55+
/.nyc_output/

‎.npmignore‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
11
test
2-
typings
3-
bundled
4-
build
5-
temp
2+
src/**/*.js
3+
src/**/*.js.map
64
coverage
7-
docs
8-
wiki
9-
karma.conf.js
105
tsconfig.json
116
tsconfig.compile.json
12-
tsconfig.test.json
13-
typings.json
14-
CONTRIBUTING.md
15-
ISSUE_TEMPLATE.md
16-
PULL_REQUEST_TEMPLATE.md
177
tslint.json
188
.travis.yml
199
.gitignore
20-
.vscode
21-
.publishrc
22-
type_definitions
23-
.idea
10+
.idea
11+
dts

‎.nycrc‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"include": [
3+
"src/**/*.js"
4+
],
5+
"exclude": [
6+
"**/index.ts",
7+
"**/index.js",
8+
"**/interfaces/*.js"
9+
],
10+
"reporter": [
11+
"lcov",
12+
"text-summary"
13+
],
14+
"extension": [
15+
".ts"
16+
],
17+
"check-coverage": true,
18+
"lines": 99,
19+
"statements": 100,
20+
"functions": 99,
21+
"branches": 89,
22+
"all": true
23+
}

‎.travis.yml‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
11
language: node_js
2+
notifications:
3+
email: false
24
node_js:
3-
- '4'
4-
- '5'
5-
- '6'
65
- 'node'
7-
8-
env:
9-
- CXX=g++-4.8
10-
addons:
11-
apt:
12-
sources:
13-
- ubuntu-toolchain-r-test
14-
packages:
15-
- g++-4.8
16-
17-
before_install:
18-
- npm install -g [email protected]
19-
20-
script:
21-
- "npm test"
22-
- "npm run test:travis"
23-
24-
after_script:
25-
- "test -e ./coverage/lcov.info && npm install coveralls@2 [email protected] && ./node_modules/.bin/remap-istanbul -i ./coverage/coverage.json -t lcovonly | coveralls"
26-
27-
sudo: required
6+
- '8'
7+
- '7'
8+
- '6'
9+
after_success:
10+
- npm run coveralls:travis
11+
- sh ./sh/prepublish.sh && semantic-release pre && sh ./sh/publish.sh
12+
branches:
13+
except:
14+
- /^v\d+\.\d+\.\d+$/
15+
sudo: false

‎CONTRIBUTING.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Contributing
2+
## Setup
3+
4+
Clone your fork of the repository
5+
6+
```
7+
$ git clone https://github.com/YOUR_USERNAME/ts-log-debug.git
8+
```
9+
10+
Install npm dependencies
11+
12+
```
13+
npm install
14+
```
15+
16+
Run build process
17+
18+
```
19+
npm run tsc:compile
20+
```
21+
22+
## Test
23+
24+
```
25+
npm run test
26+
```
27+
28+
## Write documentation
29+
30+
TsJsonProperties use docsify to convert markdown to HTML. In addition, all documentation in your code will be used to generate
31+
the Api documentation. To preview your comments on a class you can run this command:
32+
33+
```
34+
npm run doc:serve
35+
```
36+
37+
## Guidelines
38+
39+
- TsJsonProperties follow the git flow to generate a release note. To write your commit message see https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit
40+
- Please try to combine multiple commits before pushing
41+
- Please use TDD when fixing bugs. This means that you should write a unit test that fails because it reproduces the issue, then fix the issue and finally run the test to ensure that the issue has been resolved. This helps us prevent fixed bugs from happening again in the future
42+
- Please keep the test coverage at 100%. Write additional unit tests if necessary
43+
- Please create an issue before sending a PR if it is going to change the public interface of Ts.ED or includes significant architecture changes,
44+
- Feel free to ask for help from other members of the TsLogDebug team

‎ISSUE_TEMPLATE.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!-- This template it's just here to help you for write your Issue -->
2+
3+
## Informations
4+
5+
Type | Version
6+
---|---
7+
Bug/Improvement/Question | 2.x
8+
9+
****
10+
11+
## Description
12+
A few sentences describing the overall goals of the issue.
13+
14+
15+
## Todos
16+
17+
- [ ] Example (log, usecase, etc...)
18+
- [ ] Ts.ED version (bug/question)

‎LICENSE‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2016 Romain Lenzotti
4+
5+
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:
6+
7+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
8+
9+
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.

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!-- This template it's just here to help you for write your Pull Request -->
2+
3+
## Informations
4+
5+
Type | Status | Migration
6+
---|---|---
7+
Feature/Fix/Doc/Chore | Ready/In development/Hold | Yes/No
8+
9+
****
10+
11+
## Description
12+
A few sentences describing the overall goals of the pull request's commits.
13+
14+
## Usage example
15+
Example to use your feature and to improve the documentation after merging your PR:
16+
```
17+
import {} from "ts-express-decorators";
18+
19+
```
20+
21+
22+
## Todos
23+
24+
- [ ] Tests
25+
- [ ] Coverage
26+
- [ ] Example
27+
- [ ] Documentation

‎package.json‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55
"main": "lib/index.js",
66
"typings": "lib/index.d.ts",
77
"scripts": {
8-
"prepublish": "npm run tsc:compile",
9-
"coverage": "npm run test:cov && npm run test:remap",
10-
"tslint": "tslint ./src/*.ts",
11-
"release:major": "npm version major && npm publish && git push --follow-tags",
12-
"release:minor": "npm version minor && npm publish && git push --follow-tags",
13-
"release:patch": "npm version patch && npm publish && git push --follow-tags",
14-
"test": "npm run tsc && mocha --reporter spec --check-leaks --bail test/",
15-
"test:cov": "istanbul cover -x \"examples/**\" node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/ && npm run test:remap",
16-
"test:remap": "./node_modules/.bin/remap-istanbul -i coverage/coverage.json -o coverage/lcov-report -t html",
17-
"test:travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
18-
"tsc": "./node_modules/typescript/bin/tsc",
19-
"tsc:compile": "./node_modules/typescript/bin/tsc --project tsconfig.compile.json"
8+
"clean": "rimraf 'test/**/*.{js,js.map}' 'src/**/*.{js,js.map}'",
9+
"tslint": "tslint 'src/**/*.ts?(x)'",
10+
"test": "npm run clean && npm run tsc && npm run tslint && NODE_ENV=test nyc --reporter=html --reporter=text _mocha --recursive",
11+
"coveralls:travis": "nyc report --reporter=text-lcov | coveralls",
12+
"tsc": "tsc --project tsconfig.json",
13+
"tsc:compile": "rimraf ./lib && tsc --project tsconfig.compile.json",
14+
"doc:serve": "concurrently \"tsc --project tsconfig.compile.json -w\" \"docsify serve ./docs\" \"cd docs/_build && nodemon --delay 2.5 -e ts --watch ../../lib build-api.js\"",
15+
"doc:build": "exit 0",
16+
"prepublish": "npm run tsc:compile"
2017
},
2118
"repository": {
2219
"type": "git",
@@ -37,15 +34,24 @@
3734
},
3835
"homepage": "https://github.com/romakita/json-properties",
3936
"devDependencies": {
40-
"@types/chai": "^3.4.32",
41-
"@types/mocha": "^2.2.31",
42-
"@types/node": "^7.0.13",
43-
"chai": "^3.5.0",
44-
"istanbul": "^0.4.2",
45-
"mocha": "^3.3.0",
46-
"remap-istanbul": "^0.9.5",
47-
"ts-node": "^3.0.2",
48-
"tslint": "^5.1.0",
49-
"typescript": "^2.2.0"
37+
"@types/chai": "^4.0.8",
38+
"@types/mocha": "^2.2.44",
39+
"@types/node": "^8.0.54",
40+
"chai": "^4.1.2",
41+
"coveralls": "^3.0.0",
42+
"mocha": "^4.0.1",
43+
"nyc": "^11.4.0",
44+
"semantic-release": "^7.0.2",
45+
"ts-node": "^3.3.0",
46+
"tslint": "^5.8.0",
47+
"typescript": "^2.5.0"
48+
},
49+
"release": {
50+
"debug": false,
51+
"branch": "production"
52+
},
53+
"gflow": {
54+
"master": "master",
55+
"production": "production"
5056
}
5157
}

‎readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ts-json-properties
1+
# Ts.JsonProperties
22

33
[![Build Status](https://travis-ci.org/Romakita/ts-json-properties.svg?branch=master)](https://travis-ci.org/Romakita/ts-json-properties)
44
[![Coverage Status](https://coveralls.io/repos/github/Romakita/ts-json-properties/badge.svg?branch=master)](https://coveralls.io/github/Romakita/ts-json-properties?branch=master)
@@ -17,7 +17,7 @@
1717
* `@Value(expression)` : resolve expression and values the attribute (decorator).
1818
* `@Constant(expression)` : resolve expression and values the attribute but attribut is frozen (decorator).
1919
* `@EnvValue(expression)` : resolve expression and values the attribute from process.node.env or from properties if env value doesn't exists (decorator).
20-
* `Properties.getValue` : resolve expression and values the attribute (programmatic).
20+
* `Properties.get()` : resolve expression and values the attribute (programmatic).
2121

2222
## Installation
2323
```bash

0 commit comments

Comments
 (0)