Updates vfs to be more future safe when running on node + 2021 dts files for playground

packages/sandbox/package.json

@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@typescript/ata": "0.9.3",
-    "@typescript/vfs": "1.4.0"
+    "@typescript/vfs": "1.5.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^13.0.1",

packages/ts-twoslasher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript/twoslash",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "license": "MIT",
   "author": "TypeScript team",
   "homepage": "https://github.com/microsoft/TypeScript-Website",
@@ -53,8 +53,8 @@
     "typescript": false
   },
   "dependencies": {
-    "@typescript/vfs": "1.4.0",
+    "@typescript/vfs": "1.5.0",
     "debug": "^4.1.1",
     "lz-string": "^1.4.4"
   }
-}
+}

packages/typescript-vfs/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.5
+
+- Makes `createDefaultMapFromNodeModules` pull all the `.d.ts` files from the node_modules folder, not just the `.d.ts` files which were known ahead of time. 
+- Updates the known .d.s files to include ones from TypeScript 5.1 beta.
+
 ### 1.3
 
 - Adds a JS file into the npm tarball for using with a vanilla script tag, which sets `global.tsvfs` with exported function.

packages/typescript-vfs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typescript/vfs",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "license": "MIT",
   "author": "TypeScript team",
   "homepage": "https://github.com/microsoft/TypeScript-Website",

packages/typescript-vfs/src/index.ts

@@ -91,9 +91,13 @@ export function createVirtualTypeScriptEnvironment(
   }
 }
 
+// TODO: This could be replaced by grabbing: https://github.com/microsoft/TypeScript/blob/main/src/lib/libs.json
+// and then using that to generate the list of files from the server, but it is not included in the npm package
+
 /**
  * Grab the list of lib files for a particular target, will return a bit more than necessary (by including
- * the dom) but that's OK
+ * the dom) but that's OK, we're really working with the constraint that you can't get a list of files
+ * when running in a browser.
  *
  * @param target The compiler settings target baseline
  * @param ts A copy of the TypeScript module
@@ -102,15 +106,15 @@ export const knownLibFilesForCompilerOptions = (compilerOptions: CompilerOptions
   const target = compilerOptions.target || ts.ScriptTarget.ES5
   const lib = compilerOptions.lib || []
 
+  // Note that this will include files which can't be found for particular versions of TS
+  // TODO: Replace this with some sort of API call if https://github.com/microsoft/TypeScript/pull/54011
+  // or similar is merged.
   const files = [
     "lib.d.ts",
+    "lib.decorators.d.ts",
+    "lib.decorators.legacy.d.ts",
     "lib.dom.d.ts",
     "lib.dom.iterable.d.ts",
-    "lib.webworker.d.ts",
-    "lib.webworker.importscripts.d.ts",
-    "lib.scripthost.d.ts",
-    "lib.es5.d.ts",
-    "lib.es6.d.ts",
     "lib.es2015.collection.d.ts",
     "lib.es2015.core.d.ts",
     "lib.es2015.d.ts",
@@ -125,6 +129,7 @@ export const knownLibFilesForCompilerOptions = (compilerOptions: CompilerOptions
     "lib.es2016.d.ts",
     "lib.es2016.full.d.ts",
     "lib.es2017.d.ts",
+    "lib.es2017.date.d.ts",
     "lib.es2017.full.d.ts",
     "lib.es2017.intl.d.ts",
     "lib.es2017.object.d.ts",
@@ -141,28 +146,57 @@ export const knownLibFilesForCompilerOptions = (compilerOptions: CompilerOptions
     "lib.es2019.array.d.ts",
     "lib.es2019.d.ts",
     "lib.es2019.full.d.ts",
+    "lib.es2019.intl.d.ts",
     "lib.es2019.object.d.ts",
     "lib.es2019.string.d.ts",
     "lib.es2019.symbol.d.ts",
+    "lib.es2020.bigint.d.ts",
     "lib.es2020.d.ts",
+    "lib.es2020.date.d.ts",
     "lib.es2020.full.d.ts",
-    "lib.es2020.string.d.ts",
-    "lib.es2020.symbol.wellknown.d.ts",
-    "lib.es2020.bigint.d.ts",
+    "lib.es2020.intl.d.ts",
+    "lib.es2020.number.d.ts",
     "lib.es2020.promise.d.ts",
     "lib.es2020.sharedmemory.d.ts",
-    "lib.es2020.intl.d.ts",
+    "lib.es2020.string.d.ts",
+    "lib.es2020.symbol.wellknown.d.ts",
     "lib.es2021.d.ts",
     "lib.es2021.full.d.ts",
+    "lib.es2021.intl.d.ts",
     "lib.es2021.promise.d.ts",
     "lib.es2021.string.d.ts",
     "lib.es2021.weakref.d.ts",
+    "lib.es2022.array.d.ts",
+    "lib.es2022.d.ts",
+    "lib.es2022.error.d.ts",
+    "lib.es2022.full.d.ts",
+    "lib.es2022.intl.d.ts",
+    "lib.es2022.object.d.ts",
+    "lib.es2022.regexp.d.ts",
+    "lib.es2022.sharedmemory.d.ts",
+    "lib.es2022.string.d.ts",
+    "lib.es2023.array.d.ts",
+    "lib.es2023.collection.d.ts",
+    "lib.es2023.d.ts",
+    "lib.es2023.full.d.ts",
+    "lib.es5.d.ts",
+    "lib.es6.d.ts",
+    "lib.esnext.array.d.ts",
+    "lib.esnext.asynciterable.d.ts",
+    "lib.esnext.bigint.d.ts",
     "lib.esnext.d.ts",
+    "lib.esnext.decorators.d.ts",
+    "lib.esnext.disposable.d.ts",
     "lib.esnext.full.d.ts",
     "lib.esnext.intl.d.ts",
     "lib.esnext.promise.d.ts",
     "lib.esnext.string.d.ts",
+    "lib.esnext.symbol.d.ts",
     "lib.esnext.weakref.d.ts",
+    "lib.scripthost.d.ts",
+    "lib.webworker.d.ts",
+    "lib.webworker.importscripts.d.ts",
+    "lib.webworker.iterable.d.ts"
   ]
 
   const targetToCut = ts.ScriptTarget[target]
@@ -190,9 +224,15 @@ export const knownLibFilesForCompilerOptions = (compilerOptions: CompilerOptions
 /**
  * Sets up a Map with lib contents by grabbing the necessary files from
  * the local copy of typescript via the file system.
+ *
+ * The first two args are un-used, but kept around so as to not cause a
+ * semver major bump for no gain to module users.
  */
-export const createDefaultMapFromNodeModules = (compilerOptions: CompilerOptions, ts?: typeof import("typescript"), tsLibDirectory?: string) => {
-  const tsModule = ts || require("typescript")
+export const createDefaultMapFromNodeModules = (
+  _compilerOptions: CompilerOptions,
+  _ts?: typeof import("typescript"),
+  tsLibDirectory?: string
+) => {
   const path = requirePath()
   const fs = requireFS()
 
@@ -201,9 +241,11 @@ export const createDefaultMapFromNodeModules = (compilerOptions: CompilerOptions
     return fs.readFileSync(path.join(lib, name), "utf8")
   }
 
-  const libs = knownLibFilesForCompilerOptions(compilerOptions, tsModule)
+  const libFiles = fs.readdirSync(tsLibDirectory || path.dirname(require.resolve("typescript")))
+  const knownLibFiles = libFiles.filter(f => f.startsWith("lib.") && f.endsWith(".d.ts"))
+
   const fsMap = new Map<string, string>()
-  libs.forEach(lib => {
+  knownLibFiles.forEach(lib => {
     fsMap.set("/" + lib, getLib(lib))
   })
   return fsMap
@@ -286,9 +328,14 @@ export const createDefaultMapFromCDN = (
 
   // Map the known libs to a node fetch promise, then return the contents
   function uncached() {
-    return Promise.all(files.map(lib => fetchlike(prefix + lib).then(resp => resp.text()))).then(contents => {
-      contents.forEach((text, index) => fsMap.set("/" + files[index], text))
-    })
+    return (
+      Promise.all(files.map(lib => fetchlike(prefix + lib).then(resp => resp.text())))
+        .then(contents => {
+          contents.forEach((text, index) => fsMap.set("/" + files[index], text))
+        })
+        // Return a NOOP for .d.ts files which aren't in the current build of TypeScript
+        .catch(() => { })
+    )
   }
 
   // A localstorage and lzzip aware version of the lib files
@@ -310,20 +357,26 @@ export const createDefaultMapFromCDN = (
 
         if (!content) {
           // Make the API call and store the text concent in the cache
-          return fetchlike(prefix + lib)
-            .then(resp => resp.text())
-            .then(t => {
-              storelike.setItem(cacheKey, zip(t))
-              return t
-            })
+          return (
+            fetchlike(prefix + lib)
+              .then(resp => resp.text())
+              .then(t => {
+                storelike.setItem(cacheKey, zip(t))
+                return t
+              })
+              // Return a NOOP for .d.ts files which aren't in the current build of TypeScript
+              .catch(() => { })
+          )
         } else {
           return Promise.resolve(unzip(content))
         }
       })
     ).then(contents => {
       contents.forEach((text, index) => {
-        const name = "/" + files[index]
-        fsMap.set(name, text)
+        if (text) {
+          const name = "/" + files[index]
+          fsMap.set(name, text)
+        }
       })
     })
   }
@@ -403,7 +456,12 @@ export function createSystem(files: Map<string, string>): System {
  * a set of virtual files which are prioritised over the FS versions, then a path to the root of your
  * project (basically the folder your node_modules lives)
  */
-export function createFSBackedSystem(files: Map<string, string>, _projectRoot: string, ts: TS, tsLibDirectory?: string): System {
+export function createFSBackedSystem(
+  files: Map<string, string>,
+  _projectRoot: string,
+  ts: TS,
+  tsLibDirectory?: string
+): System {
   // We need to make an isolated folder for the tsconfig, but also need to be able to resolve the
   // existing node_modules structures going back through the history
   const root = _projectRoot + "/vfs"

packages/typescript-vfs/test/index.test.ts

@@ -209,3 +209,8 @@ it("throws when you request a lib file which isn't in the fsMap", () => {
 
   expect(t).toThrow()
 })
+
+it("grabs lib dts files from node_modules", async () => {
+  const fsMap = createDefaultMapFromNodeModules({})
+  expect(fsMap.get("/lib.es2015.collection.d.ts")).toBeDefined()
+})

packages/typescriptlang-org/package.json

@@ -25,7 +25,7 @@
     "@types/react-helmet": "^5.0.15",
     "@typescript/playground": "0.1.0",
     "@typescript/sandbox": "0.1.0",
-    "@typescript/twoslash": "3.2.1",
+    "@typescript/twoslash": "3.2.2",
     "gatsby": "^3.8.1",
     "gatsby-link": "3.10.0",
     "gatsby-plugin-catch-links": "^3.10.0",

yarn.lock

@@ -6119,7 +6119,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript/[email protected], @typescript/vfs@workspace:packages/typescript-vfs":
+"@typescript/vfs@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@typescript/vfs@npm:1.3.4"
+  dependencies:
+    debug: ^4.1.1
+  checksum: 9468126c7f5da5811f65a6a8ccded68ba3ae32e5bff710ff0fc792b9592dd0b64606669703c707a61350d18d0640a60465fd1fdfa19224bf75998061d461cbf5
+  languageName: node
+  linkType: hard
+
+"@typescript/vfs@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@typescript/vfs@npm:1.4.0"
+  dependencies:
+    debug: ^4.1.1
+  checksum: 67219c9354d142ef8259da172066db043133d8b6cc0a5d862b9867d5950c5f6c9b816e8b29f8901e8cd2572003282fbbec097e53932bc6da01d0fa2e40520014
+  languageName: node
+  linkType: hard
+
+"@typescript/vfs@workspace:packages/typescript-vfs":
   version: 0.0.0-use.local
   resolution: "@typescript/vfs@workspace:packages/typescript-vfs"
   dependencies:
@@ -6136,15 +6154,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@typescript/vfs@npm:1.3.4":
-  version: 1.3.4
-  resolution: "@typescript/vfs@npm:1.3.4"
-  dependencies:
-    debug: ^4.1.1
-  checksum: 9468126c7f5da5811f65a6a8ccded68ba3ae32e5bff710ff0fc792b9592dd0b64606669703c707a61350d18d0640a60465fd1fdfa19224bf75998061d461cbf5
-  languageName: node
-  linkType: hard
-
 "@webassemblyjs/ast@npm:1.11.0":
   version: 1.11.0
   resolution: "@webassemblyjs/ast@npm:1.11.0"