@sythos/js_barcode_universal 1.5.8 → 1.5.9

package/src/js/frameqr/decoder.js

@@ -27,7 +27,6 @@
  *
  * Original work. No code from any other barcode implementation.
  */
-
 /**
  * Decoder for the Sythos Canvas QR profile.
  *
@@ -42,21 +41,13 @@
  *
  * @module frameqr/decoder
  */
-
 import { FormatError } from '../core/errors.js';
 import { decodeQR } from '../qr/decoder.js';
-import {
-  FRAMEQR_PROFILE,
-  normalizeCanvasSpec,
-  validateCanvasSpec,
-  analyzeCanvasDamage,
-} from './tables.js';
-
+import { FRAMEQR_PROFILE, normalizeCanvasSpec, validateCanvasSpec, analyzeCanvasDamage, } from './tables.js';
 /** @param {unknown} value @returns {boolean} */
 function isObject(value) {
-  return value !== null && typeof value === 'object';
+    return value !== null && typeof value === 'object';
 }
-
 /**
  * Return the profile marker attached by the encoder. Older callers sometimes
  * use camel case, so accepting it here is harmless while the emitted marker
@@ -66,16 +57,15 @@ function isObject(value) {
  * @returns {object|null}
  */
 function markerOf(matrix) {
-  const marker = matrix && (matrix.frameqr ?? matrix.frameQR);
-  return isObject(marker) ? marker : null;
+    const marker = matrix && (matrix.frameqr ?? matrix.frameQR);
+    return isObject(marker) ? marker : null;
 }
-
 /** @param {unknown} profile @returns {boolean} */
 function isExpectedProfile(profile) {
-  if (profile === FRAMEQR_PROFILE.id) return true;
-  return isObject(profile) && profile.id === FRAMEQR_PROFILE.id;
+    if (profile === FRAMEQR_PROFILE.id)
+        return true;
+    return isObject(profile) && profile.id === FRAMEQR_PROFILE.id;
 }
-
 /**
  * Normalize and validate the canvas metadata. Validation functions in the
  * table module throw on invalid input; a few consumers also return `false` or
@@ -87,34 +77,33 @@ function isExpectedProfile(profile) {
  * @returns {{canvas: object, damage: object}}
  */
 function validateCanvas(symbolSize, version, canvas) {
-  if (!isObject(canvas)) throw new FormatError('Sythos Canvas QR: canvas metadata is missing');
-
-  let normalized;
-  try {
-    normalized = normalizeCanvasSpec(symbolSize, canvas);
-    const validation = validateCanvasSpec(version, normalized);
-    if (
-      validation === false ||
-      (Array.isArray(validation) && validation.length > 0) ||
-      (isObject(validation) && validation.valid === false) ||
-      (isObject(validation) && validation.safe === false)
-    ) {
-      throw new Error('canvas geometry is outside the profile limits');
+    if (!isObject(canvas))
+        throw new FormatError('Sythos Canvas QR: canvas metadata is missing');
+    let normalized;
+    try {
+        normalized = normalizeCanvasSpec(symbolSize, canvas);
+        const validation = validateCanvasSpec(version, normalized);
+        if (validation === false ||
+            (Array.isArray(validation) && validation.length > 0) ||
+            (isObject(validation) && validation.valid === false) ||
+            (isObject(validation) && validation.safe === false)) {
+            throw new Error('canvas geometry is outside the profile limits');
+        }
+    }
+    catch (error) {
+        if (error instanceof FormatError)
+            throw error;
+        throw new FormatError(`Sythos Canvas QR: invalid canvas metadata: ${error.message}`);
+    }
+    let damage;
+    try {
+        damage = analyzeCanvasDamage(version, normalized);
     }
-  } catch (error) {
-    if (error instanceof FormatError) throw error;
-    throw new FormatError(`Sythos Canvas QR: invalid canvas metadata: ${error.message}`);
-  }
-
-  let damage;
-  try {
-    damage = analyzeCanvasDamage(version, normalized);
-  } catch (error) {
-    throw new FormatError(`Sythos Canvas QR: cannot analyse canvas damage: ${error.message}`);
-  }
-  return { canvas: normalized, damage };
+    catch (error) {
+        throw new FormatError(`Sythos Canvas QR: cannot analyse canvas damage: ${error.message}`);
+    }
+    return { canvas: normalized, damage };
 }
-
 /**
  * Resolve the profile marker and canvas from the matrix/options pair.
  *
@@ -128,61 +117,53 @@ function validateCanvas(symbolSize, version, canvas) {
  * @returns {{profile: string, canvas: object, damage: object, certified: false}}
  */
 function resolveProfile(matrix, options) {
-  const marker = markerOf(matrix);
-  const suppliedProfile = options.profile;
-  const markerProfile = marker ? marker.profile : undefined;
-  if (markerProfile !== undefined && suppliedProfile !== undefined) {
-    const markerId = isObject(markerProfile) ? markerProfile.id : markerProfile;
-    const suppliedId = isObject(suppliedProfile) ? suppliedProfile.id : suppliedProfile;
-    if (markerId !== suppliedId) {
-      throw new FormatError('Sythos Canvas QR: matrix and requested profile markers disagree');
+    const marker = markerOf(matrix);
+    const suppliedProfile = options.profile;
+    const markerProfile = marker ? marker.profile : undefined;
+    if (markerProfile !== undefined && suppliedProfile !== undefined) {
+        const markerId = isObject(markerProfile) ? markerProfile.id : markerProfile;
+        const suppliedId = isObject(suppliedProfile) ? suppliedProfile.id : suppliedProfile;
+        if (markerId !== suppliedId) {
+            throw new FormatError('Sythos Canvas QR: matrix and requested profile markers disagree');
+        }
     }
-  }
-  const profile = markerProfile ?? suppliedProfile;
-
-  if (!isExpectedProfile(profile)) {
-    throw new FormatError(
-      'Sythos Canvas QR: profile marker is missing or is not the Sythos Canvas QR profile'
-    );
-  }
-  if (marker && marker.certified === true) {
-    throw new FormatError(
-      'Sythos Canvas QR: certified FrameQR input is not supported by this profile decoder'
-    );
-  }
-  if (!marker && !options.allowUnmarked) {
-    throw new FormatError(
-      'Sythos Canvas QR: unmarked QR matrix rejected; provide a verified profile marker'
-    );
-  }
-
-  const markerCanvas = marker ? marker.canvas : undefined;
-  const canvas = options.canvas ?? markerCanvas;
-  const version = (matrix.width - 17) / 4;
-  if (!Number.isInteger(version) || version < 1 || version > 40) {
-    throw new FormatError(`Sythos Canvas QR: invalid QR symbol size ${matrix.width}`);
-  }
-  const checked = validateCanvas(matrix.width, version, canvas);
-  if (markerCanvas && options.canvas) {
-    let marked;
-    try {
-      marked = normalizeCanvasSpec(matrix.width, markerCanvas);
-    } catch (error) {
-      throw new FormatError(`Sythos Canvas QR: invalid marker canvas: ${error.message}`);
+    const profile = markerProfile ?? suppliedProfile;
+    if (!isExpectedProfile(profile)) {
+        throw new FormatError('Sythos Canvas QR: profile marker is missing or is not the Sythos Canvas QR profile');
+    }
+    if (marker && marker.certified === true) {
+        throw new FormatError('Sythos Canvas QR: certified FrameQR input is not supported by this profile decoder');
     }
-    const fields = ['shape', 'centerX', 'centerY', 'width', 'height', 'angle'];
-    if (fields.some((field) => marked[field] !== checked.canvas[field])) {
-      throw new FormatError('Sythos Canvas QR: matrix and requested canvas metadata disagree');
+    if (!marker && !options.allowUnmarked) {
+        throw new FormatError('Sythos Canvas QR: unmarked QR matrix rejected; provide a verified profile marker');
     }
-  }
-  return {
-    profile: FRAMEQR_PROFILE.id,
-    canvas: checked.canvas,
-    damage: checked.damage,
-    certified: false,
-  };
+    const markerCanvas = marker ? marker.canvas : undefined;
+    const canvas = options.canvas ?? markerCanvas;
+    const version = (matrix.width - 17) / 4;
+    if (!Number.isInteger(version) || version < 1 || version > 40) {
+        throw new FormatError(`Sythos Canvas QR: invalid QR symbol size ${matrix.width}`);
+    }
+    const checked = validateCanvas(matrix.width, version, canvas);
+    if (markerCanvas && options.canvas) {
+        let marked;
+        try {
+            marked = normalizeCanvasSpec(matrix.width, markerCanvas);
+        }
+        catch (error) {
+            throw new FormatError(`Sythos Canvas QR: invalid marker canvas: ${error.message}`);
+        }
+        const fields = ['shape', 'centerX', 'centerY', 'width', 'height', 'angle'];
+        if (fields.some((field) => marked[field] !== checked.canvas[field])) {
+            throw new FormatError('Sythos Canvas QR: matrix and requested canvas metadata disagree');
+        }
+    }
+    return {
+        profile: FRAMEQR_PROFILE.id,
+        canvas: checked.canvas,
+        damage: checked.damage,
+        certified: false,
+    };
 }
-
 /**
  * Decode a Sythos Canvas QR matrix.
  *
@@ -203,37 +184,33 @@ function resolveProfile(matrix, options) {
  *   is an ordinary QR Code.
  */
 export function decodeFrameQR(matrix, options = {}) {
-  if (!matrix || !Number.isInteger(matrix.width) || !Number.isInteger(matrix.height)) {
-    throw new FormatError('Sythos Canvas QR: no matrix supplied');
-  }
-  if (matrix.width !== matrix.height) {
-    throw new FormatError(
-      `Sythos Canvas QR: symbol must be square, got ${matrix.width}x${matrix.height}`
-    );
-  }
-
-  const profile = resolveProfile(matrix, options);
-  let decoded;
-  try {
-    decoded = decodeQR(matrix);
-  } catch (error) {
-    // Preserve the original QR/RS error when possible, but give callers a
-    // profile-specific context without exposing implementation details.
-    if (error instanceof FormatError) {
-      throw new FormatError(`Sythos Canvas QR: payload is not recoverable: ${error.message}`);
+    if (!matrix || !Number.isInteger(matrix.width) || !Number.isInteger(matrix.height)) {
+        throw new FormatError('Sythos Canvas QR: no matrix supplied');
+    }
+    if (matrix.width !== matrix.height) {
+        throw new FormatError(`Sythos Canvas QR: symbol must be square, got ${matrix.width}x${matrix.height}`);
+    }
+    const profile = resolveProfile(matrix, options);
+    let decoded;
+    try {
+        decoded = decodeQR(matrix);
+    }
+    catch (error) {
+        // Preserve the original QR/RS error when possible, but give callers a
+        // profile-specific context without exposing implementation details.
+        if (error instanceof FormatError) {
+            throw new FormatError(`Sythos Canvas QR: payload is not recoverable: ${error.message}`);
+        }
+        throw error;
     }
-    throw error;
-  }
-
-  return {
-    ...decoded,
-    format: 'frameqr',
-    profile: profile.profile,
-    certified: profile.certified,
-    frame: profile.canvas,
-    canvas: profile.canvas,
-    canvasDamage: profile.damage,
-  };
+    return {
+        ...decoded,
+        format: 'frameqr',
+        profile: profile.profile,
+        certified: profile.certified,
+        frame: profile.canvas,
+        canvas: profile.canvas,
+        canvasDamage: profile.damage,
+    };
 }
-
 export { isExpectedProfile };

package/src/js/frameqr/detector.js

@@ -27,7 +27,6 @@
  *
  * Original work. No code from any other barcode implementation.
  */
-
 /**
  * Detector for the non-certified Sythos Canvas QR profile.
  *
@@ -45,19 +44,12 @@
  *
  * @module frameqr/detector
  */
-
 import { NotFoundError } from '../core/errors.js';
 import { sampleQuad } from '../image/grid-sampler.js';
 import { detectQR } from '../qr/detector.js';
 import { decodeFrameQR } from './decoder.js';
-import {
-  FRAMEQR_PROFILE,
-  canvasModules,
-  normalizeCanvasSpec,
-} from './tables.js';
-
+import { FRAMEQR_PROFILE, canvasModules, normalizeCanvasSpec, } from './tables.js';
 /** @typedef {{x:number, y:number}} Point */
-
 /** @typedef {object} FrameQRDetection
  * @property {Point[]} corners Outer corners in reading order.
  * @property {number} dimension QR modules per side.
@@ -69,11 +61,10 @@ import {
  * @property {string} profile Profile identifier.
  * @property {false} certified Always false for this implementation.
  */
-
 function orientationDegrees(corners) {
-  const [tl, tr] = corners;
-  const angle = Math.atan2(tr.y - tl.y, tr.x - tl.x) * 180 / Math.PI;
-  return ((Math.round(angle / 90) * 90) % 360 + 360) % 360;
+    const [tl, tr] = corners;
+    const angle = Math.atan2(tr.y - tl.y, tr.x - tl.x) * 180 / Math.PI;
+    return ((Math.round(angle / 90) * 90) % 360 + 360) % 360;
 }
 /**
  * Return the number of canvas modules that are dark in a sampled matrix.
@@ -83,20 +74,20 @@ function orientationDegrees(corners) {
  * artwork; both are rejected because decoding that image would be speculative.
  */
 function canvasDarkCount(matrix, canvas) {
-  let dark = 0;
-  for (const [x, y] of canvasModules(matrix.width, canvas)) {
-    if (matrix.get(x, y)) dark++;
-  }
-  return dark;
+    let dark = 0;
+    for (const [x, y] of canvasModules(matrix.width, canvas)) {
+        if (matrix.get(x, y))
+            dark++;
+    }
+    return dark;
 }
-
 function sameCandidate(left, right) {
-  if (left.dimension !== right.dimension) return false;
-  const a = left.corners[0];
-  const b = right.corners[0];
-  return Math.hypot(a.x - b.x, a.y - b.y) <= Math.max(left.moduleSize, right.moduleSize) * 2;
+    if (left.dimension !== right.dimension)
+        return false;
+    const a = left.corners[0];
+    const b = right.corners[0];
+    return Math.hypot(a.x - b.x, a.y - b.y) <= Math.max(left.moduleSize, right.moduleSize) * 2;
 }
-
 /**
  * Detect Sythos Canvas QR symbols in a binarized raster.
  *
@@ -109,66 +100,76 @@ function sameCandidate(left, right) {
  *   profile signature is found.
  */
 export function detectFrameQR(binaryImage, options = {}) {
-  if (!binaryImage || !binaryImage.width || !binaryImage.height) {
-    throw new NotFoundError('detectFrameQR: no image supplied');
-  }
-
-  let candidates;
-  try { candidates = detectQR(binaryImage); } catch { return []; }
-  const detections = [];
-
-  for (const candidate of candidates) {
-    // QR detector dimensions are already constrained to legal Model 2 sizes.
-    let canvas;
-    try { canvas = normalizeCanvasSpec(candidate.dimension, options.canvas); }
-    catch { continue; }
-
-    for (const voting of [Boolean(options.voting), !Boolean(options.voting)]) {
-      let matrix;
-      try { matrix = sampleQuad(binaryImage, candidate.dimension, candidate.corners, voting); }
-      catch { continue; }
-
-      // The signature check is intentionally strict. It prevents an ordinary
-      // QR symbol from being relabelled as Canvas QR by the decoder's explicit
-      // allowUnmarked escape hatch.
-      if (canvasDarkCount(matrix, canvas) !== 0) continue;
-
-      const marked = matrix;
-      marked.frameqr = {
-        profile: FRAMEQR_PROFILE.id,
-        certified: false,
-        canvas,
-      };
-      let decoded;
-      try {
-        decoded = decodeFrameQR(marked, {
-          profile: FRAMEQR_PROFILE.id,
-          canvas,
-          allowUnmarked: true,
-        });
-      } catch { continue; }
-
-      const detection = {
-        corners: candidate.corners,
-        dimension: candidate.dimension,
-        version: candidate.version,
-        moduleSize: candidate.moduleSize,
-        rotation: orientationDegrees(candidate.corners),
-        matrix: marked,
-        canvas,
-        profile: FRAMEQR_PROFILE.id,
-        certified: false,
-        result: decoded,
-      };
-      if (!detections.some((entry) => sameCandidate(entry, detection))) detections.push(detection);
-      break;
+    if (!binaryImage || !binaryImage.width || !binaryImage.height) {
+        throw new NotFoundError('detectFrameQR: no image supplied');
+    }
+    let candidates;
+    try {
+        candidates = detectQR(binaryImage);
+    }
+    catch {
+        return [];
+    }
+    const detections = [];
+    for (const candidate of candidates) {
+        // QR detector dimensions are already constrained to legal Model 2 sizes.
+        let canvas;
+        try {
+            canvas = normalizeCanvasSpec(candidate.dimension, options.canvas);
+        }
+        catch {
+            continue;
+        }
+        for (const voting of [Boolean(options.voting), !Boolean(options.voting)]) {
+            let matrix;
+            try {
+                matrix = sampleQuad(binaryImage, candidate.dimension, candidate.corners, voting);
+            }
+            catch {
+                continue;
+            }
+            // The signature check is intentionally strict. It prevents an ordinary
+            // QR symbol from being relabelled as Canvas QR by the decoder's explicit
+            // allowUnmarked escape hatch.
+            if (canvasDarkCount(matrix, canvas) !== 0)
+                continue;
+            const marked = matrix;
+            marked.frameqr = {
+                profile: FRAMEQR_PROFILE.id,
+                certified: false,
+                canvas,
+            };
+            let decoded;
+            try {
+                decoded = decodeFrameQR(marked, {
+                    profile: FRAMEQR_PROFILE.id,
+                    canvas,
+                    allowUnmarked: true,
+                });
+            }
+            catch {
+                continue;
+            }
+            const detection = {
+                corners: candidate.corners,
+                dimension: candidate.dimension,
+                version: candidate.version,
+                moduleSize: candidate.moduleSize,
+                rotation: orientationDegrees(candidate.corners),
+                matrix: marked,
+                canvas,
+                profile: FRAMEQR_PROFILE.id,
+                certified: false,
+                result: decoded,
+            };
+            if (!detections.some((entry) => sameCandidate(entry, detection)))
+                detections.push(detection);
+            break;
+        }
     }
-  }
-
-  detections.sort((a, b) => b.moduleSize - a.moduleSize);
-  return detections;
+    detections.sort((a, b) => b.moduleSize - a.moduleSize);
+    return detections;
 }
-
 /**
  * Detect and decode all verified Canvas QR symbols in one call.
  *
@@ -177,16 +178,22 @@ export function detectFrameQR(binaryImage, options = {}) {
  * @returns {Array<object>}
  */
 export function detectAndDecodeFrameQR(binaryImage, options = {}) {
-  let detections;
-  try { detections = detectFrameQR(binaryImage, options); } catch { return []; }
-  const results = [];
-  const seen = new Set();
-  for (const detection of detections) {
-    const result = detection.result;
-    const key = `${result.version}|${result.text}`;
-    if (seen.has(key)) continue;
-    seen.add(key);
-    results.push({ ...result, corners: detection.corners, rotation: detection.rotation });
-  }
-  return results;
+    let detections;
+    try {
+        detections = detectFrameQR(binaryImage, options);
+    }
+    catch {
+        return [];
+    }
+    const results = [];
+    const seen = new Set();
+    for (const detection of detections) {
+        const result = detection.result;
+        const key = `${result.version}|${result.text}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        results.push({ ...result, corners: detection.corners, rotation: detection.rotation });
+    }
+    return results;
 }