Merge branch 'main' into use-intl-locale

Author: eemeli

.github/workflows/test.yml

@@ -3,18 +3,17 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
   workflow_dispatch:
 jobs:
   dist:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [18, 20, latest]
+        node: [20.19.0, 22, latest]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Use Node.js ${{matrix.node}}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{matrix.node}}
       - run: npm ci

.mocharc.yaml

@@ -63,7 +63,7 @@ Hacking on `fluent.js` is easy! To quickly get started clone the repo:
     $ git clone https://github.com/projectfluent/fluent.js.git
     $ cd fluent.js
 
-You'll need at least **Node.js 14.18** and **npm 7**.
+You'll need at least **Node.js 20.19**.
 Older versions are not supported.
 
 Install the dependencies used by all packages, which are managed as

README.md

@@ -1,6 +1,5 @@
 import js from "@eslint/js";
 import eslintConfigPrettier from "eslint-config-prettier";
-import mochaPlugin from "eslint-plugin-mocha";
 import globals from "globals";
 
 import tseslint from "typescript-eslint";
@@ -18,23 +17,6 @@ export default [
       "tools/",
     ],
   },
-  {
-    languageOptions: {
-      ecmaVersion: 2018,
-      sourceType: "module",
-    },
-  },
-
-  // Config files
-  {
-    files: ["**/*.mjs"],
-    languageOptions: { ecmaVersion: 2020 },
-  },
-  {
-    files: ["**/*.cjs"],
-    languageOptions: { globals: { ...globals.node } },
-  },
-
   js.configs.recommended,
   {
     files: ["**/*.js", "**/*.mjs", "*/src/*.ts"],
@@ -109,32 +91,24 @@ export default [
   {
     files: ["*/test/**"],
     languageOptions: {
-      globals: { ...globals.mocha, ...globals.node },
-      ecmaVersion: 2020,
+      globals: { ...globals.node, ...globals.vitest },
     },
-    plugins: { mocha: mochaPlugin },
     rules: {
-      "mocha/no-exclusive-tests": "error",
-      "mocha/no-identical-title": "error",
       "no-console": "off",
       "prefer-arrow-callback": "off",
     },
   },
   {
     files: ["fluent-dom/test/*"],
-    languageOptions: { globals: { ...globals.browser } },
+    languageOptions: { globals: { ...globals.browser, ...globals.vitest } },
   },
   {
     files: ["fluent-react/test/**"],
     languageOptions: {
-      globals: { ...globals.browser, ...globals.jest },
-      ecmaVersion: 2020,
+      globals: { ...globals.browser, ...globals.vitest },
       parserOptions: { ecmaFeatures: { jsx: true } },
     },
-    plugins: { mocha: mochaPlugin },
     rules: {
-      "mocha/no-exclusive-tests": "error",
-      "mocha/no-identical-title": "error",
       "no-unused-vars": "off",
     },
   },

eslint.config.mjs

@@ -424,7 +424,6 @@ The undocumented `_parse` export was also removed in favor of
 - Rename `MessageContext` to `FluentBundle`. (#222)
 
   The following renames have been made to the public API:
-
   - Rename `MessageContext` to `FluentBundle`.
   - Rename `MessageArgument` to `FluentType`.
   - Rename `MessageNumberArgument` to `FluentNumber`.
@@ -492,7 +491,6 @@ The undocumented `_parse` export was also removed in favor of
 ## fluent 0.6.0 (January 31, 2018)
 
 - Implement Fluent Syntax 0.5.
-
   - Add support for terms.
   - Add support for `#`, `##` and `###` comments.
   - Remove support for tags.

fluent-bundle/CHANGELOG.md

@@ -40,12 +40,10 @@
   ],
   "scripts": {
     "build": "tsc",
-    "postbuild": "rollup -c ../rollup.config.mjs",
-    "test": "mocha 'test/*_test.js'"
+    "postbuild": "rollup -c ../rollup.config.mjs"
   },
   "engines": {
-    "node": ">=18.0.0",
-    "npm": ">=7.0.0"
+    "node": "^20.19 || ^22.12 || >=24"
   },
   "devDependencies": {
     "@fluent/dedent": "^0.5.0",

fluent-bundle/package.json

@@ -154,15 +154,12 @@ function resolveVariableReference(
   let arg: FluentVariable;
   if (scope.params) {
     // We're inside a TermReference. It's OK to reference undefined parameters.
-    if (Object.prototype.hasOwnProperty.call(scope.params, name)) {
+    if (name in scope.params) {
       arg = scope.params[name];
     } else {
       return new FluentNone(`$${name}`);
     }
-  } else if (
-    scope.args &&
-    Object.prototype.hasOwnProperty.call(scope.args, name)
-  ) {
+  } else if (scope.args && name in scope.args) {
     // We're in the top-level Pattern or inside a MessageReference. Missing
     // variables references produce ReferenceErrors.
     arg = scope.args[name];

fluent-bundle/src/resolver.ts

@@ -19,11 +19,11 @@ import {
 
 // This regex is used to iterate through the beginnings of messages and terms.
 // With the /m flag, the ^ matches at the beginning of every line.
-const RE_MESSAGE_START = /^(-?[a-zA-Z][\w-]*) *= */gm;
+const RE_MESSAGE_START = /^(?<!\r)(-?[a-zA-Z][\w-]*) *= */gm;
 
 // Both Attributes and Variants are parsed in while loops. These regexes are
 // used to break out of them.
-const RE_ATTRIBUTE_START = /\.([a-zA-Z][\w-]*) *= */y;
+const RE_ATTRIBUTE_START = /(?<=\n *)\.([a-zA-Z][\w-]*) *= */y;
 const RE_VARIANT_START = /\*?\[/y;
 
 const RE_NUMBER_LITERAL = /(-?[0-9]+(?:\.([0-9]+))?)/y;
@@ -37,8 +37,8 @@ const RE_FUNCTION_NAME = /^[A-Z][A-Z0-9_-]*$/;
 // if the next line is indented. For StringLiterals they are: \ (starts an
 // escape sequence), " (ends the literal), and line breaks which are not allowed
 // in StringLiterals. Note that string runs may be empty; text runs may not.
-const RE_TEXT_RUN = /([^{}\n\r]+)/y;
-const RE_STRING_RUN = /([^\\"\n\r]*)/y;
+const RE_TEXT_RUN = /((?:[^{}\n\r]|\r(?!\n))+)/y;
+const RE_STRING_RUN = /((?:[^\\"\n\r]|\r(?!\n))*)/y;
 
 // Escape sequences.
 const RE_STRING_ESCAPE = /\\([\\"])/y;
@@ -53,17 +53,17 @@ const RE_BLANK_LINES = / *\r?\n/g;
 const RE_INDENT = /( *)$/;
 
 // Common tokens.
-const TOKEN_BRACE_OPEN = /{\s*/y;
-const TOKEN_BRACE_CLOSE = /\s*}/y;
-const TOKEN_BRACKET_OPEN = /\[\s*/y;
-const TOKEN_BRACKET_CLOSE = /\s*] */y;
-const TOKEN_PAREN_OPEN = /\s*\(\s*/y;
-const TOKEN_ARROW = /\s*->\s*/y;
-const TOKEN_COLON = /\s*:\s*/y;
+const TOKEN_BRACE_OPEN = /{(?: |\r?\n)*/y;
+const TOKEN_BRACE_CLOSE = /(?: |\r?\n)*}/y;
+const TOKEN_BRACKET_OPEN = /\[(?: |\r?\n)*/y;
+const TOKEN_BRACKET_CLOSE = /(?: |\r?\n)*] */y;
+const TOKEN_PAREN_OPEN = /(?: |\r?\n)*\((?: |\r?\n)*/y;
+const TOKEN_ARROW = /(?: |\r?\n)*->(?: |\r?\n)*/y;
+const TOKEN_COLON = /(?: |\r?\n)*:(?: |\r?\n)*/y;
 // Note the optional comma. As a deviation from the Fluent EBNF, the parser
 // doesn't enforce commas between call arguments.
-const TOKEN_COMMA = /\s*,?\s*/y;
-const TOKEN_BLANK = /\s+/y;
+const TOKEN_COMMA = /(?: |\r?\n)*,?(?: |\r?\n)*/y;
+const TOKEN_BLANK = /(?: |\r?\n)+/y;
 
 /**
  * Fluent Resource is a structure storing parsed localization entries.

fluent-bundle/src/resource.ts

@@ -5,7 +5,7 @@ import { Scope } from "./scope.js";
 // In addition to this minimal interface, these objects are also expected
 // to be supported by Intl.DateTimeFormat
 interface TemporalInstant {
-  epochMilliseconds: number
+  epochMilliseconds: number;
   toString(): string;
 }
 interface TemporalDateTypes {
@@ -14,12 +14,12 @@ interface TemporalDateTypes {
   toString(): string;
 }
 interface TemporalPlainTime {
-  hour: number
-  minute: number
-  second: number
+  hour: number;
+  minute: number;
+  second: number;
   toString(): string;
 }
-type TemporalObject = TemporalInstant | TemporalDateTypes | TemporalPlainTime
+type TemporalObject = TemporalInstant | TemporalDateTypes | TemporalPlainTime;
 
 export type FluentValue = FluentType<unknown> | string;
 

fluent-bundle/src/types.ts

@@ -1,19 +1,19 @@
 import assert from "assert";
 import ftl from "@fluent/dedent";
 
-import { FluentBundle } from "../esm/bundle.js";
-import { FluentResource } from "../esm/resource.js";
-import { FluentType, FluentNumber, FluentDateTime } from "../esm/types.js";
+import { FluentBundle } from "../src/bundle.ts";
+import { FluentResource } from "../src/resource.ts";
+import { FluentType, FluentNumber, FluentDateTime } from "../src/types.ts";
 
 suite("Variables", function () {
   let bundle, errs;
 
-  setup(function () {
+  beforeEach(function () {
     errs = [];
   });
 
   suite("in values", function () {
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
@@ -58,7 +58,7 @@ suite("Variables", function () {
   });
 
   suite("in selectors", function () {
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
@@ -78,7 +78,7 @@ suite("Variables", function () {
   });
 
   suite("in function calls", function () {
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
@@ -96,7 +96,7 @@ suite("Variables", function () {
   });
 
   suite("simple errors", function () {
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
@@ -158,7 +158,7 @@ suite("Variables", function () {
   suite("and strings", function () {
     let args;
 
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
@@ -179,7 +179,7 @@ suite("Variables", function () {
   });
 
   suite("and numbers", function () {
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
@@ -207,7 +207,7 @@ suite("Variables", function () {
   suite("and dates", function () {
     let dtf;
 
-    suiteSetup(function () {
+    beforeAll(function () {
       dtf = new Intl.DateTimeFormat("en-US");
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
@@ -243,33 +243,33 @@ suite("Variables", function () {
       }
     }
 
-    suiteSetup(function () {
+    beforeAll(function () {
       bundle = new FluentBundle("en-US", { useIsolating: false });
       bundle.addResource(
         new FluentResource(ftl`
         foo = { $arg }
         bar = { foo }
         `)
       );
+    });
 
-      const args = {
-        // CustomType is a wrapper around the value
-        arg: new CustomType(),
-      };
+    const args = {
+      // CustomType is a wrapper around the value
+      arg: new CustomType(),
+    };
+
+    test("interpolation", function () {
+      const msg = bundle.getMessage("foo");
+      const value = bundle.formatPattern(msg.value, args, errs);
+      assert.strictEqual(value, "CUSTOM");
+      assert.strictEqual(errs.length, 0);
+    });
 
-      test("interpolation", function () {
-        const msg = bundle.getMessage("foo");
-        const value = bundle.formatPattern(msg.value, args, errs);
-        assert.strictEqual(value, "CUSTOM");
-        assert.strictEqual(errs.length, 0);
-      });
-
-      test("nested interpolation", function () {
-        const msg = bundle.getMessage("bar");
-        const value = bundle.formatPattern(msg.value, args, errs);
-        assert.strictEqual(value, "CUSTOM");
-        assert.strictEqual(errs.length, 0);
-      });
+    test("nested interpolation", function () {
+      const msg = bundle.getMessage("bar");
+      const value = bundle.formatPattern(msg.value, args, errs);
+      assert.strictEqual(value, "CUSTOM");
+      assert.strictEqual(errs.length, 0);
     });
   });
 });