Backports / 11.2.0-beta.1

CHANGELOG.md

@@ -10,14 +10,23 @@
 > - :house: [Internal]
 > - :nail_care: [Polish]
 
-# 11.1.5 (Unreleased)
+# 11.2.0-beta.1
 
-- Handle absolute file paths in gentype https://github.com/rescript-lang/rescript-compiler/pull/7111
-- Deprecate JSX 3 https://github.com/rescript-lang/rescript-compiler/pull/7042
-- Deprecate js_cast.res https://github.com/rescript-lang/rescript-compiler/pull/7074
+#### :boom: Breaking Change
+
+- Deprecate JSX 3. https://github.com/rescript-lang/rescript-compiler/pull/7042
+- Deprecate js_cast.res. https://github.com/rescript-lang/rescript-compiler/pull/7074
 - Deprecate top-level `"suffix"` option in `rescript.json`. https://github.com/rescript-lang/rescript-compiler/pull/7056
 
+#### :bug: Bug Fix
+
+- Handle absolute file paths in gentype. https://github.com/rescript-lang/rescript-compiler/pull/7111
+- Fix "rescript format" with many files. https://github.com/rescript-lang/rescript-compiler/pull/7081
+- Fix exponential notation syntax. https://github.com/rescript-lang/rescript/pull/7174
+- Fix formatter handling of wildcard in pattern matching records with no fields specified. https://github.com/rescript-lang/rescript/pull/7224
+
 #### :house: Internal
+
 - Playground: Bundle and upload stdlib runtime so that the playground can execute functions from Core/Belt/Js. https://github.com/rescript-lang/rescript/pull/7268
 
 # 11.1.4

jscomp/common/bs_version.ml

@@ -21,6 +21,6 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "11.1.4"
+let version = "11.2.0-beta.1"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
 let package_name = ref "rescript"

jscomp/syntax/src/res_printer.ml

@@ -2377,6 +2377,8 @@ and printPattern ~state (p : Parsetree.pattern) cmtTbl =
       Doc.group (Doc.concat [variantName; argsDoc])
     | Ppat_type ident ->
       Doc.concat [Doc.text "#..."; printIdentPath ident cmtTbl]
+    | Ppat_record ([], Open) ->
+      Doc.concat [Doc.lbrace; Doc.text "_"; Doc.rbrace]
     | Ppat_record (rows, openFlag) ->
       Doc.group
         (Doc.concat

jscomp/syntax/src/res_scanner.ml

@@ -203,24 +203,30 @@ let scanIdentifier scanner =
 
 let scanDigits scanner ~base =
   if base <= 10 then
-    let rec loop scanner =
+    let rec loop scanner foundDigits =
       match scanner.ch with
-      | '0' .. '9' | '_' ->
+      | '0' .. '9' ->
         next scanner;
-        loop scanner
-      | _ -> ()
+        loop scanner true
+      | '_' ->
+        next scanner;
+        loop scanner false
+      | _ -> foundDigits
     in
-    loop scanner
+    loop scanner false
   else
-    let rec loop scanner =
+    let rec loop scanner foundDigits =
       match scanner.ch with
       (* hex *)
-      | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' ->
+      | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ->
+        next scanner;
+        loop scanner true
+      | '_' ->
         next scanner;
-        loop scanner
-      | _ -> ()
+        loop scanner false
+      | _ -> foundDigits
     in
-    loop scanner
+    loop scanner false
 
 (* float: (0…9) { 0…9∣ _ } [. { 0…9∣ _ }] [(e∣ E) [+∣ -] (0…9) { 0…9∣ _ }]   *)
 let scanNumber scanner =
@@ -245,25 +251,30 @@ let scanNumber scanner =
         8)
     | _ -> 10
   in
-  scanDigits scanner ~base;
+  ignore (scanDigits scanner ~base);
 
   (*  *)
   let isFloat =
     if '.' == scanner.ch then (
       next scanner;
-      scanDigits scanner ~base;
+      ignore (scanDigits scanner ~base);
       true)
     else false
   in
 
   (* exponent part *)
   let isFloat =
+    let startPos = position scanner in
     match scanner.ch with
     | 'e' | 'E' | 'p' | 'P' ->
       (match peek scanner with
       | '+' | '-' -> next2 scanner
       | _ -> next scanner);
-      scanDigits scanner ~base;
+      let endPos = position scanner in
+      let foundDigits = scanDigits scanner ~base in
+      if not foundDigits then
+        scanner.err ~startPos ~endPos
+          (Diagnostics.message "Expected digits after exponential notation.");
       true
     | _ -> isFloat
   in

jscomp/syntax/tests/parsing/errors/scanner/expected/exponent_notation.res.txt

@@ -0,0 +1,30 @@
+
+  Syntax error!
+  tests/parsing/errors/scanner/exponent_notation.res:7:10
+
+  5 │ let x = 1_e_1
+  6 │ 
+  7 │ let x = 1e
+  8 │ 
+  9 │ let x = 1_e_
+
+  Expected digits after exponential notation.
+
+
+  Syntax error!
+  tests/parsing/errors/scanner/exponent_notation.res:9:11
+
+   7 │ let x = 1e
+   8 │ 
+   9 │ let x = 1_e_
+  10 │ 
+  11 │ let x = 1.
+
+  Expected digits after exponential notation.
+
+let x = 1e1
+let x = 1e_1
+let x = 1_e_1
+let x = 1e
+let x = 1_e_
+let x = 1.

jscomp/syntax/tests/parsing/errors/scanner/exponent_notation.res

@@ -0,0 +1,11 @@
+let x = 1e1
+
+let x = 1e_1
+
+let x = 1_e_1
+
+let x = 1e
+
+let x = 1_e_
+
+let x = 1.

jscomp/syntax/tests/printer/pattern/expected/record.res.txt

@@ -116,3 +116,14 @@ let get_age3 = ({age: module(P: S), name: _}) => age2
 let get_age3 = ({age: exception Exit, name: _}) => age2
 
 let get_age3 = ({age: %raw("__GC"), name: _}) => age2
+
+let get_age3 = ({age, _}) => age
+let get_age3 = ({_}) => ""
+let get_age3 = () =>
+  switch x {
+  | {age, _} => age
+  }
+let get_age3 = () =>
+  switch x {
+  | {_} => ""
+  }

jscomp/syntax/tests/printer/pattern/record.res

@@ -60,3 +60,14 @@ let get_age3 = ({age: module(P: S), name: _}) => age2
 let get_age3 = ({age: exception Exit, name: _}) => age2
 
 let get_age3 = ({age: %raw("__GC"), name: _}) => age2
+
+let get_age3 = ({age, _}) => age
+let get_age3 = ({_}) => ""
+let get_age3 = () => 
+  switch x {
+  | {age, _} => age
+  }
+let get_age3 = () => 
+  switch x {
+  | {_} => ""
+  }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rescript",
-  "version": "11.1.4",
+  "version": "11.2.0-beta.1",
   "devDependencies": {
     "mocha": "10.1.0",
     "nyc": "15.0.0",

packages/std/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rescript/std",
-  "version": "11.1.4",
+  "version": "11.2.0-beta.1",
   "keywords": [
     "rescript",
     "stdlib",

scripts/rescript_format.js

@@ -1,5 +1,7 @@
 //@ts-check
+var os = require("os");
 var arg = require("./rescript_arg.js");
+
 var format_usage = `Usage: rescript format <options> [files]
 
 \`rescript format\` formats the current directory
@@ -67,18 +69,43 @@ async function readStdin() {
   return Buffer.concat(chunks).toString("utf8");
 }
 
+const numThreads = os.cpus().length;
+
+/**
+ * Splits an array into smaller chunks of a specified size.
+ *
+ * @template T
+ * @param {T[]} array - The array to split into chunks.
+ * @param {number} chunkSize - The size of each chunk.
+ * @returns {T[][]} - An array of chunks, where each chunk is an array of type T.
+ */
+function chunkArray(array, chunkSize) {
+  /** @type {T[][]} */
+  const result = [];
+
+  for (let i = 0; i < array.length; i += chunkSize) {
+    result.push(array.slice(i, i + chunkSize));
+  }
+
+  return result;
+}
+
 /**
  * @param {string[]} files
  * @param {string} bsc_exe
  * @param {(x: string) => boolean} isSupportedFile
  * @param {boolean} checkFormatting
  */
 async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
-  var incorrectlyFormattedFiles = 0;
+  const supportedFiles = files.filter(isSupportedFile);
+  const batchSize = 4 * os.cpus().length;
+  const batches = chunkArray(supportedFiles, batchSize);
+
+  let incorrectlyFormattedFiles = 0;
   try {
-    const _promises = await Promise.all(
-      files.map(async file => {
-        if (isSupportedFile(file)) {
+    for (const batch of batches) {
+      await Promise.all(
+        batch.map(async file => {
           const flags = checkFormatting
             ? ["-format", file]
             : ["-o", file, "-format", file];
@@ -90,10 +117,9 @@ async function formatFiles(files, bsc_exe, isSupportedFile, checkFormatting) {
               incorrectlyFormattedFiles++;
             }
           }
-        }
-        return null;
-      })
-    );
+        })
+      );
+    }
   } catch (err) {
     console.error(err);
     process.exit(2);