@intlify/message-compiler 9.11.1 → 9.12.1

package/dist/message-compiler.node.mjs

@@ -1,5 +1,5 @@
 /*!
-  * message-compiler v9.11.1
+  * message-compiler v9.12.1
   * (c) 2024 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -21,6 +21,23 @@ function createLocation(start, end, source) {
     return loc;
 }
 
+const CompileWarnCodes = {
+    USE_MODULO_SYNTAX: 1,
+    __EXTEND_POINT__: 2
+};
+/** @internal */
+const warnMessages = {
+    [CompileWarnCodes.USE_MODULO_SYNTAX]: `Use modulo before '{{0}}'.`
+};
+function createCompileWarn(code, loc, ...args) {
+    const msg = (process.env.NODE_ENV !== 'production') ? format(warnMessages[code] || '', ...(args || [])) : code;
+    const message = { message: String(msg), code };
+    if (loc) {
+        message.location = loc;
+    }
+    return message;
+}
+
 const CompileErrorCodes = {
     // tokenizer error codes
     EXPECTED_TOKEN: 1,
@@ -415,33 +432,46 @@ function createTokenizer(source, options = {}) {
         }
         return null;
     }
+    function isIdentifier(ch) {
+        const cc = ch.charCodeAt(0);
+        return ((cc >= 97 && cc <= 122) || // a-z
+            (cc >= 65 && cc <= 90) || // A-Z
+            (cc >= 48 && cc <= 57) || // 0-9
+            cc === 95 || // _
+            cc === 36 // $
+        );
+    }
     function takeIdentifierChar(scnr) {
-        const closure = (ch) => {
-            const cc = ch.charCodeAt(0);
-            return ((cc >= 97 && cc <= 122) || // a-z
-                (cc >= 65 && cc <= 90) || // A-Z
-                (cc >= 48 && cc <= 57) || // 0-9
-                cc === 95 || // _
-                cc === 36 // $
-            );
-        };
-        return takeChar(scnr, closure);
+        return takeChar(scnr, isIdentifier);
+    }
+    function isNamedIdentifier(ch) {
+        const cc = ch.charCodeAt(0);
+        return ((cc >= 97 && cc <= 122) || // a-z
+            (cc >= 65 && cc <= 90) || // A-Z
+            (cc >= 48 && cc <= 57) || // 0-9
+            cc === 95 || // _
+            cc === 36 || // $
+            cc === 45 // -
+        );
+    }
+    function takeNamedIdentifierChar(scnr) {
+        return takeChar(scnr, isNamedIdentifier);
+    }
+    function isDigit(ch) {
+        const cc = ch.charCodeAt(0);
+        return cc >= 48 && cc <= 57; // 0-9
     }
     function takeDigit(scnr) {
-        const closure = (ch) => {
-            const cc = ch.charCodeAt(0);
-            return cc >= 48 && cc <= 57; // 0-9
-        };
-        return takeChar(scnr, closure);
+        return takeChar(scnr, isDigit);
+    }
+    function isHexDigit(ch) {
+        const cc = ch.charCodeAt(0);
+        return ((cc >= 48 && cc <= 57) || // 0-9
+            (cc >= 65 && cc <= 70) || // A-F
+            (cc >= 97 && cc <= 102)); // a-f
     }
     function takeHexDigit(scnr) {
-        const closure = (ch) => {
-            const cc = ch.charCodeAt(0);
-            return ((cc >= 48 && cc <= 57) || // 0-9
-                (cc >= 65 && cc <= 70) || // A-F
-                (cc >= 97 && cc <= 102)); // a-f
-        };
-        return takeChar(scnr, closure);
+        return takeChar(scnr, isHexDigit);
     }
     function getDigits(scnr) {
         let ch = '';
@@ -505,7 +535,7 @@ function createTokenizer(source, options = {}) {
         skipSpaces(scnr);
         let ch = '';
         let name = '';
-        while ((ch = takeIdentifierChar(scnr))) {
+        while ((ch = takeNamedIdentifierChar(scnr))) {
             name += ch;
         }
         if (scnr.currentChar() === EOF) {
@@ -528,14 +558,16 @@ function createTokenizer(source, options = {}) {
         }
         return value;
     }
+    function isLiteral(ch) {
+        return ch !== LITERAL_DELIMITER && ch !== CHAR_LF;
+    }
     function readLiteral(scnr) {
         skipSpaces(scnr);
         // eslint-disable-next-line no-useless-escape
         eat(scnr, `\'`);
         let ch = '';
         let literal = '';
-        const fn = (x) => x !== LITERAL_DELIMITER && x !== CHAR_LF;
-        while ((ch = takeChar(scnr, fn))) {
+        while ((ch = takeChar(scnr, isLiteral))) {
             if (ch === '\\') {
                 literal += readEscapeSequence(scnr);
             }
@@ -587,15 +619,17 @@ function createTokenizer(source, options = {}) {
         }
         return `\\${unicode}${sequence}`;
     }
+    function isInvalidIdentifier(ch) {
+        return (ch !== "{" /* TokenChars.BraceLeft */ &&
+            ch !== "}" /* TokenChars.BraceRight */ &&
+            ch !== CHAR_SP &&
+            ch !== CHAR_LF);
+    }
     function readInvalidIdentifier(scnr) {
         skipSpaces(scnr);
         let ch = '';
         let identifiers = '';
-        const closure = (ch) => ch !== "{" /* TokenChars.BraceLeft */ &&
-            ch !== "}" /* TokenChars.BraceRight */ &&
-            ch !== CHAR_SP &&
-            ch !== CHAR_LF;
-        while ((ch = takeChar(scnr, closure))) {
+        while ((ch = takeChar(scnr, isInvalidIdentifier))) {
             identifiers += ch;
         }
         return identifiers;
@@ -872,7 +906,7 @@ function fromEscapeSequence(match, codePoint4, codePoint6) {
 }
 function createParser(options = {}) {
     const location = options.location !== false;
-    const { onError } = options;
+    const { onError, onWarn } = options;
     function emitError(tokenzer, code, start, offset, ...args) {
         const end = tokenzer.currentPosition();
         end.offset += offset;
@@ -886,6 +920,15 @@ function createParser(options = {}) {
             onError(err);
         }
     }
+    function emitWarn(tokenzer, code, start, offset, ...args) {
+        const end = tokenzer.currentPosition();
+        end.offset += offset;
+        end.column += offset;
+        if (onWarn) {
+            const loc = location ? createLocation(start, end) : null;
+            onWarn(createCompileWarn(code, loc, args));
+        }
+    }
     function startNode(type, offset, loc) {
         const node = { type };
         if (location) {
@@ -922,11 +965,14 @@ function createParser(options = {}) {
         endNode(node, tokenizer.currentOffset(), tokenizer.currentPosition());
         return node;
     }
-    function parseNamed(tokenizer, key) {
+    function parseNamed(tokenizer, key, modulo) {
         const context = tokenizer.context();
         const { lastOffset: offset, lastStartLoc: loc } = context; // get brace left loc
         const node = startNode(4 /* NodeTypes.Named */, offset, loc);
         node.key = key;
+        if (modulo === true) {
+            node.modulo = true;
+        }
         tokenizer.nextToken(); // skip brach right
         endNode(node, tokenizer.currentOffset(), tokenizer.currentPosition());
         return node;
@@ -1046,6 +1092,7 @@ function createParser(options = {}) {
         const node = startNode(2 /* NodeTypes.Message */, startOffset, startLoc);
         node.items = [];
         let nextToken = null;
+        let modulo = null;
         do {
             const token = nextToken || tokenizer.nextToken();
             nextToken = null;
@@ -1062,11 +1109,18 @@ function createParser(options = {}) {
                     }
                     node.items.push(parseList(tokenizer, token.value || ''));
                     break;
+                case 4 /* TokenTypes.Modulo */:
+                    modulo = true;
+                    break;
                 case 5 /* TokenTypes.Named */:
                     if (token.value == null) {
                         emitError(tokenizer, CompileErrorCodes.UNEXPECTED_LEXICAL_ANALYSIS, context.lastStartLoc, 0, getTokenCaption(token));
                     }
-                    node.items.push(parseNamed(tokenizer, token.value || ''));
+                    node.items.push(parseNamed(tokenizer, token.value || '', !!modulo));
+                    if (modulo) {
+                        emitWarn(tokenizer, CompileWarnCodes.USE_MODULO_SYNTAX, context.lastStartLoc, 0, getTokenCaption(token));
+                        modulo = null;
+                    }
                     break;
                 case 7 /* TokenTypes.Literal */:
                     if (token.value == null) {
@@ -1603,4 +1657,4 @@ function baseCompile(source, options = {}) {
     }
 }
 
-export { CompileErrorCodes, ERROR_DOMAIN$2 as ERROR_DOMAIN, LOCATION_STUB, baseCompile, createCompileError, createLocation, createParser, createPosition, defaultOnError, detectHtmlTag, errorMessages };
+export { CompileErrorCodes, CompileWarnCodes, ERROR_DOMAIN$2 as ERROR_DOMAIN, LOCATION_STUB, baseCompile, createCompileError, createCompileWarn, createLocation, createParser, createPosition, defaultOnError, detectHtmlTag, errorMessages, warnMessages };

package/dist/message-compiler.prod.cjs

@@ -1,5 +1,5 @@
 /*!
-  * message-compiler v9.11.1
+  * message-compiler v9.12.1
   * (c) 2024 kazuya kawaguchi
   * Released under the MIT License.
   */
@@ -23,6 +23,23 @@ function createLocation(start, end, source) {
     return loc;
 }
 
+const CompileWarnCodes = {
+    USE_MODULO_SYNTAX: 1,
+    __EXTEND_POINT__: 2
+};
+/** @internal */
+const warnMessages = {
+    [CompileWarnCodes.USE_MODULO_SYNTAX]: `Use modulo before '{{0}}'.`
+};
+function createCompileWarn(code, loc, ...args) {
+    const msg = code;
+    const message = { message: String(msg), code };
+    if (loc) {
+        message.location = loc;
+    }
+    return message;
+}
+
 const CompileErrorCodes = {
     // tokenizer error codes
     EXPECTED_TOKEN: 1,
@@ -415,33 +432,46 @@ function createTokenizer(source, options = {}) {
         }
         return null;
     }
+    function isIdentifier(ch) {
+        const cc = ch.charCodeAt(0);
+        return ((cc >= 97 && cc <= 122) || // a-z
+            (cc >= 65 && cc <= 90) || // A-Z
+            (cc >= 48 && cc <= 57) || // 0-9
+            cc === 95 || // _
+            cc === 36 // $
+        );
+    }
     function takeIdentifierChar(scnr) {
-        const closure = (ch) => {
-            const cc = ch.charCodeAt(0);
-            return ((cc >= 97 && cc <= 122) || // a-z
-                (cc >= 65 && cc <= 90) || // A-Z
-                (cc >= 48 && cc <= 57) || // 0-9
-                cc === 95 || // _
-                cc === 36 // $
-            );
-        };
-        return takeChar(scnr, closure);
+        return takeChar(scnr, isIdentifier);
+    }
+    function isNamedIdentifier(ch) {
+        const cc = ch.charCodeAt(0);
+        return ((cc >= 97 && cc <= 122) || // a-z
+            (cc >= 65 && cc <= 90) || // A-Z
+            (cc >= 48 && cc <= 57) || // 0-9
+            cc === 95 || // _
+            cc === 36 || // $
+            cc === 45 // -
+        );
+    }
+    function takeNamedIdentifierChar(scnr) {
+        return takeChar(scnr, isNamedIdentifier);
+    }
+    function isDigit(ch) {
+        const cc = ch.charCodeAt(0);
+        return cc >= 48 && cc <= 57; // 0-9
     }
     function takeDigit(scnr) {
-        const closure = (ch) => {
-            const cc = ch.charCodeAt(0);
-            return cc >= 48 && cc <= 57; // 0-9
-        };
-        return takeChar(scnr, closure);
+        return takeChar(scnr, isDigit);
+    }
+    function isHexDigit(ch) {
+        const cc = ch.charCodeAt(0);
+        return ((cc >= 48 && cc <= 57) || // 0-9
+            (cc >= 65 && cc <= 70) || // A-F
+            (cc >= 97 && cc <= 102)); // a-f
     }
     function takeHexDigit(scnr) {
-        const closure = (ch) => {
-            const cc = ch.charCodeAt(0);
-            return ((cc >= 48 && cc <= 57) || // 0-9
-                (cc >= 65 && cc <= 70) || // A-F
-                (cc >= 97 && cc <= 102)); // a-f
-        };
-        return takeChar(scnr, closure);
+        return takeChar(scnr, isHexDigit);
     }
     function getDigits(scnr) {
         let ch = '';
@@ -505,7 +535,7 @@ function createTokenizer(source, options = {}) {
         skipSpaces(scnr);
         let ch = '';
         let name = '';
-        while ((ch = takeIdentifierChar(scnr))) {
+        while ((ch = takeNamedIdentifierChar(scnr))) {
             name += ch;
         }
         if (scnr.currentChar() === EOF) {
@@ -528,14 +558,16 @@ function createTokenizer(source, options = {}) {
         }
         return value;
     }
+    function isLiteral(ch) {
+        return ch !== LITERAL_DELIMITER && ch !== CHAR_LF;
+    }
     function readLiteral(scnr) {
         skipSpaces(scnr);
         // eslint-disable-next-line no-useless-escape
         eat(scnr, `\'`);
         let ch = '';
         let literal = '';
-        const fn = (x) => x !== LITERAL_DELIMITER && x !== CHAR_LF;
-        while ((ch = takeChar(scnr, fn))) {
+        while ((ch = takeChar(scnr, isLiteral))) {
             if (ch === '\\') {
                 literal += readEscapeSequence(scnr);
             }
@@ -587,15 +619,17 @@ function createTokenizer(source, options = {}) {
         }
         return `\\${unicode}${sequence}`;
     }
+    function isInvalidIdentifier(ch) {
+        return (ch !== "{" /* TokenChars.BraceLeft */ &&
+            ch !== "}" /* TokenChars.BraceRight */ &&
+            ch !== CHAR_SP &&
+            ch !== CHAR_LF);
+    }
     function readInvalidIdentifier(scnr) {
         skipSpaces(scnr);
         let ch = '';
         let identifiers = '';
-        const closure = (ch) => ch !== "{" /* TokenChars.BraceLeft */ &&
-            ch !== "}" /* TokenChars.BraceRight */ &&
-            ch !== CHAR_SP &&
-            ch !== CHAR_LF;
-        while ((ch = takeChar(scnr, closure))) {
+        while ((ch = takeChar(scnr, isInvalidIdentifier))) {
             identifiers += ch;
         }
         return identifiers;
@@ -872,7 +906,7 @@ function fromEscapeSequence(match, codePoint4, codePoint6) {
 }
 function createParser(options = {}) {
     const location = options.location !== false;
-    const { onError } = options;
+    const { onError, onWarn } = options;
     function emitError(tokenzer, code, start, offset, ...args) {
         const end = tokenzer.currentPosition();
         end.offset += offset;
@@ -886,6 +920,15 @@ function createParser(options = {}) {
             onError(err);
         }
     }
+    function emitWarn(tokenzer, code, start, offset, ...args) {
+        const end = tokenzer.currentPosition();
+        end.offset += offset;
+        end.column += offset;
+        if (onWarn) {
+            const loc = location ? createLocation(start, end) : null;
+            onWarn(createCompileWarn(code, loc, args));
+        }
+    }
     function startNode(type, offset, loc) {
         const node = { type };
         if (location) {
@@ -922,11 +965,14 @@ function createParser(options = {}) {
         endNode(node, tokenizer.currentOffset(), tokenizer.currentPosition());
         return node;
     }
-    function parseNamed(tokenizer, key) {
+    function parseNamed(tokenizer, key, modulo) {
         const context = tokenizer.context();
         const { lastOffset: offset, lastStartLoc: loc } = context; // get brace left loc
         const node = startNode(4 /* NodeTypes.Named */, offset, loc);
         node.key = key;
+        if (modulo === true) {
+            node.modulo = true;
+        }
         tokenizer.nextToken(); // skip brach right
         endNode(node, tokenizer.currentOffset(), tokenizer.currentPosition());
         return node;
@@ -1046,6 +1092,7 @@ function createParser(options = {}) {
         const node = startNode(2 /* NodeTypes.Message */, startOffset, startLoc);
         node.items = [];
         let nextToken = null;
+        let modulo = null;
         do {
             const token = nextToken || tokenizer.nextToken();
             nextToken = null;
@@ -1062,11 +1109,18 @@ function createParser(options = {}) {
                     }
                     node.items.push(parseList(tokenizer, token.value || ''));
                     break;
+                case 4 /* TokenTypes.Modulo */:
+                    modulo = true;
+                    break;
                 case 5 /* TokenTypes.Named */:
                     if (token.value == null) {
                         emitError(tokenizer, CompileErrorCodes.UNEXPECTED_LEXICAL_ANALYSIS, context.lastStartLoc, 0, getTokenCaption(token));
                     }
-                    node.items.push(parseNamed(tokenizer, token.value || ''));
+                    node.items.push(parseNamed(tokenizer, token.value || '', !!modulo));
+                    if (modulo) {
+                        emitWarn(tokenizer, CompileWarnCodes.USE_MODULO_SYNTAX, context.lastStartLoc, 0, getTokenCaption(token));
+                        modulo = null;
+                    }
                     break;
                 case 7 /* TokenTypes.Literal */:
                     if (token.value == null) {
@@ -1588,13 +1642,16 @@ function baseCompile(source, options = {}) {
 }
 
 exports.CompileErrorCodes = CompileErrorCodes;
+exports.CompileWarnCodes = CompileWarnCodes;
 exports.ERROR_DOMAIN = ERROR_DOMAIN;
 exports.LOCATION_STUB = LOCATION_STUB;
 exports.baseCompile = baseCompile;
 exports.createCompileError = createCompileError;
+exports.createCompileWarn = createCompileWarn;
 exports.createLocation = createLocation;
 exports.createParser = createParser;
 exports.createPosition = createPosition;
 exports.defaultOnError = defaultOnError;
 exports.detectHtmlTag = detectHtmlTag;
 exports.errorMessages = errorMessages;
+exports.warnMessages = warnMessages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlify/message-compiler",
-  "version": "9.11.1",
+  "version": "9.12.1",
   "description": "@intlify/message-compiler",
   "keywords": [
     "compiler",
@@ -34,7 +34,7 @@
   "types": "dist/message-compiler.d.ts",
   "dependencies": {
     "source-map-js": "^1.0.2",
-    "@intlify/shared": "9.11.1"
+    "@intlify/shared": "9.12.1"
   },
   "engines": {
     "node": ">= 16"