Skip to content

Commit

Permalink
😒 pull changes from typescript/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Ammar Dodin committed Dec 1, 2017
2 parents c9ee501 + e481697 commit 1f07fda
Show file tree
Hide file tree
Showing 14 changed files with 2,657 additions and 1,437 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ visual-recognition/*.js
text-to-speech/*.js
speech-to-text/*.js
authorization/*.js
index.js
index.js
.nyc_output
**/*.d.ts
**/*.js.map
14 changes: 14 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ examples
LICENSE
CONTRIBUTING.md
RELEASE.md
CONTRIBUTING.md
CHANGELOG.md
jsdoc/
doc/
auth.js.enc
Expand All @@ -21,3 +23,15 @@ transform.js
scripts/
# this is created in the build on travis ci when it updates the docs in the gh-pages branch
gh-pages/
tsconfig.json
tslint.json
typings.json
typings
.vscode
.nyc_output
.github
.eslintrc.js
.eslintcache
.eslintignore
.gitattributes
watson-developer-cloud-*.tgz
57 changes: 0 additions & 57 deletions karma.conf.js

This file was deleted.

8 changes: 4 additions & 4 deletions lib/base_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import bufferFrom = require('buffer-from');
import { stripTrailingSlash } from './helper';

// custom interfaces
interface HeaderOptions {
export interface HeaderOptions {
'X-Watson-Learning-Opt-Out'?: boolean;
[key: string]: any;
}

interface UserOptions {
export interface UserOptions {
url?: string;
version_date?: string;
username?: string;
Expand All @@ -40,14 +40,14 @@ interface UserOptions {
token?: string;
}

interface BaseServiceOptions extends UserOptions {
export interface BaseServiceOptions extends UserOptions {
headers: HeaderOptions;
url: string;
jar?: request.CookieJar;
qs: any;
}

interface Credentials {
export interface Credentials {
username: string;
password: string;
api_key: string;
Expand Down
6 changes: 3 additions & 3 deletions lib/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ export interface FileObject {
}

// internal interfaces
interface FileOptions {
export interface FileOptions {
filename?: string;
contentType?: string;
}

interface FileParamAttributes {
export interface FileParamAttributes {
data: ReadableStream | Buffer | FileObject;
contentType: string;
}

interface FileStream extends ReadableStream {
export interface FileStream extends ReadableStream {
path: string | Buffer;
}

Expand Down
Loading

0 comments on commit 1f07fda

Please sign in to comment.