@volar/typescript 2.3.0-alpha.9 → 2.3.1

package/lib/quickstart/createLanguageServicePlugin.js

@@ -1,28 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayItemsEqual = exports.createLanguageServicePlugin = void 0;
+exports.decoratedLanguageServiceHosts = exports.decoratedLanguageServices = exports.projectExternalFileExtensions = exports.externalFiles = void 0;
+exports.createLanguageServicePlugin = createLanguageServicePlugin;
+exports.arrayItemsEqual = arrayItemsEqual;
 const language_core_1 = require("@volar/language-core");
 const common_1 = require("../common");
 const decorateLanguageService_1 = require("../node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
-const externalFiles = new WeakMap();
-const projectExternalFileExtensions = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createLanguageServicePlugin(loadLanguagePlugins) {
+exports.externalFiles = new WeakMap();
+exports.projectExternalFileExtensions = new WeakMap();
+exports.decoratedLanguageServices = new WeakSet();
+exports.decoratedLanguageServiceHosts = new WeakSet();
+function createLanguageServicePlugin(create) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
             create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
-                    const languagePlugins = loadLanguagePlugins(ts, info);
+                if (!exports.decoratedLanguageServices.has(info.languageService)
+                    && !exports.decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
+                    exports.decoratedLanguageServices.add(info.languageService);
+                    exports.decoratedLanguageServiceHosts.add(info.languageServiceHost);
+                    const { languagePlugins, setup } = create(ts, info);
                     const extensions = languagePlugins
                         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
                         .flat();
-                    projectExternalFileExtensions.set(info.project, extensions);
+                    exports.projectExternalFileExtensions.set(info.project, extensions);
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
                     const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
                     const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
@@ -45,27 +47,27 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                     });
                     (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
                     (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
+                    setup?.(language);
                 }
                 return info.languageService;
             },
             getExternalFiles(project, updateLevel = 0) {
-                if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
-                    const extensions = projectExternalFileExtensions.get(project);
+                if (updateLevel >= 1
+                    || !exports.externalFiles.has(project)) {
+                    const oldFiles = exports.externalFiles.get(project);
+                    const extensions = exports.projectExternalFileExtensions.get(project);
                     const newFiles = extensions?.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
-                    externalFiles.set(project, newFiles);
+                    exports.externalFiles.set(project, newFiles);
                     if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
                         project.refreshDiagnostics();
                     }
                 }
-                return externalFiles.get(project);
+                return exports.externalFiles.get(project);
             },
         };
         return pluginModule;
     };
 }
-exports.createLanguageServicePlugin = createLanguageServicePlugin;
 function arrayItemsEqual(a, b) {
     if (a.length !== b.length) {
         return false;
@@ -78,5 +80,4 @@ function arrayItemsEqual(a, b) {
     }
     return true;
 }
-exports.arrayItemsEqual = arrayItemsEqual;
 //# sourceMappingURL=createLanguageServicePlugin.js.map

package/lib/quickstart/runTsc.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runTsc = exports.getLanguagePlugins = void 0;
+exports.getLanguagePlugins = void 0;
+exports.runTsc = runTsc;
 const fs = require("fs");
 let getLanguagePlugins = () => [];
 exports.getLanguagePlugins = getLanguagePlugins;
@@ -37,7 +38,6 @@ function runTsc(tscPath, extensions, _getLanguagePlugins) {
         delete require.cache[tscPath];
     }
 }
-exports.runTsc = runTsc;
 function replace(text, ...[search, replace]) {
     const before = text;
     text = text.replace(search, replace);

package/lib/resolveModuleName.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResolveModuleName = void 0;
+exports.createResolveModuleName = createResolveModuleName;
 function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
     const toSourceFileInfo = new Map();
     const moduleResolutionHost = {
@@ -87,5 +87,4 @@ function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
         return false;
     }
 }
-exports.createResolveModuleName = createResolveModuleName;
 //# sourceMappingURL=resolveModuleName.js.map

package/lib/typescript/core.js

@@ -1,7 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startsWith = exports.createGetCanonicalFileName = exports.stringContains = exports.endsWith = exports.getStringComparer = exports.compareStringsCaseSensitive = exports.equateStringsCaseSensitive = exports.equateStringsCaseInsensitive = exports.last = exports.lastOrUndefined = exports.sort = exports.some = exports.flatMap = exports.flatten = exports.map = exports.indexOfAnyCharCode = exports.findIndex = exports.every = void 0;
-require("./corePublic");
+exports.every = every;
+exports.findIndex = findIndex;
+exports.indexOfAnyCharCode = indexOfAnyCharCode;
+exports.map = map;
+exports.flatten = flatten;
+exports.flatMap = flatMap;
+exports.some = some;
+exports.sort = sort;
+exports.lastOrUndefined = lastOrUndefined;
+exports.last = last;
+exports.equateStringsCaseInsensitive = equateStringsCaseInsensitive;
+exports.equateStringsCaseSensitive = equateStringsCaseSensitive;
+exports.compareStringsCaseSensitive = compareStringsCaseSensitive;
+exports.getStringComparer = getStringComparer;
+exports.endsWith = endsWith;
+exports.stringContains = stringContains;
+exports.createGetCanonicalFileName = createGetCanonicalFileName;
+exports.startsWith = startsWith;
 const emptyArray = [];
 /**
  * Iterates through `array` by index and performs the callback on each element of array until the callback
@@ -18,7 +34,6 @@ function every(array, callback) {
     }
     return true;
 }
-exports.every = every;
 /** Works like Array.prototype.findIndex, returning `-1` if no element satisfying the predicate is found. */
 function findIndex(array, predicate, startIndex) {
     if (array === undefined) {
@@ -31,7 +46,6 @@ function findIndex(array, predicate, startIndex) {
     }
     return -1;
 }
-exports.findIndex = findIndex;
 function contains(array, value, equalityComparer = equateValues) {
     if (array) {
         for (const v of array) {
@@ -50,7 +64,6 @@ function indexOfAnyCharCode(text, charCodes, start) {
     }
     return -1;
 }
-exports.indexOfAnyCharCode = indexOfAnyCharCode;
 function map(array, f) {
     let result;
     if (array) {
@@ -61,7 +74,6 @@ function map(array, f) {
     }
     return result;
 }
-exports.map = map;
 /**
  * Flattens an array containing a mix of array or non-array elements.
  *
@@ -81,7 +93,6 @@ function flatten(array) {
     }
     return result;
 }
-exports.flatten = flatten;
 /**
  * Maps an array. If the mapped value is an array, it is spread into the result.
  *
@@ -105,7 +116,6 @@ function flatMap(array, mapfn) {
     }
     return result || emptyArray;
 }
-exports.flatMap = flatMap;
 function some(array, predicate) {
     if (array) {
         if (predicate) {
@@ -121,7 +131,6 @@ function some(array, predicate) {
     }
     return false;
 }
-exports.some = some;
 // function append<T>(to: T[] | undefined, value: T): T[];
 // function append<T>(to: T[] | undefined, value: T | undefined): T[] | undefined;
 // function append<T>(to: Push<T>, value: T | undefined): void;
@@ -164,19 +173,16 @@ function addRange(to, from, start, end) {
 function sort(array, comparer) {
     return (array.length === 0 ? array : array.slice().sort(comparer));
 }
-exports.sort = sort;
 /**
  * Returns the last element of an array if non-empty, `undefined` otherwise.
  */
 function lastOrUndefined(array) {
     return array === undefined || array.length === 0 ? undefined : array[array.length - 1];
 }
-exports.lastOrUndefined = lastOrUndefined;
 function last(array) {
     // Debug.assert(array.length !== 0);
     return array[array.length - 1];
 }
-exports.last = last;
 /**
  * Tests whether a value is an array.
  */
@@ -247,7 +253,6 @@ function equateStringsCaseInsensitive(a, b) {
             && b !== undefined
             && a.toUpperCase() === b.toUpperCase();
 }
-exports.equateStringsCaseInsensitive = equateStringsCaseInsensitive;
 /**
  * Compare the equality of two strings using a case-sensitive ordinal comparison.
  *
@@ -257,7 +262,6 @@ exports.equateStringsCaseInsensitive = equateStringsCaseInsensitive;
 function equateStringsCaseSensitive(a, b) {
     return equateValues(a, b);
 }
-exports.equateStringsCaseSensitive = equateStringsCaseSensitive;
 function compareComparableValues(a, b) {
     return a === b ? 0 /* Comparison.EqualTo */ :
         a === undefined ? -1 /* Comparison.LessThan */ :
@@ -304,26 +308,20 @@ function compareStringsCaseInsensitive(a, b) {
 function compareStringsCaseSensitive(a, b) {
     return compareComparableValues(a, b);
 }
-exports.compareStringsCaseSensitive = compareStringsCaseSensitive;
 function getStringComparer(ignoreCase) {
     return ignoreCase ? compareStringsCaseInsensitive : compareStringsCaseSensitive;
 }
-exports.getStringComparer = getStringComparer;
 function endsWith(str, suffix) {
     const expectedPos = str.length - suffix.length;
     return expectedPos >= 0 && str.indexOf(suffix, expectedPos) === expectedPos;
 }
-exports.endsWith = endsWith;
 function stringContains(str, substring) {
     return str.indexOf(substring) !== -1;
 }
-exports.stringContains = stringContains;
 function createGetCanonicalFileName(useCaseSensitiveFileNames) {
     return useCaseSensitiveFileNames ? identity : toFileNameLowerCase;
 }
-exports.createGetCanonicalFileName = createGetCanonicalFileName;
 function startsWith(str, prefix) {
     return str.lastIndexOf(prefix, 0) === 0;
 }
-exports.startsWith = startsWith;
 //# sourceMappingURL=core.js.map

package/lib/typescript/path.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.containsPath = exports.removeTrailingDirectorySeparator = exports.normalizePath = exports.getNormalizedPathComponents = exports.combinePaths = exports.getDirectoryPath = exports.fileExtensionIsOneOf = exports.hasExtension = exports.isRootedDiskPath = exports.directorySeparator = void 0;
+exports.directorySeparator = void 0;
+exports.isRootedDiskPath = isRootedDiskPath;
+exports.hasExtension = hasExtension;
+exports.fileExtensionIsOneOf = fileExtensionIsOneOf;
+exports.getDirectoryPath = getDirectoryPath;
+exports.combinePaths = combinePaths;
+exports.getNormalizedPathComponents = getNormalizedPathComponents;
+exports.normalizePath = normalizePath;
+exports.removeTrailingDirectorySeparator = removeTrailingDirectorySeparator;
+exports.containsPath = containsPath;
 const core_1 = require("./core");
-require("./types");
 /**
  * Internally, we represent paths as strings with '/' as the directory separator.
  * When we make system calls (eg: LanguageServiceHost.getDirectory()),
@@ -26,11 +34,9 @@ function isAnyDirectorySeparator(charCode) {
 function isRootedDiskPath(path) {
     return getEncodedRootLength(path) > 0;
 }
-exports.isRootedDiskPath = isRootedDiskPath;
 function hasExtension(fileName) {
     return (0, core_1.stringContains)(getBaseFileName(fileName), ".");
 }
-exports.hasExtension = hasExtension;
 function fileExtensionIs(path, extension) {
     return path.length > extension.length && (0, core_1.endsWith)(path, extension);
 }
@@ -42,7 +48,6 @@ function fileExtensionIsOneOf(path, extensions) {
     }
     return false;
 }
-exports.fileExtensionIsOneOf = fileExtensionIsOneOf;
 /**
  * Determines whether a path has a trailing separator (`/` or `\\`).
  */
@@ -171,7 +176,6 @@ function getDirectoryPath(path) {
     path = removeTrailingDirectorySeparator(path);
     return path.slice(0, Math.max(rootLength, path.lastIndexOf(exports.directorySeparator)));
 }
-exports.getDirectoryPath = getDirectoryPath;
 function getBaseFileName(path, extensions, ignoreCase) {
     path = normalizeSlashes(path);
     // if the path provided is itself the root, then it has not file name.
@@ -357,7 +361,6 @@ function combinePaths(path, ...paths) {
     }
     return path;
 }
-exports.combinePaths = combinePaths;
 /**
  * Parse a path into an array containing a root component (at index 0) and zero or more path
  * components (at indices > 0). The result is normalized.
@@ -371,7 +374,6 @@ exports.combinePaths = combinePaths;
 function getNormalizedPathComponents(path, currentDirectory) {
     return reducePathComponents(getPathComponents(path, currentDirectory));
 }
-exports.getNormalizedPathComponents = getNormalizedPathComponents;
 function normalizePath(path) {
     path = normalizeSlashes(path);
     // Most paths don't require normalization
@@ -390,14 +392,12 @@ function normalizePath(path) {
     const normalized = getPathFromPathComponents(reducePathComponents(getPathComponents(path)));
     return normalized && hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(normalized) : normalized;
 }
-exports.normalizePath = normalizePath;
 function removeTrailingDirectorySeparator(path) {
     if (hasTrailingDirectorySeparator(path)) {
         return path.substr(0, path.length - 1);
     }
     return path;
 }
-exports.removeTrailingDirectorySeparator = removeTrailingDirectorySeparator;
 function ensureTrailingDirectorySeparator(path) {
     if (!hasTrailingDirectorySeparator(path)) {
         return path + exports.directorySeparator;
@@ -435,5 +435,4 @@ function containsPath(parent, child, currentDirectory, ignoreCase) {
     }
     return true;
 }
-exports.containsPath = containsPath;
 //# sourceMappingURL=path.js.map

package/lib/typescript/utilities.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchFiles = void 0;
+exports.matchFiles = matchFiles;
 const core_1 = require("./core");
 const path_1 = require("./path");
-require("./types");
 // KLUDGE: Don't assume one 'node_modules' links to another. More likely a single directory inside the node_modules is the symlink.
 // ALso, don't assume that an `@foo` directory is linked. More likely the contents of that are linked.
 // Reserved characters, forces escaping of any non-word (or digit), non-whitespace character.
@@ -212,7 +211,6 @@ function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNa
         }
     }
 }
-exports.matchFiles = matchFiles;
 /**
  * Computes the unique non-wildcard base paths amongst the provided include patterns.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.0-alpha.9",
+	"version": "2.3.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.3.0-alpha.9",
+		"@volar/language-core": "2.3.1",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.3.0-alpha.9"
+		"@volar/language-service": "2.3.1"
 	},
-	"gitHead": "3f741930343896dfc464a893ebe5f3619bb1a1aa"
+	"gitHead": "51742317a2950abd97e1a1a266b2c137bede4ad3"
 }