share some code + rm tsconfig.json (I don't know how to fix it)

Author: Stephen Gutekanst

src/extension.ts

@@ -1,7 +1,7 @@
 import * as sourcegraph from 'sourcegraph'
-import { fetchDiscussionThreads } from './api'
-import distanceInWordsToNow from 'date-fns/distance_in_words_to_now'
+import { distanceInWordsToNow } from 'date-fns'
 import { resolveSettings, Settings } from './settings'
+import { fetchDiscussionThreads } from './shared/api'
 
 export function activate(): void {
     function activeEditor(): sourcegraph.CodeEditor | undefined {

src/graphql.ts

@@ -0,0 +1,5 @@
+import * as sourcegraph from 'sourcegraph'
+
+export async function queryGraphQL(query: string, variables: any = {}): Promise<any> {
+    return sourcegraph.commands.executeCommand<any>('queryGraphQL', query, variables)
+}

src/shared/SHARED.md

@@ -0,0 +1,8 @@
+This code is shared between:
+
+- https://github.com/sourcegraph/sourcegraph-extension-api
+- https://github.com/sourcegraph/sourcegraph-vscode
+
+Eventually it should be moved into an npm package somewhere. Until then, ensure
+you are updating both copies at the same time. Do not modify one and not modify
+the other.

src/api.ts renamed to src/shared/api.ts

@@ -1,12 +1,6 @@
-// TODO: This file is allllll copypasta (kind of)!
-
-import * as sourcegraph from 'sourcegraph'
+import { queryGraphQL } from '../graphql'
 import { createAggregateError } from './errors'
 
-async function queryGraphQL(query: string, variables: any = {}) {
-    return sourcegraph.commands.executeCommand<any>('queryGraphQL', query, variables)
-}
-
 const discussionCommentFieldsFragment = `
     fragment DiscussionCommentFields on DiscussionComment {
       id
@@ -21,7 +15,7 @@ const discussionCommentFieldsFragment = `
   `
 
 function discussionThreadFieldsFragment(relativeRev?: string): string {
-    var relativeRevFields: string = ''
+    let relativeRevFields = ''
     if (relativeRev) {
         relativeRevFields = `
         relativePath(rev: $relativeRev)
@@ -84,11 +78,11 @@ function discussionThreadFieldsFragment(relativeRev?: string): string {
  *
  * @return Promise that emits the new discussion thread.
  */
-async function createThread(
+export async function createThread(
     input: SourcegraphGQL.IDiscussionThreadCreateInput,
-    relativeRev: string = ''
+    relativeRev = ''
 ): Promise<SourcegraphGQL.IDiscussionThread> {
-    let { data, errors } = await queryGraphQL(
+    const { data, errors } = await queryGraphQL(
         `
         mutation CreateThread($input: DiscussionThreadCreateInput!, $relativeRev: String!) {
           discussions {
@@ -125,7 +119,7 @@ export async function fetchDiscussionThreads(opts: {
     relativeRev?: string
 }): Promise<SourcegraphGQL.IDiscussionThreadConnection> {
     opts.relativeRev = opts.relativeRev || ''
-    let { data, errors } = await queryGraphQL(
+    const { data, errors } = await queryGraphQL(
         `
         query DiscussionThreads(
           $first: Int
@@ -175,9 +169,9 @@ export async function fetchDiscussionThreads(opts: {
  */
 export async function fetchDiscussionThreadAndComments(
     threadID: string,
-    relativeRev: string = ''
+    relativeRev = ''
 ): Promise<SourcegraphGQL.IDiscussionThread> {
-    let { data, errors } = await queryGraphQL(
+    const { data, errors } = await queryGraphQL(
         `
         query DiscussionThreadComments($threadID: ID!, $relativeRev: String!) {
           discussionThreads(threadID: $threadID) {
@@ -217,9 +211,9 @@ export async function fetchDiscussionThreadAndComments(
 export async function addCommentToThread(
     threadID: string,
     contents: string,
-    relativeRev: string = ''
+    relativeRev = ''
 ): Promise<SourcegraphGQL.IDiscussionThread> {
-    let { data, errors } = await queryGraphQL(
+    const { data, errors } = await queryGraphQL(
         `
         mutation AddCommentToThread($threadID: ID!, $contents: String!, $relativeRev: String!) {
           discussions {
@@ -251,7 +245,7 @@ export async function addCommentToThread(
  * @return Promise that emits the HTML string, which is already sanitized and escaped and thus is always safe to render.
  */
 export async function renderMarkdown(markdown: string, options?: SourcegraphGQL.IMarkdownOptions): Promise<string> {
-    let { data, errors } = await queryGraphQL(
+    const { data, errors } = await queryGraphQL(
         `
         query RenderMarkdown($markdown: String!, $options: MarkdownOptions) {
           renderMarkdown(markdown: $markdown, options: $options)

src/errors.ts renamed to src/shared/errors.ts

@@ -1,5 +1,3 @@
-// TODO: This file is allllll copypasta!
-
 export interface ErrorLike {
     message: string
     code?: string