@@ -5,8 +5,8 @@ import { CSSExportsWithSourceMap } from './getCssExports';
55import { VALID_VARIABLE_REGEXP } from './validVarRegexp' ;
66import { Logger } from './logger' ;
77
8- const isValidVariable = ( className : string ) =>
9- VALID_VARIABLE_REGEXP . test ( className ) ;
8+ const isValidVariable = ( classname : string ) =>
9+ VALID_VARIABLE_REGEXP . test ( classname ) ;
1010
1111const flattenClassNames = (
1212 previousValue : string [ ] = [ ] ,
@@ -28,22 +28,22 @@ export const createDtsExports = ({
2828
2929 const possiblyUndefined = Boolean ( options . noUncheckedIndexedAccess ) ;
3030
31- const classNameToProperty = ( className : string ) =>
32- `'${ className } '${ possiblyUndefined ? '?' : '' } : string;` ;
33- const classNameToNamedExport = ( className : string ) =>
34- `export let ${ className } ${ possiblyUndefined ? '?' : '' } : string;` ;
31+ const classnameToProperty = ( classname : string ) =>
32+ `'${ classname } '${ possiblyUndefined ? '?' : '' } : string;` ;
33+ const classnameToNamedExport = ( classname : string ) =>
34+ `export let ${ classname } ${ possiblyUndefined ? '?' : '' } : string;` ;
3535
3636 const processedClasses = Object . keys ( classes )
3737 . map ( transformClasses ( options . classnameTransform ) )
3838 . reduce ( flattenClassNames , [ ] ) ;
3939 const filteredClasses = processedClasses
4040 . filter ( isValidVariable )
41- . map ( classNameToNamedExport ) ;
41+ . map ( classnameToNamedExport ) ;
4242
4343 let dts = `\
4444declare let classes: {
45- ${ processedClasses . map ( classNameToProperty ) . join ( '\n ' ) } ${
46- options . allowAdditionalClasses ? '\n [key: string]: string;' : ''
45+ ${ processedClasses . map ( classnameToProperty ) . join ( '\n ' ) } ${
46+ options . allowUnknownClassnames ? '\n [key: string]: string;' : ''
4747 }
4848};
4949export default classes;
@@ -65,15 +65,15 @@ export default classes;
6565
6666 // Create a list of filtered classnames and hashed classnames.
6767 const filteredClasses = Object . entries ( cssExports . classes )
68- . map ( ( [ className , hashedClassName ] ) => [
68+ . map ( ( [ classname , hashedClassname ] ) => [
6969 // TODO: Improve this. It may return multiple valid classnames and we
7070 // want to handle all of those.
71- transformClasses ( options . classnameTransform ) ( className ) [ 0 ] ,
72- hashedClassName ,
71+ transformClasses ( options . classnameTransform ) ( classname ) [ 0 ] ,
72+ hashedClassname ,
7373 ] )
74- . filter ( ( [ className ] ) => isValidVariable ( className ) ) ;
74+ . filter ( ( [ classname ] ) => isValidVariable ( classname ) ) ;
7575
76- filteredClasses . forEach ( ( [ className , hashedClassName ] ) => {
76+ filteredClasses . forEach ( ( [ classname , hashedClassName ] ) => {
7777 const matchedLine = cssLines . findIndex ( ( line ) =>
7878 line . includes ( hashedClassName ) ,
7979 ) ;
@@ -85,7 +85,7 @@ export default classes;
8585 column : matchedColumn >= 0 ? matchedColumn : 0 ,
8686 } ) ;
8787 dtsLines [ lineNumber ? lineNumber - 1 : 0 ] +=
88- classNameToNamedExport ( className ) ;
88+ classnameToNamedExport ( classname ) ;
8989 } ) ;
9090
9191 dts = dtsLines . join ( '\n' ) ;
0 commit comments