@typescript-deploys/pr-build 5.7.0-pr-59759-2 → 5.7.0-pr-59736-2

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-insiders.20240826`;
+var version = `${versionMajorMinor}.0-insiders.20240827`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -1203,73 +1203,6 @@ function skipWhile(array, predicate) {
 function isNodeLikeSystem() {
   return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof require !== "undefined";
 }
-function createPrefixSuffixTrie() {
-  function createTrie() {
-    return {
-      children: void 0,
-      value: void 0
-    };
-  }
-  const root = createTrie();
-  function* iterateAllMatches(input) {
-    var _a;
-    let node = root;
-    if (node.value) {
-      yield* iterateSuffix(node.value, 0);
-    }
-    for (let i = 0; i < input.length; i++) {
-      const child = (_a = node.children) == null ? void 0 : _a[input[i]];
-      if (!child) break;
-      if (child.value) {
-        yield* iterateSuffix(child.value, i + 1);
-      }
-      node = child;
-    }
-    return;
-    function* iterateSuffix(node2, start) {
-      var _a2;
-      if (node2.value) {
-        yield node2.value;
-      }
-      for (let i = input.length - 1; i >= start; i--) {
-        const child = (_a2 = node2.children) == null ? void 0 : _a2[input[i]];
-        if (!child) break;
-        if (child.value) {
-          yield child.value;
-        }
-        node2 = child;
-      }
-    }
-  }
-  function set(prefix, suffix, fn) {
-    let prefixNode = root;
-    for (let i = 0; i < prefix.length; i++) {
-      const char = prefix[i];
-      const children = prefixNode.children ?? (prefixNode.children = {});
-      const child = children[char] ?? (children[char] = createTrie());
-      prefixNode = child;
-    }
-    let suffixNode = prefixNode.value ?? (prefixNode.value = createTrie());
-    for (let i = suffix.length - 1; i >= 0; i--) {
-      const char = suffix[i];
-      const children = suffixNode.children ?? (suffixNode.children = {});
-      const child = children[char] ?? (children[char] = createTrie());
-      suffixNode = child;
-    }
-    suffixNode.value = fn(suffixNode.value);
-  }
-  function hasAnyMatch(input) {
-    for (const _ of iterateAllMatches(input)) {
-      return true;
-    }
-    return false;
-  }
-  return {
-    iterateAllMatches,
-    set,
-    hasAnyMatch
-  };
-}
 
 // src/compiler/debug.ts
 var Debug;
@@ -59988,38 +59921,13 @@ function createTypeChecker(host) {
     }
   }
   function removeStringLiteralsMatchedByTemplateLiterals(types) {
-    let patterns = filter(types, isPatternLiteralType);
-    const templateLiterals = filter(patterns, (t) => !!(t.flags & 134217728 /* TemplateLiteral */));
-    const estimatedCount = templateLiterals.length * countWhere(types, (t) => !!(t.flags & 128 /* StringLiteral */));
-    if (estimatedCount > 0) {
-      const trie = createPrefixSuffixTrie();
-      forEach(templateLiterals, (t) => {
-        const prefix = t.texts[0];
-        const suffix = t.texts[t.texts.length - 1];
-        trie.set(prefix, suffix, (templates) => append(templates, t));
-      });
-      let i = types.length;
-      outer: while (i > 0) {
-        i--;
-        const t = types[i];
-        if (!(t.flags & 128 /* StringLiteral */)) continue;
-        const text = t.value;
-        for (const templates of trie.iterateAllMatches(text)) {
-          if (some(templates, (template) => isTypeMatchedByTemplateLiteralOrStringMapping(t, template))) {
-            orderedRemoveItemAt(types, i);
-            continue outer;
-          }
-        }
-      }
-      patterns = filter(patterns, (t) => !!(t.flags & 268435456 /* StringMapping */));
-    }
-    if (patterns.length) {
+    const templates = filter(types, isPatternLiteralType);
+    if (templates.length) {
       let i = types.length;
       while (i > 0) {
         i--;
         const t = types[i];
-        if (!(t.flags & 128 /* StringLiteral */)) continue;
-        if (some(patterns, (template) => isTypeMatchedByTemplateLiteralOrStringMapping(t, template))) {
+        if (t.flags & 128 /* StringLiteral */ && some(templates, (template) => isTypeMatchedByTemplateLiteralOrStringMapping(t, template))) {
           orderedRemoveItemAt(types, i);
         }
       }
@@ -78290,6 +78198,7 @@ function createTypeChecker(host) {
       case 214 /* NewExpression */:
       case 211 /* PropertyAccessExpression */:
       case 229 /* YieldExpression */:
+      case 110 /* ThisKeyword */:
         return 3 /* Sometimes */;
       case 226 /* BinaryExpression */:
         switch (node.operatorToken.kind) {

package/lib/typescript.js

@@ -429,7 +429,6 @@ __export(typescript_exports, {
   createPackageJsonInfo: () => createPackageJsonInfo,
   createParenthesizerRules: () => createParenthesizerRules,
   createPatternMatcher: () => createPatternMatcher,
-  createPrefixSuffixTrie: () => createPrefixSuffixTrie,
   createPrinter: () => createPrinter,
   createPrinterWithDefaults: () => createPrinterWithDefaults,
   createPrinterWithRemoveComments: () => createPrinterWithRemoveComments,
@@ -2266,7 +2265,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-insiders.20240826`;
+var version = `${versionMajorMinor}.0-insiders.20240827`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3746,73 +3745,6 @@ function skipWhile(array, predicate) {
 function isNodeLikeSystem() {
   return typeof process !== "undefined" && !!process.nextTick && !process.browser && typeof require !== "undefined";
 }
-function createPrefixSuffixTrie() {
-  function createTrie() {
-    return {
-      children: void 0,
-      value: void 0
-    };
-  }
-  const root = createTrie();
-  function* iterateAllMatches(input) {
-    var _a;
-    let node = root;
-    if (node.value) {
-      yield* iterateSuffix(node.value, 0);
-    }
-    for (let i = 0; i < input.length; i++) {
-      const child = (_a = node.children) == null ? void 0 : _a[input[i]];
-      if (!child) break;
-      if (child.value) {
-        yield* iterateSuffix(child.value, i + 1);
-      }
-      node = child;
-    }
-    return;
-    function* iterateSuffix(node2, start) {
-      var _a2;
-      if (node2.value) {
-        yield node2.value;
-      }
-      for (let i = input.length - 1; i >= start; i--) {
-        const child = (_a2 = node2.children) == null ? void 0 : _a2[input[i]];
-        if (!child) break;
-        if (child.value) {
-          yield child.value;
-        }
-        node2 = child;
-      }
-    }
-  }
-  function set(prefix, suffix, fn) {
-    let prefixNode = root;
-    for (let i = 0; i < prefix.length; i++) {
-      const char = prefix[i];
-      const children = prefixNode.children ?? (prefixNode.children = {});
-      const child = children[char] ?? (children[char] = createTrie());
-      prefixNode = child;
-    }
-    let suffixNode = prefixNode.value ?? (prefixNode.value = createTrie());
-    for (let i = suffix.length - 1; i >= 0; i--) {
-      const char = suffix[i];
-      const children = suffixNode.children ?? (suffixNode.children = {});
-      const child = children[char] ?? (children[char] = createTrie());
-      suffixNode = child;
-    }
-    suffixNode.value = fn(suffixNode.value);
-  }
-  function hasAnyMatch(input) {
-    for (const _ of iterateAllMatches(input)) {
-      return true;
-    }
-    return false;
-  }
-  return {
-    iterateAllMatches,
-    set,
-    hasAnyMatch
-  };
-}
 
 // src/compiler/debug.ts
 var LogLevel = /* @__PURE__ */ ((LogLevel3) => {
@@ -64611,38 +64543,13 @@ function createTypeChecker(host) {
     }
   }
   function removeStringLiteralsMatchedByTemplateLiterals(types) {
-    let patterns = filter(types, isPatternLiteralType);
-    const templateLiterals = filter(patterns, (t) => !!(t.flags & 134217728 /* TemplateLiteral */));
-    const estimatedCount = templateLiterals.length * countWhere(types, (t) => !!(t.flags & 128 /* StringLiteral */));
-    if (estimatedCount > 0) {
-      const trie = createPrefixSuffixTrie();
-      forEach(templateLiterals, (t) => {
-        const prefix = t.texts[0];
-        const suffix = t.texts[t.texts.length - 1];
-        trie.set(prefix, suffix, (templates) => append(templates, t));
-      });
-      let i = types.length;
-      outer: while (i > 0) {
-        i--;
-        const t = types[i];
-        if (!(t.flags & 128 /* StringLiteral */)) continue;
-        const text = t.value;
-        for (const templates of trie.iterateAllMatches(text)) {
-          if (some(templates, (template) => isTypeMatchedByTemplateLiteralOrStringMapping(t, template))) {
-            orderedRemoveItemAt(types, i);
-            continue outer;
-          }
-        }
-      }
-      patterns = filter(patterns, (t) => !!(t.flags & 268435456 /* StringMapping */));
-    }
-    if (patterns.length) {
+    const templates = filter(types, isPatternLiteralType);
+    if (templates.length) {
       let i = types.length;
       while (i > 0) {
         i--;
         const t = types[i];
-        if (!(t.flags & 128 /* StringLiteral */)) continue;
-        if (some(patterns, (template) => isTypeMatchedByTemplateLiteralOrStringMapping(t, template))) {
+        if (t.flags & 128 /* StringLiteral */ && some(templates, (template) => isTypeMatchedByTemplateLiteralOrStringMapping(t, template))) {
           orderedRemoveItemAt(types, i);
         }
       }
@@ -82913,6 +82820,7 @@ function createTypeChecker(host) {
       case 214 /* NewExpression */:
       case 211 /* PropertyAccessExpression */:
       case 229 /* YieldExpression */:
+      case 110 /* ThisKeyword */:
         return 3 /* Sometimes */;
       case 226 /* BinaryExpression */:
         switch (node.operatorToken.kind) {
@@ -164832,9 +164740,13 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
   if (parentNamedImportOrExport) {
     const languageVersion = getEmitScriptTarget(host.getCompilationSettings());
     if (!isIdentifierText(name, languageVersion)) {
-      insertText = JSON.stringify(name);
+      insertText = quotePropertyName(sourceFile, preferences, name);
       if (parentNamedImportOrExport.kind === 275 /* NamedImports */) {
-        insertText += " as " + generateIdentifierForArbitraryString(name, languageVersion);
+        scanner.setText(sourceFile.text);
+        scanner.resetTokenState(position);
+        if (!(scanner.scan() === 130 /* AsKeyword */ && scanner.scan() === 80 /* Identifier */)) {
+          insertText += " as " + generateIdentifierForArbitraryString(name, languageVersion);
+        }
       }
     } else if (parentNamedImportOrExport.kind === 275 /* NamedImports */) {
       const possibleToken = stringToToken(name);
@@ -167002,7 +166914,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
       case 153 /* SetKeyword */:
         return !isFromObjectTypeDeclaration(contextToken2);
       case 80 /* Identifier */: {
-        if (containingNodeKind === 276 /* ImportSpecifier */ && contextToken2 === parent2.name && contextToken2.text === "type") {
+        if ((containingNodeKind === 276 /* ImportSpecifier */ || containingNodeKind === 281 /* ExportSpecifier */) && contextToken2 === parent2.name && contextToken2.text === "type") {
           return false;
         }
         const ancestorVariableDeclaration = findAncestor(
@@ -178791,6 +178703,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
       Debug.assert(rangeContainsRange(parent2, currentTokenInfo.token));
       const lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine();
       let indentToken = false;
+      let isNewlineSemicolon = false;
       if (currentTokenInfo.leadingTrivia) {
         processTrivia(currentTokenInfo.leadingTrivia, parent2, childContextNode, dynamicIndentation);
       }
@@ -178805,6 +178718,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
           if (lineAction === 0 /* None */) {
             const prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
             indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
+            isNewlineSemicolon = currentTokenInfo.token.kind === 27 /* SemicolonToken */;
           } else {
             indentToken = lineAction === 1 /* LineAdded */;
           }
@@ -178815,7 +178729,7 @@ function formatSpanWorker(originalRange, enclosingNode, initialIndentation, delt
         processTrivia(currentTokenInfo.trailingTrivia, parent2, childContextNode, dynamicIndentation);
       }
       if (indentToken) {
-        const tokenIndentation = isTokenInRange && !rangeContainsError(currentTokenInfo.token) ? dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container, !!isListEndToken) : -1 /* Unknown */;
+        const tokenIndentation = isTokenInRange && !rangeContainsError(currentTokenInfo.token) ? dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container, !!isListEndToken || isNewlineSemicolon) : -1 /* Unknown */;
         let indentNextTokenOrTrivia = true;
         if (currentTokenInfo.leadingTrivia) {
           const commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind, tokenIndentation, container);
@@ -180243,7 +180157,6 @@ __export(ts_exports2, {
   createPackageJsonInfo: () => createPackageJsonInfo,
   createParenthesizerRules: () => createParenthesizerRules,
   createPatternMatcher: () => createPatternMatcher,
-  createPrefixSuffixTrie: () => createPrefixSuffixTrie,
   createPrinter: () => createPrinter,
   createPrinterWithDefaults: () => createPrinterWithDefaults,
   createPrinterWithRemoveComments: () => createPrinterWithRemoveComments,
@@ -194602,7 +194515,6 @@ if (typeof console !== "undefined") {
   createPackageJsonInfo,
   createParenthesizerRules,
   createPatternMatcher,
-  createPrefixSuffixTrie,
   createPrinter,
   createPrinterWithDefaults,
   createPrinterWithRemoveComments,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.7.0-pr-59759-2",
+  "version": "5.7.0-pr-59736-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [