@lde/search-typesense 0.51.0 → 0.52.0

package/dist/query-compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-compiler.d.ts","sourceRoot":"","sources":["../src/query-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,QAAQ,EAEb,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,UAAU,EAIhB,MAAM,aAAa,CAAC;AAqBrB;mDACmD;AACnD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,CACvB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,MAAM,EAAE,KACpB,UAAU,GAAG,SAAS,CAAC;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC;;;;;;;;OAQG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,wBAA6B,GACrC,YAAY,CAAC,MAAM,CAAC,CAkCtB;AA2hBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD"}
+{"version":3,"file":"query-compiler.d.ts","sourceRoot":"","sources":["../src/query-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEzE,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,QAAQ,EAEb,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,UAAU,EAIhB,MAAM,aAAa,CAAC;AAqBrB;mDACmD;AACnD,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;;;;;;;;;;;;;OAgBG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,CACvB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,SAAS,MAAM,EAAE,KACpB,UAAU,GAAG,SAAS,CAAC;IAC5B;;;;;;OAMG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC;;;;;;;;OAQG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAC/B;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,UAAU,EACtB,OAAO,GAAE,wBAA6B,GACrC,YAAY,CAAC,MAAM,CAAC,CAkCtB;AA4jBD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD"}

package/dist/query-compiler.js

@@ -78,13 +78,25 @@ function compileRangeFacet(name, ranges) {
  * folded `*_search` companion(s); a localized field’s active-locale companion
  * keeps its full weight while the other locale is gently demoted (−1, floored at
  * 1), so a match in the user’s language ranks higher while cross-language matches
- * still surface.
+ * still surface. A request with no language preference demotes nothing.
+ *
+ * The fields are ordered by weight, heaviest first, and among equal weights a
+ * leading companion – the request’s language, or the first tagged locale –
+ * comes first. Typesense stems the
+ * query once, with the settings of the highest-weighted field – the first one
+ * on a tie (https://github.com/typesense/typesense/issues/1815) – so an
+ * unstemmed companion in the lead leaves the query unstemmed, and the stemmed
+ * companions match only where the stem happens to equal the word. The order
+ * changes nothing else: every field carries an explicit weight.
  */
 function queryFields(searchType, locale, schema) {
-    const names = [];
-    const weights = [];
-    collectSearchable(searchType, locale, schema, '', new Set(), names, weights);
-    return { names, weights };
+    const fields = [];
+    collectSearchable(searchType, locale, schema, '', new Set(), fields);
+    fields.sort((left, right) => right.weight - left.weight || Number(right.leads) - Number(left.leads));
+    return {
+        names: fields.map((field) => field.name),
+        weights: fields.map((field) => field.weight),
+    };
 }
 /**
  * Collect the searchable physical fields of a type and of everything it nests,
@@ -105,7 +117,7 @@ function queryFields(searchType, locale, schema) {
  * boundary the collection's own walk cuts at, so no field is declared indexed
  * that this walk does not ask for.
  */
-function collectSearchable(searchType, locale, schema, prefix, onPath, names, weights) {
+function collectSearchable(searchType, locale, schema, prefix, onPath, fields) {
     const walked = new Set(onPath).add(searchType.name);
     for (const field of searchableFields(searchType)) {
         const search = physicalFields(field).search;
@@ -113,20 +125,34 @@ function collectSearchable(searchType, locale, schema, prefix, onPath, names, we
         if (field.kind === 'text') {
             const locales = field.locales;
             const activeLocale = matchLanguage(locale, locales)[0];
+            const noPreference = activeLocale === undefined || activeLocale === 'und';
+            // Without a preference the first tagged locale stems the query; only an
+            // `und`-only field leads with `und`.
+            const leading = noPreference
+                ? (locales.find((candidate) => candidate !== 'und') ?? activeLocale)
+                : activeLocale;
             search.forEach((name, index) => {
-                names.push(qualify(prefix, name));
-                // The active locale keeps full weight; `und` is language-neutral, so
-                // it is never demoted (an untagged-only field would otherwise always
-                // rank below its declared weight).
-                weights.push(locales[index] === activeLocale || locales[index] === 'und'
-                    ? baseWeight
-                    : Math.max(1, baseWeight - 1));
+                fields.push({
+                    name: qualify(prefix, name),
+                    // The active locale keeps full weight; `und` is language-neutral, so
+                    // it is never demoted (an untagged-only field would otherwise always
+                    // rank below its declared weight).
+                    weight: noPreference ||
+                        locales[index] === activeLocale ||
+                        locales[index] === 'und'
+                        ? baseWeight
+                        : Math.max(1, baseWeight - 1),
+                    leads: locales[index] === leading,
+                });
             });
         }
         else {
             for (const name of search) {
-                names.push(qualify(prefix, name));
-                weights.push(baseWeight);
+                fields.push({
+                    name: qualify(prefix, name),
+                    weight: baseWeight,
+                    leads: false,
+                });
             }
         }
     }
@@ -155,7 +181,7 @@ function collectSearchable(searchType, locale, schema, prefix, onPath, names, we
             if (onPath.has(nestedType.name)) {
                 continue;
             }
-            collectSearchable(nestedType, locale, schema, qualify(prefix, field.name), walked, names, weights);
+            collectSearchable(nestedType, locale, schema, qualify(prefix, field.name), walked, fields);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/search-typesense",
-  "version": "0.51.0",
+  "version": "0.52.0",
   "description": "Typesense implementation of the @lde/search SearchEngine port: collection-schema builder, query compiler, label-resolving result reconstruction, and blue/green index lifecycle. Engine-specific (Typesense) but domain-agnostic.",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
@@ -36,6 +36,6 @@
   },
   "peerDependencies": {
     "@lde/dataset": "^0.10.1",
-    "@lde/pipeline": "^0.45.0"
+    "@lde/pipeline": "^0.46.0"
   }
 }