Move constants to files they are used.

pull/3465/head
Eric de Boer 2024-06-21 11:06:05 +02:00
parent 39af2474d2
commit 333fd0562a
5 changed files with 35 additions and 71 deletions

View File

@ -24,11 +24,13 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
const constants = require("cards.constants.js");
const encode = require("cards.encode.js"); const encode = require("cards.encode.js");
const Barcode = require("cards.Barcode.js"); const Barcode = require("cards.Barcode.js");
// Standard start end and middle bits
const SIDE_BIN = '101';
const MIDDLE_BIN = '01010';
// Base class for EAN8 & EAN13 // Base class for EAN8 & EAN13
class EAN extends Barcode { class EAN extends Barcode {
constructor(data, options) { constructor(data, options) {
@ -53,11 +55,11 @@ class EAN extends Barcode {
encode() { encode() {
const data = [ const data = [
constants.SIDE_BIN, SIDE_BIN,
this.leftEncode(), this.leftEncode(),
constants.MIDDLE_BIN, MIDDLE_BIN,
this.rightEncode(), this.rightEncode(),
constants.SIDE_BIN SIDE_BIN
]; ];
return { return {

View File

@ -26,10 +26,12 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
const constants = require("cards.constants.js");
const EAN = require("cards.EAN.js"); const EAN = require("cards.EAN.js");
const EAN13_STRUCTURE = [
'LLLLLL', 'LLGLGG', 'LLGGLG', 'LLGGGL', 'LGLLGG',
'LGGLLG', 'LGGGLL', 'LGLGLG', 'LGLGGL', 'LGGLGL'
];
// Calculate the checksum digit // Calculate the checksum digit
// https://en.wikipedia.org/wiki/International_Article_Number_(EAN)#Calculation_of_checksum_digit // https://en.wikipedia.org/wiki/International_Article_Number_(EAN)#Calculation_of_checksum_digit
@ -72,7 +74,7 @@ class EAN13 extends EAN {
leftEncode() { leftEncode() {
const data = this.data.substr(1, 6); const data = this.data.substr(1, 6);
const structure = constants.EAN13_STRUCTURE[this.data[0]]; const structure = EAN13_STRUCTURE[this.data[0]];
return super.leftEncode(data, structure); return super.leftEncode(data, structure);
} }

View File

@ -1,60 +0,0 @@
/*
* JS source adapted from https://github.com/lindell/JsBarcode
*
* The MIT License (MIT)
*
* Copyright (c) 2016 Johan Lindell (johan@lindell.me)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
module.exports = {
// Standard start end and middle bits
SIDE_BIN : '101',
MIDDLE_BIN : '01010',
BINARIES : {
'L': [ // The L (left) type of encoding
'0001101', '0011001', '0010011', '0111101', '0100011',
'0110001', '0101111', '0111011', '0110111', '0001011'
],
'G': [ // The G type of encoding
'0100111', '0110011', '0011011', '0100001', '0011101',
'0111001', '0000101', '0010001', '0001001', '0010111'
],
'R': [ // The R (right) type of encoding
'1110010', '1100110', '1101100', '1000010', '1011100',
'1001110', '1010000', '1000100', '1001000', '1110100'
],
'O': [ // The O (odd) encoding for UPC-E
'0001101', '0011001', '0010011', '0111101', '0100011',
'0110001', '0101111', '0111011', '0110111', '0001011'
],
'E': [ // The E (even) encoding for UPC-E
'0100111', '0110011', '0011011', '0100001', '0011101',
'0111001', '0000101', '0010001', '0001001', '0010111'
]
},
// Define the EAN-13 structure
EAN13_STRUCTURE : [
'LLLLLL', 'LLGLGG', 'LLGGLG', 'LLGGGL', 'LGLLGG',
'LGGLLG', 'LGGGLL', 'LGLGLG', 'LGLGGL', 'LGGLGL'
]
}

View File

@ -24,13 +24,34 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
const constants = require("cards.constants.js"); const BINARIES = {
'L': [ // The L (left) type of encoding
'0001101', '0011001', '0010011', '0111101', '0100011',
'0110001', '0101111', '0111011', '0110111', '0001011'
],
'G': [ // The G type of encoding
'0100111', '0110011', '0011011', '0100001', '0011101',
'0111001', '0000101', '0010001', '0001001', '0010111'
],
'R': [ // The R (right) type of encoding
'1110010', '1100110', '1101100', '1000010', '1011100',
'1001110', '1010000', '1000100', '1001000', '1110100'
],
'O': [ // The O (odd) encoding for UPC-E
'0001101', '0011001', '0010011', '0111101', '0100011',
'0110001', '0101111', '0111011', '0110111', '0001011'
],
'E': [ // The E (even) encoding for UPC-E
'0100111', '0110011', '0011011', '0100001', '0011101',
'0111001', '0000101', '0010001', '0001001', '0010111'
]
};
// Encode data string // Encode data string
const encode = (data, structure, separator) => { const encode = (data, structure, separator) => {
let encoded = data let encoded = data
.split('') .split('')
.map((val, idx) => constants.BINARIES[structure[idx]]) .map((val, idx) => BINARIES[structure[idx]])
.map((val, idx) => val ? val[data[idx]] : ''); .map((val, idx) => val ? val[data[idx]] : '');
if (separator) { if (separator) {

View File

@ -16,7 +16,6 @@
{"name":"cards.qrcode.js","url":"qrcode.js"}, {"name":"cards.qrcode.js","url":"qrcode.js"},
{"name":"cards.codabar.js","url":"codabar.js"}, {"name":"cards.codabar.js","url":"codabar.js"},
{"name":"cards.code39.js","url":"code39.js"}, {"name":"cards.code39.js","url":"code39.js"},
{"name":"cards.constants.js","url":"constants.js"},
{"name":"cards.EAN.js","url":"EAN.js"}, {"name":"cards.EAN.js","url":"EAN.js"},
{"name":"cards.EAN8.js","url":"EAN8.js"}, {"name":"cards.EAN8.js","url":"EAN8.js"},
{"name":"cards.EAN13.js","url":"EAN13.js"}, {"name":"cards.EAN13.js","url":"EAN13.js"},