@atlaspack/validator-typescript 2.14.5-canary.138 → 2.14.5-canary.139

package/lib/TypeScriptValidator.d.ts

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

package/lib/TypeScriptValidator.js

@@ -48,6 +48,7 @@ function _tsUtils() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // eslint-disable-line import/no-extraneous-dependencies
+
 let langServiceCache = {};
 var _default = exports.default = new (_plugin().Validator)({
   async validateAll({
@@ -90,7 +91,9 @@ var _default = exports.default = new (_plugin().Validator)({
     return validatorResults;
   }
 });
-async function getConfig(asset, options, resolveConfigWithPath) {
+async function getConfig(asset, options,
+// @ts-expect-error TS2304
+resolveConfigWithPath) {
   let configNames = ['tsconfig.json'];
   let tsconfig = await (0, _utils().loadConfig)(asset.fs, asset.filePath, configNames, options.projectRoot);
   let configPath = await resolveConfigWithPath(configNames, asset.filePath);
@@ -116,8 +119,6 @@ function tryCreateLanguageService(config, asset, options) {
       langServiceCache[config.configHash] = {
         configHost,
         host,
-        // $FlowFixMe[incompatible-variance]
-        // $FlowFixMe[incompatible-call]
         service: _typescript().default.createLanguageService(host, _typescript().default.createDocumentRegistry())
       };
     }
@@ -171,6 +172,8 @@ function getValidateResultFromDiagnostics(filePath, diagnostics) {
           };
         }
       }
+
+      // @ts-expect-error TS2345
       validatorResult.errors.push({
         origin: '@atlaspack/validator-typescript',
         message: diagnosticMessage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/validator-typescript",
-  "version": "2.14.5-canary.138+eda07caaf",
+  "version": "2.14.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,17 +9,18 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/TypeScriptValidator.js",
-  "source": "src/TypeScriptValidator.js",
+  "main": "./lib/TypeScriptValidator.js",
+  "source": "./src/TypeScriptValidator.ts",
+  "types": "./lib/TypeScriptValidator.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/ts-utils": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/types": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf"
+    "@atlaspack/diagnostic": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/ts-utils": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/types": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977"
   },
   "devDependencies": {
     "typescript": ">=3.0.0"
@@ -28,5 +29,8 @@
     "typescript": ">=3.0.0"
   },
   "type": "commonjs",
-  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,4 +1,3 @@
-// @flow
 import type {
   Asset,
   ConfigResult,
@@ -9,33 +8,32 @@ import type {LanguageService, Diagnostic} from 'typescript'; // eslint-disable-l
 
 import path from 'path';
 import ts from 'typescript';
-import {type DiagnosticCodeFrame, escapeMarkdown} from '@atlaspack/diagnostic';
+import {DiagnosticCodeFrame, escapeMarkdown} from '@atlaspack/diagnostic';
 import {hashObject, loadConfig} from '@atlaspack/utils';
 import {Validator} from '@atlaspack/plugin';
 import {LanguageServiceHost, ParseConfigHost} from '@atlaspack/ts-utils';
 
 let langServiceCache: {
-  [configHash: string]: {|
-    configHost: ParseConfigHost,
-    host: LanguageServiceHost,
-    service: LanguageService,
-  |},
-  ...
+  [configHash: string]: {
+    configHost: ParseConfigHost;
+    host: LanguageServiceHost;
+    service: LanguageService;
+  };
 } = {};
 
-type TSValidatorConfig = {|
-  filepath: ?string,
-  baseDir: string,
-  configHash: string,
-  tsconfig: ConfigResult | null,
-|};
+type TSValidatorConfig = {
+  filepath: string | null | undefined;
+  baseDir: string;
+  configHash: string;
+  tsconfig: ConfigResult | null;
+};
 
-export default (new Validator({
+export default new Validator({
   async validateAll({
     assets,
     options,
     resolveConfigWithPath,
-  }): Promise<Array<?ValidateResult>> {
+  }): Promise<Array<ValidateResult | null | undefined>> {
     // Build a collection that of all the LanguageServices related to files that just changed.
     let servicesToValidate: Set<string> = new Set();
     await Promise.all(
@@ -55,7 +53,7 @@ export default (new Validator({
     );
 
     // Ask typescript to analyze all changed programs and translate the results into ValidatorResult objects.
-    let validatorResults: Array<?ValidateResult> = [];
+    let validatorResults: Array<ValidateResult | null | undefined> = [];
     servicesToValidate.forEach((configHash) => {
       // Make sure that the filesystem being used by the LanguageServiceHost and ParseConfigHost is up-to-date.
       // (This could change in the context of re-running tests, and probably also for other reasons).
@@ -76,12 +74,13 @@ export default (new Validator({
 
     return validatorResults;
   },
-}): Validator);
+}) as Validator;
 
 async function getConfig(
-  asset,
-  options,
-  resolveConfigWithPath,
+  asset: Asset,
+  options: PluginOptions,
+  // @ts-expect-error TS2304
+  resolveConfigWithPath: ResolveConfigWithPathFn,
 ): Promise<TSValidatorConfig> {
   let configNames = ['tsconfig.json'];
   let tsconfig = await loadConfig(
@@ -90,7 +89,7 @@ async function getConfig(
     configNames,
     options.projectRoot,
   );
-  let configPath: ?string = await resolveConfigWithPath(
+  let configPath: string | null | undefined = await resolveConfigWithPath(
     configNames,
     asset.filePath,
   );
@@ -130,8 +129,6 @@ function tryCreateLanguageService(
       langServiceCache[config.configHash] = {
         configHost,
         host,
-        // $FlowFixMe[incompatible-variance]
-        // $FlowFixMe[incompatible-call]
         service: ts.createLanguageService(host, ts.createDocumentRegistry()),
       };
     }
@@ -141,7 +138,7 @@ function tryCreateLanguageService(
 /** Translates semantic diagnostics (from TypeScript) into a ValidateResult that Parcel understands. */
 function getValidateResultFromDiagnostics(
   filePath: string,
-  diagnostics: $ReadOnlyArray<Diagnostic>,
+  diagnostics: ReadonlyArray<Diagnostic>,
 ): ValidateResult {
   let validatorResult = {
     warnings: [],
@@ -159,7 +156,7 @@ function getValidateResultFromDiagnostics(
           : diagnostic.messageText.messageText,
       );
 
-      let codeframe: ?DiagnosticCodeFrame;
+      let codeframe: DiagnosticCodeFrame | null | undefined;
       if (file != null && diagnostic.start != null) {
         let source = file.text || diagnostic.source;
         if (file.fileName) {
@@ -205,6 +202,7 @@ function getValidateResultFromDiagnostics(
         }
       }
 
+      // @ts-expect-error TS2345
       validatorResult.errors.push({
         origin: '@atlaspack/validator-typescript',
         message: diagnosticMessage,

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}