@sythos/js_barcode_universal 1.5.3 → 1.5.4

package/README.md

@@ -118,8 +118,8 @@ The `unpkg` and `jsdelivr` fields point at the IIFE bundle, so a CDN needs no in
 
 ```html
 <script src="https://unpkg.com/@sythos/js_barcode_universal"></script>
-<script src="https://unpkg.com/@sythos/js_barcode_universal@1.5.3"></script>
-<script src="https://cdn.jsdelivr.net/npm/@sythos/js_barcode_universal@1.5.3"></script>
+<script src="https://unpkg.com/@sythos/js_barcode_universal@1.5.4"></script>
+<script src="https://cdn.jsdelivr.net/npm/@sythos/js_barcode_universal@1.5.4"></script>
 ```
 
 Pin the version for anything you ship; the unpinned form resolves to `latest` and will move under
@@ -407,6 +407,12 @@ the generic `ean2` and `ean5` format IDs. The image reader recognizes them only
 when attached to a validated EAN/UPC parent; use the composition helpers with
 an EAN/UPC base symbol.
 
+EAN-2 and EAN-5 are parent-bound supplements, never standalone image results. They may be
+listed with EAN-13, EAN-8, UPC-A, UPC-E or Bookland ISBN in `formats`: the parent remains valid
+without a supplement, and a valid requested supplement is exposed only through `result.addon`.
+If only `ean2` or `ean5` is requested, a validated EAN/UPC parent is still required and remains
+the returned `format`; an absent, malformed or unrequested supplement never rejects the parent.
+
 ### GS1 DataBar
 
 The `databar` subpath exposes original GS1 GTIN/AI codecs plus physical

package/bundle/sythos-barcode.esm.js

@@ -1,5 +1,5 @@
 /*!
- * Sythos Barcode Suite v1.5.3
+ * Sythos Barcode Suite v1.5.4
  *
  * MIT License
  *
@@ -3907,6 +3907,34 @@ const DECODERS = [
   ['codabar', decodeCodabar],
 ];
 
+const EAN_PARENT_FORMATS = new Set(['ean13', 'ean8', 'upca', 'upce', 'isbn']);
+const EAN_SUPPLEMENT_FORMATS = new Set(['ean2', 'ean5']);
+
+/** @param {string} format @returns {boolean} */
+function isEANParentFormat(format) {
+  return format === 'ean13' || format === 'ean8' || format === 'upca' || format === 'upce';
+}
+
+/**
+ * An ISBN is printed as a Bookland EAN-13, so its decoded parent remains
+ * `ean13` while an ISBN filter accepts only the Bookland prefixes.
+ *
+ * @param {{format:string, text:string}} result
+ * @param {Set<string>} enabled
+ * @returns {boolean}
+ */
+function isRequestedEANParent(result, enabled) {
+  if (enabled.has(result.format)) return true;
+  return result.format === 'ean13' && enabled.has('isbn') && /^97[89]/.test(result.text);
+}
+
+/** @param {object} result @returns {object} */
+function withoutEANAddon(result) {
+  const { addon, ...parent } = result;
+  void addon;
+  return parent;
+}
+
 /**
  * Read every linear symbol found in a binarized image.
  *
@@ -3924,7 +3952,8 @@ function decodeOneD(image, options = {}) {
     if (!enabled) return true;
     if (enabled.has(id)) return true;
     if (id === 'ean13' || id === 'ean8' || id === 'upca' || id === 'upce') {
-      return enabled.has('ean2') || enabled.has('ean5');
+      return enabled.has('ean2') || enabled.has('ean5') ||
+        (id === 'ean13' && enabled.has('isbn'));
     }
     if (id === 'code128') return enabled.has('gs1128');
     if (id === 'gs1databar14') return enabled.has('databar') || enabled.has('gs1-databar14');
@@ -3961,11 +3990,21 @@ function decodeOneD(image, options = {}) {
         }
         if (!result) continue;
         if (enabled) {
-          const addonRequested = enabled.has('ean2') || enabled.has('ean5');
-          const isEANBase = result.format === 'ean13' || result.format === 'ean8' ||
-            result.format === 'upca' || result.format === 'upce';
-          if (isEANBase && addonRequested) {
-            if (!result.addon || !enabled.has(result.addon.format)) continue;
+          if (isEANParentFormat(result.format)) {
+            const baseRequested = [...EAN_PARENT_FORMATS].some((format) => enabled.has(format));
+            const parentRequested = isRequestedEANParent(result, enabled);
+            if (baseRequested && !parentRequested) {
+              continue;
+            }
+            if (!baseRequested) {
+              // A supplement is never an independent barcode. When it is the
+              // only requested format, return its validated EAN/UPC parent.
+              if (!result.addon || !EAN_SUPPLEMENT_FORMATS.has(result.addon.format) ||
+                  !enabled.has(result.addon.format)) continue;
+            } else if (result.addon && !enabled.has(result.addon.format)) {
+              // Supplements are optional whenever a requested parent exists.
+              result = withoutEANAddon(result);
+            }
           } else if (result.format === 'gs1128') {
             if (!enabled.has('gs1128') && !enabled.has('code128')) continue;
           } else if (result.format === 'gs1databar14') {
@@ -3985,7 +4024,15 @@ function decodeOneD(image, options = {}) {
     }
   }
 
-  return results;
+  // A valid EAN/UPC parent is substantially more constrained than a generic
+  // narrow/wide candidate. Suppress competing interpretations of the same
+  // scanline, while retaining symbols detected on other rows.
+  const eanRows = new Set(results
+    .filter((result) => isEANParentFormat(result.format))
+    .map((result) => result.row));
+  return eanRows.size === 0
+    ? results
+    : results.filter((result) => !eanRows.has(result.row) || isEANParentFormat(result.format));
 }
 
 /**
@@ -16813,7 +16860,7 @@ function decodeStrict(image, options) {
 }
 
 /** Library version, matching package.json. */
-const VERSION = '1.5.3';
+const VERSION = '1.5.4';
 
 __exports.listFormats = listFormats;
 __exports.encode = encode;

package/bundle/sythos-barcode.js

@@ -1,5 +1,5 @@
 /*!
- * Sythos Barcode Suite v1.5.3
+ * Sythos Barcode Suite v1.5.4
  *
  * MIT License
  *
@@ -3908,6 +3908,34 @@ const DECODERS = [
   ['codabar', decodeCodabar],
 ];
 
+const EAN_PARENT_FORMATS = new Set(['ean13', 'ean8', 'upca', 'upce', 'isbn']);
+const EAN_SUPPLEMENT_FORMATS = new Set(['ean2', 'ean5']);
+
+/** @param {string} format @returns {boolean} */
+function isEANParentFormat(format) {
+  return format === 'ean13' || format === 'ean8' || format === 'upca' || format === 'upce';
+}
+
+/**
+ * An ISBN is printed as a Bookland EAN-13, so its decoded parent remains
+ * `ean13` while an ISBN filter accepts only the Bookland prefixes.
+ *
+ * @param {{format:string, text:string}} result
+ * @param {Set<string>} enabled
+ * @returns {boolean}
+ */
+function isRequestedEANParent(result, enabled) {
+  if (enabled.has(result.format)) return true;
+  return result.format === 'ean13' && enabled.has('isbn') && /^97[89]/.test(result.text);
+}
+
+/** @param {object} result @returns {object} */
+function withoutEANAddon(result) {
+  const { addon, ...parent } = result;
+  void addon;
+  return parent;
+}
+
 /**
  * Read every linear symbol found in a binarized image.
  *
@@ -3925,7 +3953,8 @@ function decodeOneD(image, options = {}) {
     if (!enabled) return true;
     if (enabled.has(id)) return true;
     if (id === 'ean13' || id === 'ean8' || id === 'upca' || id === 'upce') {
-      return enabled.has('ean2') || enabled.has('ean5');
+      return enabled.has('ean2') || enabled.has('ean5') ||
+        (id === 'ean13' && enabled.has('isbn'));
     }
     if (id === 'code128') return enabled.has('gs1128');
     if (id === 'gs1databar14') return enabled.has('databar') || enabled.has('gs1-databar14');
@@ -3962,11 +3991,21 @@ function decodeOneD(image, options = {}) {
         }
         if (!result) continue;
         if (enabled) {
-          const addonRequested = enabled.has('ean2') || enabled.has('ean5');
-          const isEANBase = result.format === 'ean13' || result.format === 'ean8' ||
-            result.format === 'upca' || result.format === 'upce';
-          if (isEANBase && addonRequested) {
-            if (!result.addon || !enabled.has(result.addon.format)) continue;
+          if (isEANParentFormat(result.format)) {
+            const baseRequested = [...EAN_PARENT_FORMATS].some((format) => enabled.has(format));
+            const parentRequested = isRequestedEANParent(result, enabled);
+            if (baseRequested && !parentRequested) {
+              continue;
+            }
+            if (!baseRequested) {
+              // A supplement is never an independent barcode. When it is the
+              // only requested format, return its validated EAN/UPC parent.
+              if (!result.addon || !EAN_SUPPLEMENT_FORMATS.has(result.addon.format) ||
+                  !enabled.has(result.addon.format)) continue;
+            } else if (result.addon && !enabled.has(result.addon.format)) {
+              // Supplements are optional whenever a requested parent exists.
+              result = withoutEANAddon(result);
+            }
           } else if (result.format === 'gs1128') {
             if (!enabled.has('gs1128') && !enabled.has('code128')) continue;
           } else if (result.format === 'gs1databar14') {
@@ -3986,7 +4025,15 @@ function decodeOneD(image, options = {}) {
     }
   }
 
-  return results;
+  // A valid EAN/UPC parent is substantially more constrained than a generic
+  // narrow/wide candidate. Suppress competing interpretations of the same
+  // scanline, while retaining symbols detected on other rows.
+  const eanRows = new Set(results
+    .filter((result) => isEANParentFormat(result.format))
+    .map((result) => result.row));
+  return eanRows.size === 0
+    ? results
+    : results.filter((result) => !eanRows.has(result.row) || isEANParentFormat(result.format));
 }
 
 /**
@@ -16814,7 +16861,7 @@ function decodeStrict(image, options) {
 }
 
 /** Library version, matching package.json. */
-const VERSION = '1.5.3';
+const VERSION = '1.5.4';
 
 __exports.listFormats = listFormats;
 __exports.encode = encode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sythos/js_barcode_universal",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Read and write barcodes in JavaScript with zero runtime dependencies. QR Code, Micro QR, rMQR, FrameQR Code, Aztec Code and Rune, PDF417 variants, GS1 DataBar Omnidirectional/Truncated, EAN supplements and one-dimensional formats.",
   "author": {
     "name": "Sythos",

package/src/index.js

@@ -588,4 +588,4 @@ export function decodeStrict(image, options) {
 }
 
 /** Library version, matching package.json. */
-export const VERSION = '1.5.3';
+export const VERSION = '1.5.4';

package/src/oned/reader.js

@@ -1142,6 +1142,34 @@ const DECODERS = [
   ['codabar', decodeCodabar],
 ];
 
+const EAN_PARENT_FORMATS = new Set(['ean13', 'ean8', 'upca', 'upce', 'isbn']);
+const EAN_SUPPLEMENT_FORMATS = new Set(['ean2', 'ean5']);
+
+/** @param {string} format @returns {boolean} */
+function isEANParentFormat(format) {
+  return format === 'ean13' || format === 'ean8' || format === 'upca' || format === 'upce';
+}
+
+/**
+ * An ISBN is printed as a Bookland EAN-13, so its decoded parent remains
+ * `ean13` while an ISBN filter accepts only the Bookland prefixes.
+ *
+ * @param {{format:string, text:string}} result
+ * @param {Set<string>} enabled
+ * @returns {boolean}
+ */
+function isRequestedEANParent(result, enabled) {
+  if (enabled.has(result.format)) return true;
+  return result.format === 'ean13' && enabled.has('isbn') && /^97[89]/.test(result.text);
+}
+
+/** @param {object} result @returns {object} */
+function withoutEANAddon(result) {
+  const { addon, ...parent } = result;
+  void addon;
+  return parent;
+}
+
 /**
  * Read every linear symbol found in a binarized image.
  *
@@ -1159,7 +1187,8 @@ export function decodeOneD(image, options = {}) {
     if (!enabled) return true;
     if (enabled.has(id)) return true;
     if (id === 'ean13' || id === 'ean8' || id === 'upca' || id === 'upce') {
-      return enabled.has('ean2') || enabled.has('ean5');
+      return enabled.has('ean2') || enabled.has('ean5') ||
+        (id === 'ean13' && enabled.has('isbn'));
     }
     if (id === 'code128') return enabled.has('gs1128');
     if (id === 'gs1databar14') return enabled.has('databar') || enabled.has('gs1-databar14');
@@ -1196,11 +1225,21 @@ export function decodeOneD(image, options = {}) {
         }
         if (!result) continue;
         if (enabled) {
-          const addonRequested = enabled.has('ean2') || enabled.has('ean5');
-          const isEANBase = result.format === 'ean13' || result.format === 'ean8' ||
-            result.format === 'upca' || result.format === 'upce';
-          if (isEANBase && addonRequested) {
-            if (!result.addon || !enabled.has(result.addon.format)) continue;
+          if (isEANParentFormat(result.format)) {
+            const baseRequested = [...EAN_PARENT_FORMATS].some((format) => enabled.has(format));
+            const parentRequested = isRequestedEANParent(result, enabled);
+            if (baseRequested && !parentRequested) {
+              continue;
+            }
+            if (!baseRequested) {
+              // A supplement is never an independent barcode. When it is the
+              // only requested format, return its validated EAN/UPC parent.
+              if (!result.addon || !EAN_SUPPLEMENT_FORMATS.has(result.addon.format) ||
+                  !enabled.has(result.addon.format)) continue;
+            } else if (result.addon && !enabled.has(result.addon.format)) {
+              // Supplements are optional whenever a requested parent exists.
+              result = withoutEANAddon(result);
+            }
           } else if (result.format === 'gs1128') {
             if (!enabled.has('gs1128') && !enabled.has('code128')) continue;
           } else if (result.format === 'gs1databar14') {
@@ -1220,7 +1259,15 @@ export function decodeOneD(image, options = {}) {
     }
   }
 
-  return results;
+  // A valid EAN/UPC parent is substantially more constrained than a generic
+  // narrow/wide candidate. Suppress competing interpretations of the same
+  // scanline, while retaining symbols detected on other rows.
+  const eanRows = new Set(results
+    .filter((result) => isEANParentFormat(result.format))
+    .map((result) => result.row));
+  return eanRows.size === 0
+    ? results
+    : results.filter((result) => !eanRows.has(result.row) || isEANParentFormat(result.format));
 }
 
 /**