@mleonard9/vin-scanner 1.2.0 → 1.2.2

package/src/vinUtils.ts

@@ -54,9 +54,8 @@ const DEFAULT_RESOLVED_OPTIONS: ResolvedVinScannerOptions = {
     language: 'latin',
   },
   detection: {
-    resultMode: 'best',
+    resultMode: 'first',
     preferBarcode: true,
-    validateChecksum: true,
     emitDuplicates: false,
     maxFrameRate: 30,
     forceOrientation: null,
@@ -94,9 +93,6 @@ export const resolveOptions = (
       preferBarcode:
         options?.detection?.preferBarcode ??
         DEFAULT_RESOLVED_OPTIONS.detection.preferBarcode,
-      validateChecksum:
-        options?.detection?.validateChecksum ??
-        DEFAULT_RESOLVED_OPTIONS.detection.validateChecksum,
       emitDuplicates,
       maxFrameRate:
         options?.detection?.maxFrameRate ??
@@ -320,12 +316,16 @@ const isValidNorthAmericaWmi = (value: string): boolean => {
     return false;
   }
   const firstChar = value[0];
-  // North America: 1, 2 (Canada), 4, 5 (United States)
+  // North America: 1, 2 (Canada), 3, 4, 5 (United States)
+  // Japan : 'J' Germany : 'W'
   return (
     firstChar === '1' ||
     firstChar === '2' ||
+    firstChar === '3' ||
     firstChar === '4' ||
-    firstChar === '5'
+    firstChar === '5' ||
+    firstChar === 'J' ||
+    firstChar === 'W'
   );
 };
 
@@ -466,34 +466,7 @@ const toBoundingBox = (
   return blockBox || lineBox || elementBox;
 };
 
-/**
- * Calculate confidence score for a barcode-based VIN candidate
- * Barcodes/QR codes are hard values, so they should always return 100% confidence
- */
-const calculateBarcodeConfidence = (
-  value: string,
-  validateChecksum: boolean
-): number => {
-  'worklet';
-  // Barcodes/QR codes are hard values - always 100% confidence for valid VINs
-  const checksumValid = isValidVin(value);
-  if (checksumValid) {
-    return 1.0; // 100% confidence for valid VINs from barcodes
-  }
-
-  // If validation is disabled, still return high confidence
-  if (!validateChecksum) {
-    return 0.95;
-  }
-
-  // Invalid VINs should not be returned (handled by caller)
-  return 0;
-};
-
-const candidateFromBarcode = (
-  detection: BarcodeDetection,
-  validateChecksum: boolean
-): VinCandidate[] => {
+const candidateFromBarcode = (detection: BarcodeDetection): VinCandidate[] => {
   'worklet';
   const values = new Set<string>();
   tokenizeCandidate(detection.rawValue ?? '').forEach((value) =>
@@ -504,73 +477,17 @@ const candidateFromBarcode = (
   );
   const boundingBox = toBoundingBox(detection, 'barcode');
   return Array.from(values)
-    .filter((value) => {
-      // Only return valid full VINs (17 characters that pass validation)
-      if (validateChecksum) {
-        return isValidVin(value);
-      }
-      // If validation is disabled, still only return 17-character VINs
-      return value.length === 17;
-    })
-    .map((value) => {
-      const confidence = calculateBarcodeConfidence(value, validateChecksum);
-      return {
-        value,
-        source: 'barcode' as const,
-        confidence,
-        boundingBox,
-        origin: detection.displayValue ? 'displayValue' : 'rawValue',
-        rawPayload: detection,
-      };
-    });
+    .filter((value) => isValidVin(value))
+    .map((value) => ({
+      value,
+      source: 'barcode' as const,
+      boundingBox,
+      origin: detection.displayValue ? 'displayValue' : 'rawValue',
+      rawPayload: detection,
+    }));
 };
 
-/**
- * Calculate confidence score for a text-based VIN candidate
- * Higher confidence for:
- * - Valid check digit
- * - Found with VIN prefix context
- * - Element/line level detection (vs block level)
- */
-const calculateTextConfidence = (
-  value: string,
-  rawText: string,
-  origin: string,
-  validateChecksum: boolean
-): number => {
-  'worklet';
-  let confidence = 0.5; // Base confidence for text recognition
-
-  // Check digit validation significantly increases confidence
-  const checksumValid = isValidVin(value);
-  if (checksumValid) {
-    confidence += 0.35; // Boost to 0.85
-  } else if (!validateChecksum) {
-    confidence += 0.2; // Still boost if validation is disabled
-  }
-
-  // Context-aware detection (VIN prefix found) increases confidence
-  const hasVinPrefix =
-    /VIN|Vehicle\s+(?:Identification|ID|Id)|Chassis|Serial/i.test(rawText);
-  if (hasVinPrefix) {
-    confidence += 0.1; // Boost to 0.95 if checksum valid, 0.6 if not
-  }
-
-  // Element-level text is more accurate than block-level
-  if (origin === 'element') {
-    confidence += 0.05;
-  } else if (origin === 'line') {
-    confidence += 0.03;
-  }
-
-  // Cap at 0.98 (never 1.0 for text recognition)
-  return Math.min(confidence, 0.98);
-};
-
-const candidateFromText = (
-  detection: TextDetection,
-  validateChecksum: boolean
-): VinCandidate[] => {
+const candidateFromText = (detection: TextDetection): VinCandidate[] => {
   'worklet';
   const valueMap = new Map<string, { rawText: string; order: number }>();
 
@@ -596,32 +513,18 @@ const candidateFromText = (
     toBoundingBox(detection, 'block');
 
   return Array.from(valueMap.entries())
-    .filter(([value]) => {
-      // Only return valid full VINs (17 characters that pass validation)
-      if (validateChecksum) {
-        return isValidVin(value);
-      }
-      // If validation is disabled, still only return 17-character VINs
-      return value.length === 17;
-    })
-    .map(([value, { rawText }]) => {
+    .map(([value]) => value)
+    .filter((value) => isValidVin(value))
+    .map((value) => {
       const origin = detection.elementText?.includes(value)
         ? 'element'
         : detection.lineText?.includes(value)
           ? 'line'
           : 'block';
 
-      const confidence = calculateTextConfidence(
-        value,
-        rawText,
-        origin,
-        validateChecksum
-      );
-
       return {
         value,
         source: 'text' as const,
-        confidence,
         boundingBox,
         origin,
         rawPayload: detection,
@@ -639,8 +542,7 @@ const dedupeCandidates = (candidates: VinCandidate[]): VinCandidate[] => {
       candidate.boundingBox?.top ?? 'x',
       candidate.boundingBox?.left ?? 'y',
     ].join(':');
-    const existing = map.get(key);
-    if (!existing || existing.confidence < candidate.confidence) {
+    if (!map.has(key)) {
       map.set(key, candidate);
     }
   });
@@ -654,39 +556,43 @@ export const buildVinCandidates = (
   'worklet';
   const list: VinCandidate[] = [];
 
-  if (options.barcode.enabled) {
+  const addBarcodeCandidates = () => {
+    if (!options.barcode.enabled) {
+      return;
+    }
     (payload.barcodes ?? []).forEach((barcode) => {
-      list.push(
-        ...candidateFromBarcode(barcode, options.detection.validateChecksum)
-      );
+      list.push(...candidateFromBarcode(barcode));
     });
-  }
-  if (options.text.enabled) {
+  };
+
+  const addTextCandidates = () => {
+    if (!options.text.enabled) {
+      return;
+    }
     (payload.textBlocks ?? []).forEach((textBlock) => {
-      list.push(
-        ...candidateFromText(textBlock, options.detection.validateChecksum)
-      );
+      list.push(...candidateFromText(textBlock));
     });
+  };
+
+  if (options.detection.preferBarcode) {
+    addBarcodeCandidates();
+    addTextCandidates();
+  } else {
+    addTextCandidates();
+    addBarcodeCandidates();
   }
   return dedupeCandidates(list);
 };
 
-export const pickBestCandidate = (
+export const pickFirstCandidate = (
   candidates: VinCandidate[],
   options: ResolvedVinScannerOptions
 ): VinCandidate | null => {
   'worklet';
+  // eslint-disable-next-line no-void
+  void options;
   if (!candidates.length) {
     return null;
   }
-  const sorted = [...candidates].sort((a, b) => {
-    if (a.confidence !== b.confidence) {
-      return b.confidence - a.confidence;
-    }
-    if (options.detection.preferBarcode && a.source !== b.source) {
-      return a.source === 'barcode' ? -1 : 1;
-    }
-    return 0;
-  });
-  return sorted[0] ?? null;
+  return candidates[0] ?? null;
 };