cldr 7.4.0 → 7.4.1

package/.vscode/launch.json

@@ -0,0 +1,36 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Test suite",
+      "program": "${workspaceFolder}/node_modules/.bin/_mocha",
+      "args": ["--timeout", "9999999999"],
+      "skipFiles": [
+        "<node_internals>/**" // Prevent stepping through async_hooks.js et al.
+      ]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Mocha current file",
+      "cwd": "${workspaceRoot}",
+      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha",
+      "windows": {
+        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha.cmd"
+      },
+      "runtimeArgs": [
+        "--timeout",
+        "999999",
+        "--colors",
+        "--recursive",
+        "${file}"
+      ],
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

package/CHANGELOG.md

@@ -1,10 +1,20 @@
+### v7.4.1 (2023-06-05)
+
+- [Support more \[ ... \] variants in RBNF rules Fixes \#174](https://github.com/papandreou/node-cldr/commit/43a362a21ad3f43e02e75185db3bac532a457dbe) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [Add vscode debugger launch config](https://github.com/papandreou/node-cldr/commit/54352b8e8be09ee43a1225ecc05a19c35bcb2c06) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+- [replace depracated environment](https://github.com/papandreou/node-cldr/commit/25ba30271adce04d164868ca97a2e1dd70b4de6a) ([rotsee](mailto:leo_wallentin@hotmail.com))
+- [syntax](https://github.com/papandreou/node-cldr/commit/2c6bbc4f027ec6f7a78319b2553200d8fd6feff9) ([rotsee](mailto:leo_wallentin@hotmail.com))
+
 ### v7.4.0 (2023-04-13)
 
- - CLDR upgraded to v43
+#### Pull requests
 
-### v7.3.0 (2022-11-11)
+- [#172](https://github.com/papandreou/node-cldr/pull/172)  ([rotsee](mailto:leo_wallentin@hotmail.com))
+
+#### Commits to master
 
- - CLDR upgraded to v42
+- [v7.4.0: CLDR 43](https://github.com/papandreou/node-cldr/commit/25efb35558c40d8bc523b591955c4091f90cfe2a) ([rotsee](mailto:leo_wallentin@hotmail.com))
+- [Fix CHANGELOG generation in preversion script now that an npm env var changed](https://github.com/papandreou/node-cldr/commit/8dd6ee35193df27c4cd0f85912f7827a720cd258) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
 
 ### v7.2.0 (2022-04-24)
 

package/lib/CldrRbnfRuleSet.js

@@ -399,9 +399,62 @@ CldrRbnfRuleSet.prototype = {
               rbnf: optional,
               value: rule.value,
             });
-            expressionAsts.push({
-              type: 'ConditionalExpression',
-              test: {
+            let testAst;
+            if (rule.value === '-x') {
+              throw new Error('[ ... ] not allowed in negative number rule');
+            } else if (rule.value === '0.x') {
+              throw new Error('[ ... ] not allowed in proper fraction rule');
+            } else if (rule.value === 'x.x') {
+              // in improper-fraction rule:
+              // Omit the optional text if the number is between 0 and 1 (same as specifying both an x.x rule and a 0.x rule)
+              testAst = {
+                type: 'BinaryExpression',
+                operator: '&&',
+                left: {
+                  type: 'BinaryExpression',
+                  operator: '>=',
+                  left: {
+                    type: 'Identifier',
+                    name: 'n',
+                  },
+                  right: {
+                    type: 'Literal',
+                    value: 0,
+                  },
+                },
+                right: {
+                  type: 'BinaryExpression',
+                  operator: '<=',
+                  left: {
+                    type: 'Identifier',
+                    name: 'n',
+                  },
+                  right: {
+                    type: 'Literal',
+                    value: 1,
+                  },
+                },
+              };
+            } else if (rule.value === 'x.0') {
+              // in default rule:
+              // Omit the optional text if the number is an integer (same as specifying both an x.x rule and an x.0 rule)
+              testAst = {
+                type: 'UnaryExpression',
+                operator: '!',
+                prefix: true,
+                argument: {
+                  type: 'Identifier',
+                  name: 'isFractional',
+                },
+              };
+            } else {
+              // TODO:
+              // in rule in fraction rule set:
+              // Omit the optional text if multiplying the number by the rule's base value yields 1.
+
+              // in normal rule:
+              // Omit the optional text if the number is an even multiple of the rule's divisor
+              testAst = {
                 type: 'BinaryExpression',
                 operator: '===',
                 left: {
@@ -420,7 +473,12 @@ CldrRbnfRuleSet.prototype = {
                   type: 'Literal',
                   value: 0,
                 },
-              },
+              };
+            }
+
+            expressionAsts.push({
+              type: 'ConditionalExpression',
+              test: testAst,
               consequent: {
                 type: 'Literal',
                 value: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cldr",
-  "version": "7.4.0",
+  "version": "7.4.1",
   "description": "Library for extracting data from CLDR (the Unicode Common Locale Data Repository)",
   "main": "lib/cldr.js",
   "scripts": {

package/test/extractRbnfFunctionByType.js

@@ -271,4 +271,16 @@ describe('extractRbnfFunctionByType', () => {
       }
     });
   });
+
+  describe('with the Russian RBNF rules', function () {
+    // Regression test for https://github.com/papandreou/node-cldr/issues/174
+    it('should render a number', function () {
+      const renderers = cldr.extractRbnfFunctionByType('ru');
+      expect(
+        renderers.renderSpelloutCardinalMasculine(123),
+        'to equal',
+        'сто двадцать три'
+      );
+    });
+  });
 });