@softwear/latestcollectioncore 1.0.174 → 1.0.176

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.174",
+  "version": "1.0.176",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "date-fns": "^2.29.3",
-    "filtrex": "^2.2.3"
+    "filtrex": "^2.2.3",
+    "jspdf": "^4.2.1"
   }
 }

package/src/imageBinder.ts

@@ -32,18 +32,19 @@ function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Arr
   const skusCopy = deepCopy(filteredSkus)
   const preppedSkus: Array<Record<string, any>> = []
   const fileNames2skip: Array<string> = []
-  let idx = 0
-  skusCopy.forEach((sku) => {
-    const fieldsToBeMerged = {}
+  skusCopy.forEach((sku, idx) => {
     if (sku.images && sku.images.length > 0) {
       // If a fileName is already matched, we skip it
       fileNames.forEach((fileName) => {
-        if (sku.images?.includes(fileName) && !fileNames2skip.includes(fileName)) fileNames2skip.push(fileName)
+        if (sku.images?.includes(fileName) && fileNames2skip.indexOf(fileName) == -1) fileNames2skip.push(fileName)
       })
       // If a sku has images, we skip it
+      sku['skip'] = true
+      preppedSkus.push(sku)
       return
     }
 
+    const fieldsToBeMerged = {}
     for (const fieldName in sku) {
       if (fieldName == '__created' || fieldName == '__modified' || fieldName == 'images' || fieldName == 'brandhash' || (merge == true && fieldName == 'colorFamily')) continue
       let fieldVal = sku[fieldName]
@@ -70,7 +71,6 @@ function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Arr
     } else {
       const newSku = {}
       newSku['originalSku'] = filteredSkus[idx]
-      idx++
       for (const fieldVal in fieldsToBeMerged) {
         const fieldNameArray = fieldsToBeMerged[fieldVal].sort()
         if (fieldNameArray.length > 1) {
@@ -83,7 +83,7 @@ function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Arr
     }
   })
   const fileNames2Match = fileNames.filter((fileName) => {
-    return fileNames2skip.includes(fileName) == false
+    return fileNames2skip.indexOf(fileName) == -1
   })
   return { preppedSkus: preppedSkus, fileNames2Match: fileNames2Match }
 }
@@ -116,7 +116,7 @@ function checkWithoutLast(fileName: string) {
     .toLowerCase()
     .split(/[_\-.\s()]+|%[0-9A-Fa-f]{2}/)
     .slice(0, -1)
-  const lastToken = tokens.at(-1)
+  const lastToken = tokens[tokens.length - 1]
   let returnWithoutLast = false
   if (lastToken) {
     if (lastToken.includes('front') || lastToken.includes('back') || lastToken.includes('side') || lastToken.includes('sole')) returnWithoutLast = true
@@ -167,7 +167,7 @@ function testQuickSearch(
           if (pair[0] == cleanedFileName) {
             indicesToReturn.push(idx)
             patternStringFound = quickSearchPattern
-          } else if (indicesToReturn.length == 0 && pair[0] == fileNameWithoutLast && !indicesWithoutLast.includes(idx)) {
+          } else if (indicesToReturn.length == 0 && pair[0] == fileNameWithoutLast && indicesWithoutLast.indexOf(idx) == -1) {
             indicesWithoutLast.push(idx)
             patternStringFound = quickSearchPattern
           }
@@ -188,6 +188,7 @@ function prepQuickSearch(preppedSkus: any): Record<string, Array<any>> {
     patternStrings.push(pattern.join('-'))
   })
   preppedSkus.forEach((sku, idx) => {
+    if (sku['skip']) return
     GLOBAL_PATTERNS.forEach((pattern, patternIndex) => {
       const proposedFilename = pattern.reduce((out, field) => out + (field in sku ? sku[field] : ''), '')
       if (proposedFilename) {
@@ -204,11 +205,10 @@ function prepQuickSearch(preppedSkus: any): Record<string, Array<any>> {
 
 function addNewPatternToQuickSearch(preppedSkus: any, pattern: Array<string>, quickSearch: Record<string, Array<Array<any>>>): Record<string, Array<any>> {
   const newQuickSearchArray: Array<Array<any>> = []
-  let idx = 0
-  preppedSkus.forEach((sku) => {
+  preppedSkus.forEach((sku, idx) => {
+    if (sku['skip']) return
     const proposedFilename = pattern.reduce((out, field) => out + (field in sku ? sku[field] : ''), '')
     if (proposedFilename) newQuickSearchArray.push([proposedFilename, idx])
-    idx++
   })
   quickSearch[pattern.join('-')] = newQuickSearchArray
   return quickSearch
@@ -223,6 +223,7 @@ function fallbackSearch(cleanedFileName: string, fileNameWithoutLast: string, pr
   let currentBestSubstringPatterns: Record<string, Array<number>> = {}
   let maxPatternlength = 0
   preppedSkus.forEach((sku, idx) => {
+    if (sku['skip']) return
     if (pattern_found.length > 0) {
       // In case a new pattern has been found in one sku, test that on the remaining skus. If they don't match the pattern, skip them.
       const proposedFilename = pattern_found.reduce((out, field) => out + (field in sku ? sku[field] : ''), '')
@@ -282,15 +283,15 @@ function fallbackSearch(cleanedFileName: string, fileNameWithoutLast: string, pr
           substringPattern.splice(idx, 1)
         }
       })
-      const proposedFilename = Object.values(substringObject).join('')
+      const proposedFilename = (<any>Object).values(substringObject).join('')
       if (proposedFilename == cleanedFileName || (fileNameWithoutLast && proposedFilename == fileNameWithoutLast)) {
         // We've discovered a new pattern
-        pattern_found = Object.values(patternObject)
+        pattern_found = (<any>Object).values(patternObject)
         exactMatches.push(idx)
         return
       }
-      patternString = Object.values(patternObject).join('-')
-      const revisedPatternLength = Object.values(patternObject).length
+      patternString = (<any>Object).values(patternObject).join('-')
+      const revisedPatternLength = (<any>Object).values(patternObject).length
       if (revisedPatternLength == maxPatternlength) {
         // We've found a new pattern of the same length, so we keep this one too
         if (patternString in currentBestSubstringPatterns) {
@@ -317,7 +318,7 @@ function fallbackSearch(cleanedFileName: string, fileNameWithoutLast: string, pr
         const sku = preppedSkus[idx]
         pattern.forEach((fieldName) => {
           const fieldVal = sku[fieldName]
-          if (fieldVal && !uniqueFieldVals.includes(fieldVal)) uniqueFieldVals.push(fieldVal)
+          if (fieldVal && uniqueFieldVals.indexOf(fieldVal) == -1) uniqueFieldVals.push(fieldVal)
         })
       })
       uniqueFieldVals.sort((a, b) => {
@@ -364,6 +365,7 @@ function imageBinder(fileNames: Array<string>, filteredSkus: SkuI[], brand: stri
       const fileNameWithoutLast = checkWithoutLast(fileName)
       fileNameIndexMatch[fileName] = []
       preppedSkus.forEach((sku, idx) => {
+        if (sku['skip']) return
         let skuStillMatches = true
         specifiedPattern.every((fieldName) => {
           if (!(fieldName in sku)) skuStillMatches = false

package/src/index.ts

@@ -14,9 +14,12 @@ export { default as hasOnlyDigits } from './hasOnlyDigits'
 export { default as imageBinder } from './imageBinder'
 export { default as isean13 } from './isean13'
 export { default as pivotTable } from './pivotTable'
+export { default as reports, genPDF } from './reports'
 export { default as round2 } from './round2'
 export { default as sizeToMap } from './sizeToMap'
 export { default as transaction } from './transaction'
+export * from './pdf'
+export type { GenPdfAlert, GenPdfOptions, PdfFontDefinition, PdfFontVariant, PdfImageAsset } from './reports'
 export * from './types'
 export * from './consts'
 export {

package/src/pdf.ts

@@ -0,0 +1,76 @@
+export interface PaperSize {
+  width: number
+  height: number
+  footerHeight: number
+}
+
+export type TextAlign = 1 | 2 | 3 // 1: left, 2: center, 3: right
+export type ObjectType = 'text' | 'field' | 'rectangle' | 'image' | 'container'
+export type RepeatContainer = 'horizontal' | 'vertical' | undefined
+
+export interface BaseLayoutObject {
+  type: ObjectType
+  x: number
+  y: number
+  width: number
+  height: number
+  active?: boolean
+  snapToBottom?: boolean
+  name?: string
+}
+
+export interface TextLayoutObject extends BaseLayoutObject {
+  type: 'text'
+  text: string
+  textAlign?: TextAlign
+  fontFamily: string
+  fontSize: number
+  fontStyle: number
+  case?: 1 | 2 // 1: uppercase, 2: lowercase
+}
+
+export interface FieldLayoutObject extends BaseLayoutObject {
+  type: 'field'
+  source?: string
+  format?: 'date' | 'currency'
+  textAlign?: TextAlign
+  fontFamily: string
+  fontSize: number
+  fontStyle: number
+  case?: 1 | 2
+}
+
+export interface RectangleLayoutObject extends BaseLayoutObject {
+  type: 'rectangle'
+}
+
+export interface ImageLayoutObject extends BaseLayoutObject {
+  type: 'image'
+  url?: string
+  image?: HTMLImageElement
+}
+
+export interface ContainerLayoutObject extends BaseLayoutObject {
+  type: 'container'
+  source: string
+  children: LayoutObject[]
+  repeatContainer?: RepeatContainer
+  repeatOnOverflow?: boolean
+  pageBreak?: boolean
+  /** Minimum mm of remaining space before drawing next item; if less, break to next page first */
+  minHeightBeforeBreak?: number
+  /** When true, container and children are drawn only once at the end of the report, not on every page */
+  printOnlyAtEnd?: boolean
+}
+
+export type LayoutObject = TextLayoutObject | FieldLayoutObject | RectangleLayoutObject | ImageLayoutObject | ContainerLayoutObject
+
+export interface Layout {
+  name?: string
+  group?: string
+  paperSize: PaperSize
+  objects: LayoutObject[]
+  active?: boolean
+  /** Default font for text/field objects that have no fontFamily. E.g. 'Inter', 'Helvetica'. */
+  defaultFontFamily?: string
+}