htmlnano 3.1.0 → 3.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. package/README.md +37 -23
  2. package/dist/_modules/collapseAttributeWhitespace.d.mts +58 -14
  3. package/dist/_modules/collapseAttributeWhitespace.d.ts +58 -14
  4. package/dist/_modules/collapseBooleanAttributes.d.mts +58 -14
  5. package/dist/_modules/collapseBooleanAttributes.d.ts +58 -14
  6. package/dist/_modules/collapseWhitespace.d.mts +58 -14
  7. package/dist/_modules/collapseWhitespace.d.ts +58 -14
  8. package/dist/_modules/custom.d.mts +58 -14
  9. package/dist/_modules/custom.d.ts +58 -14
  10. package/dist/_modules/deduplicateAttributeValues.d.mts +58 -14
  11. package/dist/_modules/deduplicateAttributeValues.d.ts +58 -14
  12. package/dist/_modules/example.d.mts +58 -14
  13. package/dist/_modules/example.d.ts +58 -14
  14. package/dist/_modules/mergeScripts.d.mts +58 -14
  15. package/dist/_modules/mergeScripts.d.ts +58 -14
  16. package/dist/_modules/mergeScripts.js +30 -23
  17. package/dist/_modules/mergeScripts.mjs +30 -23
  18. package/dist/_modules/mergeStyles.d.mts +58 -14
  19. package/dist/_modules/mergeStyles.d.ts +58 -14
  20. package/dist/_modules/mergeStyles.js +26 -21
  21. package/dist/_modules/mergeStyles.mjs +26 -21
  22. package/dist/_modules/minifyAttributes.d.mts +58 -14
  23. package/dist/_modules/minifyAttributes.d.ts +58 -14
  24. package/dist/_modules/minifyAttributes.js +2 -2
  25. package/dist/_modules/minifyAttributes.mjs +2 -2
  26. package/dist/_modules/minifyConditionalComments.d.mts +58 -14
  27. package/dist/_modules/minifyConditionalComments.d.ts +58 -14
  28. package/dist/_modules/minifyCss.d.mts +61 -14
  29. package/dist/_modules/minifyCss.d.ts +61 -14
  30. package/dist/_modules/minifyCss.js +79 -12
  31. package/dist/_modules/minifyCss.mjs +79 -13
  32. package/dist/_modules/minifyHtmlTemplate.d.mts +58 -14
  33. package/dist/_modules/minifyHtmlTemplate.d.ts +58 -14
  34. package/dist/_modules/minifyJs.d.mts +58 -13
  35. package/dist/_modules/minifyJs.d.ts +58 -13
  36. package/dist/_modules/minifyJs.js +12 -0
  37. package/dist/_modules/minifyJs.mjs +12 -0
  38. package/dist/_modules/minifyJson.d.mts +58 -14
  39. package/dist/_modules/minifyJson.d.ts +58 -14
  40. package/dist/_modules/minifyJson.js +1 -1
  41. package/dist/_modules/minifyJson.mjs +1 -1
  42. package/dist/_modules/minifySvg.d.mts +58 -13
  43. package/dist/_modules/minifySvg.d.ts +58 -13
  44. package/dist/_modules/minifySvg.js +2 -2
  45. package/dist/_modules/minifySvg.mjs +2 -2
  46. package/dist/_modules/minifyUrls.d.mts +58 -14
  47. package/dist/_modules/minifyUrls.d.ts +58 -14
  48. package/dist/_modules/minifyUrls.js +2 -2
  49. package/dist/_modules/minifyUrls.mjs +2 -2
  50. package/dist/_modules/normalizeAttributeValues.d.mts +58 -14
  51. package/dist/_modules/normalizeAttributeValues.d.ts +58 -14
  52. package/dist/_modules/removeAttributeQuotes.d.mts +58 -14
  53. package/dist/_modules/removeAttributeQuotes.d.ts +58 -14
  54. package/dist/_modules/removeComments.d.mts +58 -14
  55. package/dist/_modules/removeComments.d.ts +58 -14
  56. package/dist/_modules/removeComments.js +1 -1
  57. package/dist/_modules/removeComments.mjs +1 -1
  58. package/dist/_modules/removeEmptyAttributes.d.mts +58 -14
  59. package/dist/_modules/removeEmptyAttributes.d.ts +58 -14
  60. package/dist/_modules/removeEmptyElements.d.mts +58 -14
  61. package/dist/_modules/removeEmptyElements.d.ts +58 -14
  62. package/dist/_modules/removeOptionalTags.d.mts +58 -14
  63. package/dist/_modules/removeOptionalTags.d.ts +58 -14
  64. package/dist/_modules/removeRedundantAttributes.d.mts +58 -14
  65. package/dist/_modules/removeRedundantAttributes.d.ts +58 -14
  66. package/dist/_modules/removeUnusedCss.d.mts +58 -14
  67. package/dist/_modules/removeUnusedCss.d.ts +58 -14
  68. package/dist/_modules/removeUnusedCss.js +3 -2
  69. package/dist/_modules/removeUnusedCss.mjs +3 -2
  70. package/dist/_modules/sortAttributes.d.mts +61 -16
  71. package/dist/_modules/sortAttributes.d.ts +61 -16
  72. package/dist/_modules/sortAttributes.js +5 -9
  73. package/dist/_modules/sortAttributes.mjs +5 -9
  74. package/dist/_modules/sortAttributesWithLists.d.mts +61 -15
  75. package/dist/_modules/sortAttributesWithLists.d.ts +61 -15
  76. package/dist/_modules/sortAttributesWithLists.js +43 -56
  77. package/dist/_modules/sortAttributesWithLists.mjs +43 -56
  78. package/dist/index.d.ts +59 -15
  79. package/dist/index.js +7 -6
  80. package/dist/index.mjs +7 -6
  81. package/dist/presets/ampSafe.d.ts +57 -12
  82. package/dist/presets/max.d.ts +57 -12
  83. package/dist/presets/max.js +9 -5
  84. package/dist/presets/max.mjs +9 -5
  85. package/dist/presets/safe.d.ts +57 -12
  86. package/dist/presets/safe.js +1 -1
  87. package/dist/presets/safe.mjs +1 -1
  88. package/package.json +20 -14
@@ -1,25 +1,70 @@
1
1
  import PostHTML from 'posthtml';
2
- import { MinifyOptions } from 'terser';
3
- import { Options } from 'cssnano';
4
- import { Config } from 'svgo';
5
- import { UserDefinedOptions } from 'purgecss';
6
2
 
7
- type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
3
+ type PostHTMLNodeLike = PostHTML.Node | string;
4
+ type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
8
5
  options?: {
9
6
  quoteAllAttributes?: boolean | undefined;
10
7
  quoteStyle?: 0 | 1 | 2 | undefined;
11
8
  replaceQuote?: boolean | undefined;
12
9
  } | undefined;
13
10
  render(): string;
14
- render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
11
+ render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
15
12
  };
16
13
  type MaybeArray<T> = T | Array<T>;
17
- type PostHTMLNodeLike = PostHTML.Node | string;
18
14
  type HtmlnanoTemplateRule = {
19
15
  tag: string;
20
16
  attrs?: Record<string, string | boolean | void>;
21
17
  };
22
18
  type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
19
+ type HtmlnanoMinifyCssOptions = object;
20
+ type HtmlnanoMinifyJsOptions = object;
21
+ type HtmlnanoMinifySvgOptions = object;
22
+ type HtmlnanoPurgeCssPattern = string | RegExp;
23
+ type HtmlnanoPurgeCssExtractorResultDetailed = {
24
+ attributes: {
25
+ names: string[];
26
+ values: string[];
27
+ };
28
+ classes: string[];
29
+ ids: string[];
30
+ tags: string[];
31
+ undetermined: string[];
32
+ };
33
+ type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
34
+ type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
35
+ type HtmlnanoPurgeCssSourceMapOptions = {
36
+ absolute?: boolean;
37
+ annotation?: boolean | string;
38
+ from?: string;
39
+ inline?: boolean;
40
+ prev?: boolean | object | string;
41
+ sourcesContent?: boolean;
42
+ to?: string;
43
+ };
44
+ type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
45
+ standard?: HtmlnanoPurgeCssPattern[];
46
+ deep?: RegExp[];
47
+ greedy?: RegExp[];
48
+ variables?: HtmlnanoPurgeCssPattern[];
49
+ keyframes?: HtmlnanoPurgeCssPattern[];
50
+ };
51
+ interface HtmlnanoPurgeCssOptions {
52
+ tool: 'purgeCSS';
53
+ defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
54
+ fontFace?: boolean;
55
+ keyframes?: boolean;
56
+ output?: string;
57
+ rejected?: boolean;
58
+ rejectedCss?: boolean;
59
+ sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
60
+ stdin?: boolean;
61
+ stdout?: boolean;
62
+ variables?: boolean;
63
+ safelist?: HtmlnanoPurgeCssSafelist;
64
+ blocklist?: HtmlnanoPurgeCssPattern[];
65
+ skippedContentGlobs?: string[];
66
+ dynamicAttributes?: string[];
67
+ }
23
68
  interface HtmlnanoOptions {
24
69
  skipConfigLoading?: boolean;
25
70
  configPath?: string;
@@ -34,16 +79,16 @@ interface HtmlnanoOptions {
34
79
  minifyUrls?: URL | string | false;
35
80
  mergeStyles?: boolean;
36
81
  mergeScripts?: boolean;
37
- minifyCss?: Options | boolean;
82
+ minifyCss?: HtmlnanoMinifyCssOptions | boolean;
38
83
  minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
39
84
  minifyConditionalComments?: boolean;
40
- minifyJs?: MinifyOptions | boolean;
85
+ minifyJs?: HtmlnanoMinifyJsOptions | boolean;
41
86
  minifyJson?: boolean;
42
87
  minifyAttributes?: boolean | {
43
88
  metaContent?: boolean;
44
89
  redundantWhitespaces?: 'safe' | 'agressive' | false;
45
90
  };
46
- minifySvg?: Config | boolean;
91
+ minifySvg?: HtmlnanoMinifySvgOptions | boolean;
47
92
  normalizeAttributeValues?: boolean;
48
93
  removeAttributeQuotes?: boolean | {
49
94
  force?: boolean;
@@ -55,9 +100,8 @@ interface HtmlnanoOptions {
55
100
  };
56
101
  removeRedundantAttributes?: boolean;
57
102
  removeOptionalTags?: boolean;
58
- removeUnusedCss?: boolean | ({
59
- tool: 'purgeCSS';
60
- } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
103
+ removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
104
+ tool?: 'uncss';
61
105
  banner?: boolean;
62
106
  csspath?: string;
63
107
  htmlroot?: string;
@@ -77,7 +121,7 @@ interface HtmlnanoOptions {
77
121
  type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
78
122
  type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
79
123
  type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
80
- type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
124
+ type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
81
125
  type HtmlnanoModule<Options = any> = {
82
126
  onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
83
127
  onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;
@@ -1,25 +1,70 @@
1
1
  import PostHTML from 'posthtml';
2
- import { MinifyOptions } from 'terser';
3
- import { Options } from 'cssnano';
4
- import { Config } from 'svgo';
5
- import { UserDefinedOptions } from 'purgecss';
6
2
 
7
- type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
3
+ type PostHTMLNodeLike = PostHTML.Node | string;
4
+ type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
8
5
  options?: {
9
6
  quoteAllAttributes?: boolean | undefined;
10
7
  quoteStyle?: 0 | 1 | 2 | undefined;
11
8
  replaceQuote?: boolean | undefined;
12
9
  } | undefined;
13
10
  render(): string;
14
- render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
11
+ render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
15
12
  };
16
13
  type MaybeArray<T> = T | Array<T>;
17
- type PostHTMLNodeLike = PostHTML.Node | string;
18
14
  type HtmlnanoTemplateRule = {
19
15
  tag: string;
20
16
  attrs?: Record<string, string | boolean | void>;
21
17
  };
22
18
  type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
19
+ type HtmlnanoMinifyCssOptions = object;
20
+ type HtmlnanoMinifyJsOptions = object;
21
+ type HtmlnanoMinifySvgOptions = object;
22
+ type HtmlnanoPurgeCssPattern = string | RegExp;
23
+ type HtmlnanoPurgeCssExtractorResultDetailed = {
24
+ attributes: {
25
+ names: string[];
26
+ values: string[];
27
+ };
28
+ classes: string[];
29
+ ids: string[];
30
+ tags: string[];
31
+ undetermined: string[];
32
+ };
33
+ type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
34
+ type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
35
+ type HtmlnanoPurgeCssSourceMapOptions = {
36
+ absolute?: boolean;
37
+ annotation?: boolean | string;
38
+ from?: string;
39
+ inline?: boolean;
40
+ prev?: boolean | object | string;
41
+ sourcesContent?: boolean;
42
+ to?: string;
43
+ };
44
+ type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
45
+ standard?: HtmlnanoPurgeCssPattern[];
46
+ deep?: RegExp[];
47
+ greedy?: RegExp[];
48
+ variables?: HtmlnanoPurgeCssPattern[];
49
+ keyframes?: HtmlnanoPurgeCssPattern[];
50
+ };
51
+ interface HtmlnanoPurgeCssOptions {
52
+ tool: 'purgeCSS';
53
+ defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
54
+ fontFace?: boolean;
55
+ keyframes?: boolean;
56
+ output?: string;
57
+ rejected?: boolean;
58
+ rejectedCss?: boolean;
59
+ sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
60
+ stdin?: boolean;
61
+ stdout?: boolean;
62
+ variables?: boolean;
63
+ safelist?: HtmlnanoPurgeCssSafelist;
64
+ blocklist?: HtmlnanoPurgeCssPattern[];
65
+ skippedContentGlobs?: string[];
66
+ dynamicAttributes?: string[];
67
+ }
23
68
  interface HtmlnanoOptions {
24
69
  skipConfigLoading?: boolean;
25
70
  configPath?: string;
@@ -34,16 +79,16 @@ interface HtmlnanoOptions {
34
79
  minifyUrls?: URL | string | false;
35
80
  mergeStyles?: boolean;
36
81
  mergeScripts?: boolean;
37
- minifyCss?: Options | boolean;
82
+ minifyCss?: HtmlnanoMinifyCssOptions | boolean;
38
83
  minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
39
84
  minifyConditionalComments?: boolean;
40
- minifyJs?: MinifyOptions | boolean;
85
+ minifyJs?: HtmlnanoMinifyJsOptions | boolean;
41
86
  minifyJson?: boolean;
42
87
  minifyAttributes?: boolean | {
43
88
  metaContent?: boolean;
44
89
  redundantWhitespaces?: 'safe' | 'agressive' | false;
45
90
  };
46
- minifySvg?: Config | boolean;
91
+ minifySvg?: HtmlnanoMinifySvgOptions | boolean;
47
92
  normalizeAttributeValues?: boolean;
48
93
  removeAttributeQuotes?: boolean | {
49
94
  force?: boolean;
@@ -55,9 +100,8 @@ interface HtmlnanoOptions {
55
100
  };
56
101
  removeRedundantAttributes?: boolean;
57
102
  removeOptionalTags?: boolean;
58
- removeUnusedCss?: boolean | ({
59
- tool: 'purgeCSS';
60
- } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
103
+ removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
104
+ tool?: 'uncss';
61
105
  banner?: boolean;
62
106
  csspath?: string;
63
107
  htmlroot?: string;
@@ -77,7 +121,7 @@ interface HtmlnanoOptions {
77
121
  type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
78
122
  type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
79
123
  type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
80
- type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
124
+ type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
81
125
  type HtmlnanoModule<Options = any> = {
82
126
  onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
83
127
  onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;
@@ -20,7 +20,7 @@ const mod = {
20
20
  return [
21
21
  JSON.stringify(JSON.parse(jsonContent))
22
22
  ];
23
- } catch (unused) {
23
+ } catch {
24
24
  // Invalid JSON
25
25
  }
26
26
  }
@@ -18,7 +18,7 @@ const mod = {
18
18
  return [
19
19
  JSON.stringify(JSON.parse(jsonContent))
20
20
  ];
21
- } catch (unused) {
21
+ } catch {
22
22
  // Invalid JSON
23
23
  }
24
24
  }
@@ -1,25 +1,71 @@
1
1
  import PostHTML from 'posthtml';
2
- import { MinifyOptions } from 'terser';
3
- import { Options } from 'cssnano';
4
2
  import { Config } from 'svgo';
5
- import { UserDefinedOptions } from 'purgecss';
6
3
 
7
- type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
4
+ type PostHTMLNodeLike = PostHTML.Node | string;
5
+ type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
8
6
  options?: {
9
7
  quoteAllAttributes?: boolean | undefined;
10
8
  quoteStyle?: 0 | 1 | 2 | undefined;
11
9
  replaceQuote?: boolean | undefined;
12
10
  } | undefined;
13
11
  render(): string;
14
- render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
12
+ render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
15
13
  };
16
14
  type MaybeArray<T> = T | Array<T>;
17
- type PostHTMLNodeLike = PostHTML.Node | string;
18
15
  type HtmlnanoTemplateRule = {
19
16
  tag: string;
20
17
  attrs?: Record<string, string | boolean | void>;
21
18
  };
22
19
  type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
20
+ type HtmlnanoMinifyCssOptions = object;
21
+ type HtmlnanoMinifyJsOptions = object;
22
+ type HtmlnanoMinifySvgOptions = object;
23
+ type HtmlnanoPurgeCssPattern = string | RegExp;
24
+ type HtmlnanoPurgeCssExtractorResultDetailed = {
25
+ attributes: {
26
+ names: string[];
27
+ values: string[];
28
+ };
29
+ classes: string[];
30
+ ids: string[];
31
+ tags: string[];
32
+ undetermined: string[];
33
+ };
34
+ type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
35
+ type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
36
+ type HtmlnanoPurgeCssSourceMapOptions = {
37
+ absolute?: boolean;
38
+ annotation?: boolean | string;
39
+ from?: string;
40
+ inline?: boolean;
41
+ prev?: boolean | object | string;
42
+ sourcesContent?: boolean;
43
+ to?: string;
44
+ };
45
+ type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
46
+ standard?: HtmlnanoPurgeCssPattern[];
47
+ deep?: RegExp[];
48
+ greedy?: RegExp[];
49
+ variables?: HtmlnanoPurgeCssPattern[];
50
+ keyframes?: HtmlnanoPurgeCssPattern[];
51
+ };
52
+ interface HtmlnanoPurgeCssOptions {
53
+ tool: 'purgeCSS';
54
+ defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
55
+ fontFace?: boolean;
56
+ keyframes?: boolean;
57
+ output?: string;
58
+ rejected?: boolean;
59
+ rejectedCss?: boolean;
60
+ sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
61
+ stdin?: boolean;
62
+ stdout?: boolean;
63
+ variables?: boolean;
64
+ safelist?: HtmlnanoPurgeCssSafelist;
65
+ blocklist?: HtmlnanoPurgeCssPattern[];
66
+ skippedContentGlobs?: string[];
67
+ dynamicAttributes?: string[];
68
+ }
23
69
  interface HtmlnanoOptions {
24
70
  skipConfigLoading?: boolean;
25
71
  configPath?: string;
@@ -34,16 +80,16 @@ interface HtmlnanoOptions {
34
80
  minifyUrls?: URL | string | false;
35
81
  mergeStyles?: boolean;
36
82
  mergeScripts?: boolean;
37
- minifyCss?: Options | boolean;
83
+ minifyCss?: HtmlnanoMinifyCssOptions | boolean;
38
84
  minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
39
85
  minifyConditionalComments?: boolean;
40
- minifyJs?: MinifyOptions | boolean;
86
+ minifyJs?: HtmlnanoMinifyJsOptions | boolean;
41
87
  minifyJson?: boolean;
42
88
  minifyAttributes?: boolean | {
43
89
  metaContent?: boolean;
44
90
  redundantWhitespaces?: 'safe' | 'agressive' | false;
45
91
  };
46
- minifySvg?: Config | boolean;
92
+ minifySvg?: HtmlnanoMinifySvgOptions | boolean;
47
93
  normalizeAttributeValues?: boolean;
48
94
  removeAttributeQuotes?: boolean | {
49
95
  force?: boolean;
@@ -55,9 +101,8 @@ interface HtmlnanoOptions {
55
101
  };
56
102
  removeRedundantAttributes?: boolean;
57
103
  removeOptionalTags?: boolean;
58
- removeUnusedCss?: boolean | ({
59
- tool: 'purgeCSS';
60
- } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
104
+ removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
105
+ tool?: 'uncss';
61
106
  banner?: boolean;
62
107
  csspath?: string;
63
108
  htmlroot?: string;
@@ -77,7 +122,7 @@ interface HtmlnanoOptions {
77
122
  type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
78
123
  type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
79
124
  type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
80
- type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
125
+ type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
81
126
  type HtmlnanoModule<Options = any> = {
82
127
  onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
83
128
  onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;
@@ -1,25 +1,71 @@
1
1
  import PostHTML from 'posthtml';
2
- import { MinifyOptions } from 'terser';
3
- import { Options } from 'cssnano';
4
2
  import { Config } from 'svgo';
5
- import { UserDefinedOptions } from 'purgecss';
6
3
 
7
- type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
4
+ type PostHTMLNodeLike = PostHTML.Node | string;
5
+ type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
8
6
  options?: {
9
7
  quoteAllAttributes?: boolean | undefined;
10
8
  quoteStyle?: 0 | 1 | 2 | undefined;
11
9
  replaceQuote?: boolean | undefined;
12
10
  } | undefined;
13
11
  render(): string;
14
- render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
12
+ render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
15
13
  };
16
14
  type MaybeArray<T> = T | Array<T>;
17
- type PostHTMLNodeLike = PostHTML.Node | string;
18
15
  type HtmlnanoTemplateRule = {
19
16
  tag: string;
20
17
  attrs?: Record<string, string | boolean | void>;
21
18
  };
22
19
  type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
20
+ type HtmlnanoMinifyCssOptions = object;
21
+ type HtmlnanoMinifyJsOptions = object;
22
+ type HtmlnanoMinifySvgOptions = object;
23
+ type HtmlnanoPurgeCssPattern = string | RegExp;
24
+ type HtmlnanoPurgeCssExtractorResultDetailed = {
25
+ attributes: {
26
+ names: string[];
27
+ values: string[];
28
+ };
29
+ classes: string[];
30
+ ids: string[];
31
+ tags: string[];
32
+ undetermined: string[];
33
+ };
34
+ type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
35
+ type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
36
+ type HtmlnanoPurgeCssSourceMapOptions = {
37
+ absolute?: boolean;
38
+ annotation?: boolean | string;
39
+ from?: string;
40
+ inline?: boolean;
41
+ prev?: boolean | object | string;
42
+ sourcesContent?: boolean;
43
+ to?: string;
44
+ };
45
+ type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
46
+ standard?: HtmlnanoPurgeCssPattern[];
47
+ deep?: RegExp[];
48
+ greedy?: RegExp[];
49
+ variables?: HtmlnanoPurgeCssPattern[];
50
+ keyframes?: HtmlnanoPurgeCssPattern[];
51
+ };
52
+ interface HtmlnanoPurgeCssOptions {
53
+ tool: 'purgeCSS';
54
+ defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
55
+ fontFace?: boolean;
56
+ keyframes?: boolean;
57
+ output?: string;
58
+ rejected?: boolean;
59
+ rejectedCss?: boolean;
60
+ sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
61
+ stdin?: boolean;
62
+ stdout?: boolean;
63
+ variables?: boolean;
64
+ safelist?: HtmlnanoPurgeCssSafelist;
65
+ blocklist?: HtmlnanoPurgeCssPattern[];
66
+ skippedContentGlobs?: string[];
67
+ dynamicAttributes?: string[];
68
+ }
23
69
  interface HtmlnanoOptions {
24
70
  skipConfigLoading?: boolean;
25
71
  configPath?: string;
@@ -34,16 +80,16 @@ interface HtmlnanoOptions {
34
80
  minifyUrls?: URL | string | false;
35
81
  mergeStyles?: boolean;
36
82
  mergeScripts?: boolean;
37
- minifyCss?: Options | boolean;
83
+ minifyCss?: HtmlnanoMinifyCssOptions | boolean;
38
84
  minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
39
85
  minifyConditionalComments?: boolean;
40
- minifyJs?: MinifyOptions | boolean;
86
+ minifyJs?: HtmlnanoMinifyJsOptions | boolean;
41
87
  minifyJson?: boolean;
42
88
  minifyAttributes?: boolean | {
43
89
  metaContent?: boolean;
44
90
  redundantWhitespaces?: 'safe' | 'agressive' | false;
45
91
  };
46
- minifySvg?: Config | boolean;
92
+ minifySvg?: HtmlnanoMinifySvgOptions | boolean;
47
93
  normalizeAttributeValues?: boolean;
48
94
  removeAttributeQuotes?: boolean | {
49
95
  force?: boolean;
@@ -55,9 +101,8 @@ interface HtmlnanoOptions {
55
101
  };
56
102
  removeRedundantAttributes?: boolean;
57
103
  removeOptionalTags?: boolean;
58
- removeUnusedCss?: boolean | ({
59
- tool: 'purgeCSS';
60
- } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
104
+ removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
105
+ tool?: 'uncss';
61
106
  banner?: boolean;
62
107
  csspath?: string;
63
108
  htmlroot?: string;
@@ -77,7 +122,7 @@ interface HtmlnanoOptions {
77
122
  type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
78
123
  type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
79
124
  type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
80
- type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
125
+ type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
81
126
  type HtmlnanoModule<Options = any> = {
82
127
  onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
83
128
  onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;
@@ -32,12 +32,12 @@ var helpers_js = require('../helpers.js');
32
32
  console.error('htmlnano fails to minify the svg:');
33
33
  console.error(error);
34
34
  }
35
- let fallbackSvgStr = svgStr;
35
+ let fallbackSvgStr;
36
36
  try {
37
37
  fallbackSvgStr = svgo.optimize(svgStr, {
38
38
  plugins: []
39
39
  }).data;
40
- } catch (unused) {
40
+ } catch {
41
41
  fallbackSvgStr = svgStr;
42
42
  }
43
43
  // @ts-expect-error -- remove this node
@@ -30,12 +30,12 @@ import { optionalImport } from '../helpers.mjs';
30
30
  console.error('htmlnano fails to minify the svg:');
31
31
  console.error(error);
32
32
  }
33
- let fallbackSvgStr = svgStr;
33
+ let fallbackSvgStr;
34
34
  try {
35
35
  fallbackSvgStr = svgo.optimize(svgStr, {
36
36
  plugins: []
37
37
  }).data;
38
- } catch (unused) {
38
+ } catch {
39
39
  fallbackSvgStr = svgStr;
40
40
  }
41
41
  // @ts-expect-error -- remove this node
@@ -1,25 +1,70 @@
1
1
  import PostHTML from 'posthtml';
2
- import { MinifyOptions } from 'terser';
3
- import { Options } from 'cssnano';
4
- import { Config } from 'svgo';
5
- import { UserDefinedOptions } from 'purgecss';
6
2
 
7
- type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
3
+ type PostHTMLNodeLike = PostHTML.Node | string;
4
+ type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
8
5
  options?: {
9
6
  quoteAllAttributes?: boolean | undefined;
10
7
  quoteStyle?: 0 | 1 | 2 | undefined;
11
8
  replaceQuote?: boolean | undefined;
12
9
  } | undefined;
13
10
  render(): string;
14
- render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
11
+ render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
15
12
  };
16
13
  type MaybeArray<T> = T | Array<T>;
17
- type PostHTMLNodeLike = PostHTML.Node | string;
18
14
  type HtmlnanoTemplateRule = {
19
15
  tag: string;
20
16
  attrs?: Record<string, string | boolean | void>;
21
17
  };
22
18
  type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
19
+ type HtmlnanoMinifyCssOptions = object;
20
+ type HtmlnanoMinifyJsOptions = object;
21
+ type HtmlnanoMinifySvgOptions = object;
22
+ type HtmlnanoPurgeCssPattern = string | RegExp;
23
+ type HtmlnanoPurgeCssExtractorResultDetailed = {
24
+ attributes: {
25
+ names: string[];
26
+ values: string[];
27
+ };
28
+ classes: string[];
29
+ ids: string[];
30
+ tags: string[];
31
+ undetermined: string[];
32
+ };
33
+ type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
34
+ type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
35
+ type HtmlnanoPurgeCssSourceMapOptions = {
36
+ absolute?: boolean;
37
+ annotation?: boolean | string;
38
+ from?: string;
39
+ inline?: boolean;
40
+ prev?: boolean | object | string;
41
+ sourcesContent?: boolean;
42
+ to?: string;
43
+ };
44
+ type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
45
+ standard?: HtmlnanoPurgeCssPattern[];
46
+ deep?: RegExp[];
47
+ greedy?: RegExp[];
48
+ variables?: HtmlnanoPurgeCssPattern[];
49
+ keyframes?: HtmlnanoPurgeCssPattern[];
50
+ };
51
+ interface HtmlnanoPurgeCssOptions {
52
+ tool: 'purgeCSS';
53
+ defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
54
+ fontFace?: boolean;
55
+ keyframes?: boolean;
56
+ output?: string;
57
+ rejected?: boolean;
58
+ rejectedCss?: boolean;
59
+ sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
60
+ stdin?: boolean;
61
+ stdout?: boolean;
62
+ variables?: boolean;
63
+ safelist?: HtmlnanoPurgeCssSafelist;
64
+ blocklist?: HtmlnanoPurgeCssPattern[];
65
+ skippedContentGlobs?: string[];
66
+ dynamicAttributes?: string[];
67
+ }
23
68
  interface HtmlnanoOptions {
24
69
  skipConfigLoading?: boolean;
25
70
  configPath?: string;
@@ -34,16 +79,16 @@ interface HtmlnanoOptions {
34
79
  minifyUrls?: URL | string | false;
35
80
  mergeStyles?: boolean;
36
81
  mergeScripts?: boolean;
37
- minifyCss?: Options | boolean;
82
+ minifyCss?: HtmlnanoMinifyCssOptions | boolean;
38
83
  minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
39
84
  minifyConditionalComments?: boolean;
40
- minifyJs?: MinifyOptions | boolean;
85
+ minifyJs?: HtmlnanoMinifyJsOptions | boolean;
41
86
  minifyJson?: boolean;
42
87
  minifyAttributes?: boolean | {
43
88
  metaContent?: boolean;
44
89
  redundantWhitespaces?: 'safe' | 'agressive' | false;
45
90
  };
46
- minifySvg?: Config | boolean;
91
+ minifySvg?: HtmlnanoMinifySvgOptions | boolean;
47
92
  normalizeAttributeValues?: boolean;
48
93
  removeAttributeQuotes?: boolean | {
49
94
  force?: boolean;
@@ -55,9 +100,8 @@ interface HtmlnanoOptions {
55
100
  };
56
101
  removeRedundantAttributes?: boolean;
57
102
  removeOptionalTags?: boolean;
58
- removeUnusedCss?: boolean | ({
59
- tool: 'purgeCSS';
60
- } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
103
+ removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
104
+ tool?: 'uncss';
61
105
  banner?: boolean;
62
106
  csspath?: string;
63
107
  htmlroot?: string;
@@ -77,7 +121,7 @@ interface HtmlnanoOptions {
77
121
  type HtmlnanoModuleAttrsHandler = (attrs: Record<string, string | boolean | void>, node: PostHTML.Node) => Record<string, string | boolean | void>;
78
122
  type HtmlnanoModuleContentHandler = (content: Array<PostHTMLNodeLike>, node: PostHTML.Node) => MaybeArray<PostHTMLNodeLike>;
79
123
  type HtmlnanoModuleNodeHandler = (node: PostHTMLNodeLike) => PostHTML.Node | string;
80
- type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends object ? Partial<T> : T;
124
+ type OptionalOptions<T> = T extends boolean | string | Function | number | null | undefined ? T : T extends Array<infer Item> ? Array<Item> : T extends object ? Partial<T> : T;
81
125
  type HtmlnanoModule<Options = any> = {
82
126
  onAttrs?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleAttrsHandler;
83
127
  onContent?: (options: Partial<HtmlnanoOptions>, moduleOptions: OptionalOptions<Options>) => HtmlnanoModuleContentHandler;