Merge pull request #11 from neet/integrated-model

neet · web-flow · commit dc2047258de3 · 2018-09-24T00:20:34.000+09:00
モデル統合 & #9 のパッチ
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ out
 node_modules
 .vscode-test/
 *.vsix
+storage
diff --git a/.vscodeignore b/.vscodeignore
@@ -7,3 +7,4 @@ src/**
 tsconfig.json
 vsc-extension-quickstart.md
 tslint.json
+storage
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "core-js": "^2.5.7",
     "mocha": "^5.2.0",
     "npm-run-all": "^4.1.3",
-    "qiita-js-2": "^1.3.0",
+    "qiita-js-2": "^1.3.1",
     "tslint": "^5.8.0",
     "typescript": "^3.0.3",
     "vscode": "^1.1.6",
@@ -83,7 +83,7 @@
       },
       {
         "command": "qiita.expandItems",
-        "title": "%commands.expanditems.title%",
+        "title": "%commands.expandItems.title%",
         "category": "Qiita"
       }
     ],
diff --git a/package.nls.json b/package.nls.json
@@ -37,7 +37,7 @@
   "commands.editTitle.title": "タイトルを編集",
   "commands.editTitle.success": "タイトルを編集しました",
 
-  "commands.expanditems.title": "さらに読み込む...",
+  "commands.expandItems.title": "さらに読み込む...",
 
   "quickpicks.tagQuickPick.title": "投稿に登録するタグを入力してください",
   "quickpicks.tagQuickPick.placeholder": "例) Rails React Mastodon",
diff --git a/src/commands/compose.ts b/src/commands/compose.ts
@@ -84,7 +84,7 @@ export async function compose (resource?: Uri) {
 
     try {
       const item = await client.createItem(options);
-      qiitaItemsProvider.refresh();
+      await qiitaItemsProvider.refreshItems();
 
       const openInBrowser = localize(
         'commands.compose.openInBrowser',
diff --git a/src/commands/deleteItem.ts b/src/commands/deleteItem.ts
@@ -35,7 +35,7 @@ export async function deleteItem (resource: { item: Item }) {
 
   try {
     await client.deleteItem(resource.item.id);
-    qiitaItemsProvider.refresh();
+    await qiitaItemsProvider.refreshItems();
 
     return window.showInformationMessage(localize(
       'commands.deleteItem.success',
diff --git a/src/commands/editTags.ts b/src/commands/editTags.ts
@@ -48,7 +48,7 @@ export async function editTags (resource: { item: Item }) {
     try {
       quickPick.hide();
       await updater(item, quickPick.selectedItems);
-      qiitaItemsProvider.refresh();
+      await qiitaItemsProvider.refreshItems();
 
       return window.showInformationMessage(localize(
         'commands.editTags.success',
diff --git a/src/commands/editTitle.ts b/src/commands/editTitle.ts
@@ -26,12 +26,14 @@ export function editTitle (resource: { item: Item }) {
 
     try {
       inputBox.hide();
+
       await client.updateItem(item.id, {
         body: item.body,
         tags: item.tags,
         title: inputBox.value,
       });
-      qiitaItemsProvider.refresh();
+
+      await qiitaItemsProvider.refreshItems();
 
       return window.showInformationMessage(localize(
         'commands.editTitle.success',
diff --git a/src/commands/expandItems.ts b/src/commands/expandItems.ts
@@ -1,9 +1,12 @@
 import { qiitaItemsProvider } from '../explorers/qiitaItems';
-import { itemsStore } from '../stores/itemsStore';
+import { handleErrorMessage } from '../utils/errorHandler';
 
 export async function expandItems () {
-  if (!itemsStore.done) {
-    await itemsStore.expandItems();
-    qiitaItemsProvider.refresh();
+  try {
+    if (!qiitaItemsProvider.done) {
+      await qiitaItemsProvider.expandItems();
+    }
+  } catch (error) {
+    handleErrorMessage(error);
   }
 }
diff --git a/src/commands/makePublic.ts b/src/commands/makePublic.ts
@@ -47,7 +47,8 @@ export async function makePublic (resource: { item: Item }) {
       tags: resource.item.tags,
       private: false,
     });
-    qiitaItemsProvider.refresh();
+
+    await qiitaItemsProvider.refreshItems();
 
     return window.showInformationMessage(localize(
       'commands.makePublic.success',
diff --git a/src/commands/openItem.ts b/src/commands/openItem.ts
@@ -60,8 +60,9 @@ export function openItem (storagePath?: string) {
         fs.writeFileSync(fileUri.fsPath, item.body);
       }
 
-      const document = await workspace.openTextDocument(fileUri);
-      await window.showTextDocument(document);
+      await workspace.openTextDocument(fileUri).then((document) => {
+        return window.showTextDocument(document, undefined, true);
+      });
 
       // 保存時にアップデートするためのイベントリスナを追加
       workspace.onDidSaveTextDocument(async (updatedDocument) => {
diff --git a/src/commands/openItemExternal.ts b/src/commands/openItemExternal.ts
@@ -1,6 +1,10 @@
 import { Item } from 'qiita-js-2';
 import { commands, Uri } from 'vscode';
 
+/**
+ * アイテムをブラウザで表示
+ * @param resource コマンドから渡される引数
+ */
 export function openItemExternal (resource: { item: Item }) {
   const { url } = resource.item;
   commands.executeCommand('vscode.open', Uri.parse(url));
diff --git a/src/explorers/nodes/expandItemsNode.ts b/src/explorers/nodes/expandItemsNode.ts
@@ -0,0 +1,25 @@
+import { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+export class ExpandItems extends TreeItem {
+  /**
+   * 「さらに読み込む」ボタンのためのアイテム
+   * @param collapsibleState アイテムが折り畳まれているかの状態
+   */
+  constructor (public readonly collapsibleState: TreeItemCollapsibleState) {
+    super(localize(
+      'commands.expandItems.title',
+      'さらに読み込む...',
+    ), collapsibleState);
+  }
+
+  public command = {
+    command:   'qiita.expandItems',
+    title:     localize('commands.expandItems.title', 'さらに読み込む...'),
+    arguments: [],
+  };
+
+  public contextValue = 'qiitaItems';
+}
diff --git a/src/explorers/nodes/qiitaItemsNode.ts b/src/explorers/nodes/qiitaItemsNode.ts
@@ -0,0 +1,21 @@
+import { Item } from 'qiita-js-2';
+import { Command, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
+
+export class QiitaItem extends TreeItem {
+  /**
+   * "Qiitaの投稿" ビューに表示されるアイテム
+   * @param item Qiitaの投稿
+   * @param collapsibleState アイテムが折り畳まれているかの状態
+   * @param command クリック時に発火するコマンド
+   */
+  constructor (
+    public readonly item: Item,
+    public readonly collapsibleState: TreeItemCollapsibleState,
+    public readonly command: Command,
+  ) {
+    super(item.title, collapsibleState);
+  }
+
+  public resourceUri  = Uri.parse('file:///text.md'); // Hack: アイコンをMarkdownのものに
+  public contextValue = 'qiitaItems';
+}
diff --git a/src/explorers/qiitaItems.ts b/src/explorers/qiitaItems.ts
@@ -1,71 +1,56 @@
 import { Item } from 'qiita-js-2';
-import {
-  Command,
-  Event,
-  EventEmitter,
-  TreeDataProvider,
-  TreeItem,
-  TreeItemCollapsibleState,
-  Uri,
-} from 'vscode';
+import { Event, EventEmitter, TreeDataProvider, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import * as nls from 'vscode-nls';
-import { itemsStore } from '../stores/itemsStore';
+import { client } from '../client';
+import '../polyfills';
+import { ExpandItems } from './nodes/expandItemsNode';
+import { QiitaItem } from './nodes/qiitaItemsNode';
 
 const localize = nls.loadMessageBundle();
 
+type NodeTypes = ExpandItems|QiitaItem;
 
-export class QiitaItem extends TreeItem {
-  /**
-   * "Qiitaの投稿" ビューに表示されるアイテム
-   * @param item Qiitaの投稿
-   * @param collapsibleState アイテムが折り畳まれているかの状態
-   * @param command クリック時に発火するコマンド
-   */
-  constructor (
-    public readonly item: Item,
-    public readonly collapsibleState: TreeItemCollapsibleState,
-    public readonly command: Command,
-  ) {
-    super(item.title, collapsibleState);
-  }
+class QiitaItemsProvider implements TreeDataProvider<NodeTypes> {
+  /** TreeDataProviderの変更を制御するためのEventEmitter */
+  private _onDidChangeTreeData: EventEmitter<NodeTypes|undefined> = new EventEmitter<NodeTypes|undefined>();
 
-  public resourceUri  = Uri.parse('file:///text.md'); // Hack: アイコンをMarkdownのものに
-  public contextValue = 'qiitaItems';
-}
+  /** 外部から参照するためのプロパティ */
+  public readonly onDidChangeTreeData: Event<NodeTypes|undefined> = this._onDidChangeTreeData.event;
+
+  /** 取得した投稿 */
+  public items: Item[] = [];
 
+  /** 全件取得したかどうか */
+  public done = false;
+
+  /** 自分の投稿の配列を返すイテラブル */
+  protected itemsIterable = client.fetchMyItems({ page: 1, per_page: 60 });
 
-export class ExpandItems extends TreeItem {
   /**
-   * 「さらに読み込む」ボタンのためのアイテム
-   * @param collapsibleState アイテムが折り畳まれているかの状態
+   * ツリーデータを更新
    */
-  constructor (public readonly collapsibleState: TreeItemCollapsibleState) {
-    super(localize(
-      'commands.expandItems.title',
-      'さらに読み込む...',
-    ), collapsibleState);
+  protected async refresh () {
+    this._onDidChangeTreeData.fire();
   }
 
-  public command = {
-    command: 'qiita.expandItems',
-    title:   localize('commands.expandItems.title', 'さらに読み込む...'),
-    arguments: [],
-  };
-
-  public contextValue = 'qiitaItems';
-}
-
-
-class QiitaItemsProvider implements TreeDataProvider<QiitaItem|ExpandItems> {
-  private _onDidChangeTreeData: EventEmitter<QiitaItem|ExpandItems|undefined> = new EventEmitter<QiitaItem|ExpandItems|undefined>();
-  public readonly onDidChangeTreeData: Event<QiitaItem|ExpandItems|undefined> = this._onDidChangeTreeData.event;
+  /**
+   * イテラブルを初期化して最初のページを再取得
+   */
+  public async refreshItems () {
+    const { value: items, done } = await this.itemsIterable.next('reset');
+    this.items = items;
+    this.done  = done;
+    this.refresh();
+  }
 
   /**
-   * ツリーデータを更新
+   * イテラブルのnextを呼び出し
    */
-  public async refresh () {
-    await itemsStore.refreshItems();
-    this._onDidChangeTreeData.fire();
+  public async expandItems () {
+    const { value: items, done } = await this.itemsIterable.next();
+    this.items.concat(items);
+    this.done = done;
+    this.refresh();
   }
 
   /**
@@ -82,24 +67,22 @@ class QiitaItemsProvider implements TreeDataProvider<QiitaItem|ExpandItems> {
    * @param element 取得するelement
    */
   public async getChildren (): Promise<(QiitaItem|ExpandItems)[]> {
-    if (itemsStore.items.size === 0) {
-      await itemsStore.refreshItems();
+    if (!this.items.length) {
+      await this.refreshItems();
     }
 
-    const children = [];
-
-    for (const item of itemsStore.items) {
+    const children: NodeTypes[] = this.items.map((item) => {
       const command = {
         command:   'qiita.openItem',
         title:     localize('commands.openItem.title', '開く'),
         arguments: [ item ],
       };
 
-      children.push(new QiitaItem(item, TreeItemCollapsibleState.None, command));
-    }
+      return new QiitaItem(item, TreeItemCollapsibleState.None, command);
+    });
 
     // アイテムが最後まで読み込まれていない場合、「さらに読み込む...」を挿入する
-    if (!itemsStore.done) {
+    if (!this.done) {
       children.push(new ExpandItems(TreeItemCollapsibleState.None));
     }
 
diff --git a/src/extension.ts b/src/extension.ts
@@ -1,3 +1,4 @@
+import * as path from 'path';
 import { commands, ConfigurationChangeEvent, ExtensionContext, window, workspace } from 'vscode';
 import * as nls from 'vscode-nls';
 import { client } from './client';
@@ -19,7 +20,7 @@ export function activate (context: ExtensionContext) {
 
   context.subscriptions.push(
     workspace.onDidChangeConfiguration(refreshUserState),
-    commands.registerCommand('qiita.openItem', openItem(context.storagePath)),
+    commands.registerCommand('qiita.openItem', openItem(path.join(context.extensionPath, 'storage'))),
     commands.registerCommand('qiita.editTags', editTags),
     commands.registerCommand('qiita.makePublic', makePublic),
     commands.registerCommand('qiita.compose', compose),
@@ -48,6 +49,6 @@ export function deactivate () {
 export const refreshUserState = async (e: ConfigurationChangeEvent) => {
   if (e.affectsConfiguration('qiita.token')) {
     client.setToken(workspace.getConfiguration('qiita').get('token') || '');
-    await qiitaItemsProvider.refresh();
+    await qiitaItemsProvider.refreshItems();
   }
 };
diff --git a/src/stores/itemsStore.ts b/src/stores/itemsStore.ts
diff --git a/yarn.lock b/yarn.lock
@@ -1618,9 +1618,9 @@ punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-qiita-js-2@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/qiita-js-2/-/qiita-js-2-1.3.0.tgz#b975b4599db894b697ad0432082ce54086a57688"
+qiita-js-2@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/qiita-js-2/-/qiita-js-2-1.3.1.tgz#9d407cde3b5dd48c6f5ee1e9ccd1d841e6c45412"
   dependencies:
     axios "^0.18.0"
     http-link-header "^0.8.0"
