denwa-web-shared 1.0.48 → 1.0.50

package/dist/server/index.cjs.js

@@ -429,16 +429,23 @@ const uuidToStringId = (uuid2, length = 18) => {
   return cleanUuid.slice(-length);
 };
 const uuidToNumericId = (uuid2, maxDigits = 18) => {
-  const hex = uuid2.replace(/-/g, "");
-  const safeHex = hex.slice(-14);
-  const num = parseInt(safeHex, 16);
-  let numStr = num.toString();
-  if (numStr.length < maxDigits) {
-    numStr = numStr.padStart(maxDigits, "0");
-  } else if (numStr.length > maxDigits) {
-    numStr = numStr.slice(-maxDigits);
+  const cleanUuid = uuid2.replace(/-/g, "");
+  let hash = 0;
+  for (let i = 0; i < cleanUuid.length; i++) {
+    const char = cleanUuid.charCodeAt(i);
+    hash = (hash << 5) - hash + char;
+    hash = hash & hash;
+  }
+  let result = Math.abs(hash).toString();
+  if (result.length < maxDigits) {
+    const segments = cleanUuid.match(/.{1,4}/g) || [];
+    for (const segment of segments) {
+      const segmentNum = parseInt(segment, 16);
+      result += Math.abs(segmentNum).toString();
+      if (result.length >= maxDigits) break;
+    }
   }
-  return numStr;
+  return result.slice(0, maxDigits);
 };
 const escapeXml = (str) => {
   if (!str) return "";
@@ -467,7 +474,7 @@ const generateYandexFeedXML = ({
        <name>${escapeXml(item.name)}</name>
        <vendor>${escapeXml(item.vendor)}</vendor>
        <description>${escapeXml(item.description)}</description>
-       <vendorCode>${escapeXml(item.vendorCode)}</vendorCode>
+       ${item.vendorCode && `<vendorCode>${escapeXml(item.vendorCode)}</vendorCode>`}
        <pickup>${item.pickup}</pickup>
        ${(_a = item.params) == null ? void 0 : _a.map((item2) => {
       return `<param name="${item2.name}">${escapeXml(item2.value)}</param>`;
@@ -477,7 +484,8 @@ const generateYandexFeedXML = ({
   }).join("");
   const categoriesXml = categoriesData.map((item) => {
     const id = typeof item.id === "number" ? item.id : uuidToNumericId(item.id);
-    return `<category id="${id}">${escapeXml(item.name)}</category>`;
+    const parentId = item.parentId ? ` parentId="${typeof item.parentId === "number" ? item.parentId : uuidToNumericId(item.parentId)}"` : "";
+    return `<category id="${id}"${parentId}>${escapeXml(item.name)}</category>`;
   }).join("");
   return `<?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE yml_catalog SYSTEM "shops.dtd">

package/dist/server/index.es.js

@@ -427,16 +427,23 @@ const uuidToStringId = (uuid2, length = 18) => {
   return cleanUuid.slice(-length);
 };
 const uuidToNumericId = (uuid2, maxDigits = 18) => {
-  const hex = uuid2.replace(/-/g, "");
-  const safeHex = hex.slice(-14);
-  const num = parseInt(safeHex, 16);
-  let numStr = num.toString();
-  if (numStr.length < maxDigits) {
-    numStr = numStr.padStart(maxDigits, "0");
-  } else if (numStr.length > maxDigits) {
-    numStr = numStr.slice(-maxDigits);
+  const cleanUuid = uuid2.replace(/-/g, "");
+  let hash = 0;
+  for (let i = 0; i < cleanUuid.length; i++) {
+    const char = cleanUuid.charCodeAt(i);
+    hash = (hash << 5) - hash + char;
+    hash = hash & hash;
+  }
+  let result = Math.abs(hash).toString();
+  if (result.length < maxDigits) {
+    const segments = cleanUuid.match(/.{1,4}/g) || [];
+    for (const segment of segments) {
+      const segmentNum = parseInt(segment, 16);
+      result += Math.abs(segmentNum).toString();
+      if (result.length >= maxDigits) break;
+    }
   }
-  return numStr;
+  return result.slice(0, maxDigits);
 };
 const escapeXml = (str) => {
   if (!str) return "";
@@ -465,7 +472,7 @@ const generateYandexFeedXML = ({
        <name>${escapeXml(item.name)}</name>
        <vendor>${escapeXml(item.vendor)}</vendor>
        <description>${escapeXml(item.description)}</description>
-       <vendorCode>${escapeXml(item.vendorCode)}</vendorCode>
+       ${item.vendorCode && `<vendorCode>${escapeXml(item.vendorCode)}</vendorCode>`}
        <pickup>${item.pickup}</pickup>
        ${(_a = item.params) == null ? void 0 : _a.map((item2) => {
       return `<param name="${item2.name}">${escapeXml(item2.value)}</param>`;
@@ -475,7 +482,8 @@ const generateYandexFeedXML = ({
   }).join("");
   const categoriesXml = categoriesData.map((item) => {
     const id = typeof item.id === "number" ? item.id : uuidToNumericId(item.id);
-    return `<category id="${id}">${escapeXml(item.name)}</category>`;
+    const parentId = item.parentId ? ` parentId="${typeof item.parentId === "number" ? item.parentId : uuidToNumericId(item.parentId)}"` : "";
+    return `<category id="${id}"${parentId}>${escapeXml(item.name)}</category>`;
   }).join("");
   return `<?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE yml_catalog SYSTEM "shops.dtd">

package/dist/server/lib/utils.d.ts

@@ -231,13 +231,14 @@ export declare const generateYandexFeedXML: ({ shopName, shopCompany, delivery,
     categoriesData: {
         id: string | number;
         name: string;
+        parentId?: string | number;
     }[];
     offersData: {
         id: string | number;
         categoryId: string | number;
         name: string;
         vendor: string;
-        vendorCode: string;
+        vendorCode?: string | null;
         description: string;
         href: string;
         images: IPreparedServerImageWithAlt[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "denwa-web-shared",
   "private": false,
-  "version": "1.0.48",
+  "version": "1.0.50",
   "type": "module",
   "author": "Denwa",
   "main": "dist/denwa-web-shared.cjs.js",