Merge branch 'main' into gabritto/switchsnippet

Author: gabritto

.github/workflows/ci.yml

@@ -86,6 +86,70 @@ jobs:
     - name: Build src
       run: npx hereby build-src
 
+  smoke:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run:  npm ci
+
+    - run: npx hereby lkg
+    - run: |
+        npm pack
+        mv typescript*.tgz typescript.tgz
+        echo "PACKAGE=$PWD/typescript.tgz" >> $GITHUB_ENV
+
+    - name: Smoke test
+      run: |
+        cd "$(mktemp -d)"
+        npm init --yes
+        npm install $PACKAGE tslib
+
+        echo "Testing tsc..."
+        npx tsc --version
+
+        echo "Testing tsserver..."
+        echo '{"seq": 1, "command": "status"}' | npx tsserver
+
+        cat > smoke.js << 'EOF'
+        console.log(`Testing ${process.argv[2]}...`);
+        const { __importDefault, __importStar } = require("tslib");
+        const ts = require(process.argv[2]);
+
+        // See: https://github.com/microsoft/TypeScript/pull/51474#issuecomment-1310871623
+        const fns = [
+          [() => ts.version,                          true],
+          [() => ts.default.version,                  false],
+          [() => __importDefault(ts).version,         false],
+          [() => __importDefault(ts).default.version, true],
+          [() => __importStar(ts).version,            true],
+          [() => __importStar(ts).default.version,    true],
+        ];
+
+        for (const [fn, shouldSucceed] of fns) {
+          let success = false;
+          try {
+            success = !!fn();
+          }
+          catch {}
+          const status = success ? "succeeded" : "failed";
+          if (success === shouldSucceed) {
+            console.log(`${fn.toString()} ${status} as expected.`);
+          }
+          else {
+            console.log(`${fn.toString()} unexpectedly ${status}.`);
+            process.exitCode = 1;
+          }
+        }
+        console.log("ok");
+        EOF
+
+        node ./smoke.js typescript
+        node ./smoke.js typescript/lib/tsserverlibrary
 
   misc:
     runs-on: ubuntu-latest

package-lock.json

@@ -313,7 +313,13 @@ function createBuilderProgramState(newProgram: Program, getCanonicalFileName: Ge
     });
 
     // If the global file is removed, add all files as changed
-    if (useOldState && forEachEntry(oldState!.fileInfos, (info, sourceFilePath) => (outFilePath || info.affectsGlobalScope) && !state.fileInfos.has(sourceFilePath))) {
+    if (useOldState && forEachEntry(oldState!.fileInfos, (info, sourceFilePath) => {
+        if (state.fileInfos.has(sourceFilePath)) return false;
+        if (outFilePath || info.affectsGlobalScope) return true;
+        // if file is deleted we need to write buildInfo again
+        state.buildInfoEmitPending = true;
+        return false;
+    })) {
         BuilderState.getAllFilesExcludingDefaultLibraryFile(state, newProgram, /*firstSourceFile*/ undefined)
             .forEach(file => addFileToChangeSet(state, file.resolvedPath));
     }

src/compiler/builder.ts

@@ -3,7 +3,7 @@ import {
     ExportedModulesFromDeclarationEmit, GetCanonicalFileName, getDirectoryPath, getSourceFileOfNode,
     isDeclarationFileName, isExternalOrCommonJsModule, isGlobalScopeAugmentation, isJsonSourceFile,
     isModuleWithStringLiteralName, isStringLiteral, mapDefined, mapDefinedIterator, ModuleDeclaration,
-    ModuleKind, outFile, OutputFile, Path, Program, some, SourceFile, StringLiteralLike, Symbol,
+    ModuleKind, outFile, OutputFile, Path, Program, ResolutionMode, some, SourceFile, StringLiteralLike, Symbol,
     toPath, TypeChecker,
 } from "./_namespaces/ts";
 
@@ -75,7 +75,7 @@ export namespace BuilderState {
         readonly version: string;
         signature: string | undefined;
         affectsGlobalScope: true | undefined;
-        impliedFormat: SourceFile["impliedNodeFormat"];
+        impliedFormat: ResolutionMode;
     }
 
     export interface ReadonlyManyToManyPathMap {