@ibiliaze/stringman 3.15.0 → 3.16.0

package/dist/ticket.d.ts

@@ -5,36 +5,35 @@
  */
 export declare const luhn10: (digits: string) => string;
 /**
- * Compact, stable 2-digit number for a venue or any short code.
- * Uses a small SHA-1 based hash and modulo to fit the requested width.
+ * Compact, stable numeric block from a short venue code.
+ * Uses the first two bytes of a SHA-1 digest modulo 10^len.
  */
-export declare const venueBlockNum: (venueCode: string, len?: number) => string;
+export declare const venueBlockNum: (venueCode: string, len?: 3) => string;
 /**
- * Compact, stable 2-digit number for a Fixture/Match ID string.
- * If you pass your DB fixtureId here, you’ll get a short numeric block.
+ * Compact, stable numeric block from a Fixture/Match ID string.
  */
-export declare const fixtureIdBlockNum: (fixtureId: string, len?: number) => string;
+export declare const fixtureIdBlockNum: (fixtureId: string, len?: 3) => string;
 /**
- * Compact, stable 3-digit number for a specific seat (section + row + col).
+ * Compact, stable numeric block for a specific seat (section + row + col).
  */
-export declare const seatBlockNum: (sectionId: string, row: number, col: number, len?: number) => string;
+export declare const seatBlockNum: (sectionId: string, row: number, col: number, len?: 3) => string;
 /**
- * 6-digit date/time block derived from local start time.
+ * 4-digit date/time block derived from local start time.
  * Input format expected: "YYYY-MM-DDThh:mm" (local, no 'Z').
  * Encodes YYMMDDhhmm then reduces modulo 10^len to keep width stable.
  */
-export declare const fixtureBlockNum: (fixtureLocalIso: string, len?: number) => string;
+export declare const fixtureBlockNum: (fixtureLocalIso: string, len?: 4) => string;
 /**
  * Cryptographically strong random numeric block of the given length.
  */
-export declare const rndBlockNum: (len?: number) => string;
+export declare const rndBlockNum: (len?: 6) => string;
 /**
  * Build a numeric ticket code with blocks ordered to match the picture *in reverse*:
- *   Random (3) + Sector/Block/Col (3) + Date/Time (6) + Fixture/Match ID (2) + Luhn(1)
+ *   Random (6) + Seat (3) + Date/Time (4) + Fixture/Match ID (3) + Luhn(1)
  *
- * Default dashed display groups: 3-3-6-2-1
+ * Default dashed display groups: 6-3-4-3-1
  *
- * Lengths are chosen to keep the overall size at 15 digits (incl. Luhn),
+ * Lengths are chosen to keep the overall size at 17 digits (incl. Luhn),
  * which plays nicely with scanners and manual entry.
  */
 export declare const buildTicketCodeNumeric: (args: {
@@ -48,16 +47,16 @@ export declare const buildTicketCodeNumeric: (args: {
     row: number;
     /** Seat column/number. */
     col: number;
-    /** Optional: your DB fixtureId. If present, becomes the 2-digit “Fixture/Match ID” block. */
+    /** Optional: your DB fixtureId. If present, becomes the 3-digit “Fixture/Match ID” block. */
     fixtureId?: string;
-    /** Random block length (default 3). */
+    /** Optional override for random block length (defaults to 6). */
     rndLen?: number;
     /** Show dashes for readability (default true). */
     dashed?: boolean;
 }) => string;
 /**
  * Validate a code built by buildTicketCodeNumeric (dashes optional).
- * Checks: numeric, correct total length (15), and Luhn checksum.
+ * Checks: numeric, correct total length (17), and Luhn checksum.
  */
 export declare const validateTicketCodeNumeric: (code: string) => boolean;
 /**
@@ -80,9 +79,9 @@ export declare const buildTicketCode: (args: {
     row: number;
     /** Seat column/number. */
     col: number;
-    /** Optional: your DB fixtureId. If present, becomes the 2-digit “Fixture/Match ID” block. */
+    /** Optional: your DB fixtureId. If present, becomes the 3-digit “Fixture/Match ID” block. */
     fixtureId?: string;
-    /** Random block length (default 3). */
+    /** Optional override for random block length (defaults to 6). */
     rndLen?: number;
     /** Show dashes for readability (default true). */
     dashed?: boolean;

package/dist/ticket.js

@@ -1,7 +1,23 @@
 "use strict";
+// =====================================================================================
+// Ticket Code Utilities — Format: 6-3-4-3-1 (Random • Seat • Date/Time • Fixture • Luhn)
+// Total length = 17 digits (including Luhn). Dashes optional for readability.
+// =====================================================================================
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateTicketCode = exports.buildTicketCode = exports.getTicketId = exports.validateTicketCodeNumeric = exports.buildTicketCodeNumeric = exports.rndBlockNum = exports.fixtureBlockNum = exports.seatBlockNum = exports.fixtureIdBlockNum = exports.venueBlockNum = exports.luhn10 = void 0;
 const node_crypto_1 = require("node:crypto");
+// ---------- config: block lengths (easy to tweak in one place) ----------
+const CODE_LEN = {
+    rnd: 6, // Random block
+    seat: 3, // Seat identity (section + row + col hashed to 3 digits)
+    date: 4, // Fixture local datetime compacted to 4 digits
+    fix: 3, // Fixture/Match ID block
+    check: 1, // Luhn check digit
+};
+const EXPECTED_TOTAL_LEN = CODE_LEN.rnd + CODE_LEN.seat + CODE_LEN.date + CODE_LEN.fix + CODE_LEN.check; // 17
+// =====================================================================================
+// Helpers
+// =====================================================================================
 /**
  * Left-pad a positive integer with zeros to a fixed width.
  */
@@ -29,10 +45,10 @@ const luhn10 = (digits) => {
 };
 exports.luhn10 = luhn10;
 /**
- * Compact, stable 2-digit number for a venue or any short code.
- * Uses a small SHA-1 based hash and modulo to fit the requested width.
+ * Compact, stable numeric block from a short venue code.
+ * Uses the first two bytes of a SHA-1 digest modulo 10^len.
  */
-const venueBlockNum = (venueCode, len = 2) => {
+const venueBlockNum = (venueCode, len = CODE_LEN.fix) => {
     try {
         const h = (0, node_crypto_1.createHash)('sha1').update(venueCode.toUpperCase()).digest();
         const n = ((h[0] << 8) | h[1]) % 10 ** len;
@@ -44,10 +60,9 @@ const venueBlockNum = (venueCode, len = 2) => {
 };
 exports.venueBlockNum = venueBlockNum;
 /**
- * Compact, stable 2-digit number for a Fixture/Match ID string.
- * If you pass your DB fixtureId here, you’ll get a short numeric block.
+ * Compact, stable numeric block from a Fixture/Match ID string.
  */
-const fixtureIdBlockNum = (fixtureId, len = 2) => {
+const fixtureIdBlockNum = (fixtureId, len = CODE_LEN.fix) => {
     try {
         const h = (0, node_crypto_1.createHash)('sha1').update(fixtureId).digest();
         const n = ((h[0] << 8) | h[1]) % 10 ** len;
@@ -59,9 +74,9 @@ const fixtureIdBlockNum = (fixtureId, len = 2) => {
 };
 exports.fixtureIdBlockNum = fixtureIdBlockNum;
 /**
- * Compact, stable 3-digit number for a specific seat (section + row + col).
+ * Compact, stable numeric block for a specific seat (section + row + col).
  */
-const seatBlockNum = (sectionId, row, col, len = 3) => {
+const seatBlockNum = (sectionId, row, col, len = CODE_LEN.seat) => {
     try {
         const h = (0, node_crypto_1.createHash)('sha1').update(`${sectionId}:${row}:${col}`).digest();
         const n16 = (h[0] << 8) | h[1];
@@ -74,18 +89,18 @@ const seatBlockNum = (sectionId, row, col, len = 3) => {
 };
 exports.seatBlockNum = seatBlockNum;
 /**
- * 6-digit date/time block derived from local start time.
+ * 4-digit date/time block derived from local start time.
  * Input format expected: "YYYY-MM-DDThh:mm" (local, no 'Z').
  * Encodes YYMMDDhhmm then reduces modulo 10^len to keep width stable.
  */
-const fixtureBlockNum = (fixtureLocalIso, len = 6) => {
+const fixtureBlockNum = (fixtureLocalIso, len = CODE_LEN.date) => {
     try {
         const m = fixtureLocalIso.match(/^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})/);
         if (!m)
             throw new Error('Bad fixtureLocalIso');
         const [_, y, M, d, h, mnt] = m;
         const compact = Number(`${y.slice(2)}${M}${d}${h}${mnt}`); // e.g. 2510312000
-        const n = compact % 10 ** len;
+        const n = compact % 10 ** len; // now 4 digits by default
         return pad(n, len);
     }
     catch {
@@ -96,7 +111,7 @@ exports.fixtureBlockNum = fixtureBlockNum;
 /**
  * Cryptographically strong random numeric block of the given length.
  */
-const rndBlockNum = (len = 3) => {
+const rndBlockNum = (len = CODE_LEN.rnd) => {
     try {
         const max = 10 ** len;
         return pad((0, node_crypto_1.randomInt)(0, max), len);
@@ -106,30 +121,33 @@ const rndBlockNum = (len = 3) => {
     }
 };
 exports.rndBlockNum = rndBlockNum;
+// =====================================================================================
 /**
  * Build a numeric ticket code with blocks ordered to match the picture *in reverse*:
- *   Random (3) + Sector/Block/Col (3) + Date/Time (6) + Fixture/Match ID (2) + Luhn(1)
+ *   Random (6) + Seat (3) + Date/Time (4) + Fixture/Match ID (3) + Luhn(1)
  *
- * Default dashed display groups: 3-3-6-2-1
+ * Default dashed display groups: 6-3-4-3-1
  *
- * Lengths are chosen to keep the overall size at 15 digits (incl. Luhn),
+ * Lengths are chosen to keep the overall size at 17 digits (incl. Luhn),
  * which plays nicely with scanners and manual entry.
  */
 const buildTicketCodeNumeric = (args) => {
     try {
-        // --- individual blocks ---
-        const R = (0, exports.rndBlockNum)(args.rndLen ?? 3); // Random (3)
-        const S = (0, exports.seatBlockNum)(args.sectionId, args.row, args.col); // Seat (3)
-        const D = (0, exports.fixtureBlockNum)(args.fixtureLocalIso, 6); // Date/Time (6)
-        // Fixture/Match ID (2): prefer fixtureId; fallback to venue code hash
-        const F = args.fixtureId ? (0, exports.fixtureIdBlockNum)(args.fixtureId, 2) : (0, exports.venueBlockNum)(args.venueCode, 2);
+        // --- individual blocks (new lengths) ---
+        const R = (0, exports.rndBlockNum)(6); // Random (6)
+        const S = (0, exports.seatBlockNum)(args.sectionId, args.row, args.col, CODE_LEN.seat); // Seat (3)
+        const D = (0, exports.fixtureBlockNum)(args.fixtureLocalIso, CODE_LEN.date); // Date/Time (4)
+        // Fixture/Match ID (3): prefer fixtureId; fallback to venue code hash (also 3)
+        const F = args.fixtureId
+            ? (0, exports.fixtureIdBlockNum)(args.fixtureId, CODE_LEN.fix)
+            : (0, exports.venueBlockNum)(args.venueCode, CODE_LEN.fix);
         // --- assemble (REVERSED order vs the picture’s left-to-right) ---
-        const body = `${R}${S}${D}${F}`; // 3+3+6+2 = 14
+        const body = `${R}${S}${D}${F}`; // 6+3+4+3 = 16
         const C = (0, exports.luhn10)(body); // 1 digit
-        const numeric = `${body}${C}`; // total 15 digits
+        const numeric = `${body}${C}`; // total 17 digits
         if (args.dashed === false)
             return numeric;
-        // Readability grouping for scanners/ushers: 3-3-6-2-1
+        // Readability grouping for scanners/ushers: 6-3-4-3-1
         return `${R}-${S}-${D}-${F}-${C}`;
     }
     catch {
@@ -137,15 +155,18 @@ const buildTicketCodeNumeric = (args) => {
     }
 };
 exports.buildTicketCodeNumeric = buildTicketCodeNumeric;
+// =====================================================================================
 /**
  * Validate a code built by buildTicketCodeNumeric (dashes optional).
- * Checks: numeric, correct total length (15), and Luhn checksum.
+ * Checks: numeric, correct total length (17), and Luhn checksum.
  */
 const validateTicketCodeNumeric = (code) => {
     try {
         const clean = code.replace(/-/g, '');
-        if (!/^\d{15}$/.test(clean))
-            return false; // 3+3+6+2+1
+        if (!/^\d+$/.test(clean))
+            return false;
+        if (clean.length !== EXPECTED_TOTAL_LEN)
+            return false; // 17
         const body = clean.slice(0, -1);
         const check = clean.slice(-1);
         return (0, exports.luhn10)(body) === check;
@@ -155,6 +176,7 @@ const validateTicketCodeNumeric = (code) => {
     }
 };
 exports.validateTicketCodeNumeric = validateTicketCodeNumeric;
+// =====================================================================================
 /**
  * A stable, human-readable internal ID for a seat within a fixture.
  * (Not used in the printed/scanned code — just handy elsewhere.)

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ibiliaze/stringman",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
     "pub": "npm publish --access public",
-    "git": "git add .; git commit -m 'changes'; git tag -a v3.14.1 -m 'v3.14.1'; git push origin v3.14.1; git push",
+    "git": "git add .; git commit -m 'changes'; git tag -a 3.16.0 -m '3.16.0'; git push origin 3.16.0; git push",
     "push": "npm run build; npm run git; npm run pub"
   },
   "author": "Ibi Hasanli",

package/src/ticket.ts

@@ -1,5 +1,25 @@
+// =====================================================================================
+// Ticket Code Utilities — Format: 6-3-4-3-1 (Random • Seat • Date/Time • Fixture • Luhn)
+// Total length = 17 digits (including Luhn). Dashes optional for readability.
+// =====================================================================================
+
 import { createHash, randomInt } from 'node:crypto';
 
+// ---------- config: block lengths (easy to tweak in one place) ----------
+const CODE_LEN = {
+  rnd: 6, // Random block
+  seat: 3, // Seat identity (section + row + col hashed to 3 digits)
+  date: 4, // Fixture local datetime compacted to 4 digits
+  fix: 3, // Fixture/Match ID block
+  check: 1, // Luhn check digit
+} as const;
+
+const EXPECTED_TOTAL_LEN = CODE_LEN.rnd + CODE_LEN.seat + CODE_LEN.date + CODE_LEN.fix + CODE_LEN.check; // 17
+
+// =====================================================================================
+// Helpers
+// =====================================================================================
+
 /**
  * Left-pad a positive integer with zeros to a fixed width.
  */
@@ -27,10 +47,10 @@ export const luhn10 = (digits: string): string => {
 };
 
 /**
- * Compact, stable 2-digit number for a venue or any short code.
- * Uses a small SHA-1 based hash and modulo to fit the requested width.
+ * Compact, stable numeric block from a short venue code.
+ * Uses the first two bytes of a SHA-1 digest modulo 10^len.
  */
-export const venueBlockNum = (venueCode: string, len = 2) => {
+export const venueBlockNum = (venueCode: string, len = CODE_LEN.fix) => {
   try {
     const h = createHash('sha1').update(venueCode.toUpperCase()).digest();
     const n = ((h[0] << 8) | h[1]) % 10 ** len;
@@ -41,10 +61,9 @@ export const venueBlockNum = (venueCode: string, len = 2) => {
 };
 
 /**
- * Compact, stable 2-digit number for a Fixture/Match ID string.
- * If you pass your DB fixtureId here, you’ll get a short numeric block.
+ * Compact, stable numeric block from a Fixture/Match ID string.
  */
-export const fixtureIdBlockNum = (fixtureId: string, len = 2) => {
+export const fixtureIdBlockNum = (fixtureId: string, len = CODE_LEN.fix) => {
   try {
     const h = createHash('sha1').update(fixtureId).digest();
     const n = ((h[0] << 8) | h[1]) % 10 ** len;
@@ -55,9 +74,9 @@ export const fixtureIdBlockNum = (fixtureId: string, len = 2) => {
 };
 
 /**
- * Compact, stable 3-digit number for a specific seat (section + row + col).
+ * Compact, stable numeric block for a specific seat (section + row + col).
  */
-export const seatBlockNum = (sectionId: string, row: number, col: number, len = 3) => {
+export const seatBlockNum = (sectionId: string, row: number, col: number, len = CODE_LEN.seat) => {
   try {
     const h = createHash('sha1').update(`${sectionId}:${row}:${col}`).digest();
     const n16 = (h[0] << 8) | h[1];
@@ -69,17 +88,17 @@ export const seatBlockNum = (sectionId: string, row: number, col: number, len =
 };
 
 /**
- * 6-digit date/time block derived from local start time.
+ * 4-digit date/time block derived from local start time.
  * Input format expected: "YYYY-MM-DDThh:mm" (local, no 'Z').
  * Encodes YYMMDDhhmm then reduces modulo 10^len to keep width stable.
  */
-export const fixtureBlockNum = (fixtureLocalIso: string, len = 6) => {
+export const fixtureBlockNum = (fixtureLocalIso: string, len = CODE_LEN.date) => {
   try {
     const m = fixtureLocalIso.match(/^(\d{4})-(\d{2})-(\d{2})[T ](\d{2}):(\d{2})/);
     if (!m) throw new Error('Bad fixtureLocalIso');
     const [_, y, M, d, h, mnt] = m;
     const compact = Number(`${y.slice(2)}${M}${d}${h}${mnt}`); // e.g. 2510312000
-    const n = compact % 10 ** len;
+    const n = compact % 10 ** len; // now 4 digits by default
     return pad(n, len);
   } catch {
     return ''.padStart(len, '0');
@@ -89,7 +108,7 @@ export const fixtureBlockNum = (fixtureLocalIso: string, len = 6) => {
 /**
  * Cryptographically strong random numeric block of the given length.
  */
-export const rndBlockNum = (len = 3) => {
+export const rndBlockNum = (len = CODE_LEN.rnd) => {
   try {
     const max = 10 ** len;
     return pad(randomInt(0, max), len);
@@ -98,13 +117,14 @@ export const rndBlockNum = (len = 3) => {
   }
 };
 
+// =====================================================================================
 /**
  * Build a numeric ticket code with blocks ordered to match the picture *in reverse*:
- *   Random (3) + Sector/Block/Col (3) + Date/Time (6) + Fixture/Match ID (2) + Luhn(1)
+ *   Random (6) + Seat (3) + Date/Time (4) + Fixture/Match ID (3) + Luhn(1)
  *
- * Default dashed display groups: 3-3-6-2-1
+ * Default dashed display groups: 6-3-4-3-1
  *
- * Lengths are chosen to keep the overall size at 15 digits (incl. Luhn),
+ * Lengths are chosen to keep the overall size at 17 digits (incl. Luhn),
  * which plays nicely with scanners and manual entry.
  */
 export const buildTicketCodeNumeric = (args: {
@@ -118,43 +138,47 @@ export const buildTicketCodeNumeric = (args: {
   row: number;
   /** Seat column/number. */
   col: number;
-  /** Optional: your DB fixtureId. If present, becomes the 2-digit “Fixture/Match ID” block. */
+  /** Optional: your DB fixtureId. If present, becomes the 3-digit “Fixture/Match ID” block. */
   fixtureId?: string;
-  /** Random block length (default 3). */
+  /** Optional override for random block length (defaults to 6). */
   rndLen?: number;
   /** Show dashes for readability (default true). */
   dashed?: boolean;
 }) => {
   try {
-    // --- individual blocks ---
-    const R = rndBlockNum(args.rndLen ?? 3); // Random (3)
-    const S = seatBlockNum(args.sectionId, args.row, args.col); // Seat (3)
-    const D = fixtureBlockNum(args.fixtureLocalIso, 6); // Date/Time (6)
-    // Fixture/Match ID (2): prefer fixtureId; fallback to venue code hash
-    const F = args.fixtureId ? fixtureIdBlockNum(args.fixtureId, 2) : venueBlockNum(args.venueCode, 2);
+    // --- individual blocks (new lengths) ---
+    const R = rndBlockNum(6); // Random (6)
+    const S = seatBlockNum(args.sectionId, args.row, args.col, CODE_LEN.seat); // Seat (3)
+    const D = fixtureBlockNum(args.fixtureLocalIso, CODE_LEN.date); // Date/Time (4)
+    // Fixture/Match ID (3): prefer fixtureId; fallback to venue code hash (also 3)
+    const F = args.fixtureId
+      ? fixtureIdBlockNum(args.fixtureId, CODE_LEN.fix)
+      : venueBlockNum(args.venueCode, CODE_LEN.fix);
 
     // --- assemble (REVERSED order vs the picture’s left-to-right) ---
-    const body = `${R}${S}${D}${F}`; // 3+3+6+2 = 14
+    const body = `${R}${S}${D}${F}`; // 6+3+4+3 = 16
     const C = luhn10(body); // 1 digit
-    const numeric = `${body}${C}`; // total 15 digits
+    const numeric = `${body}${C}`; // total 17 digits
 
     if (args.dashed === false) return numeric;
 
-    // Readability grouping for scanners/ushers: 3-3-6-2-1
+    // Readability grouping for scanners/ushers: 6-3-4-3-1
     return `${R}-${S}-${D}-${F}-${C}`;
   } catch {
     return '';
   }
 };
 
+// =====================================================================================
 /**
  * Validate a code built by buildTicketCodeNumeric (dashes optional).
- * Checks: numeric, correct total length (15), and Luhn checksum.
+ * Checks: numeric, correct total length (17), and Luhn checksum.
  */
 export const validateTicketCodeNumeric = (code: string) => {
   try {
     const clean = code.replace(/-/g, '');
-    if (!/^\d{15}$/.test(clean)) return false; // 3+3+6+2+1
+    if (!/^\d+$/.test(clean)) return false;
+    if (clean.length !== EXPECTED_TOTAL_LEN) return false; // 17
     const body = clean.slice(0, -1);
     const check = clean.slice(-1);
     return luhn10(body) === check;
@@ -163,6 +187,7 @@ export const validateTicketCodeNumeric = (code: string) => {
   }
 };
 
+// =====================================================================================
 /**
  * A stable, human-readable internal ID for a seat within a fixture.
  * (Not used in the printed/scanned code — just handy elsewhere.)