@metron-labs/quote-react 0.1.74 → 0.1.76

package/dist/util/pricing.d.ts

@@ -11,6 +11,7 @@ export interface PricingBreakdown {
     calculation: string;
     costingMode: "direct" | "derived" | "review";
 }
+export declare const needsQuantityConfirmation: (item: CartItem, pricing: PricingBreakdown) => boolean;
 export declare function getCartSubtotal(items: CartItem[], options?: Parameters<typeof getPricingBreakdown>[1]): number | null;
 export declare function getPricingBreakdown(item: CartItem, options?: Parameters<typeof calculateBreakdown>[1]): PricingBreakdown;
 declare function calculateBreakdown(item: CartItem, options?: {

package/dist/util/pricing.js

@@ -5,10 +5,25 @@ const unitAliases = {
     "m²": "m2",
     cbm: "m3",
     "cu m": "m3",
+    "m³": "m3",
     lm: "m",
     "lin m": "m",
+    "linear metre": "m",
+    "linear metres": "m",
+    "linear meter": "m",
+    "linear meters": "m",
     metre: "m",
+    metres: "m",
     meter: "m",
+    meters: "m",
+    litre: "l",
+    litres: "l",
+    liter: "l",
+    liters: "l",
+    ltr: "l",
+    ltrs: "l",
+    rolls: "roll",
+    coils: "coil",
     each: "each",
     ea: "each",
     nr: "each",
@@ -29,6 +44,7 @@ const unitAliases = {
 };
 const discreteSellUnits = new Set(["sheet", "length", "box", "bag", "pack", "roll", "set", "tub", "each"]);
 const packUnits = new Set(["box", "bag", "pack", "pallet", "roll", "set", "tub"]);
+const rollCountUnits = new Set(["roll", "coil"]);
 const volumeInMl = (amount, unit) => {
     if (unit === "ml")
         return amount;
@@ -49,6 +65,39 @@ const canonicalUnit = (value) => {
     const normalized = normalize(value);
     return unitAliases[normalized] ?? normalized;
 };
+const unitScale = (value) => {
+    const unit = canonicalUnit(value);
+    if (unit === "ml")
+        return { dimension: "volume", toBase: 1 };
+    if (unit === "l")
+        return { dimension: "volume", toBase: 1000 };
+    if (unit === "m3")
+        return { dimension: "volume", toBase: 1000000 };
+    if (unit === "g")
+        return { dimension: "mass", toBase: 1 };
+    if (unit === "kg")
+        return { dimension: "mass", toBase: 1000 };
+    if (unit === "t" || unit === "tonne" || unit === "tonnes")
+        return { dimension: "mass", toBase: 1000000 };
+    if (unit === "mm")
+        return { dimension: "length", toBase: 0.001 };
+    if (unit === "cm")
+        return { dimension: "length", toBase: 0.01 };
+    if (unit === "m")
+        return { dimension: "length", toBase: 1 };
+    if (unit === "ft")
+        return { dimension: "length", toBase: 0.3048 };
+    if (unit === "in" || unit === "inch" || unit === "inches")
+        return { dimension: "length", toBase: 0.0254 };
+    return null;
+};
+const convertUnitAmount = (amount, from, to) => {
+    if (sameUnit(from, to))
+        return amount;
+    const source = unitScale(from);
+    const target = unitScale(to);
+    return source && target && source.dimension === target.dimension ? (amount * source.toBase) / target.toBase : null;
+};
 const sameUnit = (left, right) => {
     const a = canonicalUnit(left);
     const b = canonicalUnit(right);
@@ -79,6 +128,8 @@ const supportsRequestedUnit = (item, requestedUnit) => {
     if (supported.length === 0 || supported.includes(requestedUnit)) {
         return true;
     }
+    if (item.unitConversions?.some((entry) => convertUnitAmount(1, requestedUnit, entry.requestUom) != null))
+        return true;
     if (sameUnit(requestedUnit, "pallet") && item.itemsPerPallet != null && item.itemsPerPallet > 0) {
         return true;
     }
@@ -131,6 +182,8 @@ const coverageFromDescription = (item, requestedUnit, sellUnit) => {
     const coverage = Number.parseFloat(match[1].replace(",", "."));
     return Number.isFinite(coverage) && coverage > 0 ? coverage : null;
 };
+export const needsQuantityConfirmation = (item, pricing) => pricing.costingMode === "review" &&
+    !(item.conversionConfidence === "llm_basket_line" && item.sellUnitsOverride != null && !item.conversionNotes?.trim());
 export function getCartSubtotal(items, options) {
     const totals = items.map((item) => getPricingBreakdown(item, options).lineTotal);
     return totals.some((total) => total == null) ? null : totals.reduce((sum, total) => sum + (total ?? 0), 0);
@@ -219,6 +272,32 @@ function calculateBreakdown(item, options) {
             costingMode: "direct",
         };
     }
+    const singleFormRequest = rollCountUnits.has(requestedUnit);
+    const explicitMultiFormPack = /\b(?:pack|box)\s+of\s+(\d+)\s+(?:rolls?|coils?)\b|\b(\d+)\s+(?:rolls?|coils?)\s+(?:per|in each)\s+(?:pack|box)\b/i.test(item.description);
+    const itemsInSalePack = sellUnit === "pack" ? item.itemsPerPack : null;
+    const hasAreaOrLengthCoverage = (item.derivedLengthM ?? 0) > 0 ||
+        (item.derivedCoverageM2 ?? 0) > 0 ||
+        /^(?:m2|m²|sqm|m)\s*(?:per|\/)/i.test(item.coverageUom ?? "");
+    if (singleFormRequest &&
+        ["each", "pack"].includes(sellUnit) &&
+        salesUnitSize === 1 &&
+        !(itemsInSalePack != null && itemsInSalePack > 1) &&
+        !explicitMultiFormPack &&
+        hasAreaOrLengthCoverage) {
+        const required = hasOverride ? overriddenSellUnits : roundQuantity(requestedAmount * (1 + wasteFactor), item.roundingRule ?? "round_up_each");
+        return {
+            requestedAmount,
+            requestedUnit,
+            salesUnitSize,
+            sellUnit,
+            calculatedSellUnits: required,
+            requiredSellUnits: required,
+            unitPrice: item.price,
+            lineTotal: item.price != null ? item.price * required : null,
+            calculation: `${requestedAmount} ${requestedUnit}${wasteFactor > 0 ? ` x ${1 + wasteFactor}` : ""} = ${required} ${sellUnit} (one product per sale unit)`,
+            costingMode: "derived",
+        };
+    }
     if (!supportsRequestedUnit(item, requestedUnit)) {
         return review("Requested unit is not supported by this catalogue conversion.");
     }
@@ -228,7 +307,8 @@ function calculateBreakdown(item, options) {
     let calculation = `Quantity review required, initial request needed ${requestedAmount} ${requestedUnit}.`;
     const wasteMultiplier = 1 + wasteFactor;
     const descriptionCoverage = coverageFromDescription(item, requestedUnit, sellUnit);
-    const conversion = item.unitConversions?.find((entry) => sameUnit(entry.requestUom, requestedUnit));
+    const conversion = item.unitConversions?.find((entry) => convertUnitAmount(1, requestedUnit, entry.requestUom) != null);
+    const conversionRequestAmount = conversion ? convertUnitAmount(requestedAmount, requestedUnit, conversion.requestUom) : null;
     const hasStructuredRoute = !!item.saleUnit && (sameUnit(requestedUnit, sellUnit) || !!conversion || (sameUnit(requestedUnit, "each") && !packUnits.has(sellUnit)));
     // A partial structured conversion must not hide a valid legacy/LLM conversion.
     if (hasStructuredRoute) {
@@ -237,8 +317,8 @@ function calculateBreakdown(item, options) {
             costingMode = "direct";
             calculation = `${requestedAmount} ${requestedUnit}${wasteFactor > 0 ? ` x ${wasteMultiplier}` : ""}`;
         }
-        else if (conversion) {
-            rawSellUnits = (requestedAmount * wasteMultiplier) / conversion.quantityPerSaleUnit;
+        else if (conversion && conversionRequestAmount != null) {
+            rawSellUnits = (conversionRequestAmount * wasteMultiplier) / conversion.quantityPerSaleUnit;
             costingMode = "derived";
             // A product sold individually can legitimately be requested by pallet. The
             // canonical conversion is pallets per each (for example 1/72), but present
@@ -246,9 +326,12 @@ function calculateBreakdown(item, options) {
             const itemsPerRequestedUnit = 1 / conversion.quantityPerSaleUnit;
             const roundedItemsPerRequestedUnit = Math.round(itemsPerRequestedUnit);
             const isWholePackRelationship = sameUnit(sellUnit, "each") && conversion.quantityPerSaleUnit < 1 && Math.abs(itemsPerRequestedUnit - roundedItemsPerRequestedUnit) < 1e-9;
+            const conversionBasis = sameUnit(requestedUnit, conversion.requestUom)
+                ? `${requestedAmount} ${requestedUnit}`
+                : `${requestedAmount} ${requestedUnit} (${conversionRequestAmount} ${conversion.requestUom})`;
             calculation = isWholePackRelationship
                 ? `${requestedAmount} ${requestedUnit}${wasteFactor > 0 ? ` x ${wasteMultiplier}` : ""} x ${roundedItemsPerRequestedUnit} per ${requestedUnit}`
-                : `${requestedAmount} ${requestedUnit}${wasteFactor > 0 ? ` x ${wasteMultiplier}` : ""} / ${conversion.quantityPerSaleUnit} ${requestedUnit} per ${sellUnit}`;
+                : `${conversionBasis}${wasteFactor > 0 ? ` x ${wasteMultiplier}` : ""} / ${conversion.quantityPerSaleUnit} ${conversion.requestUom} per ${sellUnit}`;
         }
         else if (sameUnit(requestedUnit, "each") && !packUnits.has(sellUnit)) {
             rawSellUnits = (requestedAmount * wasteMultiplier) / salesUnitSize;

package/package.json

@@ -1,53 +1,53 @@
-{
-  "name": "@metron-labs/quote-react",
-  "version": "0.1.74",
-  "description": "Metron Labs quote and estimating calculator components for React",
-  "license": "UNLICENSED",
-  "sideEffects": [
-    "*.css"
-  ],
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./styles.css": "./dist/styles.css",
-    "./*": {
-      "types": "./dist/*.d.ts",
-      "default": "./dist/*.js"
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "publishConfig": {
-    "access": "restricted"
-  },
-  "scripts": {
-    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.build.json && node scripts/copyStatic.mjs && node scripts/buildEmbed.mjs",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "prepublishOnly": "npm run typecheck && npm run build",
-    "check:embed": "node scripts/checkEmbed.mjs"
-  },
-  "peerDependencies": {
-    "react": "^18.3.0 || ^19.0.0",
-    "react-dom": "^18.3.0 || ^19.0.0"
-  },
-  "dependencies": {
-    "xlsx": "^0.18.5"
-  },
-  "devDependencies": {
-    "@types/node": "^20",
-    "@types/react": "^19",
-    "@types/react-dom": "^19",
-    "esbuild": "^0.28.2",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
-    "tsx": "^4",
-    "typescript": "^5",
-    "vitest": "^3"
-  }
-}
+{
+  "name": "@metron-labs/quote-react",
+  "version": "0.1.76",
+  "description": "Metron Labs quote and estimating calculator components for React",
+  "license": "UNLICENSED",
+  "sideEffects": [
+    "*.css"
+  ],
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./styles.css": "./dist/styles.css",
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "publishConfig": {
+    "access": "restricted"
+  },
+  "scripts": {
+    "build": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.build.json && node scripts/copyStatic.mjs && node scripts/buildEmbed.mjs",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "prepublishOnly": "npm run typecheck && npm run build",
+    "check:embed": "node scripts/checkEmbed.mjs"
+  },
+  "peerDependencies": {
+    "react": "^18.3.0 || ^19.0.0",
+    "react-dom": "^18.3.0 || ^19.0.0"
+  },
+  "dependencies": {
+    "xlsx": "^0.18.5"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "esbuild": "^0.28.2",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "tsx": "^4",
+    "typescript": "^5",
+    "vitest": "^3"
+  }
+}