ilib-lint 2.21.3 → 2.21.4

package/README.md

@@ -608,17 +608,11 @@ ilib-lint plugins from v1 of ilib-lint to v2.
 
 ## License
 
-Copyright © 2022-2025, JEDLSoft
+Copyright © 2022-2026, JEDLSoft
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+This package is released under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). The full license text is available in the [LICENSE](https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/LICENSE) file in the ilib-mono repository on GitHub.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+## Release Notes
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See [CHANGELOG.md](https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/CHANGELOG.md).
 
-See the License for the specific language governing permissions and
-limitations under the License.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilib-lint",
-  "version": "2.21.3",
+  "version": "2.21.4",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -82,9 +82,9 @@
     "ilib-ctype": "^1.3.0",
     "ilib-lint-common": "^3.7.0",
     "ilib-locale": "^1.4.0",
-    "ilib-localematcher": "^1.3.3",
+    "ilib-localematcher": "^1.3.4",
     "ilib-scriptinfo": "^1.0.0",
-    "ilib-tools-common": "^1.21.4",
+    "ilib-tools-common": "^1.22.0",
     "ilib-xliff": "^1.4.1"
   },
   "scripts": {

package/src/index.js

@@ -2,7 +2,7 @@
 /*
  * index.js - main program of ilib-lint
  *
- * Copyright © 2022-2025 JEDLSoft
+ * Copyright © 2022-2026 JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -178,7 +178,7 @@ if (options.opt.quiet) {
     logger.level = "debug";
 }
 
-logger.info("ilib-lint - Copyright (c) 2022-2025 JEDLsoft, All rights reserved.");
+logger.info("ilib-lint - Copyright (c) 2022-2026 JEDLsoft, All rights reserved.");
 
 let paths = options.args;
 if (paths.length === 0) {

package/src/plugins/BuiltinPlugin.js

@@ -169,7 +169,7 @@ export const regexRules = [
         regexps: [
             "(\\p{L}+('\\p{L}+)+)"         // word boundary + word chars + quote + word chars + word boundary (e.g., it's, don't, d'l'homme)
         ],
-        link: "https://github.com/iLib-js/ilib-lint/blob/main/docs/resource-apostrophe.md",
+        link: "https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-apostrophe.md",
         fixes: [
             { search: "'", replace: "\u2019" }
         ]

package/src/rules/ResourceCamelCase.js

@@ -39,7 +39,7 @@ class ResourceCamelCase extends ResourceRule {
 
         this.name = "resource-camel-case";
         this.description = "Ensure that when source strings contain only camel case and no whitespace, then the targets are the same";
-        this.link = "https://gihub.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-camel-case.md";
+        this.link = "https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-camel-case.md";
         this.regexps = [
             "^\\s*[a-z\\d]+([A-Z][a-z\\d]+)+\\s*$",
             "^\\s*[A-Z][a-z\\d]+([A-Z][a-z\\d]+)+\\s*$",

package/src/rules/ResourceKebabCase.js

@@ -19,7 +19,7 @@ class ResourceKebabCase extends ResourceRule {
 
         this.name = "resource-kebab-case";
         this.description = "Ensure that when source strings contain only kebab case and no whitespace, then the targets are the same";
-        this.link = "https://gihub.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-kebab-case.md";
+        this.link = "https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-kebab-case.md";
 
         const param = this.getParam() || {};
         this.exceptions = Array.isArray(param?.except) ? param.except : [];

package/src/rules/ResourceQuoteStyle.js

@@ -236,14 +236,17 @@ class ResourceQuoteStyle extends ResourceRule {
             }
             let match;
             let commands = [];
+            const startQuotePositions = new Set();
 
             while ((match = startQuote.exec(tar)) !== null) {
                 // now that we have found a start quote, find it in the matched string so
                 // that we can get the index into that string
                 const offset = match[0].indexOf(match[3]);
+                const pos = match.index + offset;
+                startQuotePositions.add(pos);
 
                 commands.push(ResourceFixer.createStringCommand(
-                    match.index + offset,
+                    pos,
                     1,
                     correctQuoteStart
                 ));
@@ -253,9 +256,13 @@ class ResourceQuoteStyle extends ResourceRule {
                 // now that we have found an end quote, find it in the matched string so
                 // that we can get the index into that string
                 const offset = match[0].indexOf(match[3]);
+                const pos = match.index + offset;
+                // skip positions already handled by startQuote to avoid overlapping commands
+                // (can occur when a quote char is surrounded by CJK letters on both sides)
+                if (startQuotePositions.has(pos)) continue;
 
                 commands.push(ResourceFixer.createStringCommand(
-                    match.index + offset,
+                    pos,
                     1,
                     correctQuoteEnd
                 ));

package/src/rules/ResourceReturnChar.js

@@ -34,7 +34,7 @@ export default class ResourceReturnChar extends ResourceRule {
         super(options);
         this.name = "resource-return-char";
         this.description = "Checks that the number of return characters (CR, LF, CRLF) in the source matches the target";
-        this.link = "https://github.com/iLib-js/ilib-lint/blob/main/docs/resource-return-char.md";
+        this.link = "https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-return-char.md";
         this.type = "resource";
     }
 

package/src/rules/ResourceSentenceEnding.js

@@ -173,7 +173,7 @@ class ResourceSentenceEnding extends ResourceRule {
         super(options);
         this.name = "resource-sentence-ending";
         this.description = "Checks that sentence-ending punctuation is appropriate for the locale of the target string and matches the punctuation in the source string";
-        this.link = "https://github.com/iLib-js/ilib-lint/blob/main/docs/resource-sentence-ending.md";
+        this.link = "https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-sentence-ending.md";
 
         // Get the parameter from the options
         const param = this.getParam() || {};
@@ -438,6 +438,40 @@ class ResourceSentenceEnding extends ResourceRule {
         return stripped.endsWith(expected);
     }
 
+    /**
+     * Detect whether a string uses "person quotation" style, where the quoted
+     * content is a direct speech quotation introduced by a comma.
+     *
+     * Person quotation: She said, "A quotation!"
+     * Call-out (default): select 'Manual Zoom.'
+     *
+     * @param {string} str
+     * @returns {boolean}
+     */
+    static isPersonQuotation(str) {
+        if (!str) return false;
+        const trimmed = str.trim();
+        const quoteChars = ResourceSentenceEnding.allQuoteChars;
+
+        const lastChar = trimmed.charAt(trimmed.length - 1);
+        if (!quoteChars.includes(lastChar)) return false;
+
+        let openPos = -1;
+        for (let i = trimmed.length - 2; i >= 0; i--) {
+            if (quoteChars.includes(trimmed.charAt(i))) {
+                openPos = i;
+                break;
+            }
+        }
+        if (openPos <= 0) return false;
+
+        let beforeQuote = openPos - 1;
+        while (beforeQuote >= 0 && /\s/.test(trimmed.charAt(beforeQuote))) {
+            beforeQuote--;
+        }
+        return beforeQuote >= 0 && trimmed.charAt(beforeQuote) === ',';
+    }
+
     /**
      * Get the last quoted string in the input, or null if none found.
      * Handles all quote types in allQuoteChars.
@@ -974,12 +1008,20 @@ class ResourceSentenceEnding extends ResourceRule {
         let highlight = '';
         let description = '';
 
+        const targetTrimmed = target?.trim() || '';
+        const targetEndsWithQuote = quoteChars.includes(targetTrimmed.charAt(targetTrimmed.length - 1));
+
         let lastSentence;
-        if (sourceEndsWithQuote) {
-            // Use the last quoted string in the target
+        if (sourceEndsWithQuote &&
+            (ResourceSentenceEnding.isPersonQuotation(sourceTrimmed) || targetEndsWithQuote)) {
+            // Person quotation (e.g. She said, "Hello!") or both source and target
+            // end with a quote — compare quoted content
             lastSentence = ResourceSentenceEnding.getLastQuotedString(target) || target.trim();
+        } else if (sourceEndsWithQuote) {
+            // Call-out / reference where the target does not end with a quote —
+            // compare overall target ending, not a sentence fragment
+            lastSentence = target.trim();
         } else {
-            // Use the full target string
             lastSentence = this.getLastSentenceFromContent(target, targetLocaleObj);
         }
 

package/src/rules/ResourceSnakeCase.js

@@ -39,7 +39,7 @@ class ResourceSnakeCase extends ResourceRule {
 
         this.name = "resource-snake-case";
         this.description = "Ensure that when source strings contain only snake case and no whitespace, then the targets are the same";
-        this.link = "https://gihub.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-snake-case.md";
+        this.link = "https://github.com/iLib-js/ilib-mono/blob/main/packages/ilib-lint/docs/resource-snake-case.md";
         this.regexps = [
             "^\\s*[a-zA-Z0-9]*(_[a-zA-Z0-9]+)+\\s*$",
             "^\\s*[a-zA-Z0-9]+(_[a-zA-Z0-9]+)*_\\s*$"