@atlaspack/reporter-lsp 2.14.5-canary.36 → 2.14.5-canary.361

package/lib/ipc.js

@@ -32,7 +32,9 @@ function createClientPipeTransport(pipeName, onConnected) {
         close() {
           return new Promise((res, rej) => {
             server.close(e => {
-              if (e) rej(e);else res();
+              if (e) rej(e);
+              // @ts-expect-error TS2794
+              else res();
             });
           });
         }

package/lib/types/LspReporter.d.ts

@@ -0,0 +1,3 @@
+import { Reporter } from '@atlaspack/plugin';
+declare const _default: Reporter;
+export default _default;

package/lib/types/ipc.d.ts

@@ -0,0 +1,4 @@
+import type { MessageConnection } from 'vscode-jsonrpc/node';
+export declare function createServer(filename: string, setup: (connection: MessageConnection) => void): Promise<{
+    close: () => Promise<void>;
+}>;

package/lib/types/utils.d.ts

@@ -0,0 +1,38 @@
+import type { DiagnosticLogEvent, FilePath } from '@atlaspack/types';
+import type { ODiagnosticSeverity } from 'vscode-languageserver';
+export type ParcelSeverity = DiagnosticLogEvent['level'];
+export declare function parcelSeverityToLspSeverity(parcelSeverity: ParcelSeverity): ODiagnosticSeverity;
+export declare function normalizeFilePath(filePath: FilePath, projectRoot: FilePath): FilePath;
+export declare const DiagnosticTag: {
+    /**
+     * Unused or unnecessary code.
+     *
+     * Clients are allowed to render diagnostics with this tag faded out instead of having
+     * an error squiggle.
+     */
+    readonly Unnecessary: ODiagnosticTag;
+    /**
+     * Deprecated or obsolete code.
+     *
+     * Clients are allowed to rendered diagnostics with this tag strike through.
+     */
+    readonly Deprecated: ODiagnosticTag;
+};
+export declare const DiagnosticSeverity: {
+    /**
+     * Reports an error.
+     */
+    readonly Error: ODiagnosticSeverity;
+    /**
+     * Reports a warning.
+     */
+    readonly Warning: ODiagnosticSeverity;
+    /**
+     * Reports an information.
+     */
+    readonly Information: ODiagnosticSeverity;
+    /**
+     * Reports a hint.
+     */
+    readonly Hint: ODiagnosticSeverity;
+};

package/lib/utils.js

@@ -14,6 +14,8 @@ function _path() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS2724
+
 function parcelSeverityToLspSeverity(parcelSeverity) {
   switch (parcelSeverity) {
     case 'error':
@@ -61,35 +63,31 @@ const DiagnosticTag = exports.DiagnosticTag = {
    * Clients are allowed to render diagnostics with this tag faded out instead of having
    * an error squiggle.
    */
-  // $FlowFixMe
+  // @ts-expect-error TS2304
   Unnecessary: 1,
   /**
    * Deprecated or obsolete code.
    *
    * Clients are allowed to rendered diagnostics with this tag strike through.
    */
-  // $FlowFixMe
+  // @ts-expect-error TS2304
   Deprecated: 2
 };
 const DiagnosticSeverity = exports.DiagnosticSeverity = {
   /**
    * Reports an error.
    */
-  // $FlowFixMe
   Error: 1,
   /**
    * Reports a warning.
    */
-  // $FlowFixMe
   Warning: 2,
   /**
    * Reports an information.
    */
-  // $FlowFixMe
   Information: 3,
   /**
    * Reports a hint.
    */
-  // $FlowFixMe
   Hint: 4
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/reporter-lsp",
-  "version": "2.14.5-canary.36+2d10c6656",
+  "version": "2.14.5-canary.361+405bbaf61",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,20 +9,24 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/LspReporter.js",
-  "source": "src/LspReporter.js",
+  "main": "./lib/LspReporter.js",
+  "source": "./src/LspReporter.ts",
+  "types": "./lib/types/LspReporter.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/lsp-protocol": "2.14.1-canary.104+2d10c6656",
-    "@atlaspack/plugin": "2.14.5-canary.36+2d10c6656",
-    "@atlaspack/utils": "2.14.5-canary.36+2d10c6656",
+    "@atlaspack/lsp-protocol": "2.14.1-canary.429+405bbaf61",
+    "@atlaspack/plugin": "2.14.5-canary.361+405bbaf61",
+    "@atlaspack/utils": "2.14.5-canary.361+405bbaf61",
     "node-ipc": "^9.1.4",
     "nullthrows": "^1.1.1",
     "ps-node": "^0.1.6",
     "vscode-jsonrpc": "^8.0.2"
   },
   "type": "commonjs",
-  "gitHead": "2d10c6656fc58743c5dbed1d2b6c5666887f9fe4"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "405bbaf619f634cf9e58cc618d9a911f7db2998d"
+}

package/src/{LspReporter.js → LspReporter.ts}

@@ -1,7 +1,6 @@
-// @flow strict-local
-
 import type {Diagnostic as ParcelDiagnostic} from '@atlaspack/diagnostic';
 import type {BundleGraph, FilePath, PackagedBundle} from '@atlaspack/types';
+// @ts-expect-error TS7016
 import type {Program, Query} from 'ps-node';
 import type {Diagnostic, DocumentUri} from 'vscode-languageserver';
 import type {MessageConnection} from 'vscode-jsonrpc/node';
@@ -18,12 +17,14 @@ import os from 'os';
 import url from 'url';
 import fs from 'fs';
 import nullthrows from 'nullthrows';
+// @ts-expect-error TS7016
 import * as ps from 'ps-node';
 import {promisify} from 'util';
 
 import {createServer} from './ipc';
 import {
-  type PublishDiagnostic,
+  // @ts-expect-error TS2305
+  PublishDiagnostic,
   NotificationBuildStatus,
   NotificationWorkspaceDiagnostics,
   RequestDocumentDiagnostics,
@@ -38,12 +39,12 @@ import {
 } from './utils';
 import type {FSWatcher} from 'fs';
 
-const lookupPid: (Query) => Program[] = promisify(ps.lookup);
+const lookupPid: (arg1: Query) => Program[] = promisify(ps.lookup);
 
-const ignoreFail = (func) => {
+const ignoreFail = (func: () => void) => {
   try {
     func();
-  } catch (e) {
+  } catch (e: any) {
     /**/
   }
 };
@@ -54,22 +55,28 @@ const META_FILE = path.join(BASEDIR, `parcel-${process.pid}.json`);
 
 let workspaceDiagnostics: DefaultMap<
   string,
-  Array<Diagnostic>,
+  Array<Diagnostic>
 > = new DefaultMap(() => []);
 
 const getWorkspaceDiagnostics = (): Array<PublishDiagnostic> =>
-  [...workspaceDiagnostics].map(([uri, diagnostics]) => ({uri, diagnostics}));
+  [...workspaceDiagnostics].map(([uri, diagnostics]: [any, any]) => ({
+    uri,
+    diagnostics,
+  }));
 
+// @ts-expect-error TS7034
 let server;
 let connections: Array<MessageConnection> = [];
 
-let bundleGraphDeferrable =
-  makeDeferredWithPromise<?BundleGraph<PackagedBundle>>();
-let bundleGraph: Promise<?BundleGraph<PackagedBundle>> =
+let bundleGraphDeferrable = makeDeferredWithPromise<
+  BundleGraph<PackagedBundle> | null | undefined
+>();
+let bundleGraph: Promise<BundleGraph<PackagedBundle> | null | undefined> =
   bundleGraphDeferrable.promise;
 
 let watchStarted = false;
 let lspStarted = false;
+// @ts-expect-error TS7034
 let watchStartPromise;
 
 const LSP_SENTINEL_FILENAME = 'lsp-server';
@@ -84,6 +91,7 @@ async function watchLspActive(): Promise<FSWatcher> {
     //
   }
 
+  // @ts-expect-error TS2769
   return fs.watch(BASEDIR, (eventType: string, filename: string) => {
     switch (eventType) {
       case 'rename':
@@ -100,7 +108,8 @@ async function watchLspActive(): Promise<FSWatcher> {
   });
 }
 
-async function doWatchStart(options) {
+// @ts-expect-error TS2552
+async function doWatchStart(options: PluginOptions) {
   await fs.promises.mkdir(BASEDIR, {recursive: true});
 
   // For each existing file, check if the pid matches a running process.
@@ -126,6 +135,7 @@ async function doWatchStart(options) {
       let graph = await bundleGraph;
       if (!graph) return;
 
+      // @ts-expect-error TS2345
       return getDiagnosticsUnusedExports(graph, uri);
     });
 
@@ -133,6 +143,7 @@ async function doWatchStart(options) {
       let graph = await bundleGraph;
       if (!graph) return null;
 
+      // @ts-expect-error TS2345
       return getImporters(graph, params);
     });
 
@@ -150,13 +161,14 @@ async function doWatchStart(options) {
 
 watchLspActive();
 
-export default (new Reporter({
+export default new Reporter({
   async report({event, options}) {
     if (event.type === 'watchStart') {
       watchStarted = true;
     }
 
     if (watchStarted && lspStarted) {
+      // @ts-expect-error TS7005
       if (!watchStartPromise) {
         watchStartPromise = doWatchStart(options);
       }
@@ -189,6 +201,7 @@ export default (new Reporter({
       }
       case 'log':
         if (
+          // @ts-expect-error TS2339
           event.diagnostics != null &&
           (event.level === 'error' ||
             event.level === 'warn' ||
@@ -211,16 +224,17 @@ export default (new Reporter({
       }
       case 'watchEnd':
         connections.forEach((c) => c.end());
+        // @ts-expect-error TS7005
         await server.close();
         ignoreFail(() => fs.unlinkSync(META_FILE));
         break;
     }
   },
-}): Reporter);
+}) as Reporter;
 
 function updateBuildState(
   state: 'start' | 'progress' | 'end',
-  message: string | void,
+  message?: string,
 ) {
   connections.forEach((c) =>
     c.sendNotification(NotificationBuildStatus, state, message),
@@ -266,7 +280,8 @@ function updateDiagnostics(
       continue;
     }
 
-    const relatedInformation = [];
+    // @ts-expect-error TS2304
+    const relatedInformation: Array<DiagnosticRelatedInformation> = [];
     for (const codeFrame of codeFrames) {
       for (const highlight of codeFrame.codeHighlights) {
         const filePath = codeFrame.filePath;
@@ -323,7 +338,7 @@ function getDiagnosticsUnusedExports(
   document: string,
 ): Array<Diagnostic> {
   let filename = url.fileURLToPath(document);
-  let diagnostics = [];
+  let diagnostics: Array<Diagnostic> = [];
 
   let asset = bundleGraph.traverse((node, context, actions) => {
     if (node.type === 'asset' && node.value.filePath === filename) {
@@ -333,7 +348,8 @@ function getDiagnosticsUnusedExports(
   });
 
   if (asset) {
-    const generateDiagnostic = (loc, type) => ({
+    // @ts-expect-error TS2304
+    const generateDiagnostic = (loc: SourceLocation, type: string) => ({
       range: {
         start: {
           line: loc.start.line - 1,
@@ -350,8 +366,10 @@ function getDiagnosticsUnusedExports(
       tags: [DiagnosticTag.Unnecessary],
     });
 
+    // @ts-expect-error TS2345
     let usedSymbols = bundleGraph.getUsedSymbols(asset);
     if (usedSymbols) {
+      // @ts-expect-error TS2339
       for (let [exported, symbol] of asset.symbols) {
         if (!usedSymbols.has(exported)) {
           if (symbol.loc) {
@@ -378,6 +396,7 @@ function getDiagnosticsUnusedExports(
       // }
     }
 
+    // @ts-expect-error TS2339
     for (let dep of asset.getDependencies()) {
       let usedSymbols = bundleGraph.getUsedSymbols(dep);
       if (usedSymbols) {
@@ -446,6 +465,7 @@ function getImporters(
   });
 
   if (asset) {
+    // @ts-expect-error TS2345
     let incoming = bundleGraph.getIncomingDependencies(asset);
     return incoming
       .filter((dep) => dep.sourcePath != null)

package/src/ipc.ts

@@ -0,0 +1,77 @@
+import * as net from 'net';
+import type {
+  MessageReader,
+  MessageWriter,
+  MessageConnection,
+} from 'vscode-jsonrpc/node';
+import {
+  createMessageConnection,
+  SocketMessageReader,
+  SocketMessageWriter,
+} from 'vscode-jsonrpc/node';
+
+function createClientPipeTransport(
+  pipeName: string,
+  onConnected: (reader: MessageReader, writer: MessageWriter) => void,
+): Promise<{
+  close: () => Promise<void>;
+}> {
+  return new Promise(
+    (
+      resolve: (
+        result:
+          | Promise<{
+              close(): Promise<void>;
+            }>
+          | {
+              close(): Promise<void>;
+            },
+      ) => void,
+      reject: (error?: any) => void,
+    ) => {
+      let server: net.Server = net.createServer((socket: net.Socket) => {
+        onConnected(
+          new SocketMessageReader(socket),
+          new SocketMessageWriter(socket),
+        );
+      });
+      server.on('error', reject);
+      server.listen(pipeName, () => {
+        server.removeListener('error', reject);
+        resolve({
+          close() {
+            return new Promise(
+              (
+                res: (result: Promise<undefined> | undefined) => void,
+                rej: (error?: any) => void,
+              ) => {
+                server.close((e) => {
+                  if (e) rej(e);
+                  // @ts-expect-error TS2794
+                  else res();
+                });
+              },
+            );
+          },
+        });
+      });
+    },
+  );
+}
+
+export function createServer(
+  filename: string,
+  setup: (connection: MessageConnection) => void,
+): Promise<{
+  close: () => Promise<void>;
+}> {
+  return createClientPipeTransport(
+    filename,
+    (reader: MessageReader, writer: MessageWriter) => {
+      let connection = createMessageConnection(reader, writer);
+      connection.listen();
+
+      setup(connection);
+    },
+  );
+}

package/src/{utils.js → utils.ts}

@@ -1,5 +1,5 @@
-// @flow
 import type {DiagnosticLogEvent, FilePath} from '@atlaspack/types';
+// @ts-expect-error TS2724
 import type {ODiagnosticSeverity} from 'vscode-languageserver';
 
 import path from 'path';
@@ -61,35 +61,31 @@ export const DiagnosticTag = {
    * Clients are allowed to render diagnostics with this tag faded out instead of having
    * an error squiggle.
    */
-  // $FlowFixMe
-  Unnecessary: (1: ODiagnosticTag),
+  // @ts-expect-error TS2304
+  Unnecessary: 1 as ODiagnosticTag,
   /**
    * Deprecated or obsolete code.
    *
    * Clients are allowed to rendered diagnostics with this tag strike through.
    */
-  // $FlowFixMe
-  Deprecated: (2: ODiagnosticTag),
-};
+  // @ts-expect-error TS2304
+  Deprecated: 2 as ODiagnosticTag,
+} as const;
 export const DiagnosticSeverity = {
   /**
    * Reports an error.
    */
-  // $FlowFixMe
-  Error: (1: ODiagnosticSeverity),
+  Error: 1 as ODiagnosticSeverity,
   /**
    * Reports a warning.
    */
-  // $FlowFixMe
-  Warning: (2: ODiagnosticSeverity),
+  Warning: 2 as ODiagnosticSeverity,
   /**
    * Reports an information.
    */
-  // $FlowFixMe
-  Information: (3: ODiagnosticSeverity),
+  Information: 3 as ODiagnosticSeverity,
   /**
    * Reports a hint.
    */
-  // $FlowFixMe
-  Hint: (4: ODiagnosticSeverity),
-};
+  Hint: 4 as ODiagnosticSeverity,
+} as const;

package/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    },
+    {
+      "path": "../../utils/atlaspack-lsp-protocol/tsconfig.json"
+    }
+  ]
+}