djlint 1.28.0 → 1.30.0

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 (368) hide show
  1. package/.coveragerc +9 -0
  2. package/.editorconfig +21 -0
  3. package/.flake8 +0 -0
  4. package/.github/FUNDING.yml +2 -0
  5. package/.github/ISSUE_TEMPLATE/config.yml +6 -0
  6. package/.github/ISSUE_TEMPLATE/feature_request.md +19 -0
  7. package/.github/ISSUE_TEMPLATE/formatter_but_report.md +30 -0
  8. package/.github/ISSUE_TEMPLATE/linter_bug_report.md +34 -0
  9. package/.github/ISSUE_TEMPLATE/translation.md +14 -0
  10. package/.github/config.yml +4 -0
  11. package/.github/pull_request_template.md +10 -0
  12. package/.github/workflows/cancel.yml +17 -0
  13. package/.github/workflows/demo.yml +98 -0
  14. package/.github/workflows/issues.yml +23 -0
  15. package/.github/workflows/linkcheck.yaml +21 -0
  16. package/.github/workflows/lint.yml +25 -0
  17. package/.github/workflows/release.yml +57 -0
  18. package/.github/workflows/test.yml +85 -0
  19. package/.pre-commit-config.yaml +45 -0
  20. package/.pre-commit-hooks.yaml +71 -0
  21. package/.prettierignore +7 -0
  22. package/.prettierrc +11 -0
  23. package/.releaserc +16 -0
  24. package/CHANGELOG.md +13 -0
  25. package/MANIFEST.in +2 -0
  26. package/build_demo.sh +17 -0
  27. package/docs/.eleventy.js +425 -0
  28. package/docs/.eleventyignore +2 -0
  29. package/docs/.prettierignore +3 -0
  30. package/docs/.prettierrc +11 -0
  31. package/docs/package.json +73 -0
  32. package/docs/readme.md +17 -0
  33. package/docs/src/_data/configuration.json +646 -0
  34. package/docs/src/_data/eleventyComputed.js +22 -0
  35. package/docs/src/_data/i18n/index.js +159 -0
  36. package/docs/src/_data/js.js +7 -0
  37. package/docs/src/_data/locales.js +17 -0
  38. package/docs/src/_data/site.json +8 -0
  39. package/docs/src/_includes/demo.njk +157 -0
  40. package/docs/src/_includes/docs_layout.njk +34 -0
  41. package/docs/src/_includes/foot.njk +26 -0
  42. package/docs/src/_includes/index.njk +187 -0
  43. package/docs/src/_includes/languages_layout.njk +11 -0
  44. package/docs/src/_includes/layout.njk +111 -0
  45. package/docs/src/_includes/nav.njk +85 -0
  46. package/docs/src/_utils/minify-html.js +14 -0
  47. package/docs/src/_utils/rollupper.js +91 -0
  48. package/docs/src/_utils/scripts.11ty.js +27 -0
  49. package/docs/src/demo.njk +4 -0
  50. package/docs/src/docs/best-practices.md +78 -0
  51. package/docs/src/docs/changelog.md +452 -0
  52. package/docs/src/docs/configuration.md +145 -0
  53. package/docs/src/docs/docs.json +4 -0
  54. package/docs/src/docs/formatter.md +82 -0
  55. package/docs/src/docs/getting-started.md +126 -0
  56. package/docs/src/docs/ignoring-code.md +75 -0
  57. package/docs/src/docs/integrations.md +120 -0
  58. package/docs/src/docs/languages/angular.md +31 -0
  59. package/docs/src/docs/languages/django.md +40 -0
  60. package/docs/src/docs/languages/golang.md +31 -0
  61. package/docs/src/docs/languages/handlebars.md +31 -0
  62. package/docs/src/docs/languages/jinja.md +39 -0
  63. package/docs/src/docs/languages/languages.json +3 -0
  64. package/docs/src/docs/languages/mustache.md +31 -0
  65. package/docs/src/docs/languages/nunjucks.md +39 -0
  66. package/docs/src/docs/languages/twig.md +41 -0
  67. package/docs/src/docs/linter.md +199 -0
  68. package/docs/src/fr/demo.njk +4 -0
  69. package/docs/src/fr/docs/best-practices.md +78 -0
  70. package/docs/src/fr/docs/changelog.md +452 -0
  71. package/docs/src/fr/docs/configuration.md +144 -0
  72. package/docs/src/fr/docs/docs.json +3 -0
  73. package/docs/src/fr/docs/formatter.md +83 -0
  74. package/docs/src/fr/docs/getting-started.md +127 -0
  75. package/docs/src/fr/docs/ignoring-code.md +75 -0
  76. package/docs/src/fr/docs/integrations.md +100 -0
  77. package/docs/src/fr/docs/languages/angular.md +31 -0
  78. package/docs/src/fr/docs/languages/django.md +31 -0
  79. package/docs/src/fr/docs/languages/golang.md +31 -0
  80. package/docs/src/fr/docs/languages/handlebars.md +31 -0
  81. package/docs/src/fr/docs/languages/jinja.md +31 -0
  82. package/docs/src/fr/docs/languages/languages.json +3 -0
  83. package/docs/src/fr/docs/languages/mustache.md +31 -0
  84. package/docs/src/fr/docs/languages/nunjucks.md +31 -0
  85. package/docs/src/fr/docs/languages/twig.md +31 -0
  86. package/docs/src/fr/docs/linter.md +207 -0
  87. package/docs/src/fr/fr.json +4 -0
  88. package/docs/src/fr/index.njk +4 -0
  89. package/docs/src/index.njk +4 -0
  90. package/docs/src/lib/generate-content-hash.js +13 -0
  91. package/docs/src/robots.txt +4 -0
  92. package/docs/src/ru/demo.njk +4 -0
  93. package/docs/src/ru/docs/best-practices.md +78 -0
  94. package/docs/src/ru/docs/changelog.md +453 -0
  95. package/docs/src/ru/docs/configuration.md +142 -0
  96. package/docs/src/ru/docs/docs.json +3 -0
  97. package/docs/src/ru/docs/formatter.md +82 -0
  98. package/docs/src/ru/docs/getting-started.md +127 -0
  99. package/docs/src/ru/docs/ignoring-code.md +75 -0
  100. package/docs/src/ru/docs/integrations.md +100 -0
  101. package/docs/src/ru/docs/languages/angular.md +31 -0
  102. package/docs/src/ru/docs/languages/django.md +31 -0
  103. package/docs/src/ru/docs/languages/golang.md +31 -0
  104. package/docs/src/ru/docs/languages/handlebars.md +31 -0
  105. package/docs/src/ru/docs/languages/jinja.md +31 -0
  106. package/docs/src/ru/docs/languages/languages.json +3 -0
  107. package/docs/src/ru/docs/languages/mustache.md +31 -0
  108. package/docs/src/ru/docs/languages/nunjucks.md +31 -0
  109. package/docs/src/ru/docs/languages/twig.md +31 -0
  110. package/docs/src/ru/docs/linter.md +126 -0
  111. package/docs/src/ru/index.njk +4 -0
  112. package/docs/src/ru/ru.json +4 -0
  113. package/docs/src/sitemap.njk +16 -0
  114. package/docs/src/static/css/site.scss +467 -0
  115. package/docs/src/static/font/fontawesome/stylesheet.scss +78 -0
  116. package/docs/src/static/img/apple-touch-icon.png +0 -0
  117. package/docs/src/static/img/demo-min.gif +0 -0
  118. package/docs/src/static/img/demo.gif +0 -0
  119. package/docs/src/static/img/demo.webm +0 -0
  120. package/docs/src/static/img/favicon-16x16.png +0 -0
  121. package/docs/src/static/img/favicon-32x32.png +0 -0
  122. package/docs/src/static/img/favicon.ico +0 -0
  123. package/docs/src/static/img/icon-square.indd +0 -0
  124. package/docs/src/static/img/icon-square.png +0 -0
  125. package/docs/src/static/img/icon.png +0 -0
  126. package/docs/src/static/img/logo-192x192.png +0 -0
  127. package/docs/src/static/img/logo-512x512.png +0 -0
  128. package/docs/src/static/img/logos/angular.png +0 -0
  129. package/docs/src/static/img/logos/django.png +0 -0
  130. package/docs/src/static/img/logos/golang.png +0 -0
  131. package/docs/src/static/img/logos/handlebars.png +0 -0
  132. package/docs/src/static/img/logos/jinja.png +0 -0
  133. package/docs/src/static/img/logos/mustache.png +0 -0
  134. package/docs/src/static/img/logos/nunjucks.png +0 -0
  135. package/docs/src/static/img/logos/twig.png +0 -0
  136. package/docs/src/static/img/old_demo.gif +0 -0
  137. package/docs/src/static/img/style.css +122 -0
  138. package/docs/src/static/js/animate.js +69 -0
  139. package/docs/src/static/js/editor.js +171 -0
  140. package/docs/src/static/js/hamburger.js +19 -0
  141. package/docs/src/static/js/modal.js +47 -0
  142. package/docs/src/static/js/worker.js +142 -0
  143. package/docs/src/static/py/EditorConfig-99-py3-none-any.whl +0 -0
  144. package/docs/src/static/py/PyYAML-99-py3-none-any.whl +0 -0
  145. package/docs/src/static/py/click-99-py3-none-any.whl +0 -0
  146. package/docs/src/static/py/colorama-99-py3-none-any.whl +0 -0
  147. package/docs/src/static/py/cssbeautifier-99-py3-none-any.whl +0 -0
  148. package/docs/src/static/py/djlint-99-py3-none-any.whl +0 -0
  149. package/docs/src/static/py/html_tag_names-99-py3-none-any.whl +0 -0
  150. package/docs/src/static/py/html_void_elements-99-py3-none-any.whl +0 -0
  151. package/docs/src/static/py/jsbeautifier-99-py3-none-any.whl +0 -0
  152. package/docs/src/static/py/json5-99-py3-none-any.whl +0 -0
  153. package/docs/src/static/py/pathspec-99-py3-none-any.whl +0 -0
  154. package/docs/src/static/py/regex-2023.5.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl +0 -0
  155. package/docs/src/static/py/six-1.16.0-py2.py3-none-any.whl +0 -0
  156. package/docs/src/static/py/tomli-2.0.1-py3-none-any.whl +0 -0
  157. package/docs/src/static/py/tqdm-4.65.0-py3-none-any.whl +0 -0
  158. package/icon.xcf +0 -0
  159. package/package.json +4 -33
  160. package/poetry.lock +835 -0
  161. package/pyproject.toml +100 -0
  162. package/renovate.json +44 -0
  163. package/scripts/updateVersion.js +16 -0
  164. package/src/djlint/__init__.py +451 -0
  165. package/src/djlint/__main__.py +4 -0
  166. package/src/djlint/formatter/__init__.py +1 -0
  167. package/src/djlint/formatter/attributes.py +212 -0
  168. package/src/djlint/formatter/compress.py +64 -0
  169. package/src/djlint/formatter/condense.py +221 -0
  170. package/src/djlint/formatter/css.py +60 -0
  171. package/src/djlint/formatter/expand.py +111 -0
  172. package/src/djlint/formatter/indent.py +418 -0
  173. package/src/djlint/formatter/js.py +58 -0
  174. package/src/djlint/helpers.py +321 -0
  175. package/src/djlint/lint.py +128 -0
  176. package/src/djlint/output.py +220 -0
  177. package/src/djlint/reformat.py +63 -0
  178. package/src/djlint/rules/H025.py +65 -0
  179. package/src/djlint/rules.yaml +279 -0
  180. package/src/djlint/settings.py +969 -0
  181. package/src/djlint/src.py +91 -0
  182. package/tests/__init__.py +0 -0
  183. package/tests/conftest.py +239 -0
  184. package/tests/test_cli.py +71 -0
  185. package/tests/test_config/__init__.py +0 -0
  186. package/tests/test_config/test_blank_line_after_tag.py +135 -0
  187. package/tests/test_config/test_blank_line_before_tag.py +141 -0
  188. package/tests/test_config/test_close_void_tags.py +31 -0
  189. package/tests/test_config/test_custom_blocks.py +56 -0
  190. package/tests/test_config/test_custom_html.py +45 -0
  191. package/tests/test_config/test_djlintrc/.djlintrc +38 -0
  192. package/tests/test_config/test_djlintrc/__init__.py +0 -0
  193. package/tests/test_config/test_djlintrc/test_config.py +44 -0
  194. package/tests/test_config/test_djlintrc_custom/.djlint-cust +38 -0
  195. package/tests/test_config/test_djlintrc_custom/.djlintrc +2 -0
  196. package/tests/test_config/test_djlintrc_custom/__init__.py +0 -0
  197. package/tests/test_config/test_djlintrc_custom/test_config.py +48 -0
  198. package/tests/test_config/test_excludes/__init__.py +0 -0
  199. package/tests/test_config/test_excludes/excluded.html +1 -0
  200. package/tests/test_config/test_excludes/foo/excluded.html +1 -0
  201. package/tests/test_config/test_excludes/html.html +1 -0
  202. package/tests/test_config/test_excludes/pyproject.toml +3 -0
  203. package/tests/test_config/test_excludes/test_config.py +30 -0
  204. package/tests/test_config/test_extension/__init__.py +0 -0
  205. package/tests/test_config/test_extension/html.test +1 -0
  206. package/tests/test_config/test_extension/pyproject.toml +3 -0
  207. package/tests/test_config/test_extension/test_config.py +27 -0
  208. package/tests/test_config/test_files/.djlintrc_global +9 -0
  209. package/tests/test_config/test_files/test.html +3 -0
  210. package/tests/test_config/test_files/test_config.py +123 -0
  211. package/tests/test_config/test_files/test_two.html +1 -0
  212. package/tests/test_config/test_format_attribute_template_tags.py +280 -0
  213. package/tests/test_config/test_format_css.py +197 -0
  214. package/tests/test_config/test_format_js.py +220 -0
  215. package/tests/test_config/test_gitignore/__init__.py +0 -0
  216. package/tests/test_config/test_gitignore/html_one.html +1 -0
  217. package/tests/test_config/test_gitignore/html_two.html +1 -0
  218. package/tests/test_config/test_gitignore/test_config.py +142 -0
  219. package/tests/test_config/test_ignore/__init__.py +0 -0
  220. package/tests/test_config/test_ignore/html.html +1 -0
  221. package/tests/test_config/test_ignore/html_two.html +12 -0
  222. package/tests/test_config/test_ignore/pyproject.toml +3 -0
  223. package/tests/test_config/test_ignore/test_config.py +32 -0
  224. package/tests/test_config/test_ignore_blocks.py +45 -0
  225. package/tests/test_config/test_ignore_case.py +39 -0
  226. package/tests/test_config/test_indent.py +63 -0
  227. package/tests/test_config/test_linter_output_format/__init__.py +0 -0
  228. package/tests/test_config/test_linter_output_format/html-one.html +1 -0
  229. package/tests/test_config/test_linter_output_format/html-two.html +1 -0
  230. package/tests/test_config/test_linter_output_format/pyproject.toml +3 -0
  231. package/tests/test_config/test_linter_output_format/test_config.py +34 -0
  232. package/tests/test_config/test_max_attribute_length.py +100 -0
  233. package/tests/test_config/test_max_line_length.py +94 -0
  234. package/tests/test_config/test_per_file_ignores/__init__.py +0 -0
  235. package/tests/test_config/test_per_file_ignores/html.html +2 -0
  236. package/tests/test_config/test_per_file_ignores/pyproject.toml +2 -0
  237. package/tests/test_config/test_per_file_ignores/test_config.py +25 -0
  238. package/tests/test_config/test_pragmas/__init__.py +0 -0
  239. package/tests/test_config/test_pragmas/html_five.html +2 -0
  240. package/tests/test_config/test_pragmas/html_four.html +5 -0
  241. package/tests/test_config/test_pragmas/html_one.html +1 -0
  242. package/tests/test_config/test_pragmas/html_six.html +2 -0
  243. package/tests/test_config/test_pragmas/html_three.html +4 -0
  244. package/tests/test_config/test_pragmas/html_two.html +2 -0
  245. package/tests/test_config/test_pragmas/pyproject.toml +3 -0
  246. package/tests/test_config/test_pragmas/test_config.py +142 -0
  247. package/tests/test_config/test_preserve_blank_lines.py +109 -0
  248. package/tests/test_config/test_preserve_leading_space.py +159 -0
  249. package/tests/test_config/test_profile/__init__.py +0 -0
  250. package/tests/test_config/test_profile/html.html +2 -0
  251. package/tests/test_config/test_profile/pyproject.toml +3 -0
  252. package/tests/test_config/test_profile/test_config.py +64 -0
  253. package/tests/test_config/test_pyproject/__init__.py +0 -0
  254. package/tests/test_config/test_pyproject/blank.html +0 -0
  255. package/tests/test_config/test_pyproject/pyproject.toml +36 -0
  256. package/tests/test_config/test_pyproject/test_config.py +44 -0
  257. package/tests/test_django/__init__.py +0 -0
  258. package/tests/test_django/test_asset.py +32 -0
  259. package/tests/test_django/test_autoescape.py +25 -0
  260. package/tests/test_django/test_block.py +29 -0
  261. package/tests/test_django/test_blocktrans.py +236 -0
  262. package/tests/test_django/test_blocktrans_trimmed.py +283 -0
  263. package/tests/test_django/test_comments.py +164 -0
  264. package/tests/test_django/test_filter.py +30 -0
  265. package/tests/test_django/test_for.py +34 -0
  266. package/tests/test_django/test_if.py +34 -0
  267. package/tests/test_django/test_ifchanged.py +37 -0
  268. package/tests/test_django/test_include.py +24 -0
  269. package/tests/test_django/test_load.py +24 -0
  270. package/tests/test_django/test_quoted.py +34 -0
  271. package/tests/test_django/test_spaceless.py +30 -0
  272. package/tests/test_django/test_tag_spaces.py +35 -0
  273. package/tests/test_django/test_templatetag.py +40 -0
  274. package/tests/test_django/test_verbatim.py +24 -0
  275. package/tests/test_django/test_with.py +32 -0
  276. package/tests/test_djlint/-.html +1 -0
  277. package/tests/test_djlint/__init__.py +0 -0
  278. package/tests/test_djlint/bad.html +6 -0
  279. package/tests/test_djlint/bad.html.dj +23 -0
  280. package/tests/test_djlint/bad.html.dj2 +2 -0
  281. package/tests/test_djlint/multiple_files/a/a.html +1 -0
  282. package/tests/test_djlint/multiple_files/b/b1.html +1 -0
  283. package/tests/test_djlint/multiple_files/b/b2.html +1 -0
  284. package/tests/test_djlint/test_djlint.py +242 -0
  285. package/tests/test_golang/__init__.py +0 -0
  286. package/tests/test_golang/test_if.py +24 -0
  287. package/tests/test_golang/test_range.py +24 -0
  288. package/tests/test_handlebars/__init__.py +0 -0
  289. package/tests/test_handlebars/test_each.py +34 -0
  290. package/tests/test_handlebars/test_else.py +24 -0
  291. package/tests/test_handlebars/test_with.py +24 -0
  292. package/tests/test_html/__init__.py +0 -0
  293. package/tests/test_html/test_alpinejs.py +65 -0
  294. package/tests/test_html/test_attributes.py +935 -0
  295. package/tests/test_html/test_aurelia.py +24 -0
  296. package/tests/test_html/test_basics.py +905 -0
  297. package/tests/test_html/test_bracket_same_line.py +177 -0
  298. package/tests/test_html/test_case.py +81 -0
  299. package/tests/test_html/test_cdata.py +34 -0
  300. package/tests/test_html/test_comments.py +333 -0
  301. package/tests/test_html/test_css.py +193 -0
  302. package/tests/test_html/test_doctype_declarations.py +202 -0
  303. package/tests/test_html/test_ignored.py +193 -0
  304. package/tests/test_html/test_interpolation.py +56 -0
  305. package/tests/test_html/test_line_break_after_multiline_tag.py +95 -0
  306. package/tests/test_html/test_next_line_empty.py +53 -0
  307. package/tests/test_html/test_selfclosing.py +55 -0
  308. package/tests/test_html/test_single_attribute_per_line.py +87 -0
  309. package/tests/test_html/test_srcset.py +43 -0
  310. package/tests/test_html/test_svg.py +104 -0
  311. package/tests/test_html/test_symbol_entities.py +34 -0
  312. package/tests/test_html/test_tag_code.py +24 -0
  313. package/tests/test_html/test_tag_dd.py +24 -0
  314. package/tests/test_html/test_tag_details_summary.py +24 -0
  315. package/tests/test_html/test_tag_dt.py +24 -0
  316. package/tests/test_html/test_tag_fig_caption.py +29 -0
  317. package/tests/test_html/test_tag_hr.py +29 -0
  318. package/tests/test_html/test_tag_picture.py +32 -0
  319. package/tests/test_html/test_tag_pre.py +45 -0
  320. package/tests/test_html/test_tag_script.py +516 -0
  321. package/tests/test_html/test_tag_small.py +24 -0
  322. package/tests/test_html/test_tag_span.py +119 -0
  323. package/tests/test_html/test_tag_textarea.py +82 -0
  324. package/tests/test_html/test_tags.py +842 -0
  325. package/tests/test_html/test_text.py +34 -0
  326. package/tests/test_html/test_whitespace.py +477 -0
  327. package/tests/test_html/test_yaml.py +156 -0
  328. package/tests/test_jinja/__init__.py +0 -0
  329. package/tests/test_jinja/test_call.py +34 -0
  330. package/tests/test_jinja/test_parenthesis.py +24 -0
  331. package/tests/test_linter/__init__.py +0 -0
  332. package/tests/test_linter/test_custom_rules/.djlint_rules.yaml +6 -0
  333. package/tests/test_linter/test_custom_rules/__init__.py +0 -0
  334. package/tests/test_linter/test_custom_rules/html.html +1 -0
  335. package/tests/test_linter/test_custom_rules/pyproject.toml +1 -0
  336. package/tests/test_linter/test_custom_rules/test_linter.py +29 -0
  337. package/tests/test_linter/test_custom_rules_bad/.djlint_rules.yaml +24 -0
  338. package/tests/test_linter/test_custom_rules_bad/__init__.py +0 -0
  339. package/tests/test_linter/test_custom_rules_bad/html.html +1 -0
  340. package/tests/test_linter/test_custom_rules_bad/pyproject.toml +1 -0
  341. package/tests/test_linter/test_custom_rules_bad/test_linter.py +29 -0
  342. package/tests/test_linter/test_django_linter.py +476 -0
  343. package/tests/test_linter/test_h005.py +45 -0
  344. package/tests/test_linter/test_h006.py +81 -0
  345. package/tests/test_linter/test_h007.py +45 -0
  346. package/tests/test_linter/test_h008.py +60 -0
  347. package/tests/test_linter/test_h009.py +45 -0
  348. package/tests/test_linter/test_h010.py +44 -0
  349. package/tests/test_linter/test_h037.py +150 -0
  350. package/tests/test_linter/test_ignore_rules.py +45 -0
  351. package/tests/test_linter/test_jinja_linter.py +227 -0
  352. package/tests/test_linter/test_linter.py +691 -0
  353. package/tests/test_linter/test_nunjucks_linter.py +59 -0
  354. package/tests/test_linter/test_python_module_rules/.djlint_rules.yaml +4 -0
  355. package/tests/test_linter/test_python_module_rules/__init__.py +0 -0
  356. package/tests/test_linter/test_python_module_rules/html_bad.html +3 -0
  357. package/tests/test_linter/test_python_module_rules/html_ok.html +3 -0
  358. package/tests/test_linter/test_python_module_rules/my_module.py +32 -0
  359. package/tests/test_linter/test_python_module_rules/pyproject.toml +1 -0
  360. package/tests/test_linter/test_python_module_rules/test_linter.py +26 -0
  361. package/tests/test_nunjucks/__init__.py +0 -0
  362. package/tests/test_nunjucks/test_functions.py +94 -0
  363. package/tests/test_nunjucks/test_macros.py +41 -0
  364. package/tests/test_nunjucks/test_set.py +206 -0
  365. package/tests/test_nunjucks/test_spaceless.py +24 -0
  366. package/tests/test_twig/__init__.py +0 -0
  367. package/tests/test_twig/test_comments.py +51 -0
  368. package/tox.ini +48 -0
@@ -0,0 +1,220 @@
1
+ """Test for format js.
2
+
3
+ --format-js
4
+ --indent-js
5
+
6
+ poetry run pytest tests/test_config/test_format_js.py
7
+ """
8
+ import pytest
9
+
10
+ from src.djlint.reformat import formatter
11
+ from tests.conftest import config_builder, printer
12
+
13
+ test_data = [
14
+ pytest.param(
15
+ ('<div><script>console.log("hi");</script></div>'),
16
+ (
17
+ "<div>\n"
18
+ " <script>\n"
19
+ ' console.log("hi");\n'
20
+ " </script>\n"
21
+ "</div>\n"
22
+ ),
23
+ ({"format_js": True}),
24
+ id="enabled",
25
+ ),
26
+ pytest.param(
27
+ ('<div><script>() => {console.log("hi")}</script></div>'),
28
+ (
29
+ "<div>\n"
30
+ " <script>\n"
31
+ " () => {\n"
32
+ ' console.log("hi")\n'
33
+ " }\n"
34
+ " </script>\n"
35
+ "</div>\n"
36
+ ),
37
+ ({"format_js": True, "indent_js": 1}),
38
+ id="enabled_with_indent",
39
+ ),
40
+ pytest.param(
41
+ (
42
+ "<div>\n"
43
+ " <script>\n"
44
+ " __jsnlog_configure = function(JL) {\n"
45
+ " JL.setOptions({\n"
46
+ ' "defaultAjaxUrl": "/analytics/trace"\n'
47
+ " })\n"
48
+ " };\n"
49
+ " try {\n"
50
+ " __jsnlog_configure(JL);\n"
51
+ " } catch (e) {};\n"
52
+ " </script>\n"
53
+ "</div>\n"
54
+ "<style>.body {width: 12px}\n"
55
+ "</style>\n"
56
+ "<script src=\"{% static '/js/shared.min.js' %}\"></script>\n"
57
+ "<script src=\"{% static '/js/alive.min.js' %}\"></script>\n"
58
+ "<script src=\"{% static '/js/search.min.js' %}\" defer async></script>\n"
59
+ "<script src=\"{% static '/js/utility.min.js' %}\" defer async></script>"
60
+ ),
61
+ (
62
+ "<div>\n"
63
+ " <script>\n"
64
+ " __jsnlog_configure = function(JL) {\n"
65
+ " JL.setOptions({\n"
66
+ ' "defaultAjaxUrl": "/analytics/trace"\n'
67
+ " })\n"
68
+ " };\n"
69
+ " try {\n"
70
+ " __jsnlog_configure(JL);\n"
71
+ " } catch (e) {};\n"
72
+ " </script>\n"
73
+ "</div>\n"
74
+ "<style>.body {width: 12px}</style>\n"
75
+ "<script src=\"{% static '/js/shared.min.js' %}\"></script>\n"
76
+ "<script src=\"{% static '/js/alive.min.js' %}\"></script>\n"
77
+ "<script src=\"{% static '/js/search.min.js' %}\" defer async></script>\n"
78
+ "<script src=\"{% static '/js/utility.min.js' %}\" defer async></script>\n"
79
+ ),
80
+ ({"format_js": True}),
81
+ id="enabled_block_one",
82
+ ),
83
+ pytest.param(
84
+ (
85
+ "<html>\n"
86
+ " <head>\n"
87
+ " <style>\n"
88
+ " body {}\n"
89
+ "\n"
90
+ " div {}\n"
91
+ " </style>\n"
92
+ " </head>\n"
93
+ " <script>\n"
94
+ " let a;\n"
95
+ "\n"
96
+ " let b;\n"
97
+ " </script>\n"
98
+ "</html>"
99
+ ),
100
+ (
101
+ "<html>\n"
102
+ " <head>\n"
103
+ " <style>\n"
104
+ " body {}\n"
105
+ "\n"
106
+ " div {}\n"
107
+ " </style>\n"
108
+ " </head>\n"
109
+ " <script>\n"
110
+ " let a;\n"
111
+ "\n"
112
+ " let b;\n"
113
+ " </script>\n"
114
+ "</html>\n"
115
+ ),
116
+ ({"format_js": True}),
117
+ id="blank lines",
118
+ ),
119
+ pytest.param(
120
+ (
121
+ "<script>\n"
122
+ " /* beautify preserve:start */\n"
123
+ "function(){}\n"
124
+ " function(){}\n"
125
+ " function(){}\n"
126
+ "\n"
127
+ " /* beautify preserve:end */\n"
128
+ "</script>\n"
129
+ "<script>\n"
130
+ " /* beautify ignore:start */\n"
131
+ "function(){}\n"
132
+ " function(){}\n"
133
+ " function(){}\n"
134
+ "\n"
135
+ " /* beautify ignore:end */\n"
136
+ "</script>\n"
137
+ "<style>\n"
138
+ " /* beautify ignore:start */\n"
139
+ " .class {display: none;}\n"
140
+ " /* beautify ignore:end */\n"
141
+ "</style>"
142
+ ),
143
+ (
144
+ "<script>\n"
145
+ " /* beautify preserve:start */\n"
146
+ "function(){}\n"
147
+ " function(){}\n"
148
+ " function(){}\n"
149
+ "\n"
150
+ " /* beautify preserve:end */\n"
151
+ "</script>\n"
152
+ "<script>\n"
153
+ " /* beautify ignore:start */\n"
154
+ "function(){}\n"
155
+ " function(){}\n"
156
+ " function(){}\n"
157
+ "\n"
158
+ " /* beautify ignore:end */\n"
159
+ "</script>\n"
160
+ "<style>\n"
161
+ " /* beautify ignore:start */\n"
162
+ " .class {display: none;}\n"
163
+ " /* beautify ignore:end */\n"
164
+ "</style>\n"
165
+ ),
166
+ ({"format_js": True}),
167
+ id="ignore",
168
+ ),
169
+ pytest.param(
170
+ (
171
+ '<script type="text/javascript">\n'
172
+ " let s = `\n"
173
+ " <p>Text.</p>`;\n"
174
+ "</script>\n"
175
+ "<div>"
176
+ '<script type="text/javascript">\n'
177
+ " let s = `\n"
178
+ " <p>Text.\n"
179
+ " </p>`;\n"
180
+ "</script></div>"
181
+ ),
182
+ (
183
+ '<script type="text/javascript">\n'
184
+ " let s = `\n"
185
+ " <p>Text.</p>`;\n"
186
+ "</script>\n"
187
+ "<div>\n"
188
+ ' <script type="text/javascript">\n'
189
+ " let s = `\n"
190
+ " <p>Text.\n"
191
+ " </p>`;\n"
192
+ " </script>\n"
193
+ "</div>\n"
194
+ ),
195
+ ({"format_js": True, "indent_js": 3}),
196
+ id="literals",
197
+ ),
198
+ pytest.param(
199
+ (
200
+ "<!-- djlint:off -->\n"
201
+ ' <script id="search-index" type="application/json">{{ search_index }}</script><div></div>\n'
202
+ " <!-- djlint:on -->"
203
+ ),
204
+ (
205
+ "<!-- djlint:off -->\n"
206
+ ' <script id="search-index" type="application/json">{{ search_index }}</script><div></div>\n'
207
+ "<!-- djlint:on -->\n"
208
+ ),
209
+ ({"format_js": True}),
210
+ id="ignored blocks",
211
+ ),
212
+ ]
213
+
214
+
215
+ @pytest.mark.parametrize(("source", "expected", "args"), test_data)
216
+ def test_base(source, expected, args):
217
+ output = formatter(config_builder(args), source)
218
+
219
+ printer(expected, source, output)
220
+ assert expected == output
File without changes
@@ -0,0 +1 @@
1
+ <h1>bad<h2>
@@ -0,0 +1 @@
1
+ <h1>bad<h2>
@@ -0,0 +1,142 @@
1
+ """Djlint tests specific to gitignore configuration.
2
+
3
+ run::
4
+
5
+ pytest tests/test_config_gitignore.py --cov=src/djlint --cov-branch \
6
+ --cov-report xml:coverage.xml --cov-report term-missing
7
+
8
+ for a single test, run::
9
+
10
+ pytest tests/test_config_gitignore.py::test_ignored_path --cov=src/djlint \
11
+ --cov-branch --cov-report xml:coverage.xml --cov-report term-missing
12
+
13
+ """
14
+ # pylint: disable=C0116,W0702,W0703,C0103
15
+ import os
16
+ import shutil
17
+ from pathlib import Path
18
+
19
+ import pytest
20
+ from click.testing import CliRunner
21
+
22
+ from src.djlint import main as djlint
23
+
24
+
25
+ @pytest.mark.xdist_group(name="group1")
26
+ def test_cli(runner: CliRunner) -> None:
27
+ result = runner.invoke(
28
+ djlint, ["tests/test_config/test_gitignore/html_two.html", "--lint"]
29
+ )
30
+ assert result.exit_code == 1
31
+
32
+ # create .git folder to make root
33
+ Path("tests/test_config/test_gitignore/.git").mkdir(parents=True, exist_ok=True)
34
+ # add a gitignore file
35
+ with open(
36
+ "tests/test_config/test_gitignore/.gitignore", "w", encoding="utf8"
37
+ ) as git:
38
+ git.write("html_two.html")
39
+
40
+ result = runner.invoke(
41
+ djlint,
42
+ [
43
+ "tests/test_config/test_gitignore/html_two.html",
44
+ "--check",
45
+ "--use-gitignore",
46
+ ],
47
+ )
48
+
49
+ assert result.exit_code == 0
50
+
51
+ result = runner.invoke(
52
+ djlint, ["tests/test_config/test_gitignore/html_two.html", "--check"]
53
+ )
54
+ assert result.exit_code == 1
55
+
56
+ try:
57
+ os.remove("tests/test_config/test_gitignore/.gitignore")
58
+ shutil.rmtree("tests/test_config/test_gitignore/.git")
59
+ except BaseException as e:
60
+ print("cleanup failed")
61
+ print(e)
62
+
63
+ # @pytest.mark.xdist_group(name="group1")
64
+ # def test_pyproject(runner: CliRunner) -> None:
65
+ result = runner.invoke(
66
+ djlint, ["tests/test_config/test_gitignore/html_two.html", "--check"]
67
+ )
68
+ assert result.exit_code == 1
69
+
70
+ # make a root
71
+ Path("tests/test_config/test_gitignore/.git").mkdir(parents=True, exist_ok=True)
72
+ # add a gitignore file
73
+ with open(
74
+ "tests/test_config/test_gitignore/.gitignore", "w", encoding="utf8"
75
+ ) as git:
76
+ git.write("html_two.html")
77
+
78
+ with open(
79
+ "tests/test_config/test_gitignore/pyproject.toml", "w", encoding="utf8"
80
+ ) as git:
81
+ git.write("[tool]\n[tool.djlint]\nuse_gitignore=true")
82
+
83
+ result = runner.invoke(
84
+ djlint, ["tests/test_config/test_gitignore/html_two.html", "--check"]
85
+ )
86
+
87
+ assert result.exit_code == 0
88
+
89
+ with open(
90
+ "tests/test_config/test_gitignore/pyproject.toml", "w", encoding="utf8"
91
+ ) as git:
92
+ git.write("[tool]\n[tool.djlint]\nuse_gitignore=false")
93
+
94
+ result = runner.invoke(
95
+ djlint, ["tests/test_config/test_gitignore/html_two.html", "--check"]
96
+ )
97
+ assert result.exit_code == 1
98
+
99
+ # verify cli overrides pyproject
100
+ result = runner.invoke(
101
+ djlint,
102
+ [
103
+ "tests/test_config/test_gitignore/html_two.html",
104
+ "--check",
105
+ "--use-gitignore",
106
+ ],
107
+ )
108
+ print(result.output)
109
+ assert result.exit_code == 0
110
+
111
+ try:
112
+ os.remove("tests/test_config/test_gitignore/.gitignore")
113
+ os.remove("tests/test_config/test_gitignore/pyproject.toml")
114
+ shutil.rmtree("tests/test_config/test_gitignore/.git")
115
+ except BaseException as e:
116
+ print("cleanup failed")
117
+ print(e)
118
+
119
+ # @pytest.mark.xdist_group(name="group1")
120
+ # def test_ignored_path(runner: CliRunner) -> None:
121
+ # test for https://github.com/Riverside-Healthcare/djLint/issues/224
122
+ # create .git folder to make root
123
+ Path("tests/test_config/test_gitignore/.git").mkdir(parents=True, exist_ok=True)
124
+ # add a gitignore file
125
+ with open(
126
+ "tests/test_config/test_gitignore/.gitignore", "w", encoding="utf8"
127
+ ) as git:
128
+ git.write("var")
129
+
130
+ result = runner.invoke(
131
+ djlint, ["-", "--use-gitignore"], input='<div><p id="a"></p></div>'
132
+ )
133
+ print(result.output)
134
+ assert result.exit_code == 0
135
+ assert "Linted 1 file" in result.output
136
+
137
+ try:
138
+ os.remove("tests/test_config/test_gitignore/.gitignore")
139
+ shutil.rmtree("tests/test_config/test_gitignore/.git")
140
+ except BaseException as e:
141
+ print("cleanup failed")
142
+ print(e)
File without changes
@@ -0,0 +1 @@
1
+ {{missing space}}
@@ -0,0 +1,12 @@
1
+ {# djlint:off H021 #}
2
+ <div>
3
+ <div>
4
+ {{ test }}
5
+ </div>
6
+ </div>
7
+ {# djlint:on #}
8
+
9
+ {% comment %} djlint:a {% endcomment %}
10
+ <a class="a"
11
+ href="b">變更密碼</a>
12
+ {% comment %} djlint:on {% endcomment %}
@@ -0,0 +1,3 @@
1
+ [tool]
2
+ [tool.djlint]
3
+ ignore = "T001"
@@ -0,0 +1,32 @@
1
+ """Djlint tests specific to pyproject.toml configuration.
2
+
3
+ pytest tests/test_config/test_ignore
4
+
5
+ """
6
+ from click.testing import CliRunner
7
+
8
+ from src.djlint import main as djlint
9
+
10
+
11
+ def test_ignores(runner: CliRunner) -> None:
12
+ result = runner.invoke(djlint, ["tests/test_config/test_ignore/html.html"])
13
+ assert """Linted 1 file, found 0 errors.""" in result.output
14
+ assert result.exit_code == 0
15
+
16
+
17
+ def test_ignored_rule_does_not_disable_formatting(runner: CliRunner) -> None:
18
+ result = runner.invoke(
19
+ djlint, ["tests/test_config/test_ignore/html_two.html", "--check"]
20
+ )
21
+ print(result.output)
22
+ assert (
23
+ """ {# djlint:off H021 #}
24
+ <div>
25
+ -<div>
26
+ -{{ test }}
27
+ -</div>
28
+ + <div>{{ test }}</div>
29
+ </div>
30
+ {# djlint:on #}"""
31
+ in result.output
32
+ )
@@ -0,0 +1,45 @@
1
+ """Test for ignored blocks.
2
+
3
+ --ignore-blocks 'raw'
4
+
5
+ poetry run pytest tests/test_config/test_ignore_blocks.py
6
+ """
7
+ import pytest
8
+
9
+ from src.djlint.reformat import formatter
10
+ from tests.conftest import config_builder, printer
11
+
12
+ test_data = [
13
+ pytest.param(
14
+ ("{% raw%} {%endraw %}"),
15
+ ("{% raw %} {% endraw %}\n"),
16
+ ({"ignore_blocks": "raw"}),
17
+ id="ignore_raw",
18
+ ),
19
+ pytest.param(
20
+ ("{% raw%} <div><img/></div> {%endraw %}"),
21
+ ("{% raw %}\n" "<div>\n" " <img />\n" "</div>\n" "{% endraw %}\n"),
22
+ ({"ignore_blocks": "raw"}),
23
+ id="ignore_raw",
24
+ ),
25
+ pytest.param(
26
+ ("{% raw%}<div></div>{%endraw %}"),
27
+ ("{% raw %}\n" " <div></div>\n" "{% endraw %}\n"),
28
+ ({"ignore_blocks": "junk"}),
29
+ id="dont_ignore_raw",
30
+ ),
31
+ pytest.param(
32
+ ("{% raws%}<div></div>{%endraws %}"),
33
+ ("{% raws %}\n" " <div></div>\n" "{% endraws %}\n"),
34
+ ({"ignore_blocks": "raw", "custom_blocks": "raws"}),
35
+ id="test overlap",
36
+ ),
37
+ ]
38
+
39
+
40
+ @pytest.mark.parametrize(("source", "expected", "args"), test_data)
41
+ def test_base(source, expected, args):
42
+ output = formatter(config_builder(args), source)
43
+
44
+ printer(expected, source, output)
45
+ assert expected == output
@@ -0,0 +1,39 @@
1
+ """Test for ignore case.
2
+
3
+ --ignore-case
4
+
5
+ poetry run pytest tests/test_config/test_ignore_case.py
6
+ """
7
+ import pytest
8
+
9
+ from src.djlint.reformat import formatter
10
+ from tests.conftest import config_builder, printer
11
+
12
+ test_data = [
13
+ pytest.param(
14
+ ("<Div></dIV><CaTs></CaTs>"),
15
+ ("<Div></dIV>\n" "<CaTs></CaTs>\n"),
16
+ ({"ignore_case": True}),
17
+ id="ignore",
18
+ ),
19
+ pytest.param(
20
+ ("<Div></dIV><CaTs></CaTs>"),
21
+ ("<div></div>\n" "<CaTs></CaTs>\n"),
22
+ ({"ignore_case": False}),
23
+ id="specify keep",
24
+ ),
25
+ pytest.param(
26
+ ("<Div></dIV><CaTs></CaTs>"),
27
+ ("<div></div>\n" "<CaTs></CaTs>\n"),
28
+ (),
29
+ id="keep",
30
+ ),
31
+ ]
32
+
33
+
34
+ @pytest.mark.parametrize(("source", "expected", "args"), test_data)
35
+ def test_base(source, expected, args):
36
+ output = formatter(config_builder(args), source)
37
+
38
+ printer(expected, source, output)
39
+ assert expected == output
@@ -0,0 +1,63 @@
1
+ """Test for indent.
2
+
3
+ --indent 4
4
+
5
+ poetry run pytest tests/test_config/test_indent.py
6
+ """
7
+ import pytest
8
+
9
+ from src.djlint.reformat import formatter
10
+ from tests.conftest import config_builder, printer
11
+
12
+ test_data = [
13
+ pytest.param(
14
+ ("<section><p><div><span></span></div></p></section>"),
15
+ (
16
+ "<section>\n"
17
+ " <p>\n"
18
+ " <div>\n"
19
+ " <span></span>\n"
20
+ " </div>\n"
21
+ " </p>\n"
22
+ "</section>\n"
23
+ ),
24
+ ({"indent": 2}),
25
+ id="int",
26
+ ),
27
+ pytest.param(
28
+ ("<section><p><div><span></span></div></p></section>"),
29
+ (
30
+ "<section>\n"
31
+ " <p>\n"
32
+ " <div>\n"
33
+ " <span></span>\n"
34
+ " </div>\n"
35
+ " </p>\n"
36
+ "</section>\n"
37
+ ),
38
+ ({"indent": "2"}),
39
+ id="str",
40
+ ),
41
+ pytest.param(
42
+ ("<section><p><div><span></span></div></p></section>"),
43
+ (
44
+ "<section>\n"
45
+ " <p>\n"
46
+ " <div>\n"
47
+ " <span></span>\n"
48
+ " </div>\n"
49
+ " </p>\n"
50
+ "</section>\n"
51
+ ),
52
+ ({"indent": 1}),
53
+ id="one",
54
+ ),
55
+ ]
56
+
57
+
58
+ @pytest.mark.parametrize(("source", "expected", "args"), test_data)
59
+ def test_base(source, expected, args):
60
+ output = formatter(config_builder(args), source)
61
+
62
+ printer(expected, source, output)
63
+ assert expected == output
@@ -0,0 +1,3 @@
1
+ [tool]
2
+ [tool.djlint]
3
+ linter_output_format="{filename}:{line}: {code} {message} {match}"
@@ -0,0 +1,34 @@
1
+ """Djlint tests specific to linter output format.
2
+
3
+ run::
4
+
5
+ pytest tests/test_config_linter_output_format.py --cov=src/djlint --cov-branch \
6
+ --cov-report xml:coverage.xml --cov-report term-missing
7
+
8
+ for a single test, run::
9
+
10
+ pytest tests/test_config_linter_output_format.py::test_with_config --cov=src/djlint \
11
+ --cov-branch --cov-report xml:coverage.xml --cov-report term-missing
12
+
13
+ """
14
+ # pylint: disable=C0116
15
+
16
+ from click.testing import CliRunner
17
+
18
+ from src.djlint import main as djlint
19
+
20
+
21
+ def test_with_config(runner: CliRunner) -> None:
22
+ result = runner.invoke(
23
+ djlint, ["tests/test_config/test_linter_output_format", "--lint"]
24
+ )
25
+ assert result.exit_code == 1
26
+
27
+ print(result.output)
28
+ assert (
29
+ """html-one.html:1:0: H025 Tag seems to be an orphan. <h1>
30
+ html-one.html:1:8: H025 Tag seems to be an orphan. </h2>
31
+ html-two.html:1:0: H025 Tag seems to be an orphan. <h1>
32
+ html-two.html:1:8: H025 Tag seems to be an orphan. </h2>"""
33
+ in result.output
34
+ )