ilib-lint 2.21.0 → 2.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilib-lint",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -43,7 +43,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/iLib-js/ilib-mono.git"
+    "url": "https://github.com/iLib-js/ilib-mono"
   },
   "engines": {
     "node": ">=12 <23"
@@ -64,7 +64,7 @@
     "jsdoc-to-markdown": "^8.0.3",
     "typescript": "^5.9.2",
     "npm-run-all": "^4.1.5",
-    "ilib-lint-webos": "^1.0.3",
+    "ilib-lint-webos": "^1.3.0",
     "ilib-internal": "^0.0.0"
   },
   "dependencies": {
@@ -77,14 +77,14 @@
     "micromatch": "^4.0.7",
     "options-parser": "^0.4.0",
     "xml-js": "^1.6.11",
-    "ilib-xliff-webos": "^1.0.2",
+    "ilib-xliff-webos": "^1.0.5",
     "ilib-casemapper": "^1.0.2",
     "ilib-common": "^1.1.6",
     "ilib-ctype": "^1.3.0",
     "ilib-locale": "^1.2.4",
     "ilib-lint-common": "^3.7.0",
     "ilib-scriptinfo": "^1.0.0",
-    "ilib-tools-common": "^1.20.0",
+    "ilib-tools-common": "^1.20.1",
     "ilib-xliff": "^1.4.1"
   },
   "scripts": {

package/src/plugins/XliffParser.js

@@ -80,7 +80,8 @@ class XliffParser extends Parser {
 
         const xliff = new ResourceXliff({
             path: sourceFile.getPath(),
-            xliff: xliffObj
+            xliff: xliffObj,
+            sourceLocale: xliffObj.sourceLocale
         });
 
         xliff.parse(data);

package/src/plugins/XliffSerializer.js

@@ -63,7 +63,8 @@ class XliffSerializer extends Serializer {
         const xliffObj = XliffFactory(getXliffInfo(ir.sourceFile.getContent()));
         const xliff = new ResourceXliff({
             path: ir.sourceFile.getPath(),
-            xliff: xliffObj
+            xliff: xliffObj,
+            sourceLocale: xliffObj.sourceLocale
         });
         resources.forEach(resource => {
             xliff.addResource(resource);
@@ -76,4 +77,4 @@ class XliffSerializer extends Serializer {
     }
 }
 
-export default XliffSerializer;
+export default XliffSerializer;

package/src/plugins/utils.js

@@ -23,25 +23,43 @@ import { xml2js } from 'xml-js';
 * Extracts the XLIFF version from the provided data.
 *
 * @param {String} data The XML data as a string.
-* @returns {Object} the xliff version and style.
+* @returns {Object} the xliff version, style and sourceLocale.
 */
 export function getXliffInfo(data) {
     const defaultInfo = {
         version: "1.2",
-        style: "standard"
+        style: "standard",
+        sourceLocale: "en-US"
     };
     if (!data) return defaultInfo;
 
     try {
         const parsedData = xml2js(data);
-        const xmlVersion = parsedData?.elements?.[0]?.attributes?.version;
-        const projectAttr = parsedData?.elements?.[0]?.elements?.[0]?.attributes?.['l:project'];
+        const root = parsedData?.elements?.find(el => el.name === "xliff");
+        if (!root) return defaultInfo;
+
+        const xmlVersion = root.attributes?.version || defaultInfo.version;
+
+        // XLIFF 1.2: <file source-language="">
+        const fileElem = root.elements?.find(el => el.name === "file");
+        const sourceLanguage12 = fileElem?.attributes?.["source-language"];
+
+        // XLIFF 2.0: <xliff srcLang="">
+        const sourceLanguage20 = root.attributes?.srcLang;
+
+        const sourceLocale = xmlVersion === "1.2" ? sourceLanguage12 : sourceLanguage20;
+
+        // style
+        const projectAttr = fileElem?.attributes?.["l:project"] || root.attributes?.["l:project"];
+        const style = xmlVersion === "2.0" && !projectAttr ? "webOS" : "standard";
 
         return {
-            version: xmlVersion || defaultInfo.version,
-            style: (!projectAttr && xmlVersion === "2.0") ? "webOS" : "standard"
+            version: xmlVersion,
+            style,
+            sourceLocale: sourceLocale || defaultInfo.sourceLocale
         };
+
     } catch (e) {
         return defaultInfo;
     }
-}
+}