@takeshape/schema 12.1.4 → 12.1.6

package/dist/builtin-schema.js

@@ -158,6 +158,65 @@ const builtInShapes = {
             required: ['value']
         }
     },
+    TSWhereMatchPhraseAdvanced: {
+        id: 'TSWhereMatchPhraseAdvanced',
+        name: 'TSWhereMatchPhraseAdvanced',
+        title: 'Where Match Phrase Advanced',
+        schema: {
+            type: 'object',
+            properties: {
+                query: { type: 'string', description: 'The phrase to match.' },
+                slop: {
+                    type: 'integer',
+                    description: 'Number of positions terms can be apart. Use to match phrases with words in between, e.g., slop: 1 allows "cool shirt" to match "cool t shirt".'
+                },
+                analyzer: {
+                    type: 'string',
+                    description: "Analyzer to use for the query. If not specified, uses the field's default analyzer."
+                },
+                zero_terms_query: {
+                    type: 'string',
+                    enum: ['none', 'all'],
+                    description: "What to do if the analyzer removes all tokens. 'none' returns no results (default), 'all' matches all documents."
+                }
+            },
+            required: ['query']
+        }
+    },
+    TSWhereMatchAdvanced: {
+        id: 'TSWhereMatchAdvanced',
+        name: 'TSWhereMatchAdvanced',
+        title: 'Where Match Advanced',
+        schema: {
+            type: 'object',
+            properties: {
+                query: { type: 'string', description: 'The text to search for.' },
+                operator: {
+                    type: 'string',
+                    enum: ['and', 'or'],
+                    description: "Whether all terms must match ('and') or any term can match ('or', default)."
+                },
+                fuzziness: {
+                    type: 'string',
+                    description: "Allows fuzzy matching for typo tolerance. Use 'AUTO' to adjust based on term length, or 0, 1, 2 to specify edit distance."
+                },
+                minimum_should_match: {
+                    type: 'string',
+                    description: "Minimum number or percentage of terms that must match. E.g., '2' or '75%'."
+                },
+                analyzer: {
+                    type: 'string',
+                    description: "Analyzer to use for the query. If not specified, uses the field's default analyzer."
+                },
+                zero_terms_query: {
+                    type: 'string',
+                    enum: ['none', 'all'],
+                    description: "What to do if the analyzer removes all tokens. 'none' returns no results (default), 'all' matches all documents."
+                }
+            },
+            required: ['query']
+        }
+    },
     [asset.shapeName]: {
         id: asset.shapeId,
         name: asset.shapeName,

package/dist/template-shapes/where.d.ts

@@ -3,7 +3,7 @@ import type { ObjectSchema, ProjectSchemaJSON, PropertySchema, ShapeJSON, ShapeM
 import type { ResolvedTemplate } from './types.ts';
 export declare const MAX_RELATIONSHIP_DEPTH = 1;
 export declare const exceededRelationshipDepth: (depth?: number) => boolean;
-type ComparisonOperatorKey = 'eq' | 'lt' | 'lte' | 'gt' | 'gte' | 'in' | 'match' | 'match_phrase' | 'regexp' | 'wildcard';
+type ComparisonOperatorKey = 'eq' | 'lt' | 'lte' | 'gt' | 'gte' | 'in' | 'match' | 'match_advanced' | 'match_phrase' | 'match_phrase_advanced' | 'regexp' | 'wildcard';
 type ShapeThunk = ShapeJSON | (() => ShapeJSON);
 declare class ShapeCache {
     thunks: Map<string, ShapeThunk>;

package/dist/template-shapes/where.js

@@ -46,7 +46,7 @@ export const fieldTypeComparison = {
     id: { comparators: ['eq', 'in'], type: 'string' },
     boolean: { comparators: ['eq'], type: 'boolean' },
     string: {
-        comparators: ['eq', 'in', 'match', 'match_phrase', 'regexp', 'wildcard'],
+        comparators: ['eq', 'in', 'match', 'match_advanced', 'match_phrase', 'match_phrase_advanced', 'regexp', 'wildcard'],
         type: 'string'
     },
     date: { comparators: ['eq', 'lt', 'lte', 'gt', 'gte'], type: 'string' },
@@ -62,8 +62,8 @@ export const fieldTypeComparison = {
         comparators: ['eq', 'lt', 'lte', 'gt', 'gte', 'in'],
         type: 'string'
     },
-    draftjs: { comparators: ['match', 'match_phrase'], type: 'string' },
-    mdx: { comparators: ['match', 'match_phrase'], type: 'string' }
+    draftjs: { comparators: ['match', 'match_advanced', 'match_phrase', 'match_phrase_advanced'], type: 'string' },
+    mdx: { comparators: ['match', 'match_advanced', 'match_phrase', 'match_phrase_advanced'], type: 'string' }
 };
 export const comparatorDescriptions = {
     eq: 'Exact match',
@@ -73,7 +73,9 @@ export const comparatorDescriptions = {
     lte: 'Less than or equal',
     in: 'Array of possible exact match values.',
     match: 'Full text searching with fuzzy matching.',
+    match_advanced: 'Full text searching with advanced options like operator (and/or), fuzziness, minimum_should_match, analyzer, and zero_terms_query.',
     match_phrase: 'Full text searching requiring the exact phrase to appear in order.',
+    match_phrase_advanced: 'Full text phrase matching with advanced options like slop (word distance), analyzer, and zero_terms_query.',
     regexp: 'Regular expression string matching. Use of * wildcards could degrade performance.',
     wildcard: 'Wildcard pattern matching with * (multiple characters) and ? (single character).'
 };
@@ -113,6 +115,12 @@ export function getFieldTypeComparison(fieldType) {
         else if (op === 'wildcard') {
             result[op] = { '@ref': 'TSWhereWildcard', description };
         }
+        else if (op === 'match_advanced') {
+            result[op] = { '@ref': 'TSWhereMatchAdvanced', description };
+        }
+        else if (op === 'match_phrase_advanced') {
+            result[op] = { '@ref': 'TSWhereMatchPhraseAdvanced', description };
+        }
         else {
             result[op] = { description, type };
         }
@@ -396,7 +404,9 @@ export function getWhereShape(projectSchema, selectedShapes) {
                 }
             }),
             ...shapeCache.resolveAll(),
-            TSWhereWildcard: allBuiltInShapes.TSWhereWildcard
+            TSWhereWildcard: allBuiltInShapes.TSWhereWildcard,
+            TSWhereMatchAdvanced: allBuiltInShapes.TSWhereMatchAdvanced,
+            TSWhereMatchPhraseAdvanced: allBuiltInShapes.TSWhereMatchPhraseAdvanced
         })
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/schema",
-  "version": "12.1.4",
+  "version": "12.1.6",
   "description": "TakeShape Schema",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -57,9 +57,9 @@
     "p-reduce": "3.0.0",
     "semver": "7.7.2",
     "tiny-invariant": "1.3.3",
-    "@takeshape/errors": "12.1.4",
-    "@takeshape/json-schema": "12.1.4",
-    "@takeshape/util": "12.1.4"
+    "@takeshape/errors": "12.1.6",
+    "@takeshape/json-schema": "12.1.6",
+    "@takeshape/util": "12.1.6"
   },
   "devDependencies": {
     "@takeshape/json-schema-to-typescript": "11.0.0",
@@ -76,8 +76,8 @@
     "glob": "11.0.1",
     "json-schema-to-ts": "3.1.1",
     "shortid": "2.2.16",
-    "@takeshape/infra": "12.1.4",
-    "@takeshape/logger": "12.1.4"
+    "@takeshape/infra": "12.1.6",
+    "@takeshape/logger": "12.1.6"
   },
   "engines": {
     "node": ">=24"