npm - @typescript-deploys/pr-build - Versions diffs - 5.1.0-pr-52062-4 → 5.1.0-pr-53292-2 - Mend

@typescript-deploys/pr-build 5.1.0-pr-52062-4 → 5.1.0-pr-53292-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/tsc.js CHANGED Viewed

@@ -55721,7 +55721,7 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
+        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
           addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
         } else if (isTupleType(type)) {
           const elements = getTypeArguments(type);
@@ -58635,8 +58635,20 @@ function createTypeChecker(host) {
         return result;
       }
       const moreThanOneRealChildren = length(validChildren) > 1;
-      const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
-      const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
+      let arrayLikeTargetParts;
+      let nonArrayLikeTargetParts;
+      const iterableType = getGlobalIterableType(
+        /*reportErrors*/
+        false
+      );
+      if (iterableType !== emptyGenericType) {
+        const anyIterable = createIterableType(anyType);
+        arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
+        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
+      } else {
+        arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
+        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
+      }
       if (moreThanOneRealChildren) {
         if (arrayLikeTargetParts !== neverType) {
           const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -61916,13 +61928,6 @@ function createTypeChecker(host) {
   function isArrayOrTupleLikeType(type) {
     return isArrayLikeType(type) || isTupleLikeType(type);
   }
-  function isAssignableToAvailableAnyIterable(type) {
-    const anyIterable = getGlobalIterableType(
-      /*reportErrors*/
-      false
-    ) !== emptyGenericType && createIterableType(anyType);
-    return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
-  }
   function getTupleElementType(type, index) {
     const propType = getTypeOfPropertyOfType(type, "" + index);
     if (propType) {
@@ -66596,17 +66601,13 @@ function createTypeChecker(host) {
       type,
       (t) => {
         var _a2;
-        if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
-          const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
-            const mappedType = t2;
-            const constraint = getConstraintTypeFromMappedType(mappedType);
-            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-              return substituteIndexedMappedType(mappedType, propertyNameType);
-            }
-          });
-          return newTypes.length ? getIntersectionType(newTypes) : void 0;
+        if (isGenericMappedType(t) && !t.declaration.nameType) {
+          const constraint = getConstraintTypeFromMappedType(t);
+          const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+          const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+          if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+            return substituteIndexedMappedType(t, propertyNameType);
+          }
         } else if (t.flags & 3670016 /* StructuredType */) {
           const prop = getPropertyOfType(t, name);
           if (prop) {
@@ -66680,7 +66681,7 @@ function createTypeChecker(host) {
     return void 0;
   }
   function getContextualTypeForElementExpression(arrayContextualType, index) {
-    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
+    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
       arrayContextualType,
       (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
         t,

package/lib/tsserver.js CHANGED Viewed

@@ -60318,7 +60318,7 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
+        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
           addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
         } else if (isTupleType(type)) {
           const elements = getTypeArguments(type);
@@ -63232,8 +63232,20 @@ function createTypeChecker(host) {
         return result;
       }
       const moreThanOneRealChildren = length(validChildren) > 1;
-      const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
-      const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
+      let arrayLikeTargetParts;
+      let nonArrayLikeTargetParts;
+      const iterableType = getGlobalIterableType(
+        /*reportErrors*/
+        false
+      );
+      if (iterableType !== emptyGenericType) {
+        const anyIterable = createIterableType(anyType);
+        arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
+        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
+      } else {
+        arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
+        nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
+      }
       if (moreThanOneRealChildren) {
         if (arrayLikeTargetParts !== neverType) {
           const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -66513,13 +66525,6 @@ function createTypeChecker(host) {
   function isArrayOrTupleLikeType(type) {
     return isArrayLikeType(type) || isTupleLikeType(type);
   }
-  function isAssignableToAvailableAnyIterable(type) {
-    const anyIterable = getGlobalIterableType(
-      /*reportErrors*/
-      false
-    ) !== emptyGenericType && createIterableType(anyType);
-    return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
-  }
   function getTupleElementType(type, index) {
     const propType = getTypeOfPropertyOfType(type, "" + index);
     if (propType) {
@@ -71193,17 +71198,13 @@ function createTypeChecker(host) {
       type,
       (t) => {
         var _a2;
-        if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
-          const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
-            const mappedType = t2;
-            const constraint = getConstraintTypeFromMappedType(mappedType);
-            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-              return substituteIndexedMappedType(mappedType, propertyNameType);
-            }
-          });
-          return newTypes.length ? getIntersectionType(newTypes) : void 0;
+        if (isGenericMappedType(t) && !t.declaration.nameType) {
+          const constraint = getConstraintTypeFromMappedType(t);
+          const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+          const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+          if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+            return substituteIndexedMappedType(t, propertyNameType);
+          }
         } else if (t.flags & 3670016 /* StructuredType */) {
           const prop = getPropertyOfType(t, name);
           if (prop) {
@@ -71277,7 +71278,7 @@ function createTypeChecker(host) {
     return void 0;
   }
   function getContextualTypeForElementExpression(arrayContextualType, index) {
-    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
+    return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
       arrayContextualType,
       (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
         t,

package/lib/tsserverlibrary.js CHANGED Viewed

@@ -58128,7 +58128,7 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
+          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
             addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
           } else if (isTupleType(type)) {
             const elements = getTypeArguments(type);
@@ -61042,8 +61042,20 @@ ${lanes.join("\n")}
           return result;
         }
         const moreThanOneRealChildren = length(validChildren) > 1;
-        const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
-        const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
+        let arrayLikeTargetParts;
+        let nonArrayLikeTargetParts;
+        const iterableType = getGlobalIterableType(
+          /*reportErrors*/
+          false
+        );
+        if (iterableType !== emptyGenericType) {
+          const anyIterable = createIterableType(anyType);
+          arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
+          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
+        } else {
+          arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
+          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
+        }
         if (moreThanOneRealChildren) {
           if (arrayLikeTargetParts !== neverType) {
             const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -64323,13 +64335,6 @@ ${lanes.join("\n")}
     function isArrayOrTupleLikeType(type) {
       return isArrayLikeType(type) || isTupleLikeType(type);
     }
-    function isAssignableToAvailableAnyIterable(type) {
-      const anyIterable = getGlobalIterableType(
-        /*reportErrors*/
-        false
-      ) !== emptyGenericType && createIterableType(anyType);
-      return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
-    }
     function getTupleElementType(type, index) {
       const propType = getTypeOfPropertyOfType(type, "" + index);
       if (propType) {
@@ -69003,17 +69008,13 @@ ${lanes.join("\n")}
         type,
         (t) => {
           var _a2;
-          if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
-            const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
-              const mappedType = t2;
-              const constraint = getConstraintTypeFromMappedType(mappedType);
-              const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-              const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-              if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-                return substituteIndexedMappedType(mappedType, propertyNameType);
-              }
-            });
-            return newTypes.length ? getIntersectionType(newTypes) : void 0;
+          if (isGenericMappedType(t) && !t.declaration.nameType) {
+            const constraint = getConstraintTypeFromMappedType(t);
+            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+              return substituteIndexedMappedType(t, propertyNameType);
+            }
           } else if (t.flags & 3670016 /* StructuredType */) {
             const prop = getPropertyOfType(t, name);
             if (prop) {
@@ -69087,7 +69088,7 @@ ${lanes.join("\n")}
       return void 0;
     }
     function getContextualTypeForElementExpression(arrayContextualType, index) {
-      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
+      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
         arrayContextualType,
         (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
           t,

package/lib/typescript.js CHANGED Viewed

@@ -58128,7 +58128,7 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || everyContainedType(type, isGenericMappedType)) {
+          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
             addElement(type, 8 /* Variadic */, (_a2 = target.labeledElementDeclarations) == null ? void 0 : _a2[i]);
           } else if (isTupleType(type)) {
             const elements = getTypeArguments(type);
@@ -61042,8 +61042,20 @@ ${lanes.join("\n")}
           return result;
         }
         const moreThanOneRealChildren = length(validChildren) > 1;
-        const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
-        const nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isAssignableToAvailableAnyIterable(t));
+        let arrayLikeTargetParts;
+        let nonArrayLikeTargetParts;
+        const iterableType = getGlobalIterableType(
+          /*reportErrors*/
+          false
+        );
+        if (iterableType !== emptyGenericType) {
+          const anyIterable = createIterableType(anyType);
+          arrayLikeTargetParts = filterType(childrenTargetType, (t) => isTypeAssignableTo(t, anyIterable));
+          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isTypeAssignableTo(t, anyIterable));
+        } else {
+          arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
+          nonArrayLikeTargetParts = filterType(childrenTargetType, (t) => !isArrayOrTupleLikeType(t));
+        }
         if (moreThanOneRealChildren) {
           if (arrayLikeTargetParts !== neverType) {
             const realSource = createTupleType(checkJsxChildren(containingElement, 0 /* Normal */));
@@ -64323,13 +64335,6 @@ ${lanes.join("\n")}
     function isArrayOrTupleLikeType(type) {
       return isArrayLikeType(type) || isTupleLikeType(type);
     }
-    function isAssignableToAvailableAnyIterable(type) {
-      const anyIterable = getGlobalIterableType(
-        /*reportErrors*/
-        false
-      ) !== emptyGenericType && createIterableType(anyType);
-      return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
-    }
     function getTupleElementType(type, index) {
       const propType = getTypeOfPropertyOfType(type, "" + index);
       if (propType) {
@@ -69003,17 +69008,13 @@ ${lanes.join("\n")}
         type,
         (t) => {
           var _a2;
-          if (everyContainedType(t, (t2) => isGenericMappedType(t2) && !t2.declaration.nameType)) {
-            const newTypes = mapDefined(t.flags & 2097152 /* Intersection */ ? t.types : [t], (t2) => {
-              const mappedType = t2;
-              const constraint = getConstraintTypeFromMappedType(mappedType);
-              const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
-              const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
-              if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
-                return substituteIndexedMappedType(mappedType, propertyNameType);
-              }
-            });
-            return newTypes.length ? getIntersectionType(newTypes) : void 0;
+          if (isGenericMappedType(t) && !t.declaration.nameType) {
+            const constraint = getConstraintTypeFromMappedType(t);
+            const constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
+            const propertyNameType = nameType || getStringLiteralType(unescapeLeadingUnderscores(name));
+            if (isTypeAssignableTo(propertyNameType, constraintOfConstraint)) {
+              return substituteIndexedMappedType(t, propertyNameType);
+            }
           } else if (t.flags & 3670016 /* StructuredType */) {
             const prop = getPropertyOfType(t, name);
             if (prop) {
@@ -69087,7 +69088,7 @@ ${lanes.join("\n")}
       return void 0;
     }
     function getContextualTypeForElementExpression(arrayContextualType, index) {
-      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, (t) => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index) || mapType(
+      return arrayContextualType && (index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index) || mapType(
         arrayContextualType,
         (t) => isTupleType(t) ? getElementTypeOfSliceOfTupleType(
           t,

package/lib/typingsInstaller.js CHANGED Viewed

@@ -31585,21 +31585,24 @@ function installNpmPackages(npmPath, tsVersion, packageNames, install) {
   for (let remaining = packageNames.length; remaining > 0; ) {
     const result = getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining);
     remaining = result.remaining;
-    hasError = install(result.command) || hasError;
+    hasError = install(result.command, result.args) || hasError;
   }
   return hasError;
 }
 function getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remaining) {
   const sliceStart = packageNames.length - remaining;
-  let command, toSlice = remaining;
+  let toSlice = remaining;
+  let args;
   while (true) {
-    command = `${npmPath} install --ignore-scripts ${(toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice)).join(" ")} --save-dev --user-agent="typesInstaller/${tsVersion}"`;
-    if (command.length < 8e3) {
+    const slice = toSlice === packageNames.length ? packageNames : packageNames.slice(sliceStart, sliceStart + toSlice);
+    const length2 = reduceLeft(slice, (total, pkg) => total + pkg.length, 0);
+    if (length2 < 8e3) {
+      args = ["install", "--ignore-scripts", ...slice, "--save-dev", `--user-agent=typesInstaller/${tsVersion}`];
       break;
     }
     toSlice = toSlice - Math.floor(toSlice / 2);
   }
-  return { command, remaining: remaining - toSlice };
+  return { command: npmPath, args, remaining: remaining - toSlice };
 }
 function endsWith2(str, suffix, caseSensitive) {
   const expectedPos = str.length - suffix.length;
@@ -32059,13 +32062,13 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       this.log.writeLine(`NPM location: ${this.npmPath} (explicit '${Arguments.NpmLocation}' ${npmLocation2 === void 0 ? "not " : ""} provided)`);
       this.log.writeLine(`validateDefaultNpmLocation: ${validateDefaultNpmLocation2}`);
     }
-    ({ execSync: this.nodeExecSync } = require("child_process"));
+    ({ execSync: this.nodeExecFileSync } = require("child_process"));
     this.ensurePackageDirectoryExists(globalTypingsCacheLocation2);
     try {
       if (this.log.isEnabled()) {
         this.log.writeLine(`Updating ${typesRegistryPackageName} npm package...`);
       }
-      this.execSyncAndLog(`${this.npmPath} install --ignore-scripts ${typesRegistryPackageName}@${this.latestDistTag}`, { cwd: globalTypingsCacheLocation2 });
+      this.execFileSyncAndLog(this.npmPath, ["install", "--ignore-scripts", `${typesRegistryPackageName}@${this.latestDistTag}`], { cwd: globalTypingsCacheLocation2 });
       if (this.log.isEnabled()) {
         this.log.writeLine(`Updated ${typesRegistryPackageName} npm package`);
       }
@@ -32136,19 +32139,19 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
       this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(packageNames)}'.`);
     }
     const start = Date.now();
-    const hasError = installNpmPackages(this.npmPath, version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
+    const hasError = installNpmPackages(this.npmPath, version, packageNames, (command, args) => this.execFileSyncAndLog(command, args, { cwd }));
     if (this.log.isEnabled()) {
       this.log.writeLine(`npm install #${requestId} took: ${Date.now() - start} ms`);
     }
     onRequestCompleted(!hasError);
   }
   /** Returns 'true' in case of error. */
-  execSyncAndLog(command, options) {
+  execFileSyncAndLog(command, args, options) {
     if (this.log.isEnabled()) {
       this.log.writeLine(`Exec: ${command}`);
     }
     try {
-      const stdout = this.nodeExecSync(command, { ...options, encoding: "utf-8" });
+      const stdout = this.nodeExecFileSync(command, args, { ...options, encoding: "utf-8", timeout: 1e4 });
       if (this.log.isEnabled()) {
         this.log.writeLine(`    Succeeded. stdout:${indent(sys.newLine, stdout)}`);
       }

package/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-52062-4",
+  "version": "5.1.0-pr-53292-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "fec434c9c2e6e099b6887aa0986abf354b0c05c5"
+  "gitHead": "d914d6c336c9c603779e8e9001e3be829e54b878"
 }