@@ -1357,7 +1357,7 @@ eq("search: q from the URL is capped", readState(`?q=${"a".repeat(5000)}`, { q:
13571357 const libDir = new URL ( "./" , import . meta. url ) ;
13581358 const publicDir = new URL ( "../public/" , import . meta. url ) ;
13591359 // dist name -> source file (build.mjs copies these four from site/lib).
1360- const fromLib = { "search.js" : "search.mjs" , "owes.js" : "owes.mjs" , "cards.mjs" : "cards.mjs" , " shared.mjs": "shared.mjs" } ;
1360+ const { BROWSER_MODULES : fromLib } = await import ( "./ shared.mjs") ;
13611361 const src = ( name ) => nodeFs . readFileSync ( fromLib [ name ] ? new URL ( fromLib [ name ] , libDir ) : new URL ( name , publicDir ) , "utf8" ) ;
13621362 const importsOf = ( name ) => [ ...src ( name ) . matchAll ( / ^ i m p o r t [ ^ ; ] * ?f r o m " \. \/ ( [ ^ " ] + ) " ; / gm) ] . map ( ( m ) => m [ 1 ] ) ;
13631363 const closure = ( roots ) => {
@@ -1768,7 +1768,7 @@ eq("search: q from the URL is capped", readState(`?q=${"a".repeat(5000)}`, { q:
17681768 const nodePath = await import ( "node:path" ) ;
17691769 const publicDir = new URL ( "../public/" , import . meta. url ) ;
17701770 // dist name -> source module in site/lib (build.mjs copies these out).
1771- const fromLib = { "search.js" : "search.mjs" , "owes.js" : "owes.mjs" , "cards.mjs" : "cards.mjs" , " shared.mjs": "shared.mjs" } ;
1771+ const { BROWSER_MODULES : fromLib } = await import ( "./ shared.mjs") ;
17721772 const scripts = nodeFs . readdirSync ( publicDir ) . filter ( ( f ) => f . endsWith ( ".js" ) ) . sort ( ) ;
17731773 const tmp = nodeFs . mkdtempSync ( nodePath . join ( os . tmpdir ( ) , "fgda-client-" ) ) ;
17741774 const exportsOfPublic = ( text ) => {
@@ -1877,9 +1877,15 @@ eq("search: q from the URL is capped", readState(`?q=${"a".repeat(5000)}`, { q:
18771877 eq ( "pr-diff: modified licence is a field change" , JSON . stringify ( rows [ 1 ] . fields [ 0 ] ) , '{"field":"license","before":"CC0","after":"MIT"}' ) ;
18781878 eq ( "pr-diff: unchanged type change has no fields" , rows [ 3 ] . fields . length , 0 ) ;
18791879 const { baseArg } = await import ( "../pr-diff.mjs" ) ;
1880- eq ( "pr-diff: a sha base is accepted" , baseArg ( [ "node" , "x" , "--base" , "abc1234" ] ) , "abc1234" ) ;
1881- eq ( "pr-diff: a ref name is refused (exit 2)" , baseArg ( [ "node" , "x" , "--base" , "main" ] ) , null ) ;
1882- eq ( "pr-diff: a missing base is refused" , baseArg ( [ "node" , "x" , "--base" ] ) , null ) ;
1880+ eq ( "pr-diff: a sha base is accepted" , baseArg ( [ "--base" , "abc1234" ] ) , "abc1234" ) ;
1881+ eq ( "pr-diff: a ref name is refused (exit 2)" , baseArg ( [ "--base" , "main" ] ) , null ) ;
1882+ let missingBase = "" ;
1883+ try { baseArg ( [ "--base" ] ) ; } catch ( e ) { missingBase = e . message ; }
1884+ has ( "pr-diff: --base with no value is an error" , missingBase , "--base" ) ;
1885+ eq ( "pr-diff: no --base gives null" , baseArg ( [ ] ) , null ) ;
1886+ let unknownFlag = "" ;
1887+ try { baseArg ( [ "--bsae" , "abc1234" ] ) ; } catch ( e ) { unknownFlag = e . message ; }
1888+ has ( "pr-diff: a mistyped flag is an error" , unknownFlag , "Unknown option '--bsae'" ) ;
18831889
18841890 const one = licenceDiffMarkdown ( [ { file : "catalog/a.md" , change : "added" , fields : [ { field : "tags" , before : null , after : "a, b" } ] , evidence : null } ] ) ;
18851891 has ( "licence diff: one entry" , one , "1 entry changed." ) ;
@@ -1961,6 +1967,46 @@ eq("search: q from the URL is capped", readState(`?q=${"a".repeat(5000)}`, { q:
19611967 eq ( "fields: preview is not exported" , "preview" in optionalFields ( { preview : "none" } ) , false ) ;
19621968}
19631969
1970+ /* browser modules never import from node: (#236) -------------------------- */
1971+ {
1972+ const { BROWSER_MODULES , PAGE_MODULES } = await import ( "./shared.mjs" ) ;
1973+ const publicDir = new URL ( "../public/" , import . meta. url ) ;
1974+ const sources = [
1975+ ...Object . values ( BROWSER_MODULES ) . map ( ( f ) => [ `lib/${ f } ` , nodeFs . readFileSync ( new URL ( f , import . meta. url ) , "utf8" ) ] ) ,
1976+ ...nodeFs . readdirSync ( publicDir ) . filter ( ( f ) => f . endsWith ( ".js" ) ) . map ( ( f ) => [ `public/${ f } ` , nodeFs . readFileSync ( new URL ( f , publicDir ) , "utf8" ) ] ) ,
1977+ ] ;
1978+ for ( const [ name , text ] of sources ) {
1979+ lacks ( `browser: ${ name } imports nothing from node:` , text , 'from "node:' ) ;
1980+ lacks ( `browser: ${ name } imports no lib file by its source name` , [ ...text . matchAll ( / f r o m " \. \/ ( [ ^ " ] + ) " / g) ] . map ( ( m ) => m [ 1 ] ) . filter ( ( f ) => f . endsWith ( ".mjs" ) && ! ( f in BROWSER_MODULES ) ) . join ( ) , ".mjs" ) ;
1981+ }
1982+ const served = new Set ( [ ...Object . keys ( BROWSER_MODULES ) , ...nodeFs . readdirSync ( publicDir ) ] ) ;
1983+ for ( const [ page , mods ] of Object . entries ( PAGE_MODULES ) ) for ( const m of mods ) eq ( `browser: ${ page } preloads ${ m } , which is served` , served . has ( m ) , true ) ;
1984+ }
1985+
1986+ /* strict flags; the shortlist's esc copy (#236) --------------------------- */
1987+ {
1988+ const { readArgs } = await import ( "./cli.mjs" ) ;
1989+ const errOf = ( f ) => { try { f ( ) ; return "" ; } catch ( e ) { return e . message ; } } ;
1990+ eq ( "cli: known flags read" , readArgs ( [ "--report" , "r.md" , "--clean" ] , { report : { type : "string" } , clean : { type : "boolean" } } ) . values . report , "r.md" ) ;
1991+ has ( "cli: an unknown flag is refused" , errOf ( ( ) => readArgs ( [ "--reprot" , "r.md" ] , { report : { type : "string" } } ) ) , "Unknown option '--reprot'" ) ;
1992+ has ( "cli: a value flag with no value is refused" , errOf ( ( ) => readArgs ( [ "--report" ] , { report : { type : "string" } } ) ) , "argument missing" ) ;
1993+ has ( "cli: positionals refused unless allowed" , errOf ( ( ) => readArgs ( [ "2d" ] , { } ) ) , "Unexpected argument" ) ;
1994+ eq ( "cli: positionals when allowed" , readArgs ( [ "2d" , "x" ] , { } , { positionals : true } ) . positionals . join ( ) , "2d,x" ) ;
1995+ const { thumbsOptions } = await import ( "../thumbs.mjs" ) ;
1996+ const t = thumbsOptions ( [ "--only" , "a,b" , "--limit" , "3" , "--dry-run" ] ) ;
1997+ eq ( "thumbs flags: parsed" , `${ [ ...t . only ] . join ( ) } |${ t . limit } |${ t . dryRun } |${ t . force } ` , "a,b|3|true|false" ) ;
1998+ eq ( "thumbs flags: no limit is unlimited" , thumbsOptions ( [ ] ) . limit , Infinity ) ;
1999+ has ( "thumbs flags: a limit must be a whole number" , errOf ( ( ) => thumbsOptions ( [ "--limit" , "x" ] ) ) , "--limit needs a whole number" ) ;
2000+ has ( "thumbs flags: a limit needs a value" , errOf ( ( ) => thumbsOptions ( [ "--limit" ] ) ) , "argument missing" ) ;
2001+
2002+ const { esc } = await import ( "./shared.mjs" ) ;
2003+ const short = nodeFs . readFileSync ( new URL ( "../public/shortlist.js" , import . meta. url ) , "utf8" ) ;
2004+ const body = short . match ( / f u n c t i o n e s c a p e H t m l \( s t r \) \{ ( [ \s \S ] * ?) \n \} / ) [ 1 ] ;
2005+ const escapeHtml = new Function ( "str" , body ) ;
2006+ const sample = `<a href="x" title='y'>Tom & "Jerry"</a>` ;
2007+ eq ( "shortlist's escapeHtml matches shared esc" , escapeHtml ( sample ) , esc ( sample ) ) ;
2008+ }
2009+
19642010/* lint: unused imports (#230) --------------------------------------------- */
19652011{
19662012 const { unusedImports, scriptFiles } = await import ( "../lint.mjs" ) ;
0 commit comments