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;
@@ -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;
@@ -2,6 +2,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
2
2
 
3
3
  var helpers_js = require('../helpers.js');
4
4
 
5
+ function normalizeAttrsForKey(attrs, config) {
6
+ const normalized = {
7
+ ...config.baseAttrs
8
+ };
9
+ for (const [key, value] of Object.entries(attrs || {})){
10
+ if (config.skippedAttrs.has(key) || value === undefined) {
11
+ continue;
12
+ }
13
+ if (config.booleanAttrs.has(key)) {
14
+ normalized[key] = true;
15
+ continue;
16
+ }
17
+ normalized[key] = value;
18
+ }
19
+ return normalized;
20
+ }
21
+
5
22
  function normalizeAsyncAttr(attrs) {
6
23
  if (!attrs) {
7
24
  return;
@@ -25,24 +42,19 @@ const booleanAttrs = new Set([
25
42
  'defer',
26
43
  'nomodule'
27
44
  ]);
45
+ const skippedAttrs = new Set([
46
+ 'src',
47
+ 'integrity',
48
+ 'type'
49
+ ]);
28
50
  function normalizeScriptAttrsForKey(attrs, scriptType) {
29
- const normalized = {
30
- type: scriptType
31
- };
32
- for (const [key, value] of Object.entries(attrs)){
33
- if (key === 'src' || key === 'integrity' || key === 'type') {
34
- continue;
35
- }
36
- if (value === undefined) {
37
- continue;
38
- }
39
- if (booleanAttrs.has(key)) {
40
- normalized[key] = true;
41
- continue;
42
- }
43
- normalized[key] = value;
44
- }
45
- return normalized;
51
+ return normalizeAttrsForKey(attrs, {
52
+ baseAttrs: {
53
+ type: scriptType
54
+ },
55
+ booleanAttrs,
56
+ skippedAttrs
57
+ });
46
58
  }
47
59
  function buildScriptKey(attrs, scriptType, scriptSrcIndex) {
48
60
  const normalizedAttrs = normalizeScriptAttrsForKey(attrs, scriptType);
@@ -50,12 +62,7 @@ function buildScriptKey(attrs, scriptType, scriptSrcIndex) {
50
62
  index: scriptSrcIndex,
51
63
  ...normalizedAttrs
52
64
  };
53
- const sortedKeys = Object.keys(keyObject).sort();
54
- const sortedKeyObject = {};
55
- for (const key of sortedKeys){
56
- sortedKeyObject[key] = keyObject[key];
57
- }
58
- return JSON.stringify(sortedKeyObject);
65
+ return JSON.stringify(Object.fromEntries(Object.entries(keyObject).sort()));
59
66
  }
60
67
  function endsWithLineComment(scriptContent) {
61
68
  const lastNewlineIndex = Math.max(scriptContent.lastIndexOf('\n'), scriptContent.lastIndexOf('\r'));
@@ -1,5 +1,22 @@
1
1
  import { extractTextContentFromNode } from '../helpers.mjs';
2
2
 
3
+ function normalizeAttrsForKey(attrs, config) {
4
+ const normalized = {
5
+ ...config.baseAttrs
6
+ };
7
+ for (const [key, value] of Object.entries(attrs || {})){
8
+ if (config.skippedAttrs.has(key) || value === undefined) {
9
+ continue;
10
+ }
11
+ if (config.booleanAttrs.has(key)) {
12
+ normalized[key] = true;
13
+ continue;
14
+ }
15
+ normalized[key] = value;
16
+ }
17
+ return normalized;
18
+ }
19
+
3
20
  function normalizeAsyncAttr(attrs) {
4
21
  if (!attrs) {
5
22
  return;
@@ -23,24 +40,19 @@ const booleanAttrs = new Set([
23
40
  'defer',
24
41
  'nomodule'
25
42
  ]);
43
+ const skippedAttrs = new Set([
44
+ 'src',
45
+ 'integrity',
46
+ 'type'
47
+ ]);
26
48
  function normalizeScriptAttrsForKey(attrs, scriptType) {
27
- const normalized = {
28
- type: scriptType
29
- };
30
- for (const [key, value] of Object.entries(attrs)){
31
- if (key === 'src' || key === 'integrity' || key === 'type') {
32
- continue;
33
- }
34
- if (value === undefined) {
35
- continue;
36
- }
37
- if (booleanAttrs.has(key)) {
38
- normalized[key] = true;
39
- continue;
40
- }
41
- normalized[key] = value;
42
- }
43
- return normalized;
49
+ return normalizeAttrsForKey(attrs, {
50
+ baseAttrs: {
51
+ type: scriptType
52
+ },
53
+ booleanAttrs,
54
+ skippedAttrs
55
+ });
44
56
  }
45
57
  function buildScriptKey(attrs, scriptType, scriptSrcIndex) {
46
58
  const normalizedAttrs = normalizeScriptAttrsForKey(attrs, scriptType);
@@ -48,12 +60,7 @@ function buildScriptKey(attrs, scriptType, scriptSrcIndex) {
48
60
  index: scriptSrcIndex,
49
61
  ...normalizedAttrs
50
62
  };
51
- const sortedKeys = Object.keys(keyObject).sort();
52
- const sortedKeyObject = {};
53
- for (const key of sortedKeys){
54
- sortedKeyObject[key] = keyObject[key];
55
- }
56
- return JSON.stringify(sortedKeyObject);
63
+ return JSON.stringify(Object.fromEntries(Object.entries(keyObject).sort()));
57
64
  }
58
65
  function endsWithLineComment(scriptContent) {
59
66
  const lastNewlineIndex = Math.max(scriptContent.lastIndexOf('\n'), scriptContent.lastIndexOf('\r'));