sanity 6.0.0-next.13 → 6.0.0-next.14

package/lib/_chunks-es/version.js

@@ -1,4 +1,4 @@
-var version = "6.0.0-next.13+16dbf7a972";
+var version = "6.0.0-next.14+df43bfaa38";
 let buildVersion;
 try {
   buildVersion = process.env.PKG_BUILD_VERSION;
@@ -7,7 +7,7 @@ try {
 try {
   buildVersion = buildVersion || // This is replaced by `@sanity/pkg-utils` at build time
   // and must always be references by its full static name, e.g. no optional chaining, no `if (process && process.env)` etc.
-  "6.0.0-next.13+16dbf7a972";
+  "6.0.0-next.14+df43bfaa38";
 } catch {
 }
 const SANITY_VERSION = buildVersion || `${version}-dev`;

package/lib/index.js

@@ -19098,7 +19098,7 @@ const CACHE$1 = /* @__PURE__ */ new WeakMap(), PREVIEW_FIELD_WEIGHT_MAP$1 = {
   title: 10,
   subtitle: 5,
   description: 1.5
-}, DEFAULT_PREVIEW_SELECT_WEIGHT = 5, BASE_WEIGHTS$1 = {
+}, BASE_WEIGHTS$1 = {
   _id: {
     weight: 1,
     type: "string"
@@ -19162,47 +19162,7 @@ function getLeafWeights$1(schemaType, maxDepth, getWeight) {
 const getUserSetWeight$1 = (schemaType) => {
   const searchOptions = getTypeChain$1(schemaType).map((type) => type.options).find(isSearchConfiguration$1);
   return typeof searchOptions?.search?.weight == "number" ? searchOptions.search.weight : null;
-}, getHiddenWeight$1 = (schemaType) => getTypeChain$1(schemaType).some((type) => type.hidden) ? 0 : null, getDefaultWeights$1 = (schemaType) => typeof (getUserSetWeight$1(schemaType) ?? getHiddenWeight$1(schemaType)) == "number" ? null : 1;
-function findFieldType(type, fieldName) {
-  for (const chainType of getTypeChain$1(type))
-    if (chainType.jsonType === "object" && chainType.fields?.length) {
-      const field = chainType.fields.find(({
-        name
-      }) => name === fieldName);
-      if (field) return field.type;
-    }
-}
-function resolveLeafType(type, segments, depth, maxDepth) {
-  if (!type || depth > maxDepth) return null;
-  if (segments.length === 0)
-    return isPtField$1(type) ? "pt" : isSlugField$1(type) ? "slug" : isStringField$1(type) ? "string" : null;
-  const [head, ...rest] = segments, fieldType = findFieldType(type, head);
-  if (!fieldType) return null;
-  if (isReferenceSchemaType(fieldType) && "to" in fieldType) {
-    for (const target of fieldType.to) {
-      const leaf = resolveLeafType(target, rest, depth + 1, maxDepth);
-      if (leaf) return leaf;
-    }
-    return null;
-  }
-  return resolveLeafType(fieldType, rest, depth + 1, maxDepth);
-}
-function getPreviewSelectionPathWeights(schemaType, maxDepth, selectionKeysBySelectionPath, existingPaths) {
-  const weights = {};
-  for (const [path, previewKey] of Object.entries(selectionKeysBySelectionPath)) {
-    if (existingPaths.has(path) || path.includes("[]")) continue;
-    const leaf = resolveLeafType(schemaType, path.split("."), 0, maxDepth);
-    if (!leaf) continue;
-    const resolvedPath = leaf === "slug" && !path.endsWith(".current") ? `${path}.current` : path;
-    weights[resolvedPath] = {
-      path: resolvedPath,
-      weight: PREVIEW_FIELD_WEIGHT_MAP$1[previewKey] ?? DEFAULT_PREVIEW_SELECT_WEIGHT,
-      type: leaf === "pt" ? "pt" : "string"
-    };
-  }
-  return weights;
-}
-const getPreviewWeights$1 = (schemaType, maxDepth, isCrossDataset) => {
+}, getHiddenWeight$1 = (schemaType) => getTypeChain$1(schemaType).some((type) => type.hidden) ? 0 : null, getDefaultWeights$1 = (schemaType) => typeof (getUserSetWeight$1(schemaType) ?? getHiddenWeight$1(schemaType)) == "number" ? null : 1, getPreviewWeights$1 = (schemaType, maxDepth, isCrossDataset) => {
   const select2 = schemaType?.preview?.select;
   if (!select2) return null;
   const selectionKeysBySelectionPath = Object.fromEntries(Object.entries(select2).map(([selectionKey, selectionPath]) => [
@@ -19224,20 +19184,14 @@ const getPreviewWeights$1 = (schemaType, maxDepth, isCrossDataset) => {
     type,
     weight: PREVIEW_FIELD_WEIGHT_MAP$1[selectionKeysBySelectionPath[path]]
   }]));
-  if (isCrossDataset)
-    return Object.fromEntries(Object.entries(selectionKeysBySelectionPath).map(([path, previewFieldName]) => [path, {
-      path,
-      type: "string",
-      weight: PREVIEW_FIELD_WEIGHT_MAP$1[previewFieldName]
-    }]));
-  const previewSelectionPathWeights = isSchemaType$2(schemaType) ? getPreviewSelectionPathWeights(schemaType, maxDepth, selectionKeysBySelectionPath, new Set(Object.keys(defaultWeights))) : {}, previewWeightsFromLeafTraversal = getLeafWeights$1(schemaType, maxDepth, (type, path) => {
+  return isCrossDataset ? Object.fromEntries(Object.entries(selectionKeysBySelectionPath).map(([path, previewFieldName]) => [path, {
+    path,
+    type: "string",
+    weight: PREVIEW_FIELD_WEIGHT_MAP$1[previewFieldName]
+  }])) : getLeafWeights$1(schemaType, maxDepth, (type, path) => {
     const nested = nestedWeightsBySelectionPath[getFullyQualifiedPath$1(type, path)];
     return nested ? nested.weight : null;
   });
-  return {
-    ...previewSelectionPathWeights,
-    ...previewWeightsFromLeafTraversal
-  };
 };
 function deriveSearchWeightsFromType({
   schemaType,
@@ -19354,20 +19308,14 @@ const getUserSetWeight = (schemaType) => {
     type,
     weight: PREVIEW_FIELD_WEIGHT_MAP[selectionKeysBySelectionPath[path]] ?? 0
   }]));
-  if (isCrossDataset)
-    return Object.fromEntries(Object.entries(selectionKeysBySelectionPath).map(([path, previewFieldName]) => [path, {
-      path,
-      type: "string",
-      weight: PREVIEW_FIELD_WEIGHT_MAP[previewFieldName] ?? 0
-    }]));
-  const previewSelectionPathWeights = isSchemaType$1(schemaType) ? getPreviewSelectionPathWeights(schemaType, maxDepth, selectionKeysBySelectionPath, new Set(Object.keys(defaultWeights))) : {}, previewWeightsFromLeafTraversal = getLeafWeights(schemaType, maxDepth, (type, path) => {
+  return isCrossDataset ? Object.fromEntries(Object.entries(selectionKeysBySelectionPath).map(([path, previewFieldName]) => [path, {
+    path,
+    type: "string",
+    weight: PREVIEW_FIELD_WEIGHT_MAP[previewFieldName] ?? 0
+  }])) : getLeafWeights(schemaType, maxDepth, (type, path) => {
     const nested = nestedWeightsBySelectionPath[getFullyQualifiedPath(type, path)];
     return nested ? nested.weight : null;
   });
-  return {
-    ...previewSelectionPathWeights,
-    ...previewWeightsFromLeafTraversal
-  };
 };
 function deriveSearchWeightsFromType2024({
   schemaType,
@@ -19457,33 +19405,24 @@ function createSearchQuery$1(searchTerms, searchParams, {
   comments: comments2,
   filter: filter2
 } = {}) {
-  const flattenedSpecs = searchTerms.types.map((schemaType) => ({
+  const flattenedSpecs = searchTerms.types.map((schemaType) => deriveSearchWeightsFromType2024({
     schemaType,
-    searchSpec: deriveSearchWeightsFromType2024({
-      schemaType,
-      maxDepth: maxDepth || DEFAULT_MAX_FIELD_DEPTH,
-      isCrossDataset,
-      processPaths: (paths) => paths.filter(({
-        weight
-      }) => weight !== 1)
-    })
+    maxDepth: maxDepth || DEFAULT_MAX_FIELD_DEPTH,
+    isCrossDataset,
+    processPaths: (paths) => paths.filter(({
+      weight
+    }) => weight !== 1)
   })).filter(({
-    searchSpec
-  }) => searchSpec.paths.length !== 0).flatMap(({
-    schemaType,
-    searchSpec
-  }) => searchSpec.paths.map((path) => ({
+    paths
+  }) => paths.length !== 0).flatMap(({
+    typeName,
+    paths
+  }) => paths.map((path) => ({
     ...path,
-    typeName: searchSpec.typeName,
-    schemaType
-  }))), groupedSpecs = groupBy(flattenedSpecs, (entry) => [entry.path, entry.weight].join(":")), baseMatch = "([@, _id] match text::query($__query) || references($__rawQuery))", score = Object.entries(groupedSpecs).flatMap(([, entries]) => {
-    if (entries.some(({
-      weight
-    }) => weight === 0))
-      return [];
-    const path = entries[0].path.includes("[]") ? entries[0].path : compileFieldPath(entries[0].schemaType, entries[0].path);
-    return `boost(_type in ${JSON.stringify(entries.map((entry) => entry.typeName))} && ${path} match text::query($__query), ${entries[0].weight})`;
-  }).concat(baseMatch), inputSortOrder = sort ?? [{
+    typeName
+  }))), groupedSpecs = groupBy(flattenedSpecs, (entry) => [entry.path, entry.weight].join(":")), baseMatch = "([@, _id] match text::query($__query) || references($__rawQuery))", score = Object.entries(groupedSpecs).flatMap(([, entries]) => entries.some(({
+    weight
+  }) => weight === 0) ? [] : `boost(_type in ${JSON.stringify(entries.map((entry) => entry.typeName))} && ${entries[0].path} match text::query($__query), ${entries[0].weight})`).concat(baseMatch), inputSortOrder = sort ?? [{
     field: "_score",
     direction: "desc"
   }], isScored = inputSortOrder.some(({
@@ -19649,13 +19588,10 @@ function stripWrappingQuotes(str) {
 }
 const FINDABILITY_MVI = 4, DEFAULT_LIMIT = 1e3, combinePaths = flow([flatten$1, union, compact]), pathWithMapper = ({
   mapWith,
-  path: rawPath
-}, schemaType) => {
-  const path = !schemaType || rawPath.includes("[]") ? rawPath : compileFieldPath(schemaType, rawPath);
-  return mapWith ? `${mapWith}(${path})` : path;
-};
+  path
+}) => mapWith ? `${mapWith}(${path})` : path;
 function createConstraints(terms, specs) {
-  const combinedSearchPaths = combinePaths(specs.map((configForType) => (configForType.searchSpec.paths || []).map((opt) => pathWithMapper(opt, configForType.schemaType))));
+  const combinedSearchPaths = combinePaths(specs.map((configForType) => (configForType.paths || []).map((opt) => pathWithMapper(opt))));
   return terms.map((_term, i) => combinedSearchPaths.map((joinedPath) => `${joinedPath} match $t${i}`)).filter((constraint) => constraint.length > 0).map((constraint) => `(${constraint.join(" || ")})`);
 }
 const SPECIAL_CHARS = /([^!@#$%^&*(),\\/?";:{}|[\]+<>\s-])+/g, STRIP_EDGE_CHARS = /(^[.]+)|([.]+$)/;
@@ -19677,23 +19613,17 @@ function createSearchQuery(searchTerms, searchOpts = {}) {
     sort,
     limit: limit2,
     comments: comments2
-  } = searchOpts, specs = searchTerms.types.map((schemaType) => ({
+  } = searchOpts, specs = searchTerms.types.map((schemaType) => deriveSearchWeightsFromType({
     schemaType,
-    searchSpec: deriveSearchWeightsFromType({
-      schemaType,
-      maxDepth: maxDepth || DEFAULT_MAX_FIELD_DEPTH,
-      isCrossDataset
-    })
+    maxDepth: maxDepth || DEFAULT_MAX_FIELD_DEPTH,
+    isCrossDataset
   })).filter(({
-    searchSpec
-  }) => searchSpec.paths.length !== 0), terms = extractTermsFromQuery(searchTerms.query), filters = ["_type in $__types", ...createConstraints(terms, specs), filter2 ? `(${filter2})` : "", searchTerms.filter ? `(${searchTerms.filter})` : ""].filter(Boolean), selections = searchOpts.skipSortByScore ? [] : specs.map(({
-    searchSpec,
-    schemaType
-  }) => {
-    const constraint = `_type == "${searchSpec.typeName}" => `;
+    paths
+  }) => paths.length), terms = extractTermsFromQuery(searchTerms.query), filters = ["_type in $__types", ...createConstraints(terms, specs), filter2 ? `(${filter2})` : "", searchTerms.filter ? `(${searchTerms.filter})` : ""].filter(Boolean), selections = searchOpts.skipSortByScore ? [] : specs.map((spec) => {
+    const constraint = `_type == "${spec.typeName}" => `;
     if (searchOpts.skipSortByScore)
       return;
-    const selection2 = `{ ${searchSpec.paths.map((cfg, i) => `"w${i}": ${pathWithMapper(cfg, schemaType)}`)} }`;
+    const selection2 = `{ ${spec.paths.map((cfg, i) => `"w${i}": ${pathWithMapper(cfg)}`)} }`;
     return `${constraint}${selection2}`;
   }), inputSortOrder = sort || [{
     field: "_id",
@@ -19709,9 +19639,7 @@ function createSearchQuery(searchTerms, searchOpts = {}) {
 ${query}` : query,
     params: {
       ...toGroqParams(terms),
-      __types: specs.map(({
-        searchSpec
-      }) => searchSpec.typeName),
+      __types: specs.map((spec) => spec.typeName),
       __limit: limit2 ?? DEFAULT_LIMIT,
       ...params
     },
@@ -19719,9 +19647,7 @@ ${query}` : query,
       tag,
       perspective
     },
-    searchSpec: specs.map(({
-      searchSpec
-    }) => searchSpec),
+    searchSpec: specs,
     terms
   };
 }