@atlaspack/validator-typescript 2.14.5-canary.5 → 2.14.5-canary.500

package/dist/TypeScriptValidator.js

@@ -0,0 +1,138 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const typescript_1 = __importDefault(require("typescript"));
+const diagnostic_1 = require("@atlaspack/diagnostic");
+const utils_1 = require("@atlaspack/utils");
+const plugin_1 = require("@atlaspack/plugin");
+const ts_utils_1 = require("@atlaspack/ts-utils");
+let langServiceCache = {};
+exports.default = new plugin_1.Validator({
+    async validateAll({ assets, options, resolveConfigWithPath, }) {
+        // Build a collection that of all the LanguageServices related to files that just changed.
+        let servicesToValidate = new Set();
+        await Promise.all(assets.map(async (asset) => {
+            let config = await getConfig(asset, options, resolveConfigWithPath);
+            let { configHash } = config;
+            // Create a languageService/host in the cache for the configuration if it doesn't already exist.
+            tryCreateLanguageService(config, asset, options);
+            if (!langServiceCache[configHash])
+                return;
+            // Invalidate the file with the LanguageServiceHost so Typescript knows it has changed.
+            langServiceCache[configHash].host.invalidate(asset.filePath);
+            servicesToValidate.add(configHash);
+        }));
+        // Ask typescript to analyze all changed programs and translate the results into ValidatorResult objects.
+        let validatorResults = [];
+        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).
+            langServiceCache[configHash].host.fs = options.inputFS;
+            langServiceCache[configHash].configHost.fs = options.inputFS;
+            let program = langServiceCache[configHash].service.getProgram();
+            if (!program)
+                return;
+            let filesToCheck = program.getSourceFiles();
+            filesToCheck.forEach((sourceFile) => {
+                let diagnostics = program.getSemanticDiagnostics(sourceFile);
+                validatorResults.push(getValidateResultFromDiagnostics(sourceFile.fileName, diagnostics));
+            });
+        });
+        return validatorResults;
+    },
+});
+async function getConfig(asset, options, 
+// @ts-expect-error TS2304
+resolveConfigWithPath) {
+    let configNames = ['tsconfig.json'];
+    let tsconfig = await (0, utils_1.loadConfig)(asset.fs, asset.filePath, configNames, options.projectRoot);
+    let configPath = await resolveConfigWithPath(configNames, asset.filePath);
+    let baseDir = configPath ? path_1.default.dirname(configPath) : options.projectRoot;
+    let configHash = (tsconfig ? (0, utils_1.hashObject)(tsconfig.config) : '') + '-' + baseDir;
+    return {
+        filepath: configPath,
+        baseDir,
+        configHash,
+        tsconfig: tsconfig?.config,
+    };
+}
+/** Tries to create a typescript language service instance in the cache if it doesn't already exist. */
+function tryCreateLanguageService(config, asset, options) {
+    if (config.tsconfig && !langServiceCache[config.configHash]) {
+        // In order to prevent race conditions where we accidentally create two language services for the same config,
+        // we need to re-check the cache to see if a service has been created while we were awaiting 'ts'.
+        if (!langServiceCache[config.configHash]) {
+            let configHost = new ts_utils_1.ParseConfigHost(options.inputFS, typescript_1.default);
+            let parsedCommandLine = typescript_1.default.parseJsonConfigFileContent(config.tsconfig, configHost, config.baseDir);
+            const host = new ts_utils_1.LanguageServiceHost(options.inputFS, typescript_1.default, parsedCommandLine);
+            langServiceCache[config.configHash] = {
+                configHost,
+                host,
+                service: typescript_1.default.createLanguageService(host, typescript_1.default.createDocumentRegistry()),
+            };
+        }
+    }
+}
+/** Translates semantic diagnostics (from TypeScript) into a ValidateResult that Parcel understands. */
+function getValidateResultFromDiagnostics(filePath, diagnostics) {
+    let validatorResult = {
+        warnings: [],
+        errors: [],
+    };
+    if (diagnostics.length > 0) {
+        for (let diagnostic of diagnostics) {
+            let filename = filePath;
+            let { file } = diagnostic;
+            let diagnosticMessage = (0, diagnostic_1.escapeMarkdown)(typeof diagnostic.messageText === 'string'
+                ? diagnostic.messageText
+                : diagnostic.messageText.messageText);
+            let codeframe;
+            if (file != null && diagnostic.start != null) {
+                let source = file.text || diagnostic.source;
+                if (file.fileName) {
+                    filename = file.fileName;
+                }
+                if (source) {
+                    let lineChar = file.getLineAndCharacterOfPosition(diagnostic.start);
+                    let start = {
+                        line: lineChar.line + 1,
+                        column: lineChar.character + 1,
+                    };
+                    let end = {
+                        line: start.line,
+                        column: start.column + 1,
+                    };
+                    if (typeof diagnostic.start === 'number' &&
+                        typeof diagnostic.length === 'number') {
+                        let endCharPosition = file.getLineAndCharacterOfPosition(diagnostic.start + diagnostic.length);
+                        end = {
+                            line: endCharPosition.line + 1,
+                            column: endCharPosition.character + 1,
+                        };
+                    }
+                    codeframe = {
+                        filePath: filename,
+                        code: source,
+                        codeHighlights: [
+                            {
+                                start,
+                                end,
+                                message: diagnosticMessage,
+                            },
+                        ],
+                    };
+                }
+            }
+            // @ts-expect-error TS2345
+            validatorResult.errors.push({
+                origin: '@atlaspack/validator-typescript',
+                message: diagnosticMessage,
+                codeFrames: codeframe ? [codeframe] : undefined,
+            });
+        }
+    }
+    return validatorResult;
+}

package/lib/TypeScriptValidator.js

@@ -46,8 +46,9 @@ function _tsUtils() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // 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/lib/types/TypeScriptValidator.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/validator-typescript",
-  "version": "2.14.5-canary.5+11d6f16b6",
+  "version": "2.14.5-canary.500+cd4f5c39d",
   "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/types/TypeScriptValidator.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.73+11d6f16b6",
-    "@atlaspack/plugin": "2.14.5-canary.5+11d6f16b6",
-    "@atlaspack/ts-utils": "2.14.1-canary.73+11d6f16b6",
-    "@atlaspack/types": "2.14.5-canary.5+11d6f16b6",
-    "@atlaspack/utils": "2.14.5-canary.5+11d6f16b6"
+    "@atlaspack/diagnostic": "2.14.1-canary.568+cd4f5c39d",
+    "@atlaspack/plugin": "2.14.5-canary.500+cd4f5c39d",
+    "@atlaspack/ts-utils": "2.14.1-canary.568+cd4f5c39d",
+    "@atlaspack/types": "2.14.5-canary.500+cd4f5c39d",
+    "@atlaspack/utils": "2.14.5-canary.500+cd4f5c39d"
   },
   "devDependencies": {
     "typescript": ">=3.0.0"
@@ -28,5 +29,8 @@
     "typescript": ">=3.0.0"
   },
   "type": "commonjs",
-  "gitHead": "11d6f16b6397dee2f217167e5c98b39edb63f7a7"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "cd4f5c39de5781b1441a36efcaf4f105f9fe54b8"
+}

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,24 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/types/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    },
+    {
+      "path": "../../utils/ts-utils/tsconfig.json"
+    }
+  ]
+}