型エラー修正

Author: neet

src/commands/compose.ts

@@ -6,7 +6,6 @@ import { qiitaItemsProvider } from '../explorers/qiitaItems';
 import { tagQuickPickCreator, validateTagQuickPick } from '../quickpicks/tagQuickPick';
 import { titleInputBoxCreator, validateTitleInputBox } from '../quickpicks/titleInputBox';
 import { privateLabel, visibilityQuickPickCreator } from '../quickpicks/visibilityQuickPick';
-import { itemsStore } from '../stores/itemsStore';
 import { handleErrorMessage } from '../utils/errorHandler';
 import { getFilenameFromPath } from '../utils/getFilenameFromPath';
 
@@ -85,8 +84,7 @@ export async function compose (resource?: Uri) {
 
     try {
       const item = await client.createItem(options);
-      await itemsStore.refreshItems();
-      qiitaItemsProvider.refresh();
+      await qiitaItemsProvider.refreshItems();
 
       const openInBrowser = localize(
         'commands.compose.openInBrowser',

src/commands/deleteItem.ts

@@ -3,7 +3,6 @@ import { window } from 'vscode';
 import * as nls from 'vscode-nls';
 import { client } from '../client';
 import { qiitaItemsProvider } from '../explorers/qiitaItems';
-import { itemsStore } from '../stores/itemsStore';
 import { handleErrorMessage } from '../utils/errorHandler';
 
 const localize = nls.loadMessageBundle();
@@ -36,8 +35,7 @@ export async function deleteItem (resource: { item: Item }) {
 
   try {
     await client.deleteItem(resource.item.id);
-    await itemsStore.refreshItems();
-    qiitaItemsProvider.refresh();
+    await qiitaItemsProvider.refreshItems();
 
     return window.showInformationMessage(localize(
       'commands.deleteItem.success',

src/commands/editTags.ts

@@ -4,7 +4,6 @@ import * as nls from 'vscode-nls';
 import { client } from '../client';
 import { qiitaItemsProvider } from '../explorers/qiitaItems';
 import { makeQuickPickItemFromTag, tagQuickPickCreator, validateTagQuickPick } from '../quickpicks/tagQuickPick';
-import { itemsStore } from '../stores/itemsStore';
 import { handleErrorMessage } from '../utils/errorHandler';
 
 const localize = nls.loadMessageBundle();
@@ -49,8 +48,7 @@ export async function editTags (resource: { item: Item }) {
     try {
       quickPick.hide();
       await updater(item, quickPick.selectedItems);
-      await itemsStore.refreshItems();
-      qiitaItemsProvider.refresh();
+      await qiitaItemsProvider.refreshItems();
 
       return window.showInformationMessage(localize(
         'commands.editTags.success',

src/commands/editTitle.ts

@@ -31,7 +31,7 @@ export function editTitle (resource: { item: Item }) {
         tags: item.tags,
         title: inputBox.value,
       });
-      qiitaItemsProvider.refresh();
+      qiitaItemsProvider.refreshItems();
 
       return window.showInformationMessage(localize(
         'commands.editTitle.success',

src/commands/expandItems.ts

@@ -1,11 +1,9 @@
 import { qiitaItemsProvider } from '../explorers/qiitaItems';
-import { itemsStore } from '../stores/itemsStore';
 
 export async function expandItems () {
   try {
-    if (!itemsStore.done) {
-      await itemsStore.expandItems();
-      qiitaItemsProvider.refresh();
+    if (!qiitaItemsProvider.done) {
+      await qiitaItemsProvider.expandItems();
     }
   } catch (e) {
     console.error(e);

src/commands/makePublic.ts

@@ -47,7 +47,7 @@ export async function makePublic (resource: { item: Item }) {
       tags: resource.item.tags,
       private: false,
     });
-    qiitaItemsProvider.refresh();
+    qiitaItemsProvider.refreshItems();
 
     return window.showInformationMessage(localize(
       'commands.makePublic.success',

src/explorers/qiitaItems.ts

@@ -8,26 +8,51 @@ import { QiitaItem } from './models/qiitaItemsNode';
 
 const localize = nls.loadMessageBundle();
 
-class QiitaItemsProvider implements TreeDataProvider<TreeItem> {
-  private _onDidChangeTreeData: EventEmitter<TreeItem|undefined> = new EventEmitter<TreeItem|undefined>();
-  public readonly onDidChangeTreeData: Event<TreeItem|undefined> = this._onDidChangeTreeData.event;
+type NodeTypes = ExpandItems|QiitaItem;
+
+class QiitaItemsProvider implements TreeDataProvider<NodeTypes> {
+  /** TreeDataProviderの変更を制御するためのEventEmitter */
+  private _onDidChangeTreeData: EventEmitter<NodeTypes|undefined> = new EventEmitter<NodeTypes|undefined>();
+
+  /** 外部から参照するためのプロパティ */
+  public readonly onDidChangeTreeData: Event<NodeTypes|undefined> = this._onDidChangeTreeData.event;
 
   /** 取得した投稿 */
-  protected items: Item[] = [];
+  public items: Item[] = [];
 
   /** 全件取得したかどうか */
-  protected done = false;
+  public done = false;
 
   /** 自分の投稿の配列を返すイテラブル */
   protected itemsIterable = client.fetchMyItems({ page: 1, per_page: 60 });
 
   /**
    * ツリーデータを更新
    */
-  public async refresh () {
+  protected async refresh () {
     this._onDidChangeTreeData.fire();
   }
 
+  /**
+   * イテラブルを初期化して最初のページを再取得
+   */
+  public async refreshItems () {
+    const { value: items, done } = await this.itemsIterable.next('reset');
+    this.items = items;
+    this.done  = done;
+    this.refresh();
+  }
+
+  /**
+   * イテラブルのnextを呼び出し
+   */
+  public async expandItems () {
+    const { value: items, done } = await this.itemsIterable.next();
+    this.items.concat(items);
+    this.done = done;
+    this.refresh();
+  }
+
   /**
    * `element` に対応するツリーアイテムを取得
    * @param element 取得するelement
@@ -42,13 +67,13 @@ class QiitaItemsProvider implements TreeDataProvider<TreeItem> {
    * @param element 取得するelement
    */
   public async getChildren (): Promise<(QiitaItem|ExpandItems)[]> {
-    if (!itemsStore.items || !itemsStore.items.length) {
-      await itemsStore.refreshItems();
+    if (!this.items.length) {
+      await this.refreshItems();
     }
 
     const children = [];
 
-    for (const item of itemsStore.items) {
+    for (const item of this.items) {
       const command = {
         command:   'qiita.openItem',
         title:     localize('commands.openItem.title', '開く'),
@@ -59,30 +84,12 @@ class QiitaItemsProvider implements TreeDataProvider<TreeItem> {
     }
 
     // アイテムが最後まで読み込まれていない場合、「さらに読み込む...」を挿入する
-    if (!itemsStore.done) {
+    if (!this.done) {
       children.push(new ExpandItems(TreeItemCollapsibleState.None));
     }
 
     return children;
   }
-
-  /**
-   * イテラブルを初期化して最初のページを再取得
-   */
-  public async refreshItems () {
-    const { value: items, done } = await this.itemsIterable.next('reset');
-    this.items = items;
-    this.done  = done;
-  }
-
-  /**
-   * イテラブルのnextを呼び出し
-   */
-  public async expandItems () {
-    const { value: items, done } = await this.itemsIterable.next();
-    this.items.concat(items);
-    this.done = done;
-  }
 }
 
 export const qiitaItemsProvider = new QiitaItemsProvider();

src/extension.ts

@@ -48,6 +48,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();
   }
 };