@@ -13,79 +13,54 @@ namespace Moduless
1313 /** */
1414 type CoverFn = ( ) => CoverReturn | Promise < CoverReturn > ;
1515
16- /** */
17- export interface IRunInfo
18- {
19- cwd : string ;
20- namespacePath : string [ ] ;
21- functionPrefix ?: string ;
22- functionName ?: string ;
23- }
24-
2516 /**
26- *
17+ * An interface that stores information about the running
18+ * of a single cover function.
2719 */
28- export namespace IRunInfo
20+ export interface IRunMeta
2921 {
30- /**
31- * Creates an IRunInfo namespace, parsed from
32- * the specified namespace path, and function prefix.
33- */
34- export function parsePrefix ( qualifiedName : string ) : IRunInfo
35- {
36- const parts = qualifiedName . split ( "." ) ;
37- return {
38- cwd : process . cwd ( ) ,
39- namespacePath : parts . slice ( 0 , - 1 ) ,
40- functionPrefix : parts . at ( - 1 ) || ""
41- } ;
42- }
22+ functionNamespace : string [ ] ;
23+ functionName : string ;
24+ projectPath : string ;
4325
4426 /**
45- * Creates an IRunInfo namespace, parsed from
46- * the specified namespace path, and function name.
27+ * Whether the "name" property refers to a prefix (true),
28+ * or whether it's a fully qualified name (false) .
4729 */
48- export function parseNamed ( qualified : string )
49- {
50- const parts = qualified . split ( "." ) ;
51- return {
52- cwd : process . cwd ( ) ,
53- namespacePath : parts . slice ( 0 , - 1 ) ,
54- functionName : parts . at ( - 1 ) || ""
55- } ;
56- }
30+ prefix ?: boolean ;
5731 }
5832
5933 /**
6034 *
6135 */
62- export async function run ( info : IRunInfo )
36+ export async function run ( runInfo : IRunMeta )
6337 {
6438 // Wait 1600ms to give the debugger a chance to connect.
65- // This can be a problem with larger projects.
66- await new Promise ( r => setTimeout ( r , 1600 ) ) ;
39+ // This can be a problem with larger projects when
40+ if ( Moduless . inElectronMain || Moduless . inElectronRender )
41+ await new Promise ( r => setTimeout ( r , 1600 ) ) ;
6742
6843 if ( Moduless . inElectronRender )
6944 {
7045 // Eliminate Electron's console generated garbage
7146 console . clear ( ) ;
7247 }
7348
74- if ( ! info . functionName )
49+ if ( runInfo . prefix )
7550 {
7651 Util . log (
77- `Running cover functions in ${ info . namespacePath . join ( "." ) } +
78- `starting with ${ info . functionPrefix } ) ;
52+ `Running cover functions in ${ runInfo . functionNamespace . join ( "." ) } +
53+ `starting with ${ runInfo . functionName } ) ;
7954 }
8055
8156 let hasRunOneFunction = false ;
8257
83- const coverResult = await runCovers ( info ) ;
58+ const coverResult = await runCovers ( runInfo ) ;
8459 if ( coverResult )
8560 {
8661 hasRunOneFunction = true ;
8762
88- if ( info . functionName )
63+ if ( runInfo . functionName )
8964 return ;
9065 }
9166
@@ -98,10 +73,9 @@ namespace Moduless
9873 * only be found by traversing the TypeScript project structure.
9974 * Returns null in the case when no functions were discovered.
10075 */
101- function tryLoadCoversFromDependencies ( cwd = process . cwd ( ) )
76+ function tryLoadCoversFromDependencies ( projectPath : string )
10277 {
103- //const coverNamespaces: Namespace[] = [];
104- const graph = new ProjectGraph ( cwd ) ;
78+ const graph = new ProjectGraph ( projectPath ) ;
10579 const scriptFilePaths : string [ ] = [ ] ;
10680
10781 for ( const project of graph . eachProject ( ) )
@@ -138,20 +112,18 @@ namespace Moduless
138112 * Runs the cover functions with the specified name, from the specified
139113 * namespace. Intended for use with Node.js.
140114 */
141- async function runCovers ( info : IRunInfo )
115+ async function runCovers ( target : IRunMeta )
142116 {
143- const exports = [
144- ...tryLoadCoversFromDependencies ( info . cwd ) ,
145- globalThis ,
146- ] ;
117+ const dependencies = tryLoadCoversFromDependencies ( target . projectPath ) ;
118+ const exports = [ ...dependencies , globalThis ] ;
147119
148120 const resolvedNamespace = ( ( ) =>
149121 {
150122 nextExport: for ( const exp of exports )
151123 {
152124 let current : any = exp ;
153125
154- for ( const identifier of info . namespacePath )
126+ for ( const identifier of target . functionNamespace )
155127 {
156128 if ( ! ( identifier in current ) )
157129 continue nextExport;
@@ -165,27 +137,27 @@ namespace Moduless
165137 return current as Record < string , any > ;
166138 }
167139
140+ const ns = target . functionNamespace . join ( "." ) ;
168141 throw new Error (
169- "Could not resolve: " + info . namespacePath +
170- ". Not found or not an object." ) ;
142+ `Could not resolve: ${ ns } ) ;
171143 } ) ( ) ;
172144
173145 const covers = ( ( ) =>
174146 {
175147 const out : [ string , CoverFn ] [ ] = [ ] ;
176148
177- if ( info . functionName )
149+ if ( target . functionName )
178150 {
179- const fn = resolvedNamespace [ info . functionName ] ;
151+ const fn = resolvedNamespace [ target . functionName ] ;
180152 if ( typeof fn !== "function" )
181- throw new Error ( info . functionName + " is not a function." ) ;
153+ throw new Error ( target . functionName + " is not a function." ) ;
182154
183- out . push ( [ info . functionName , fn ] ) ;
155+ out . push ( [ target . functionName , fn ] ) ;
184156 }
185- else if ( info . functionPrefix )
157+ else if ( target . prefix )
186158 for ( const [ functionName , maybeFunction ] of Object . entries ( resolvedNamespace ) )
187159 if ( typeof maybeFunction === "function" )
188- if ( functionName . startsWith ( info . functionPrefix ) )
160+ if ( functionName . startsWith ( target . functionName ) )
189161 out . push ( [ functionName , maybeFunction ] ) ;
190162
191163 return out ;
0 commit comments