slimjson 1.1.1 → 1.1.2

package/README.md

@@ -503,7 +503,7 @@ mimo-v2.5-pro
 ## 开发
 
 ```bash
-# 运行测试（192 个用例，100% 覆盖率）
+# 运行测试（209 个用例，100% 覆盖率）
 npm test
 
 # 运行压缩率基准测试（含 trim 对比）

package/README_EN.md

@@ -492,7 +492,7 @@ mimo-v2.5-pro
 ## Development
 
 ```bash
-# Run tests (192 cases, 100% coverage)
+# Run tests (209 cases, 100% coverage)
 npm test
 
 # Run compression ratio benchmarks (with trim comparison)

package/compress.js

@@ -13,7 +13,6 @@
  */
 function mergeSchemas(s1, s2) {
     if (!Array.isArray(s1) || !Array.isArray(s2)) return s1;
-
     const first1 = s1[0];
     const first2 = s2[0];
 
@@ -40,12 +39,7 @@ function mergeSchemas(s1, s2) {
     }
 
     // 两者都是数组（不是对象 schema）→ 递归合并第一个元素
-    if (Array.isArray(first1) && Array.isArray(first2)) {
-        return [mergeSchemas(first1, first2)];
-    }
-
-    // 其他情况（原始值数组或类型不匹配）→ 取第一个
-    return s1;
+    return [mergeSchemas(first1, first2)];
 }
 
 /**
@@ -76,12 +70,10 @@ function inferSchema(value) {
             return [inferObjectSchema(objects)];
         }
         // 原始值数组 - 不压缩，由父级处理
-        return undefined;
-    }
-    if (typeof value === 'object' && value !== null) {
-        return inferObjectSchema([value]);
+        return;
     }
-    return undefined;
+    // value 是单个对象
+    return inferObjectSchema([value]);
 }
 
 /**
@@ -106,7 +98,7 @@ function inferObjectSchema(objects) {
     }
 
     return keyOrder.map(key => {
-        const values = keyValues.get(key) || [];
+        const values = keyValues.get(key);
         if (values.length === 0) return key;
 
         const sample = values[0];
@@ -147,15 +139,12 @@ function inferObjectSchema(objects) {
                 for (const v of values) {
                     if (Array.isArray(v)) {
                         const s = inferSchema(v);
-                        if (s) {
-                            // inferSchema 返回 [innerSchema]，取 innerSchema 用于合并
-                            const inner = Array.isArray(s) && s.length === 1 ? s[0] : s;
-                            merged = merged ? mergeSchemas(merged, inner) : inner;
-                        }
+                        const inner = s[0];
+                        merged = merged ? mergeSchemas(merged, inner) : inner;
                     }
                 }
                 // 再包一层 [] 表示"数组的数组"
-                return { [key]: [merged || inferSchema(sample[0])] };
+                return { [key]: [merged] };
             }
 
             // 原始值数组（如 ["张三","李四"]）→ 不压缩，直接用 key 名
@@ -180,31 +169,21 @@ function compressWithSchema(value, schema) {
         return value.map(item => compressWithSchema(item, inner));
     }
 
-    // schema 包含 undefined → 原始值数组，不压缩
-    if (Array.isArray(schema) && schema.some(s => s === undefined || s === null)) {
-        return value;
-    }
-
     // schema 是数组（对象 schema）→ 值是对象
-    if (Array.isArray(schema)) {
-        if (Array.isArray(value)) return value.length === 0 ? [] : null;
-        if (!value || typeof value !== 'object') return value;
-        return schema.map(fieldDef => {
-            let key, valueSchema;
-            if (typeof fieldDef === 'string') {
-                key = fieldDef;
-                valueSchema = undefined;
-            } else {
-                key = Object.keys(fieldDef)[0];
-                valueSchema = fieldDef[key];
-            }
-            const val = value[key];
-            if (val == null) return null;
-            return compressWithSchema(val, valueSchema);
-        });
-    }
-
-    return value;
+    if (!value || typeof value !== 'object') return value;
+    return schema.map(fieldDef => {
+        let key, valueSchema;
+        if (typeof fieldDef === 'string') {
+            key = fieldDef;
+            valueSchema = undefined;
+        } else {
+            key = Object.keys(fieldDef)[0];
+            valueSchema = fieldDef[key];
+        }
+        const val = value[key];
+        if (val == null) return null;
+        return compressWithSchema(val, valueSchema);
+    });
 }
 
 /**
@@ -257,41 +236,32 @@ function decompressWithSchema(data, schema) {
 
     // schema 是 [innerSchema] → 还原为数组
     if (Array.isArray(schema) && schema.length === 1 && Array.isArray(schema[0])) {
-        if (!Array.isArray(data)) return data;
         const inner = schema[0];
         return data.map(item => decompressWithSchema(item, inner));
     }
 
-    // schema 是数组
-    if (Array.isArray(schema)) {
-        // schema 包含 undefined 元素 → 原始值数组，不压缩
-        if (schema.some(s => s === undefined || s === null)) return data;
-
-        // 原始值（混合数组中的原始元素）→ 直接返回
-        if (typeof data !== 'object' || data === null) return data;
-
-        // 对象 schema → 还原为对象
-        const obj = {};
-        for (let i = 0; i < schema.length; i++) {
-            const fieldDef = schema[i];
-            let key, valueSchema;
-            if (typeof fieldDef === 'string') {
-                key = fieldDef;
-                valueSchema = undefined;
-            } else if (typeof fieldDef === 'object' && fieldDef !== null) {
-                key = Object.keys(fieldDef)[0];
-                valueSchema = fieldDef[key];
-            } else {
-                continue;
-            }
-            const val = data[i];
-            if (val === undefined) { obj[key] = null; continue; }
-            obj[key] = decompressWithSchema(val, valueSchema);
+    // 原始值（混合数组中的原始元素）→ 直接返回
+    if (typeof data !== 'object') return data;
+
+    // 对象 schema → 还原为对象
+    const obj = {};
+    for (let i = 0; i < schema.length; i++) {
+        const fieldDef = schema[i];
+        let key, valueSchema;
+        if (typeof fieldDef === 'string') {
+            key = fieldDef;
+            valueSchema = undefined;
+        } else if (typeof fieldDef === 'object' && fieldDef !== null) {
+            key = Object.keys(fieldDef)[0];
+            valueSchema = fieldDef[key];
+        } else {
+            continue;
         }
-        return obj;
+        const val = data[i];
+        if (val === undefined) { obj[key] = null; continue; }
+        obj[key] = decompressWithSchema(val, valueSchema);
     }
-
-    return data;
+    return obj;
 }
 
 /**
@@ -494,8 +464,7 @@ function parse(text) {
       skipWs();
       if (text[pos] !== ':') error('Expected :');
       pos++;
-      const val = parseValue();
-      obj[key] = val;
+      obj[key] = parseValue();
       skipWs();
       if (text[pos] === '}') { pos++; return obj; }
       if (text[pos] === ',') { pos++; continue; }

package/coverage/clover.xml

@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="1779512114158" clover="3.2.0">
+  <project timestamp="1779512114159" name="All files">
+    <metrics statements="266" coveredstatements="266" conditionals="295" coveredconditionals="295" methods="33" coveredmethods="33" elements="594" coveredelements="594" complexity="0" loc="266" ncloc="266" packages="1" files="1" classes="1"/>
+    <file name="compress.js" path="D:\git\slimjson\compress.js">
+      <metrics statements="266" coveredstatements="266" conditionals="295" coveredconditionals="295" methods="33" coveredmethods="33"/>
+      <line num="15" count="34" type="cond" truecount="4" falsecount="0"/>
+      <line num="16" count="32" type="stmt"/>
+      <line num="17" count="32" type="stmt"/>
+      <line num="20" count="32" type="cond" truecount="5" falsecount="0"/>
+      <line num="22" count="32" type="cond" truecount="5" falsecount="0"/>
+      <line num="25" count="32" type="cond" truecount="4" falsecount="0"/>
+      <line num="26" count="16" type="stmt"/>
+      <line num="27" count="16" type="stmt"/>
+      <line num="28" count="16" type="stmt"/>
+      <line num="29" count="36" type="cond" truecount="2" falsecount="0"/>
+      <line num="31" count="16" type="stmt"/>
+      <line num="32" count="28" type="cond" truecount="2" falsecount="0"/>
+      <line num="33" count="28" type="cond" truecount="2" falsecount="0"/>
+      <line num="34" count="6" type="stmt"/>
+      <line num="35" count="6" type="stmt"/>
+      <line num="38" count="16" type="stmt"/>
+      <line num="42" count="16" type="stmt"/>
+      <line num="49" count="117" type="cond" truecount="2" falsecount="0"/>
+      <line num="50" count="115" type="cond" truecount="2" falsecount="0"/>
+      <line num="51" count="113" type="stmt"/>
+      <line num="52" count="113" type="cond" truecount="5" falsecount="0"/>
+      <line num="54" count="81" type="stmt"/>
+      <line num="56" count="32" type="cond" truecount="2" falsecount="0"/>
+      <line num="58" count="20" type="stmt"/>
+      <line num="59" count="20" type="stmt"/>
+      <line num="60" count="36" type="stmt"/>
+      <line num="61" count="36" type="cond" truecount="2" falsecount="0"/>
+      <line num="62" count="32" type="cond" truecount="2" falsecount="0"/>
+      <line num="65" count="20" type="cond" truecount="2" falsecount="0"/>
+      <line num="68" count="28" type="cond" truecount="3" falsecount="0"/>
+      <line num="69" count="12" type="cond" truecount="2" falsecount="0"/>
+      <line num="70" count="6" type="stmt"/>
+      <line num="73" count="6" type="stmt"/>
+      <line num="76" count="2" type="stmt"/>
+      <line num="83" count="145" type="stmt"/>
+      <line num="84" count="145" type="stmt"/>
+      <line num="86" count="145" type="stmt"/>
+      <line num="87" count="272" type="cond" truecount="5" falsecount="0"/>
+      <line num="88" count="270" type="stmt"/>
+      <line num="89" count="603" type="cond" truecount="2" falsecount="0"/>
+      <line num="90" count="329" type="stmt"/>
+      <line num="91" count="329" type="stmt"/>
+      <line num="93" count="603" type="stmt"/>
+      <line num="94" count="603" type="cond" truecount="2" falsecount="0"/>
+      <line num="95" count="595" type="stmt"/>
+      <line num="100" count="145" type="stmt"/>
+      <line num="101" count="329" type="stmt"/>
+      <line num="102" count="329" type="cond" truecount="2" falsecount="0"/>
+      <line num="104" count="323" type="stmt"/>
+      <line num="107" count="323" type="cond" truecount="5" falsecount="0"/>
+      <line num="108" count="42" type="cond" truecount="3" falsecount="0"/>
+      <line num="109" count="22" type="stmt"/>
+      <line num="113" count="301" type="cond" truecount="2" falsecount="0"/>
+      <line num="115" count="56" type="cond" truecount="2" falsecount="0"/>
+      <line num="118" count="54" type="cond" truecount="5" falsecount="0"/>
+      <line num="119" count="34" type="stmt"/>
+      <line num="120" count="34" type="stmt"/>
+      <line num="121" count="64" type="cond" truecount="2" falsecount="0"/>
+      <line num="122" count="62" type="stmt"/>
+      <line num="123" count="102" type="cond" truecount="5" falsecount="0"/>
+      <line num="124" count="98" type="stmt"/>
+      <line num="129" count="34" type="stmt"/>
+      <line num="133" count="20" type="cond" truecount="2" falsecount="0"/>
+      <line num="135" count="8" type="cond" truecount="2" falsecount="0"/>
+      <line num="138" count="6" type="stmt"/>
+      <line num="139" count="6" type="stmt"/>
+      <line num="140" count="12" type="cond" truecount="2" falsecount="0"/>
+      <line num="141" count="10" type="stmt"/>
+      <line num="142" count="10" type="stmt"/>
+      <line num="143" count="10" type="cond" truecount="2" falsecount="0"/>
+      <line num="147" count="6" type="stmt"/>
+      <line num="151" count="12" type="stmt"/>
+      <line num="155" count="245" type="stmt"/>
+      <line num="163" count="948" type="cond" truecount="2" falsecount="0"/>
+      <line num="166" count="471" type="cond" truecount="5" falsecount="0"/>
+      <line num="167" count="179" type="stmt"/>
+      <line num="168" count="179" type="cond" truecount="2" falsecount="0"/>
+      <line num="169" count="284" type="stmt"/>
+      <line num="173" count="292" type="cond" truecount="4" falsecount="0"/>
+      <line num="174" count="270" type="stmt"/>
+      <line num="176" count="758" type="cond" truecount="2" falsecount="0"/>
+      <line num="177" count="626" type="stmt"/>
+      <line num="178" count="626" type="stmt"/>
+      <line num="180" count="132" type="stmt"/>
+      <line num="181" count="132" type="stmt"/>
+      <line num="183" count="758" type="stmt"/>
+      <line num="184" count="758" type="cond" truecount="2" falsecount="0"/>
+      <line num="185" count="595" type="stmt"/>
+      <line num="193" count="196" type="cond" truecount="4" falsecount="0"/>
+      <line num="194" count="174" type="cond" truecount="2" falsecount="0"/>
+      <line num="195" count="99" type="stmt"/>
+      <line num="196" count="113" type="cond" truecount="2" falsecount="0"/>
+      <line num="198" count="10" type="stmt"/>
+      <line num="205" count="580" type="cond" truecount="2" falsecount="0"/>
+      <line num="206" count="546" type="stmt"/>
+      <line num="207" count="234" type="cond" truecount="2" falsecount="0"/>
+      <line num="208" count="57" type="stmt"/>
+      <line num="210" count="234" type="stmt"/>
+      <line num="221" count="75" type="cond" truecount="2" falsecount="0"/>
+      <line num="222" count="69" type="stmt"/>
+      <line num="223" count="69" type="stmt"/>
+      <line num="224" count="69" type="cond" truecount="4" falsecount="0"/>
+      <line num="225" count="34" type="stmt"/>
+      <line num="227" count="69" type="stmt"/>
+      <line num="234" count="1932" type="cond" truecount="2" falsecount="0"/>
+      <line num="235" count="824" type="cond" truecount="2" falsecount="0"/>
+      <line num="238" count="800" type="cond" truecount="5" falsecount="0"/>
+      <line num="239" count="293" type="stmt"/>
+      <line num="240" count="483" type="stmt"/>
+      <line num="244" count="507" type="cond" truecount="4" falsecount="0"/>
+      <line num="247" count="485" type="stmt"/>
+      <line num="248" count="485" type="stmt"/>
+      <line num="249" count="1442" type="stmt"/>
+      <line num="251" count="1442" type="cond" truecount="2" falsecount="0"/>
+      <line num="252" count="1207" type="stmt"/>
+      <line num="253" count="1207" type="stmt"/>
+      <line num="254" count="235" type="cond" truecount="4" falsecount="0"/>
+      <line num="255" count="234" type="stmt"/>
+      <line num="256" count="234" type="stmt"/>
+      <line num="258" count="1" type="stmt"/>
+      <line num="260" count="1441" type="stmt"/>
+      <line num="261" count="1441" type="cond" truecount="2" falsecount="0"/>
+      <line num="262" count="1333" type="stmt"/>
+      <line num="264" count="485" type="stmt"/>
+      <line num="272" count="121" type="cond" truecount="5" falsecount="0"/>
+      <line num="273" count="117" type="cond" truecount="2" falsecount="0"/>
+      <line num="274" count="116" type="stmt"/>
+      <line num="280" count="831" type="cond" truecount="2" falsecount="0"/>
+      <line num="281" count="830" type="cond" truecount="5" falsecount="0"/>
+      <line num="283" count="824" type="cond" truecount="2" falsecount="0"/>
+      <line num="285" count="815" type="cond" truecount="2" falsecount="0"/>
+      <line num="287" count="794" type="cond" truecount="2" falsecount="0"/>
+      <line num="288" count="780" type="stmt"/>
+      <line num="303" count="117" type="stmt"/>
+      <line num="308" count="1757" type="cond" truecount="4" falsecount="0"/>
+      <line num="309" count="1756" type="cond" truecount="2" falsecount="0"/>
+      <line num="310" count="607" type="cond" truecount="2" falsecount="0"/>
+      <line num="311" count="50" type="stmt"/>
+      <line num="313" count="1149" type="cond" truecount="2" falsecount="0"/>
+      <line num="314" count="219" type="cond" truecount="2" falsecount="0"/>
+      <line num="315" count="1" type="stmt"/>
+      <line num="317" count="930" type="cond" truecount="2" falsecount="0"/>
+      <line num="318" count="920" type="cond" truecount="2" falsecount="0"/>
+      <line num="319" count="147" type="cond" truecount="2" falsecount="0"/>
+      <line num="320" count="1" type="stmt"/>
+      <line num="325" count="773" type="cond" truecount="2" falsecount="0"/>
+      <line num="326" count="761" type="stmt"/>
+      <line num="327" count="1568" type="cond" truecount="4" falsecount="0"/>
+      <line num="328" count="1416" type="stmt"/>
+      <line num="330" count="761" type="stmt"/>
+      <line num="331" count="761" type="stmt"/>
+      <line num="334" count="761" type="cond" truecount="2" falsecount="0"/>
+      <line num="335" count="756" type="stmt"/>
+      <line num="340" count="146" type="stmt"/>
+      <line num="341" count="224" type="cond" truecount="2" falsecount="0"/>
+      <line num="342" count="224" type="stmt"/>
+      <line num="344" count="146" type="stmt"/>
+      <line num="351" count="169" type="stmt"/>
+      <line num="354" count="7" type="stmt"/>
+      <line num="358" count="11366" type="cond" truecount="2" falsecount="0"/>
+      <line num="363" count="24" type="cond" truecount="2" falsecount="0"/>
+      <line num="367" count="3075" type="stmt"/>
+      <line num="368" count="3075" type="cond" truecount="2" falsecount="0"/>
+      <line num="369" count="3074" type="stmt"/>
+      <line num="370" count="3074" type="cond" truecount="2" falsecount="0"/>
+      <line num="371" count="2996" type="cond" truecount="2" falsecount="0"/>
+      <line num="372" count="2755" type="cond" truecount="2" falsecount="0"/>
+      <line num="374" count="1456" type="cond" truecount="4" falsecount="0"/>
+      <line num="375" count="1448" type="cond" truecount="4" falsecount="0"/>
+      <line num="376" count="1440" type="cond" truecount="4" falsecount="0"/>
+      <line num="377" count="1434" type="cond" truecount="5" falsecount="0"/>
+      <line num="379" count="1035" type="stmt"/>
+      <line num="383" count="80" type="stmt"/>
+      <line num="384" count="80" type="stmt"/>
+      <line num="385" count="80" type="stmt"/>
+      <line num="386" count="413" type="stmt"/>
+      <line num="387" count="413" type="cond" truecount="2" falsecount="0"/>
+      <line num="388" count="334" type="cond" truecount="2" falsecount="0"/>
+      <line num="389" count="12" type="stmt"/>
+      <line num="390" count="12" type="stmt"/>
+      <line num="391" count="12" type="cond" truecount="10" falsecount="0"/>
+      <line num="392" count="2" type="stmt"/>
+      <line num="393" count="1" type="stmt"/>
+      <line num="394" count="1" type="stmt"/>
+      <line num="395" count="1" type="stmt"/>
+      <line num="396" count="1" type="stmt"/>
+      <line num="397" count="1" type="stmt"/>
+      <line num="398" count="1" type="stmt"/>
+      <line num="399" count="1" type="stmt"/>
+      <line num="401" count="2" type="stmt"/>
+      <line num="402" count="2" type="stmt"/>
+      <line num="403" count="2" type="stmt"/>
+      <line num="404" count="2" type="stmt"/>
+      <line num="406" count="1" type="stmt"/>
+      <line num="409" count="322" type="stmt"/>
+      <line num="411" count="334" type="stmt"/>
+      <line num="413" count="1" type="stmt"/>
+      <line num="418" count="1299" type="stmt"/>
+      <line num="419" count="1299" type="stmt"/>
+      <line num="420" count="1299" type="stmt"/>
+      <line num="421" count="1299" type="cond" truecount="2" falsecount="0"/>
+      <line num="423" count="1282" type="stmt"/>
+      <line num="424" count="2768" type="stmt"/>
+      <line num="425" count="2768" type="stmt"/>
+      <line num="427" count="2768" type="cond" truecount="4" falsecount="0"/>
+      <line num="429" count="228" type="cond" truecount="2" falsecount="0"/>
+      <line num="430" count="48" type="stmt"/>
+      <line num="431" count="48" type="stmt"/>
+      <line num="432" count="48" type="stmt"/>
+      <line num="434" count="180" type="stmt"/>
+      <line num="435" count="180" type="stmt"/>
+      <line num="436" count="180" type="stmt"/>
+      <line num="437" count="180" type="cond" truecount="2" falsecount="0"/>
+      <line num="438" count="25" type="stmt"/>
+      <line num="439" count="25" type="stmt"/>
+      <line num="440" count="25" type="stmt"/>
+      <line num="442" count="155" type="stmt"/>
+      <line num="445" count="2540" type="stmt"/>
+      <line num="446" count="2539" type="stmt"/>
+      <line num="448" count="2539" type="cond" truecount="2" falsecount="0"/>
+      <line num="449" count="1332" type="cond" truecount="2" falsecount="0"/>
+      <line num="450" count="1" type="stmt"/>
+      <line num="455" count="241" type="stmt"/>
+      <line num="456" count="241" type="stmt"/>
+      <line num="457" count="241" type="stmt"/>
+      <line num="458" count="241" type="cond" truecount="2" falsecount="0"/>
+      <line num="460" count="240" type="stmt"/>
+      <line num="461" count="368" type="stmt"/>
+      <line num="463" count="368" type="cond" truecount="2" falsecount="0"/>
+      <line num="464" count="367" type="stmt"/>
+      <line num="465" count="367" type="cond" truecount="2" falsecount="0"/>
+      <line num="466" count="366" type="stmt"/>
+      <line num="467" count="366" type="stmt"/>
+      <line num="468" count="366" type="stmt"/>
+      <line num="469" count="366" type="stmt"/>
+      <line num="470" count="366" type="cond" truecount="2" falsecount="0"/>
+      <line num="471" count="129" type="cond" truecount="2" falsecount="0"/>
+      <line num="472" count="1" type="stmt"/>
+      <line num="478" count="1401" type="stmt"/>
+      <line num="479" count="1401" type="cond" truecount="2" falsecount="0"/>
+      <line num="480" count="5251" type="stmt"/>
+      <line num="482" count="1401" type="stmt"/>
+      <line num="483" count="1401" type="cond" truecount="2" falsecount="0"/>
+      <line num="484" count="1400" type="cond" truecount="2" falsecount="0"/>
+      <line num="485" count="1399" type="cond" truecount="2" falsecount="0"/>
+      <line num="486" count="1398" type="cond" truecount="2" falsecount="0"/>
+      <line num="487" count="1397" type="stmt"/>
+      <line num="491" count="399" type="stmt"/>
+      <line num="492" count="399" type="cond" truecount="2" falsecount="0"/>
+      <line num="493" count="661" type="cond" truecount="3" falsecount="0"/>
+      <line num="494" count="399" type="cond" truecount="2" falsecount="0"/>
+      <line num="495" count="2" type="stmt"/>
+      <line num="496" count="3" type="cond" truecount="3" falsecount="0"/>
+      <line num="498" count="399" type="cond" truecount="4" falsecount="0"/>
+      <line num="499" count="4" type="stmt"/>
+      <line num="500" count="4" type="cond" truecount="4" falsecount="0"/>
+      <line num="501" count="8" type="cond" truecount="3" falsecount="0"/>
+      <line num="503" count="399" type="stmt"/>
+      <line num="504" count="399" type="cond" truecount="2" falsecount="0"/>
+      <line num="505" count="398" type="stmt"/>
+      <line num="508" count="169" type="stmt"/>
+      <line num="509" count="163" type="stmt"/>
+      <line num="510" count="163" type="cond" truecount="2" falsecount="0"/>
+      <line num="511" count="162" type="stmt"/>
+      <line num="514" count="1" type="stmt"/>
+      <line num="515" count="1" type="stmt"/>
+    </file>
+  </project>
+</coverage>