@typescript-deploys/pr-build 5.3.0-pr-55718-6 → 5.3.0-pr-55727-2

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20230912`;
+var version = `${versionMajorMinor}.0-insiders.20230913`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -36691,7 +36691,7 @@ function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, e
     return false;
   }
   for (const ext of extensionGroup) {
-    if (fileExtensionIs(file, ext)) {
+    if (fileExtensionIs(file, ext) && (ext !== ".ts" /* Ts */ || !fileExtensionIs(file, ".d.ts" /* Dts */))) {
       return false;
     }
     const higherPriorityPath = keyMapper(changeExtension(file, ext));
@@ -73972,11 +73972,7 @@ function createTypeChecker(host) {
             error(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
           }
           checkNaNEquality(errorNode, operator, left, right);
-          if (isUnitType(leftType) && isUnitType(rightType) && isTypeIdenticalTo(leftType, rightType)) {
-            error(errorNode, Diagnostics.This_condition_will_always_return_0, operator === 37 /* EqualsEqualsEqualsToken */ || operator === 35 /* EqualsEqualsToken */ ? "true" : "false");
-          } else {
-            reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
-          }
+          reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
         }
         return booleanType;
       case 104 /* InstanceOfKeyword */:
@@ -81958,11 +81954,11 @@ function createTypeChecker(host) {
       if (fileToDirective.has(file.path))
         return;
       fileToDirective.set(file.path, [key, mode]);
-      for (const { fileName, resolutionMode } of file.referencedFiles) {
+      for (const { fileName } of file.referencedFiles) {
         const resolvedFile = resolveTripleslashReference(fileName, file.fileName);
         const referencedFile = host.getSourceFile(resolvedFile);
         if (referencedFile) {
-          addReferencedFilesToTypeDirective(referencedFile, key, resolutionMode || file.impliedNodeFormat);
+          addReferencedFilesToTypeDirective(referencedFile, key, mode || file.impliedNodeFormat);
         }
       }
     }
@@ -114472,7 +114468,8 @@ function isIgnoredFileFromWildCardWatching({
   currentDirectory,
   useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   writeLog,
-  toPath: toPath3
+  toPath: toPath3,
+  getScriptKind
 }) {
   const newPath = removeIgnoredPath(fileOrDirectoryPath);
   if (!newPath) {
@@ -114482,7 +114479,7 @@ function isIgnoredFileFromWildCardWatching({
   fileOrDirectoryPath = newPath;
   if (fileOrDirectoryPath === watchedDirPath)
     return false;
-  if (hasExtension(fileOrDirectoryPath) && !isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
+  if (hasExtension(fileOrDirectoryPath) && !(isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions) || isSupportedScriptKind())) {
     writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
     return true;
   }
@@ -114511,6 +114508,25 @@ function isIgnoredFileFromWildCardWatching({
   function hasSourceFile(file) {
     return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
   }
+  function isSupportedScriptKind() {
+    if (!getScriptKind)
+      return false;
+    const scriptKind = getScriptKind(fileOrDirectory);
+    switch (scriptKind) {
+      case 3 /* TS */:
+      case 4 /* TSX */:
+      case 7 /* Deferred */:
+      case 5 /* External */:
+        return true;
+      case 1 /* JS */:
+      case 2 /* JSX */:
+        return getAllowJSCompilerOption(options);
+      case 6 /* JSON */:
+        return getResolveJsonModule(options);
+      case 0 /* Unknown */:
+        return false;
+    }
+  }
 }
 function isBuilderProgram(program) {
   return !!program.getState;

package/lib/tsserver.js

@@ -2327,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20230912`;
+var version = `${versionMajorMinor}.0-insiders.20230913`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -41122,7 +41122,7 @@ function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, e
     return false;
   }
   for (const ext of extensionGroup) {
-    if (fileExtensionIs(file, ext)) {
+    if (fileExtensionIs(file, ext) && (ext !== ".ts" /* Ts */ || !fileExtensionIs(file, ".d.ts" /* Dts */))) {
       return false;
     }
     const higherPriorityPath = keyMapper(changeExtension(file, ext));
@@ -78674,11 +78674,7 @@ function createTypeChecker(host) {
             error2(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
           }
           checkNaNEquality(errorNode, operator, left, right);
-          if (isUnitType(leftType) && isUnitType(rightType) && isTypeIdenticalTo(leftType, rightType)) {
-            error2(errorNode, Diagnostics.This_condition_will_always_return_0, operator === 37 /* EqualsEqualsEqualsToken */ || operator === 35 /* EqualsEqualsToken */ ? "true" : "false");
-          } else {
-            reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
-          }
+          reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
         }
         return booleanType;
       case 104 /* InstanceOfKeyword */:
@@ -86660,11 +86656,11 @@ function createTypeChecker(host) {
       if (fileToDirective.has(file.path))
         return;
       fileToDirective.set(file.path, [key, mode]);
-      for (const { fileName, resolutionMode } of file.referencedFiles) {
+      for (const { fileName } of file.referencedFiles) {
         const resolvedFile = resolveTripleslashReference(fileName, file.fileName);
         const referencedFile = host.getSourceFile(resolvedFile);
         if (referencedFile) {
-          addReferencedFilesToTypeDirective(referencedFile, key, resolutionMode || file.impliedNodeFormat);
+          addReferencedFilesToTypeDirective(referencedFile, key, mode || file.impliedNodeFormat);
         }
       }
     }
@@ -119373,7 +119369,8 @@ function isIgnoredFileFromWildCardWatching({
   currentDirectory,
   useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   writeLog,
-  toPath: toPath3
+  toPath: toPath3,
+  getScriptKind: getScriptKind2
 }) {
   const newPath = removeIgnoredPath(fileOrDirectoryPath);
   if (!newPath) {
@@ -119383,7 +119380,7 @@ function isIgnoredFileFromWildCardWatching({
   fileOrDirectoryPath = newPath;
   if (fileOrDirectoryPath === watchedDirPath)
     return false;
-  if (hasExtension(fileOrDirectoryPath) && !isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
+  if (hasExtension(fileOrDirectoryPath) && !(isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions) || isSupportedScriptKind())) {
     writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
     return true;
   }
@@ -119412,6 +119409,25 @@ function isIgnoredFileFromWildCardWatching({
   function hasSourceFile(file) {
     return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
   }
+  function isSupportedScriptKind() {
+    if (!getScriptKind2)
+      return false;
+    const scriptKind = getScriptKind2(fileOrDirectory);
+    switch (scriptKind) {
+      case 3 /* TS */:
+      case 4 /* TSX */:
+      case 7 /* Deferred */:
+      case 5 /* External */:
+        return true;
+      case 1 /* JS */:
+      case 2 /* JSX */:
+        return getAllowJSCompilerOption(options);
+      case 6 /* JSON */:
+        return getResolveJsonModule(options);
+      case 0 /* Unknown */:
+        return false;
+    }
+  }
 }
 function isBuilderProgram(program) {
   return !!program.getState;
@@ -169698,7 +169714,7 @@ function getAllRules() {
     // insert space after '?' only when it is used in conditional operator
     rule("SpaceAfterQuestionMarkInConditionalOperator", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isConditionalOperatorContext], 4 /* InsertSpace */),
     // in other cases there should be no space between '?' and next token
-    rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
+    rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isNonOptionalPropertyContext], 16 /* DeleteSpace */),
     rule("NoSpaceBeforeDot", anyToken, [25 /* DotToken */, 29 /* QuestionDotToken */], [isNonJsxSameLineTokenContext, isNotPropertyAccessOnIntegerLiteral], 16 /* DeleteSpace */),
     rule("NoSpaceAfterDot", [25 /* DotToken */, 29 /* QuestionDotToken */], anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
     rule("NoSpaceBetweenImportParenInImportType", 102 /* ImportKeyword */, 21 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 16 /* DeleteSpace */),
@@ -170043,6 +170059,12 @@ function isTypeAnnotationContext(context) {
   const contextKind = context.contextNode.kind;
   return contextKind === 172 /* PropertyDeclaration */ || contextKind === 171 /* PropertySignature */ || contextKind === 169 /* Parameter */ || contextKind === 260 /* VariableDeclaration */ || isFunctionLikeKind(contextKind);
 }
+function isOptionalPropertyContext(context) {
+  return isPropertyDeclaration(context.contextNode) && context.contextNode.questionToken;
+}
+function isNonOptionalPropertyContext(context) {
+  return !isOptionalPropertyContext(context);
+}
 function isConditionalOperatorContext(context) {
   return context.contextNode.kind === 227 /* ConditionalExpression */ || context.contextNode.kind === 194 /* ConditionalType */;
 }
@@ -176190,7 +176212,7 @@ var Project3 = class _Project {
     return scriptInfo;
   }
   getScriptKind(fileName) {
-    const info = this.getOrCreateScriptInfoAndAttachToProject(fileName);
+    const info = this.projectService.getScriptInfoForPath(this.toPath(fileName));
     return info && info.scriptKind;
   }
   getScriptVersion(filename) {
@@ -179007,7 +179029,8 @@ var _ProjectService = class _ProjectService {
           program: (configuredProjectForConfig == null ? void 0 : configuredProjectForConfig.getCurrentProgram()) || config.parsedCommandLine.fileNames,
           useCaseSensitiveFileNames: this.host.useCaseSensitiveFileNames,
           writeLog: (s) => this.logger.info(s),
-          toPath: (s) => this.toPath(s)
+          toPath: (s) => this.toPath(s),
+          getScriptKind: configuredProjectForConfig ? (fileName) => configuredProjectForConfig.getScriptKind(fileName) : void 0
         }))
           return;
         if (config.reloadLevel !== 2 /* Full */)

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-insiders.20230912`;
+      version = `${versionMajorMinor}.0-insiders.20230913`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -37443,7 +37443,7 @@ ${lanes.join("\n")}
       return false;
     }
     for (const ext of extensionGroup) {
-      if (fileExtensionIs(file, ext)) {
+      if (fileExtensionIs(file, ext) && (ext !== ".ts" /* Ts */ || !fileExtensionIs(file, ".d.ts" /* Dts */))) {
         return false;
       }
       const higherPriorityPath = keyMapper(changeExtension(file, ext));
@@ -76441,11 +76441,7 @@ ${lanes.join("\n")}
               error2(errorNode, Diagnostics.This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value, eqType ? "false" : "true");
             }
             checkNaNEquality(errorNode, operator, left, right);
-            if (isUnitType(leftType) && isUnitType(rightType) && isTypeIdenticalTo(leftType, rightType)) {
-              error2(errorNode, Diagnostics.This_condition_will_always_return_0, operator === 37 /* EqualsEqualsEqualsToken */ || operator === 35 /* EqualsEqualsToken */ ? "true" : "false");
-            } else {
-              reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
-            }
+            reportOperatorErrorUnless((left2, right2) => isTypeEqualityComparableTo(left2, right2) || isTypeEqualityComparableTo(right2, left2));
           }
           return booleanType;
         case 104 /* InstanceOfKeyword */:
@@ -84427,11 +84423,11 @@ ${lanes.join("\n")}
         if (fileToDirective.has(file.path))
           return;
         fileToDirective.set(file.path, [key, mode]);
-        for (const { fileName, resolutionMode } of file.referencedFiles) {
+        for (const { fileName } of file.referencedFiles) {
           const resolvedFile = resolveTripleslashReference(fileName, file.fileName);
           const referencedFile = host.getSourceFile(resolvedFile);
           if (referencedFile) {
-            addReferencedFilesToTypeDirective(referencedFile, key, resolutionMode || file.impliedNodeFormat);
+            addReferencedFilesToTypeDirective(referencedFile, key, mode || file.impliedNodeFormat);
           }
         }
       }
@@ -117470,7 +117466,8 @@ ${lanes.join("\n")}
     currentDirectory,
     useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
     writeLog,
-    toPath: toPath3
+    toPath: toPath3,
+    getScriptKind: getScriptKind2
   }) {
     const newPath = removeIgnoredPath(fileOrDirectoryPath);
     if (!newPath) {
@@ -117480,7 +117477,7 @@ ${lanes.join("\n")}
     fileOrDirectoryPath = newPath;
     if (fileOrDirectoryPath === watchedDirPath)
       return false;
-    if (hasExtension(fileOrDirectoryPath) && !isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions)) {
+    if (hasExtension(fileOrDirectoryPath) && !(isSupportedSourceFileName(fileOrDirectory, options, extraFileExtensions) || isSupportedScriptKind())) {
       writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
       return true;
     }
@@ -117509,6 +117506,25 @@ ${lanes.join("\n")}
     function hasSourceFile(file) {
       return realProgram ? !!realProgram.getSourceFileByPath(file) : builderProgram ? builderProgram.getState().fileInfos.has(file) : !!find(program, (rootFile) => toPath3(rootFile) === file);
     }
+    function isSupportedScriptKind() {
+      if (!getScriptKind2)
+        return false;
+      const scriptKind = getScriptKind2(fileOrDirectory);
+      switch (scriptKind) {
+        case 3 /* TS */:
+        case 4 /* TSX */:
+        case 7 /* Deferred */:
+        case 5 /* External */:
+          return true;
+        case 1 /* JS */:
+        case 2 /* JSX */:
+          return getAllowJSCompilerOption(options);
+        case 6 /* JSON */:
+          return getResolveJsonModule(options);
+        case 0 /* Unknown */:
+          return false;
+      }
+    }
   }
   function isBuilderProgram(program) {
     return !!program.getState;
@@ -169170,7 +169186,7 @@ ${options.prefix}` : "\n" : options.prefix
       // insert space after '?' only when it is used in conditional operator
       rule("SpaceAfterQuestionMarkInConditionalOperator", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isConditionalOperatorContext], 4 /* InsertSpace */),
       // in other cases there should be no space between '?' and next token
-      rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
+      rule("NoSpaceAfterQuestionMark", 58 /* QuestionToken */, anyToken, [isNonJsxSameLineTokenContext, isNonOptionalPropertyContext], 16 /* DeleteSpace */),
       rule("NoSpaceBeforeDot", anyToken, [25 /* DotToken */, 29 /* QuestionDotToken */], [isNonJsxSameLineTokenContext, isNotPropertyAccessOnIntegerLiteral], 16 /* DeleteSpace */),
       rule("NoSpaceAfterDot", [25 /* DotToken */, 29 /* QuestionDotToken */], anyToken, [isNonJsxSameLineTokenContext], 16 /* DeleteSpace */),
       rule("NoSpaceBetweenImportParenInImportType", 102 /* ImportKeyword */, 21 /* OpenParenToken */, [isNonJsxSameLineTokenContext, isImportTypeContext], 16 /* DeleteSpace */),
@@ -169515,6 +169531,12 @@ ${options.prefix}` : "\n" : options.prefix
     const contextKind = context.contextNode.kind;
     return contextKind === 172 /* PropertyDeclaration */ || contextKind === 171 /* PropertySignature */ || contextKind === 169 /* Parameter */ || contextKind === 260 /* VariableDeclaration */ || isFunctionLikeKind(contextKind);
   }
+  function isOptionalPropertyContext(context) {
+    return isPropertyDeclaration(context.contextNode) && context.contextNode.questionToken;
+  }
+  function isNonOptionalPropertyContext(context) {
+    return !isOptionalPropertyContext(context);
+  }
   function isConditionalOperatorContext(context) {
     return context.contextNode.kind === 227 /* ConditionalExpression */ || context.contextNode.kind === 194 /* ConditionalType */;
   }
@@ -173532,7 +173554,7 @@ ${options.prefix}` : "\n" : options.prefix
           return scriptInfo;
         }
         getScriptKind(fileName) {
-          const info = this.getOrCreateScriptInfoAndAttachToProject(fileName);
+          const info = this.projectService.getScriptInfoForPath(this.toPath(fileName));
           return info && info.scriptKind;
         }
         getScriptVersion(filename) {
@@ -176353,7 +176375,8 @@ ${options.prefix}` : "\n" : options.prefix
                 program: (configuredProjectForConfig == null ? void 0 : configuredProjectForConfig.getCurrentProgram()) || config.parsedCommandLine.fileNames,
                 useCaseSensitiveFileNames: this.host.useCaseSensitiveFileNames,
                 writeLog: (s) => this.logger.info(s),
-                toPath: (s) => this.toPath(s)
+                toPath: (s) => this.toPath(s),
+                getScriptKind: configuredProjectForConfig ? (fileName) => configuredProjectForConfig.getScriptKind(fileName) : void 0
               }))
                 return;
               if (config.reloadLevel !== 2 /* Full */)

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20230912`;
+var version = `${versionMajorMinor}.0-insiders.20230913`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.3.0-pr-55718-6",
+  "version": "5.3.0-pr-55727-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -113,5 +113,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "3746c7e4e22e0b0b56c18c3463f73aef5e0faa52"
+  "gitHead": "93ec2799df89a9621eb6cc3c4bf2367d6b6c0436"
 }