Merge pull request #10 from nulab/fix-conflict-ts3

Fix conflict: Typescript3

.gitignore

@@ -1,5 +1,7 @@
 npm-debug.log
 node_modules
+dist/test/
+dist/src/
 coverage
 *~
 *.swp

.travis.yml

@@ -2,9 +2,6 @@ sudo: false
 language: node_js
 node_js:
 - node
-before_install:
-  - npm install -g typings
 install:
-  - npm install
-  - typings install
+  - npm ci
 script: npm run build && npm test

README.md

@@ -10,11 +10,6 @@ npm:
 $ npm install --save backlog-js
 ```
 
-Typings:
-```
-$ typings install dt~backlog-js --save --global
-```
-
 ## Getting started
 Append your "API Key" or "OAuth2 Access Token" to requests to the API to return data.
 

dist/backlog.d.ts

@@ -39,24 +39,24 @@ declare module 'backlog-js' {
     });
     getSpace(): Promise<any>;
     getSpaceActivities(params: Option.Space.GetActivitiesParams): Promise<any>;
+    getSpaceIcon(): Promise<Entity.File.FileData>;
     getSpaceNotification(): Promise<any>;
     putSpaceNotification(params: Option.Space.PutSpaceNotificationParams): Promise<any>;
     getSpaceDiskUsage(): Promise<any>;
-    getSpaceIcon(): Promise<Entity.File.FileData>;
     postSpaceAttachment(form: FormData): Promise<any>;
     getUsers(): Promise<any>;
     getUser(userId: number): Promise<any>;
     postUser(params: Option.User.PostUserParams): Promise<any>;
     patchUser(userId: number, params: Option.User.PatchUserParams): Promise<any>;
     deleteUser(userId: number): Promise<any>;
     getMyself(): Promise<any>;
+    getUserIcon(userId: number): Promise<Entity.File.FileData>;
     getUserActivities(userId: number, params: Option.User.GetUserActivitiesParams): Promise<any>;
     getUserStars(userId: number, params: Option.User.GetUserStarsParams): Promise<any>;
     getUserStarsCount(userId: number, params: Option.User.GetUserStarsCountParams): Promise<any>;
     getRecentlyViewedIssues(params: Option.User.GetRecentlyViewedParams): Promise<any>;
     getRecentlyViewedProjects(params: Option.User.GetRecentlyViewedParams): Promise<any>;
     getRecentlyViewedWikis(params: Option.User.GetRecentlyViewedParams): Promise<any>;
-    getUserIcon(userId: number): Promise<Entity.File.FileData>;
     getGroups(params: Option.Group.GetGroupsParams): Promise<any>;
     postGroups(params: Option.Group.PostGroupsParams): Promise<any>;
     getGroup(groupId: number): Promise<any>;
@@ -65,12 +65,14 @@ declare module 'backlog-js' {
     getStatuses(): Promise<any>;
     getResolutions(): Promise<any>;
     getPriorities(): Promise<any>;
-    postProject(params: Option.Project.PostProjectParams): Promise<any>;
     getProjects(params?: Option.Project.GetProjectsParams): Promise<any>;
+    postProject(params: Option.Project.PostProjectParams): Promise<any>;
     getProject(projectIdOrKey: string): Promise<any>;
     patchProject(projectIdOrKey: string, params: Option.Project.PatchProjectParams): Promise<any>;
     deleteProject(projectIdOrKey: string): Promise<any>;
+    getProjectIcon(projectIdOrKey: string): Promise<Entity.File.FileData>;
     getProjectActivities(projectIdOrKey: string, params: Option.Space.GetActivitiesParams): Promise<any>;
+    postProjectUser(projectIdOrKey: string|number, userId: string): Promise<any>;
     getProjectUsers(projectIdOrKey: string): Promise<any>;
     deleteProjectUsers(projectIdOrKey: string, params: Option.Project.DeleteProjectUsersParams): Promise<any>;
     postProjectAdministrators(projectIdOrKey: string, params: Option.Project.PostProjectAdministrators): Promise<any>;
@@ -96,17 +98,18 @@ declare module 'backlog-js' {
     patchCustomFieldItem(projectIdOrKey: string, id: number, itemId: number, params: Option.Project.PatchCustomFieldItemParams): Promise<any>;
     deleteCustomFieldItem(projectIdOrKey: string, id: number, params: Option.Project.PostCustomFieldItemParams): Promise<any>;
     getSharedFiles(projectIdOrKey: string, path: string, params: Option.Project.GetSharedFilesParams): Promise<any>;
+    getSharedFile(projectIdOrKey: string, sharedFileId: number): Promise<Entity.File.FileData>;
     getProjectsDiskUsage(projectIdOrKey: string): Promise<any>;
     getWebhooks(projectIdOrKey: string): Promise<any>;
     postWebhook(projectIdOrKey: string, params: Option.Project.PostWebhookParams): Promise<any>;
     getWebhook(projectIdOrKey: string, webhookId: string): Promise<any>;
     patchWebhook(projectIdOrKey: string, webhookId: string, params: Option.Project.PatchWebhookParams): Promise<any>;
     deleteWebhook(projectIdOrKey: string, webhookId: string): Promise<any>;
+    getIssues(params?: Option.Issue.GetIssuesParams): Promise<any>;
+    getIssuesCount(params?: Option.Issue.GetIssuesParams): Promise<any>;
     postIssue(params: Option.Issue.PostIssueParams): Promise<any>;
     patchIssue(issueIdOrKey: string, params: Option.Issue.PatchIssueParams): Promise<any>;
-    getIssues(params?: Option.Issue.GetIssuesParams): Promise<any>;
     getIssue(issueIdOrKey: string): Promise<any>;
-    getIssuesCount(params?: Option.Issue.GetIssuesParams): Promise<any>;
     deleteIssuesCount(issueIdOrKey: string): Promise<any>;
     getIssueComments(issueIdOrKey: string, params: Option.Issue.GetIssueCommentsParams): Promise<any>;
     postIssueComments(issueIdOrKey: string, params: Option.Issue.PostIssueCommentsParams): Promise<any>;
@@ -116,6 +119,7 @@ declare module 'backlog-js' {
     getIssueCommentNotifications(issueIdOrKey: string, commentId: number): Promise<any>;
     postIssueCommentNotifications(issueIdOrKey: string, commentId: number, prams: Option.Issue.IssueCommentNotifications): Promise<any>;
     getIssueAttachments(issueIdOrKey: string): Promise<any>;
+    getIssueAttachment(issueIdOrKey: string, attachmentId: number): Promise<Entity.File.FileData>;
     deleteIssueAttachment(issueIdOrKey: string, attachmentId: string): Promise<any>;
     getIssueSharedFiles(issueIdOrKey: string): Promise<any>;
     linkIssueSharedFiles(issueIdOrKey: string, params: Option.Issue.LinkIssueSharedFilesParams): Promise<any>;
@@ -129,6 +133,7 @@ declare module 'backlog-js' {
     deleteWiki(wikiId: number, mailNotify: boolean): Promise<any>;
     getWikisAttachments(wikiId: number): Promise<any>;
     postWikisAttachments(wikiId: number, attachmentId: number[]): Promise<any>;
+    getWikiAttachment(wikiId: number, attachmentId: number): Promise<Entity.File.FileData>;
     deleteWikisAttachments(wikiId: number, attachmentId: number): Promise<any>;
     getWikisSharedFiles(wikiId: number): Promise<any>;
     linkWikisSharedFiles(wikiId: number, fileId: number[]): Promise<any>;
@@ -152,12 +157,20 @@ declare module 'backlog-js' {
     getPullRequestCommentsCount(projectIdOrKey: string, repoIdOrName: string, number: number): Promise<any>;
     patchPullRequestComments(projectIdOrKey: string, repoIdOrName: string, number: number, commentId: number, params: Option.PullRequest.PatchPullRequestCommentsParams): Promise<any>;
     getPullRequestAttachments(projectIdOrKey: string, repoIdOrName: string, number: number): Promise<any>;
-    deletePullRequestAttachment(projectIdOrKey: string, repoIdOrName: string, number: number, attachmentId: number): Promise<any>;
-    getProjectIcon(projectIdOrKey: string): Promise<Entity.File.FileData>;
-    getSharedFile(projectIdOrKey: string, sharedFileId: number): Promise<Entity.File.FileData>;
-    getIssueAttachment(issueIdOrKey: string, attachmentId: number): Promise<Entity.File.FileData>;
-    getWikiAttachment(wikiId: number, attachmentId: number): Promise<Entity.File.FileData>;
     getPullRequestAttachment(projectIdOrKey: string, repoIdOrName: string, number: number, attachmentId: number): Promise<Entity.File.FileData>;
+    deletePullRequestAttachment(projectIdOrKey: string, repoIdOrName: string, number: number, attachmentId: number): Promise<any>;
+    getWatchingListItems(userId: number): Promise<any>;
+    getWatchingListCount(userId: number): Promise<any>;
+    getWatchingListItem(watchId: number): Promise<any>;
+    postWatchingListItem(params: any);
+    patchWatchingListItem(watchId: number, note: string): Promise<any>;
+    deletehWatchingListItem(watchId: number);
+    resetWatchingListItemAsRead(watchId: number): Promise<undefined>;
+    getProjectGroupList(projectIdOrKey: string|number);
+    postProjectGroup(projectIdOrKey: string|number, params: any);
+    deleteProjectGroup(projectIdOrKey: string|number);
+    getGroupIcon(groupId: string): Promise<any>;
+    getLicence(): Promise<any>;
     private download;
     private upload;
     private parseFileData;