Support ECI values above 127

Author: davidje13

docs/integrity.txt

@@ -1,5 +1,5 @@
-index.mjs:              sha384-t+Srr58g0YdXYGilymfaxMFvFMy3OMPIuKCEo67AZhCKKYzbZqqucoONAzov+InR
-index.js:               sha384-891dmJ3O6EdTEMN6Evag5DoSXKE2KDyKeN39Hab3a6Gilh3TGzGxr+y08FHuyE3h
+index.mjs:              sha384-m4b9mo8rku6/YQbV1e52UTglSzniaJVeyuq4NnpxRZtq9UrxWXKj+/Mx9MvtPRhK
+index.js:               sha384-jh47I3nzhofHfyfvgZFdmqUk4CYrsTIaq9LwhVmsWOFiX88x2h46P06/aDeaEtXp
 nano.mjs:               sha384-avNlMHLjqxeTtXysYm13MNj05YYIEl5Fg3itpc7p/JdjS3ULukmDYKaqUMtBj6tT
 extras/svg.mjs:         sha384-Gk8g8nmt6RvyscmK2SxGhYHjrlr8PGRa9CD96IKO9EfLBGE1Wpj/pT8TgbuUXYXM
 extras/svg.js:          sha384-VYnYxwUAQvjDtTiso2ihlfJcfZY60ZgYYdd5YKEO1B4BtZ3P7fxQ5WNuPPG/i8Np
@@ -11,4 +11,4 @@ extras/vue.mjs:         sha384-Q4U/qU20x7la3XGJDH1okfzFYN5r+AahC/KAu3xJi5vmOj0GP
 extras/vue.js:          sha384-lkJRxa/w/MmxmQCuZWCv3qKGlSyuRD86eaGUWktxjO/n7pcUstsLUW2COHlYDYQ4
 extras/errors.mjs:      sha384-LaUpr3MpI+ZWjDG8L54lwBzgymdm+C1fijP3Z3HukZOFOn3nmRUtgK5aTmOSVm/q
 extras/errors.js:       sha384-lpwl8zlB1GwhvS1ftgUv4mCvOhlixuRa8fRag2aZ2PEEPKQ++l+IjhZL8lhbZMVe
-webcomponent.mjs:       sha384-0KyuK0e9WoUF8CmQRrkMY8YIjB8m7PsWKqgPPtJYATOjsmo7LYLfzkaBMts/cj7Y
+webcomponent.mjs:       sha384-qEnJ44o+q4U5Coy2oSQk+VUSujAopoS0ehKAHURdzOOyw8J+YtxqhAnOwmwV8zlo

docs/stats.txt

@@ -1,5 +1,5 @@
-index.mjs:                  6843 bytes /     3636 bytes (compressed)
-index.js:                   6859 bytes /     3627 bytes (compressed)
+index.mjs:                  6898 bytes /     3670 bytes (compressed)
+index.js:                   6914 bytes /     3661 bytes (compressed)
 nano.mjs:                   3763 bytes /     2159 bytes (compressed)
 extras/svg.mjs:             1333 bytes /      945 bytes (compressed)
 extras/svg.js:              1350 bytes /      942 bytes (compressed)
@@ -11,4 +11,4 @@ extras/vue.mjs:             1059 bytes /      686 bytes (compressed)
 extras/vue.js:              1066 bytes /      684 bytes (compressed)
 extras/errors.mjs:           287 bytes /      342 bytes (compressed)
 extras/errors.js:            287 bytes /      340 bytes (compressed)
-webcomponent.mjs:           8550 bytes /     4396 bytes (compressed)
+webcomponent.mjs:           8605 bytes /     4431 bytes (compressed)

src/qr/options/modes.mjs

@@ -11,7 +11,13 @@ const multi =
 const eci = (id) => (data) => {
   if (data.eci !== id) {
     data.push(0b0111, 4);
-    data.push(id, 8);
+    if (id < 0x80) {
+      data.push(id, 8);
+    } else if (id < 0x4000) {
+      data.push(0x8000 | id, 16);
+    } else {
+      data.push(0xc00000 | id, 24);
+    }
     data.eci = id;
   }
 };

src/qr/options/modes.test.mjs

@@ -392,6 +392,35 @@ describe('mode.utf8', () => {
   });
 });
 
+describe('mode.eci', () => {
+  it('stores the ECI ID', () => {
+    const data = Bitmap1D();
+    mode.eci(26)(data, 1);
+    expect(data).toMatchBits(`
+      0111
+      0 0011010
+    `);
+  });
+
+  it('uses 2 bytes for larger ECI IDs', () => {
+    const data = Bitmap1D();
+    mode.eci(899)(data, 1);
+    expect(data).toMatchBits(`
+      0111
+      10 000011 10000011
+    `);
+  });
+
+  it('uses 3 bytes for very large ECI IDs', () => {
+    const data = Bitmap1D();
+    mode.eci(16384)(data, 1);
+    expect(data).toMatchBits(`
+      0111
+      110 00000 01000000 00000000
+    `);
+  });
+});
+
 describe('mode.multi', () => {
   it('appends multiple modes in succession', () => {
     const data = Bitmap1D();

web/docs/index.html

@@ -681,10 +681,9 @@ <h5><code>multi(...modes)</code></h5>
               <h5><code>eci(value)</code> / <code>bytes(data)</code></h5>
               <a id="mode_eci"></a>
               <p>
-                <code>mode.eci</code> lets you switch the Extended Channel Interpretation of the message (<a
-                  href="https://en.wikipedia.org/wiki/Extended_Channel_Interpretation"
-                  target="_blank"
-                  rel="noopener"
+                <code>mode.eci</code> lets you switch the Extended Channel Interpretation of the message (accepts
+                integer IDs from 0 to 999999;
+                <a href="https://en.wikipedia.org/wiki/Extended_Channel_Interpretation" target="_blank" rel="noopener"
                   >Wikipedia includes a list of recognised values</a
                 >). After setting this, subsequent <code>mode.bytes</code> will be interpreted in the specified
                 character set.
@@ -703,6 +702,10 @@ <h5><code>eci(value)</code> / <code>bytes(data)</code></h5>
                 3 (and even though some default to ECI 26 instead, these share the same codepoints for all ASCII
                 values).
               </p>
+              <p>
+                If you wish to use ECI values other than 3 and 26 (which are widely recognised by common QR code
+                readers), ensure you test your QR code with the readers you want to support.
+              </p>
               <p>
                 If you set an ECI which is not compatible with ASCII, do not follow it with a
                 <code>mode.ascii</code> section (prefer <code>mode.iso8859_1</code> or <code>mode.utf8</code>, as these
@@ -1588,7 +1591,7 @@ <h2>Comparison With Other Libraries</h2>
                   <a href="https://www.npmjs.com/package/lean-qr" target="_blank" rel="noopener">lean-qr</a>
                   <small>(<a href="https://qr.davidje13.com/" target="_blank" rel="noopener">demo</a>)</small>
                 </td>
-                <td class="R">6.9kB / 3.6kB</td>
+                <td class="R">6.9kB / 3.7kB</td>
                 <td>2900 / 51 / 21</td>
                 <td class="C" title="yes">&#x2705;</td>
                 <td class="C" title="yes">&#x2705;</td>