@bytebrand/export-cars 1.26.6 → 1.26.8

package/dist/utils/converter.utils.d.ts

@@ -1,3 +1,4 @@
 export declare function convertToCSV(data: unknown): string;
 export declare const xmlStringReplacer: (str: string) => string;
+export declare function normalizeTitle(title: string): string;
 export declare function parseCsvToObjects<T>(csv: string): T[];

package/dist/utils/converter.utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCsvToObjects = exports.xmlStringReplacer = exports.convertToCSV = void 0;
+exports.parseCsvToObjects = exports.normalizeTitle = exports.xmlStringReplacer = exports.convertToCSV = void 0;
 const lodash_1 = require("lodash");
 function convertToCSV(data) {
     const converted = [];
@@ -16,6 +16,16 @@ const xmlStringReplacer = (str) => {
     return typeof str === 'string' ? str.replace(/&/g, '&amp;').replace(/[<>]/g, '') : '';
 };
 exports.xmlStringReplacer = xmlStringReplacer;
+const TITLE_DISALLOWED_CHARS = /[^\p{L}\p{N} .,\-/()%"°&]/gu;
+const TITLE_EDGE_SEPARATORS = /^[\s.,\-/&]+|[\s.,\-/&]+$/g;
+function normalizeTitle(title) {
+    return (title || '')
+        .replace(TITLE_DISALLOWED_CHARS, ' ')
+        .replace(/([.,\-/])\1+/g, '$1')
+        .replace(/\s+/g, ' ')
+        .replace(TITLE_EDGE_SEPARATORS, '');
+}
+exports.normalizeTitle = normalizeTitle;
 function parseCsvToObjects(csv) {
     const rows = [];
     let row = [];

package/dist/utils/converter.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"converter.utils.js","sourceRoot":"","sources":["../../src/utils/converter.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"converter.utils.js","sourceRoot":"","sources":["../../src/utils/converter.utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebrand/export-cars",
-  "version": "1.26.6",
+  "version": "1.26.8",
   "description": "",
   "author": "bytebrand",
   "license": "UNLICENSED",

package/src/services/images.service.ts

@@ -189,12 +189,13 @@ export class ImagesService {
       return ignoreDefImages ? [] : [...this.DEFAULT_IMAGES];
     }
 
-    // marketingImageUrl (config.ts environmentConfig[env].imageUrl) points at /cache_test on
-    // dev — a leftover from the old "fb" channel, not where image-generator publishes meta_aia
-    // composites (always under /generated_images on both dev and prod). Build the meta_aia base
-    // from the plain image host instead of trusting that per-env path.
+    // marketingImageUrl AND config.imageUrl (FbConfig overrides the latter to the same
+    // per-env value right after super()) both point at the old "fb" channel's base path
+    // (/cache_test on dev, already /generated_images on prod) — not where image-generator
+    // publishes meta_aia composites. baseImageUrl is the one field neither Config nor FbConfig
+    // ever suffixes with a path, so it's the only safe base to build /generated_images on.
     const imageUrl = config.channelCode === 'meta_aia'
-      ? `${this.configService.config.imageUrl}/generated_images`
+      ? `${this.configService.config.baseImageUrl}/generated_images`
       : this.configService.config.marketingImageUrl;
 
     const marketingImageConfigs = config.marketingImages.map(i => ({ marketingImageCodes: i.imageCodes }));

package/src/transformers/fb-description.transformer.ts

@@ -46,13 +46,8 @@ export class FbDescription {
             key: get(this.car, 'engineData.cylinders', '') as string,
           },
         },
-        {
-          title: 'accordion.captionCapacity',
-          value: {
-            key: 'title.cubicCapacity',
-            data: { cubicCapacity: get(this.car, 'engineData.cubicCapacity') },
-          },
-        },
+        // "Hubraum" is not exported: the value key resolved to the label itself
+        // (title.cubicCapacity === "Hubraum"), so every listing read "Hubraum: Hubraum".
         {
           title: 'accordion.captionPower',
           value: {
@@ -166,12 +161,8 @@ export class FbDescription {
             },
           },
         },
-        {
-          title: 'title.base',
-          value: {
-            key: get(this.car, 'driveSuspension.wheelBase', '') as string,
-          },
-        },
+        // "Radstand" is not exported: driveSuspension.wheelBase is stored as null across the
+        // catalogue, so every listing read "Radstand: ;".
         {
           title: 'title.loadingVolume',
           value: {

package/src/transformers/fb.transformer.ts

@@ -1,7 +1,6 @@
 import { Cache } from 'cache-manager';
 import * as moment from 'moment';
 import {
-  escape,
   findIndex,
   get,
   includes,
@@ -12,7 +11,6 @@ import {
   join,
   toSafeInteger,
   toString,
-  trim,
   truncate,
 } from 'lodash';
 
@@ -30,7 +28,7 @@ import { Description } from '../interfaces/description.interface';
 import { FbDescription } from './fb-description.transformer';
 import { ConfigService, ImagesService, MappingService } from '../services';
 import { FbEquipment } from './fb-equipment.transformer';
-import { isValidVin } from '../utils';
+import { isValidVin, normalizeTitle } from '../utils';
 import { UserService } from 'src/services';
 import { ImageType } from '../enums';
 import {
@@ -188,14 +186,16 @@ export class FbTransformer {
   }
 
   private getTitle(car: DataSchemes.Car): string {
-    let year = toString(get(car, 'mainData.constructionYear', ''));
-    if (year === '0') {
-      year = '';
-    }
+    // mainData.constructionYear holds a raw epoch for part of the catalogue — the same
+    // corruption getFirstValidYear() already guards <year> against. Without the guard titles
+    // ship as "1609459200 Ford Galaxy …"; an invalid year is dropped instead.
+    const year = toString(getFirstValidYear(toString(get(car, 'mainData.constructionYear', ''))));
     const make = toString(get(car, 'mainData.make', ''));
     const model = toString(get(car, 'mainData.model', ''));
     const subModel = toString(get(car, 'mainData.subModel', ''));
-    return trim(escape(join([year, make, model, subModel], ' ')));
+    // No escape() here: FbXmlBuilder writes <title> inside CDATA, so HTML entities are not
+    // decoded by the consumer and leak literally ("Monte Carlo &amp; KESSY").
+    return normalizeTitle(join([year, make, model, subModel], ' '));
   }
 
   private getTrim(car: DataSchemes.Car): string {

package/src/utils/converter.utils.ts

@@ -14,6 +14,23 @@ export const xmlStringReplacer = (str: string): string => {
   return typeof str === 'string' ? str.replace(/&/g, '&amp;').replace(/[<>]/g, '') : '';
 };
 
+// Dealer-supplied subModel strings are full of decorative punctuation ("*AHK*Leder*Navi*",
+// "|ACC|PANO/AHK", "#PANO #NAVI #SONY #") which must not reach Meta. Keep letters, digits and
+// the punctuation that carries meaning in German trim names — "." "," "-" "/" "(" ")" "%",
+// "°" (360° Kamera), '"' (Zoll) and "&" (audio brands: B&O, h&k) — and turn everything else
+// into a space so neighbouring words never fuse.
+const TITLE_DISALLOWED_CHARS = /[^\p{L}\p{N} .,\-/()%"°&]/gu;
+// Leading/trailing separators only; '"' and "%" are legitimate title endings (`LM18"`, `-35%`).
+const TITLE_EDGE_SEPARATORS = /^[\s.,\-/&]+|[\s.,\-/&]+$/g;
+
+export function normalizeTitle(title: string): string {
+  return (title || '')
+    .replace(TITLE_DISALLOWED_CHARS, ' ')
+    .replace(/([.,\-/])\1+/g, '$1') // "L4H2 //Klimaanlage" -> "L4H2 /Klimaanlage"
+    .replace(/\s+/g, ' ')
+    .replace(TITLE_EDGE_SEPARATORS, '');
+}
+
 // Parses a "Publish to web" Google Sheets CSV export (RFC4180-ish, quoted fields may
 // contain commas/newlines) into row arrays, then maps rows to objects keyed by header.
 export function parseCsvToObjects<T>(csv: string): T[] {