@pro6pp/infer-react 0.0.2-beta.16 → 0.0.2-beta.17

package/dist/index.cjs

@@ -38,6 +38,100 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_react = __toESM(require("react"), 1);
 
+// ../core/src/label-formatter.ts
+function normalize(str) {
+  return str.toLowerCase().trim();
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findWordPosition(query, value) {
+  const normalizedQuery = normalize(query);
+  const normalizedValue = normalize(value);
+  if (normalizedValue.includes(" ")) {
+    return normalizedQuery.indexOf(normalizedValue);
+  }
+  const pattern = new RegExp(`(?:^|[,\\s])${escapeRegex(normalizedValue)}(?:$|[,\\s])`, "g");
+  const match = pattern.exec(normalizedQuery);
+  if (match) {
+    const matchStart = match.index;
+    const firstChar = normalizedQuery[matchStart];
+    if (firstChar === "," || firstChar === " ") {
+      return matchStart + 1;
+    }
+    return matchStart;
+  }
+  return -1;
+}
+function detectComponentOrder(query, value) {
+  const detected = [];
+  const componentMap = [];
+  if (value.street) {
+    componentMap.push({ value: value.street, type: "street" });
+  }
+  if (value.city) {
+    componentMap.push({ value: value.city, type: "city" });
+  }
+  if (value.postcode) {
+    componentMap.push({ value: value.postcode, type: "postcode" });
+  }
+  if (value.street_number !== void 0 && value.street_number !== null) {
+    componentMap.push({ value: String(value.street_number), type: "street_number" });
+  }
+  if (value.addition) {
+    componentMap.push({ value: value.addition, type: "addition" });
+  }
+  for (const comp of componentMap) {
+    const position = findWordPosition(query, comp.value);
+    if (position !== -1) {
+      detected.push({
+        type: comp.type,
+        value: comp.value,
+        position
+      });
+    }
+  }
+  detected.sort((a, b) => a.position - b.position);
+  return detected;
+}
+function formatLabelByInputOrder(query, value) {
+  if (!value || !query) {
+    return "";
+  }
+  const detectedOrder = detectComponentOrder(query, value);
+  const detectedTypes = new Set(detectedOrder.map((d) => d.type));
+  const parts = [];
+  for (const detected of detectedOrder) {
+    parts.push(detected.value);
+  }
+  const defaultOrder = ["street", "street_number", "addition", "postcode", "city"];
+  for (const type of defaultOrder) {
+    if (detectedTypes.has(type)) continue;
+    let val;
+    switch (type) {
+      case "street":
+        val = value.street;
+        break;
+      case "city":
+        val = value.city;
+        break;
+      case "street_number":
+        val = value.street_number !== void 0 ? String(value.street_number) : void 0;
+        break;
+      case "postcode":
+        val = value.postcode;
+        break;
+      case "addition":
+        val = value.addition;
+        break;
+    }
+    if (val) {
+      parts.push(val);
+    }
+  }
+  return parts.join(", ");
+}
+
 // ../core/src/core.ts
 var DEFAULTS = {
   API_URL: "https://api.pro6pp.nl/v2",
@@ -203,10 +297,11 @@ var InferCore = class {
     if (this.state.stage === "final" || isFullResult) {
       let finalQuery = label;
       if (valueObj && Object.keys(valueObj).length > 0) {
-        const { street, street_number, city, addition } = valueObj;
+        const { street, street_number, postcode, city, addition } = valueObj;
         if (street && street_number && city) {
           const suffix = addition ? ` ${addition}` : "";
-          finalQuery = `${street} ${street_number}${suffix}, ${city}`;
+          const postcodeStr = postcode ? `${postcode}, ` : "";
+          finalQuery = `${street} ${street_number}${suffix}, ${postcodeStr}${city}`;
         }
       }
       this.finishSelection(finalQuery, valueObj);
@@ -348,7 +443,8 @@ var InferCore = class {
       const key = `${item.label}|${item.subtitle || ""}|${JSON.stringify(item.value || {})}`;
       if (!seen.has(key)) {
         seen.add(key);
-        uniqueSuggestions.push(item);
+        const reformattedItem = this.reformatSuggestionLabel(item);
+        uniqueSuggestions.push(reformattedItem);
       }
     }
     const totalCount = uniqueSuggestions.length + (data.cities?.length || 0) + (data.streets?.length || 0);
@@ -372,6 +468,25 @@ var InferCore = class {
       this.selectItem(uniqueSuggestions[0]);
     }
   }
+  /**
+   * Reformats a suggestion's label based on the user's input order.
+   * If the suggestion has a structured value object, we reorder the label
+   * to match how the user typed the components.
+   */
+  reformatSuggestionLabel(item) {
+    if (!item.value || typeof item.value === "string") {
+      return item;
+    }
+    const addressValue = item.value;
+    if (!addressValue.street || !addressValue.city) {
+      return item;
+    }
+    const reformattedLabel = formatLabelByInputOrder(this.state.query, addressValue);
+    if (reformattedLabel) {
+      return { ...item, label: reformattedLabel };
+    }
+    return item;
+  }
   updateQueryAndFetch(nextQuery) {
     this.updateState({
       query: nextQuery,
@@ -421,6 +536,19 @@ var InferCore = class {
 };
 
 // ../core/src/highlight.ts
+function mergeSegments(segments) {
+  if (segments.length === 0) return segments;
+  const merged = [];
+  for (const seg of segments) {
+    const last = merged[merged.length - 1];
+    if (last && last.match === seg.match) {
+      last.text += seg.text;
+    } else {
+      merged.push({ text: seg.text, match: seg.match });
+    }
+  }
+  return merged;
+}
 function getHighlightSegments(text, query) {
   if (!query || !text) return [{ text, match: false }];
   const segments = [];
@@ -447,7 +575,7 @@ function getHighlightSegments(text, query) {
   if (!isFullMatch) {
     return [{ text, match: false }];
   }
-  return segments;
+  return mergeSegments(segments);
 }
 
 // ../core/src/default-styles.ts
@@ -583,15 +711,23 @@ var DEFAULT_STYLES = `
   }
 
   .pro6pp-item__label {
-    font-weight: 500;
+    font-weight: 400;
     flex-shrink: 1;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
+  .pro6pp-item__label--match {
+    font-weight: 520;
+  }
+
+  .pro6pp-item__label--unmatched {
+    font-weight: 400;
+    color: #4b5563;
+  }
+
   .pro6pp-item__subtitle {
-    font-size: 13px;
     color: #6b7280;
     flex-shrink: 0;
   }
@@ -611,20 +747,6 @@ var DEFAULT_STYLES = `
     text-align: center;
   }
 
-  .pro6pp-load-more {
-    width: 100%;
-    padding: 14px;
-    background: #f9fafb;
-    border: none;
-    border-top: 1px solid #e0e0e0;
-    color: #3b82f6;
-    font-size: 14px;
-    font-weight: 600;
-    cursor: pointer;
-    flex-shrink: 0;
-    touch-action: manipulation;
-  }
-
   .pro6pp-loader-item {
     padding: 10px 12px;
     color: #6b7280;
@@ -655,17 +777,6 @@ var DEFAULT_STYLES = `
       padding: 10px 12px;
       font-size: 14px;
     }
-    .pro6pp-item__subtitle {
-      font-size: 12px;
-    }
-    .pro6pp-load-more {
-      padding: 12px;
-      font-size: 13px;
-    }
-  }
-
-  .pro6pp-load-more:active {
-    background-color: #f3f4f6;
   }
 
   @keyframes pro6pp-spin {
@@ -677,16 +788,17 @@ var DEFAULT_STYLES = `
 var HighlightedText = ({ text, query }) => {
   const segments = (0, import_react.useMemo)(() => getHighlightSegments(text, query), [text, query]);
   return /* @__PURE__ */ import_react.default.createElement("span", { className: "pro6pp-item__label" }, segments.map(
-    (seg, i) => seg.match ? /* @__PURE__ */ import_react.default.createElement("strong", { key: i, className: "pro6pp-item__label--match" }, seg.text) : seg.text
+    (seg, i) => seg.match ? /* @__PURE__ */ import_react.default.createElement("span", { key: i, className: "pro6pp-item__label--match" }, seg.text) : /* @__PURE__ */ import_react.default.createElement("span", { key: i, className: "pro6pp-item__label--unmatched" }, seg.text)
   ));
 };
 function useInfer(config) {
   const [state, setState] = (0, import_react.useState)(() => {
     if (config.initialValue) {
+      const postcodeStr = config.initialValue.postcode ? `${config.initialValue.postcode}, ` : "";
       return {
         ...INITIAL_STATE,
         value: config.initialValue,
-        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${config.initialValue.city}`,
+        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${postcodeStr}${config.initialValue.city}`,
         isValid: true,
         stage: "final"
       };
@@ -716,7 +828,8 @@ function useInfer(config) {
     });
     if (config.initialValue) {
       const address = config.initialValue;
-      const label = `${address.street} ${address.street_number}, ${address.city}`;
+      const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+      const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
       instance.selectItem({ label, value: address });
     }
     return instance;
@@ -732,7 +845,8 @@ function useInfer(config) {
   ]);
   const setValue = (address) => {
     if (!address) return;
-    const label = `${address.street} ${address.street_number}, ${address.city}`;
+    const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+    const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
     core.selectItem({ label, value: address });
   };
   return {

package/dist/index.js

@@ -12,6 +12,100 @@ import React, {
   useImperativeHandle
 } from "react";
 
+// ../core/src/label-formatter.ts
+function normalize(str) {
+  return str.toLowerCase().trim();
+}
+function escapeRegex(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function findWordPosition(query, value) {
+  const normalizedQuery = normalize(query);
+  const normalizedValue = normalize(value);
+  if (normalizedValue.includes(" ")) {
+    return normalizedQuery.indexOf(normalizedValue);
+  }
+  const pattern = new RegExp(`(?:^|[,\\s])${escapeRegex(normalizedValue)}(?:$|[,\\s])`, "g");
+  const match = pattern.exec(normalizedQuery);
+  if (match) {
+    const matchStart = match.index;
+    const firstChar = normalizedQuery[matchStart];
+    if (firstChar === "," || firstChar === " ") {
+      return matchStart + 1;
+    }
+    return matchStart;
+  }
+  return -1;
+}
+function detectComponentOrder(query, value) {
+  const detected = [];
+  const componentMap = [];
+  if (value.street) {
+    componentMap.push({ value: value.street, type: "street" });
+  }
+  if (value.city) {
+    componentMap.push({ value: value.city, type: "city" });
+  }
+  if (value.postcode) {
+    componentMap.push({ value: value.postcode, type: "postcode" });
+  }
+  if (value.street_number !== void 0 && value.street_number !== null) {
+    componentMap.push({ value: String(value.street_number), type: "street_number" });
+  }
+  if (value.addition) {
+    componentMap.push({ value: value.addition, type: "addition" });
+  }
+  for (const comp of componentMap) {
+    const position = findWordPosition(query, comp.value);
+    if (position !== -1) {
+      detected.push({
+        type: comp.type,
+        value: comp.value,
+        position
+      });
+    }
+  }
+  detected.sort((a, b) => a.position - b.position);
+  return detected;
+}
+function formatLabelByInputOrder(query, value) {
+  if (!value || !query) {
+    return "";
+  }
+  const detectedOrder = detectComponentOrder(query, value);
+  const detectedTypes = new Set(detectedOrder.map((d) => d.type));
+  const parts = [];
+  for (const detected of detectedOrder) {
+    parts.push(detected.value);
+  }
+  const defaultOrder = ["street", "street_number", "addition", "postcode", "city"];
+  for (const type of defaultOrder) {
+    if (detectedTypes.has(type)) continue;
+    let val;
+    switch (type) {
+      case "street":
+        val = value.street;
+        break;
+      case "city":
+        val = value.city;
+        break;
+      case "street_number":
+        val = value.street_number !== void 0 ? String(value.street_number) : void 0;
+        break;
+      case "postcode":
+        val = value.postcode;
+        break;
+      case "addition":
+        val = value.addition;
+        break;
+    }
+    if (val) {
+      parts.push(val);
+    }
+  }
+  return parts.join(", ");
+}
+
 // ../core/src/core.ts
 var DEFAULTS = {
   API_URL: "https://api.pro6pp.nl/v2",
@@ -177,10 +271,11 @@ var InferCore = class {
     if (this.state.stage === "final" || isFullResult) {
       let finalQuery = label;
       if (valueObj && Object.keys(valueObj).length > 0) {
-        const { street, street_number, city, addition } = valueObj;
+        const { street, street_number, postcode, city, addition } = valueObj;
         if (street && street_number && city) {
           const suffix = addition ? ` ${addition}` : "";
-          finalQuery = `${street} ${street_number}${suffix}, ${city}`;
+          const postcodeStr = postcode ? `${postcode}, ` : "";
+          finalQuery = `${street} ${street_number}${suffix}, ${postcodeStr}${city}`;
         }
       }
       this.finishSelection(finalQuery, valueObj);
@@ -322,7 +417,8 @@ var InferCore = class {
       const key = `${item.label}|${item.subtitle || ""}|${JSON.stringify(item.value || {})}`;
       if (!seen.has(key)) {
         seen.add(key);
-        uniqueSuggestions.push(item);
+        const reformattedItem = this.reformatSuggestionLabel(item);
+        uniqueSuggestions.push(reformattedItem);
       }
     }
     const totalCount = uniqueSuggestions.length + (data.cities?.length || 0) + (data.streets?.length || 0);
@@ -346,6 +442,25 @@ var InferCore = class {
       this.selectItem(uniqueSuggestions[0]);
     }
   }
+  /**
+   * Reformats a suggestion's label based on the user's input order.
+   * If the suggestion has a structured value object, we reorder the label
+   * to match how the user typed the components.
+   */
+  reformatSuggestionLabel(item) {
+    if (!item.value || typeof item.value === "string") {
+      return item;
+    }
+    const addressValue = item.value;
+    if (!addressValue.street || !addressValue.city) {
+      return item;
+    }
+    const reformattedLabel = formatLabelByInputOrder(this.state.query, addressValue);
+    if (reformattedLabel) {
+      return { ...item, label: reformattedLabel };
+    }
+    return item;
+  }
   updateQueryAndFetch(nextQuery) {
     this.updateState({
       query: nextQuery,
@@ -395,6 +510,19 @@ var InferCore = class {
 };
 
 // ../core/src/highlight.ts
+function mergeSegments(segments) {
+  if (segments.length === 0) return segments;
+  const merged = [];
+  for (const seg of segments) {
+    const last = merged[merged.length - 1];
+    if (last && last.match === seg.match) {
+      last.text += seg.text;
+    } else {
+      merged.push({ text: seg.text, match: seg.match });
+    }
+  }
+  return merged;
+}
 function getHighlightSegments(text, query) {
   if (!query || !text) return [{ text, match: false }];
   const segments = [];
@@ -421,7 +549,7 @@ function getHighlightSegments(text, query) {
   if (!isFullMatch) {
     return [{ text, match: false }];
   }
-  return segments;
+  return mergeSegments(segments);
 }
 
 // ../core/src/default-styles.ts
@@ -557,15 +685,23 @@ var DEFAULT_STYLES = `
   }
 
   .pro6pp-item__label {
-    font-weight: 500;
+    font-weight: 400;
     flex-shrink: 1;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
+  .pro6pp-item__label--match {
+    font-weight: 520;
+  }
+
+  .pro6pp-item__label--unmatched {
+    font-weight: 400;
+    color: #4b5563;
+  }
+
   .pro6pp-item__subtitle {
-    font-size: 13px;
     color: #6b7280;
     flex-shrink: 0;
   }
@@ -585,20 +721,6 @@ var DEFAULT_STYLES = `
     text-align: center;
   }
 
-  .pro6pp-load-more {
-    width: 100%;
-    padding: 14px;
-    background: #f9fafb;
-    border: none;
-    border-top: 1px solid #e0e0e0;
-    color: #3b82f6;
-    font-size: 14px;
-    font-weight: 600;
-    cursor: pointer;
-    flex-shrink: 0;
-    touch-action: manipulation;
-  }
-
   .pro6pp-loader-item {
     padding: 10px 12px;
     color: #6b7280;
@@ -629,17 +751,6 @@ var DEFAULT_STYLES = `
       padding: 10px 12px;
       font-size: 14px;
     }
-    .pro6pp-item__subtitle {
-      font-size: 12px;
-    }
-    .pro6pp-load-more {
-      padding: 12px;
-      font-size: 13px;
-    }
-  }
-
-  .pro6pp-load-more:active {
-    background-color: #f3f4f6;
   }
 
   @keyframes pro6pp-spin {
@@ -651,16 +762,17 @@ var DEFAULT_STYLES = `
 var HighlightedText = ({ text, query }) => {
   const segments = useMemo(() => getHighlightSegments(text, query), [text, query]);
   return /* @__PURE__ */ React.createElement("span", { className: "pro6pp-item__label" }, segments.map(
-    (seg, i) => seg.match ? /* @__PURE__ */ React.createElement("strong", { key: i, className: "pro6pp-item__label--match" }, seg.text) : seg.text
+    (seg, i) => seg.match ? /* @__PURE__ */ React.createElement("span", { key: i, className: "pro6pp-item__label--match" }, seg.text) : /* @__PURE__ */ React.createElement("span", { key: i, className: "pro6pp-item__label--unmatched" }, seg.text)
   ));
 };
 function useInfer(config) {
   const [state, setState] = useState(() => {
     if (config.initialValue) {
+      const postcodeStr = config.initialValue.postcode ? `${config.initialValue.postcode}, ` : "";
       return {
         ...INITIAL_STATE,
         value: config.initialValue,
-        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${config.initialValue.city}`,
+        query: `${config.initialValue.street} ${config.initialValue.street_number}, ${postcodeStr}${config.initialValue.city}`,
         isValid: true,
         stage: "final"
       };
@@ -690,7 +802,8 @@ function useInfer(config) {
     });
     if (config.initialValue) {
       const address = config.initialValue;
-      const label = `${address.street} ${address.street_number}, ${address.city}`;
+      const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+      const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
       instance.selectItem({ label, value: address });
     }
     return instance;
@@ -706,7 +819,8 @@ function useInfer(config) {
   ]);
   const setValue = (address) => {
     if (!address) return;
-    const label = `${address.street} ${address.street_number}, ${address.city}`;
+    const postcodeStr = address.postcode ? `${address.postcode}, ` : "";
+    const label = `${address.street} ${address.street_number}, ${postcodeStr}${address.city}`;
     core.selectItem({ label, value: address });
   };
   return {

package/package.json

@@ -20,7 +20,7 @@
     "url": "https://github.com/pro6pp/infer-sdk/issues"
   },
   "sideEffects": false,
-  "version": "0.0.2-beta.16",
+  "version": "0.0.2-beta.17",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -46,7 +46,7 @@
     "react": ">=16"
   },
   "dependencies": {
-    "@pro6pp/infer-core": "0.0.2-beta.14"
+    "@pro6pp/infer-core": "0.0.2-beta.15"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.1",