Skip to content

Commit

Permalink
Merge pull request #222 from shimataro/develop
Browse files Browse the repository at this point in the history
version 1.0.0-rc.1
  • Loading branch information
shimataro authored Aug 23, 2018
2 parents 4a90261 + 7ea7d2b commit 21f343d
Show file tree
Hide file tree
Showing 6 changed files with 612 additions and 559 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.0.0-rc.1] - 2018-08-23
### Fixed
* method to publish

## [0.16.0] - 2018-08-21
### Added
* `EMAIL`, `IPV4`, `IPV6` to `adjuster.STRING.PATTERN`
Expand Down Expand Up @@ -188,7 +192,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [0.1.0] - 2018-04-18
* First release.

[Unreleased]: https://github.com/shimataro/node-adjuster/compare/v0.16.0...HEAD
[Unreleased]: https://github.com/shimataro/node-adjuster/compare/v1.0.0-rc.1...HEAD
[1.0.0-rc.1]: https://github.com/shimataro/node-adjuster/compare/v0.16.0...v1.0.0-rc.1
[0.16.0]: https://github.com/shimataro/node-adjuster/compare/v0.15.1...v0.16.0
[0.15.1]: https://github.com/shimataro/node-adjuster/compare/v0.15.0...v0.15.1
[0.15.0]: https://github.com/shimataro/node-adjuster/compare/v0.14.0...v0.15.0
Expand Down
120 changes: 64 additions & 56 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,20 @@ var adjuster = require("adjuster");
```

### ES Modules

```javascript
// foo.mjs
import adjuster from "adjuster";
```

### using [Babel](https://babeljs.io/)
### TypeScript

```typescript
// foo.ts
import * as adjuster from "adjuster";
```

### ES6 Modules with [Babel](https://babeljs.io/)

```javascript
// same as ES Modules!
Expand Down Expand Up @@ -458,15 +466,15 @@ interface NumberAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => number|void): number;

// feature methods (chainable)
strict(): NumberAdjuster;
default(value: number): NumberAdjuster;
acceptNull(value?: number|null /* = null */): NumberAdjuster;
acceptEmptyString(value?: number|null /* = null */): NumberAdjuster;
acceptSpecialFormats(): NumberAdjuster;
integer(adjust?: boolean /* = false */): NumberAdjuster;
only(...values: number[]): NumberAdjuster;
minValue(value: number, adjust?: boolean /* = false */): NumberAdjuster;
maxValue(value: number, adjust?: boolean /* = false */): NumberAdjuster;
strict(): this;
default(value: number): this;
acceptNull(value?: number|null /* = null */): this;
acceptEmptyString(value?: number|null /* = null */): this;
acceptSpecialFormats(): this;
integer(adjust?: boolean /* = false */): this;
only(...values: number[]): this;
minValue(value: number, adjust?: boolean /* = false */): this;
maxValue(value: number, adjust?: boolean /* = false */): this;
}
```

Expand Down Expand Up @@ -751,11 +759,11 @@ interface BooleanAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => boolean|void): number;

// feature methods (chainable)
strict(): BooleanAdjuster;
acceptAllNumbers(): BooleanAdjuster;
default(value: boolean): BooleanAdjuster;
acceptNull(value?: boolean|null /* = null */): BooleanAdjuster;
acceptEmptyString(value?: boolean|null /* = null */): BooleanAdjuster;
strict(): this;
acceptAllNumbers(): this;
default(value: boolean): this;
acceptNull(value?: boolean|null /* = null */): this;
acceptEmptyString(value?: boolean|null /* = null */): this;
}
```

Expand Down Expand Up @@ -947,15 +955,15 @@ interface StringAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => string|void): string;

// feature methods (chainable)
strict(): StringAdjuster;
default(value: string): StringAdjuster;
acceptNull(value?: string|null /* = null */): StringAdjuster;
acceptEmptyString(value?: string|null /* = null */): StringAdjuster;
trim(): StringAdjuster;
only(...values: string[]): StringAdjuster;
minLength(length: number): StringAdjuster;
maxLength(length: number, adjust?: boolean /* = false */): StringAdjuster;
pattern(pattern: string|RegExp): StringAdjuster;
strict(): this;
default(value: string): this;
acceptNull(value?: string|null /* = null */): this;
acceptEmptyString(value?: string|null /* = null */): this;
trim(): this;
only(...values: string[]): this;
minLength(length: number): this;
maxLength(length: number, adjust?: boolean /* = false */): this;
pattern(pattern: string|RegExp): this;
}
```

Expand Down Expand Up @@ -1180,14 +1188,14 @@ interface NumericStringAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => string|void): string;

// feature methods (chainable)
default(value: string): NumericStringAdjuster;
acceptNull(value?: string|null /* = null */): NumericStringAdjuster;
acceptEmptyString(value?: string|null /* = null */): NumericStringAdjuster;
joinArray(): NumericStringAdjuster;
separatedBy(separator: string|RegExp): NumericStringAdjuster;
minLength(length: number): NumericStringAdjuster;
maxLength(length: number, adjust?: boolean /* = false */): NumericStringAdjuster;
checksum(algorithm: string): NumericStringAdjuster;
default(value: string): this;
acceptNull(value?: string|null /* = null */): this;
acceptEmptyString(value?: string|null /* = null */): this;
joinArray(): this;
separatedBy(separator: string|RegExp): this;
minLength(length: number): this;
maxLength(length: number, adjust?: boolean /* = false */): this;
checksum(algorithm: string): this;
}
```

Expand Down Expand Up @@ -1397,10 +1405,10 @@ interface IPv4Adjuster {
adjust(value: any, onError?: (err: AdjusterError) => string|void): string;

// feature methods (chainable)
default(value: string): IPv4Adjuster;
acceptNull(value?: string|null /* = null */): IPv4Adjuster;
acceptEmptyString(value?: string|null /* = null */): IPv4Adjuster;
trim(): IPv4Adjuster;
default(value: string): this;
acceptNull(value?: string|null /* = null */): this;
acceptEmptyString(value?: string|null /* = null */): this;
trim(): this;
}
```

Expand Down Expand Up @@ -1514,10 +1522,10 @@ interface IPv6Adjuster {
adjust(value: any, onError?: (err: AdjusterError) => string|void): string;

// feature methods (chainable)
default(value: string): IPv6Adjuster;
acceptNull(value?: string|null /* = null */): IPv6Adjuster;
acceptEmptyString(value?: string|null /* = null */): IPv6Adjuster;
trim(): IPv6Adjuster;
default(value: string): this;
acceptNull(value?: string|null /* = null */): this;
acceptEmptyString(value?: string|null /* = null */): this;
trim(): this;
}
```

Expand Down Expand Up @@ -1640,11 +1648,11 @@ interface EmailAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => string|void): string;

// feature methods (chainable)
default(value: string): EmailAdjuster;
acceptNull(value?: string|null /* = null */): EmailAdjuster;
acceptEmptyString(value?: string|null /* = null */): EmailAdjuster;
trim(): EmailAdjuster;
pattern(pattern: string|RegExp): EmailAdjuster;
default(value: string): this;
acceptNull(value?: string|null /* = null */): this;
acceptEmptyString(value?: string|null /* = null */): this;
trim(): this;
pattern(pattern: string|RegExp): this;
}
```

Expand Down Expand Up @@ -1802,14 +1810,14 @@ interface ArrayAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => Array|void): Array;

// feature methods (chainable)
default(value: Array): ArrayAdjuster;
acceptNull(value?: Array|null /* = null */): ArrayAdjuster;
acceptEmptyString(value: Array|null /* = null */): ArrayAdjuster;
separatedBy(separator: string|RegExp): ArrayAdjuster;
toArray(): ArrayAdjuster;
minLength(length: number): ArrayAdjuster;
maxLength(length: number, adjust?: boolean /* = false */): ArrayAdjuster;
each(adjusterInstance: AdjusterBase, ignoreEachErrors: boolean /* = false */): ArrayAdjuster;
default(value: Array): this;
acceptNull(value?: Array|null /* = null */): this;
acceptEmptyString(value: Array|null /* = null */): this;
separatedBy(separator: string|RegExp): this;
toArray(): this;
minLength(length: number): this;
maxLength(length: number, adjust?: boolean /* = false */): this;
each(adjusterInstance: AdjusterBase, ignoreEachErrors: boolean /* = false */): this;
}
```

Expand Down Expand Up @@ -2013,9 +2021,9 @@ interface ObjectAdjuster {
adjust(value: any, onError?: (err: AdjusterError) => Object|void): Object;

// feature methods (chainable)
default(value: Object): ObjectAdjuster;
acceptNull(value?: Object|null /* = null */): ObjectAdjuster;
acceptEmptyString(value: Object|null /* = null */): ObjectAdjuster;
default(value: Object): this;
acceptNull(value?: Object|null /* = null */): this;
acceptEmptyString(value: Object|null /* = null */): this;
constraints(constraints): ObjectAdjuster;
}
```
Expand Down
10 changes: 6 additions & 4 deletions create-release-branch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

BASE_BRANCH="develop"

DIR_TMP="tmp"

URL_PRODUCT="https://github.com/shimataro/node-adjuster"
URL_REPOSITORY="${URL_PRODUCT}.git"
URL_COMPARE="${URL_PRODUCT}/compare"
URL_RELEASE="${URL_PRODUCT}/releases/new"

Expand Down Expand Up @@ -164,11 +167,10 @@ Remaining processes are...
Release title: ${COLOR_INPUT}node-adjuster ${VERSION} released${COLOR_RESET}
Description this release: (copy and paste CHANGELOG.md)
6. Publish!
${COLOR_COMMAND}git checkout master${COLOR_RESET}
${COLOR_COMMAND}git pull${COLOR_RESET}
${COLOR_COMMAND}npm publish --access=public${COLOR_RESET}
${COLOR_COMMAND}git clone -b master ${URL_REPOSITORY} ${DIR_TMP}${COLOR_RESET}
${COLOR_COMMAND}npm publish ${DIR_TMP} --access=public${COLOR_RESET}
7. Post processing
${COLOR_COMMAND}git checkout ${BASE_BRANCH}${COLOR_RESET}
${COLOR_COMMAND}rm -rf ${DIR_TMP}${COLOR_RESET}
${COLOR_COMMAND}git pull${COLOR_RESET}
That's all!
Expand Down
Loading

0 comments on commit 21f343d

Please sign in to comment.