11import { Filtering , type MatchResult } from '@/components/ComponentBrowser/filtering'
2- import { SuggestionEntry } from '@/stores/suggestionDatabase/entry'
2+ import { type SuggestionEntry } from '@/stores/suggestionDatabase/entry'
33import {
44 makeConstructor ,
55 makeFunction ,
@@ -9,9 +9,12 @@ import {
99 makeModuleMethod ,
1010 makeStaticMethod ,
1111} from '@/stores/suggestionDatabase/mockSuggestion'
12- import { qnLastSegment , QualifiedName } from '@/util/qualifiedName'
12+ import { assert } from '@/util/assert'
13+ import { parseAbsoluteProjectPath } from '@/util/projectPath'
14+ import { qnLastSegment , tryQualifiedName } from '@/util/qualifiedName'
1315import { expect , test } from 'vitest'
14- import { Opt } from 'ydoc-shared/util/data/opt'
16+ import { type Opt } from 'ydoc-shared/util/data/opt'
17+ import { unwrap } from 'ydoc-shared/util/data/result'
1518
1619test . each ( [
1720 makeModuleMethod ( 'Standard.Base.Data.read' , { group : 'Standard.Base.MockGroup1' } ) ,
@@ -37,11 +40,19 @@ test.each([
3740 expect ( filtering . filter ( entry , [ ] ) ) . toBeNull ( )
3841} )
3942
43+ function stdPath ( path : string ) {
44+ assert ( path . startsWith ( 'Standard.' ) )
45+ return parseAbsoluteProjectPath ( unwrap ( tryQualifiedName ( path ) ) )
46+ }
47+
4048test ( 'An Instance method is shown when self arg matches' , ( ) => {
4149 const entry1 = makeMethod ( 'Standard.Base.Data.Vector.Vector.get' )
4250 const entry2 = makeMethod ( 'Standard.Base.Data.Table.get' )
4351 const filteringWithSelfType = new Filtering ( {
44- selfArg : { type : 'known' , typename : 'Standard.Base.Data.Vector.Vector' } ,
52+ selfArg : {
53+ type : 'known' ,
54+ typename : stdPath ( 'Standard.Base.Data.Vector.Vector' ) ,
55+ } ,
4556 } )
4657 expect ( filteringWithSelfType . filter ( entry1 , [ ] ) ) . not . toBeNull ( )
4758 expect ( filteringWithSelfType . filter ( entry2 , [ ] ) ) . toBeNull ( )
@@ -59,7 +70,10 @@ test('`Any` type methods taken into account when filtering', () => {
5970 const entry1 = makeMethod ( 'Standard.Base.Data.Vector.Vector.get' )
6071 const entry2 = makeMethod ( 'Standard.Base.Any.Any.to_string' )
6172 const filtering = new Filtering ( {
62- selfArg : { type : 'known' , typename : 'Standard.Base.Data.Vector.Vector' } ,
73+ selfArg : {
74+ type : 'known' ,
75+ typename : stdPath ( 'Standard.Base.Data.Vector.Vector' ) ,
76+ } ,
6377 } )
6478 expect ( filtering . filter ( entry1 , [ ] ) ) . not . toBeNull ( )
6579 expect ( filtering . filter ( entry2 , [ ] ) ) . not . toBeNull ( )
@@ -72,9 +86,9 @@ test('`Any` type methods taken into account when filtering', () => {
7286test ( 'Additional self types are taken into account when filtering' , ( ) => {
7387 const entry1 = makeMethod ( 'Standard.Base.Data.Numbers.Float.abs' )
7488 const entry2 = makeMethod ( 'Standard.Base.Data.Numbers.Number.sqrt' )
75- const additionalSelfType = 'Standard.Base.Data.Numbers.Number' as QualifiedName
89+ const additionalSelfType = stdPath ( 'Standard.Base.Data.Numbers.Number' )
7690 const filtering = new Filtering ( {
77- selfArg : { type : 'known' , typename : 'Standard.Base.Data.Numbers.Float' } ,
91+ selfArg : { type : 'known' , typename : stdPath ( 'Standard.Base.Data.Numbers.Float' ) } ,
7892 } )
7993 expect ( filtering . filter ( entry1 , [ additionalSelfType ] ) ) . not . toBeNull ( )
8094 expect ( filtering . filter ( entry2 , [ additionalSelfType ] ) ) . not . toBeNull ( )
@@ -97,7 +111,10 @@ test.each([
97111 makeMethod ( 'Standard.Base.Data.Vector.Vector2.get' ) ,
98112] ) ( '$name is filtered out when Vector self type is specified' , ( entry ) => {
99113 const filtering = new Filtering ( {
100- selfArg : { type : 'known' , typename : 'Standard.Base.Data.Vector.Vector' } ,
114+ selfArg : {
115+ type : 'known' ,
116+ typename : stdPath ( 'Standard.Base.Data.Vector.Vector' ) ,
117+ } ,
101118 } )
102119 expect ( filtering . filter ( entry , [ ] ) ) . toBeNull ( )
103120} )
@@ -203,14 +220,14 @@ test.each<MatchingTestCase>([
203220 ] ,
204221 } ,
205222 {
206- pattern : 'pr .foo' ,
223+ pattern : 'ma .foo' ,
207224 matchedSorted : [
208- { module : 'local.Pr ' , name : 'foo' } , // exact match
209- { module : 'local.Project' , name : 'foo' } , // name exact match and owner name start match
210- { module : 'local.Pr ' , name : 'foobar' } , // module exact match and name start match
211- { module : 'local.Pr ' , name : 'bar' , aliases : [ 'baz' , 'foo' ] } , // exact alias match
212- { module : 'local.Project' , name : 'bar' , aliases : [ 'baz' , 'foo' ] } , // exact alias match, but nonexact owner match
213- { module : 'local.Project' , name : 'bar' , aliases : [ 'bazbar' , 'foobar' ] } , // alias start match
225+ { module : 'local.Project.Ma ' , name : 'foo' } , // exact match
226+ { module : 'local.Project.Main ' , name : 'foo' } , // name exact match and owner name start match
227+ { module : 'local.Project.Ma ' , name : 'foobar' } , // module exact match and name start match
228+ { module : 'local.Project.Ma ' , name : 'bar' , aliases : [ 'baz' , 'foo' ] } , // exact alias match
229+ { module : 'local.Project.Main ' , name : 'bar' , aliases : [ 'baz' , 'foo' ] } , // exact alias match, but nonexact owner match
230+ { module : 'local.Project.Main ' , name : 'bar' , aliases : [ 'bazbar' , 'foobar' ] } , // alias start match
214231 { name : 'bar_foo' } , // name word exact match
215232 { name : 'baz_foobar' } , // name word start match
216233 { name : 'bar' , aliases : [ 'bar_foo' ] } , // alias word exact match
@@ -220,22 +237,25 @@ test.each<MatchingTestCase>([
220237 ] ,
221238 notMatched : [
222239 { module : 'local.Project.Data' , name : 'foo' } ,
223- { module : 'local.Ploject' , name : 'foo' } ,
224240 { module : 'local.Pr' , name : 'bar' } ,
225241 ] ,
226242 } ,
227243] ) ( 'Matching pattern $pattern' , ( { pattern, matchedSorted, notMatched } ) => {
228244 const filtering = new Filtering ( { pattern } )
229- const matchedSortedEntries = Array . from ( matchedSorted , ( { name, aliases, module } ) =>
245+ const matchedSortedEntries = matchedSorted . map ( ( { name, aliases, module } ) =>
230246 makeModuleMethod ( `${ module ?? 'local.Project' } ${ name } , { aliases : aliases ?? [ ] } ) ,
231247 )
232- const matchResults = Array . from ( matchedSortedEntries , ( entry ) => filtering . filter ( entry , [ ] ) )
248+ const matchResults = matchedSortedEntries . map ( ( entry ) => filtering . filter ( entry , [ ] ) )
233249 // Checking matching entries
234250 function checkResult ( entry : SuggestionEntry , result : Opt < MatchResult > ) {
235- expect ( result , `Matching entry ${ entry . definitionPath } ) . not . toBeNull ( )
251+ expect ( result , `Matching entry ${ JSON . stringify ( entry . definitionPath ) } ) . not . toBeNull ( )
236252 expect (
237253 matchedText (
238- 'memberOf' in entry && entry . memberOf ? qnLastSegment ( entry . memberOf ) : '' ,
254+ 'memberOf' in entry ?
255+ entry . memberOf . path ?
256+ qnLastSegment ( entry . memberOf . path )
257+ : 'Main'
258+ : '' ,
239259 entry . name ,
240260 result ! ,
241261 )
@@ -257,10 +277,9 @@ test.each<MatchingTestCase>([
257277
258278 // Checking non-matching entries
259279 for ( const { module, name, aliases } of notMatched ) {
260- const entry = {
261- ...makeModuleMethod ( `${ module ?? 'local.Project' } ${ name } ) ,
280+ const entry = makeModuleMethod ( `${ module ?? 'local.Project' } ${ name } , {
262281 aliases : aliases ?? [ ] ,
263- }
264- expect ( filtering . filter ( entry , [ ] ) , entry . definitionPath ) . toBeNull ( )
282+ } )
283+ expect ( filtering . filter ( entry , [ ] ) , JSON . stringify ( entry . definitionPath ) ) . toBeNull ( )
265284 }
266285} )
0 commit comments