Merge pull request #38 from pydsigner/general_enhancements

General enhancements

Author: pydsigner

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.0", "setuptools-scm"]
+requires = ["setuptools>=64.0", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -28,13 +28,16 @@ classifiers = [
 ]
 dynamic = ["version"]
 
+[project.urls]
+Source = "https://github.com/pydsigner/anchovy"
+
 [project.optional-dependencies]
 jinja = ["Jinja2>=3.1.2"]
 markdown = ["anchovy[jinja]", "markdown_it_py>=3.0.0"]
 css = ["tinycss2>=1.1.1"]
 pretty = ["rich>=12.5.1"]
 pillow = ["Pillow>=9.2.0"]
-minify = ["csscompressor>=0.9.5", "minify-html-onepass>=0.11.1"]
+minify = ["lightningcss>=0.1.1,<1.0", "minify-html-onepass>=0.11.1"]
 web = ["anchovy[markdown]", "anchovy[css]", "anchovy[pillow]", "anchovy[minify]"]
 base = ["anchovy[web]", "anchovy[pretty]"]
 # Currently, [all] is the same as [base]; this will change in the future if
@@ -43,7 +46,12 @@ all = ["anchovy[base]"]
 # Includes all possible dependencies, including fallbacks that will not be used
 # under normal circumstances, for linting purposes. End users are intended to
 # ignore this option.
-cq = ["anchovy[all]", "commonmark>=0.9.1", "markdown>=3.4.3", "mistletoe>=1.1.0", "tqdm>=4.65.0"]
+cq = [
+    "anchovy[all]",
+    "commonmark>=0.9.1", "markdown>=3.4.3", "mistletoe>=1.1.0",
+    "tqdm>=4.65.0",
+    "minify-html>=0.11.1",
+]
 
 [project.scripts]
 anchovy = "anchovy.cli:main"

src/anchovy/cli.py

@@ -176,9 +176,9 @@ def main():
         context: Context | None = namespace.get('CONTEXT')
     else:
         label: str = f'-m {args.module.__name__}'
-        settings: InputBuildSettings | None = getattr(args.module, 'SETTINGS')
-        rules: list[Rule] | None = getattr(args.module, 'RULES')
-        context: Context | None = getattr(args.module, 'CONTEXT')
+        settings: InputBuildSettings | None = getattr(args.module, 'SETTINGS', None)
+        rules: list[Rule] | None = getattr(args.module, 'RULES', None)
+        context: Context | None = getattr(args.module, 'CONTEXT', None)
 
     if args.audit_steps:
         audit_rules = context.rules if context else rules

src/anchovy/css/__init__.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 
 from ..core import Step
-from ..dependencies import Dependency, import_install_check
+from ..dependencies import pip_dependency
 
 
 class AnchovyCSSStep(Step):
@@ -13,9 +13,9 @@ class AnchovyCSSStep(Step):
     encoding = 'utf-8'
 
     @classmethod
-    def get_dependencies(cls) -> set[Dependency]:
-        return super().get_dependencies() | {
-            Dependency('tinycss2', 'pip', import_install_check),
+    def get_dependencies(cls):
+        return {
+            pip_dependency('tinycss2'),
         }
 
     def __call__(self, path: Path, output_paths: list[Path]):

src/anchovy/minify.py

@@ -14,8 +14,8 @@ def __init__(self, source_dir: ContextDir = 'input_dir'):
     def __call__(self, path: Path, output_paths: list[Path]):
         parent_dir = self.context[self.source_dir]
         data = '\n\n'.join(
-            (parent_dir / filename.strip()).read_text(self.encoding)
-            for filename in path.open() if filename
+            (parent_dir / f).read_text(self.encoding)
+            for filename in path.open() if (f := filename.strip()) and not f.startswith('#')
         )
 
         for o_path in output_paths:
@@ -27,15 +27,37 @@ def __call__(self, path: Path, output_paths: list[Path]):
 
 class CSSMinifierStep(Step):
     encoding = 'utf-8'
+
     @classmethod
     def get_dependencies(cls):
         return {
-            pip_dependency('csscompressor'),
+            pip_dependency('lightningcss')
         }
 
+    def __init__(self,
+                 error_recovery: bool = False,
+                 parser_flags: dict[str, bool] | None = None,
+                 unused_symbols: set[str] | None = None,
+                 browsers_list: list[str] | None = ['defaults'],
+                 minify: bool = True):
+
+        self.error_recovery = error_recovery
+        self.parser_flags = parser_flags or {}
+        self.unused_symbols = unused_symbols
+        self.browsers_list = browsers_list
+        self.minify = minify
+
     def __call__(self, path: Path, output_paths: list[Path]):
-        import csscompressor
-        data = csscompressor.compress(path.read_text(self.encoding))
+        import lightningcss
+        data = lightningcss.process_stylesheet(
+            path.read_text(self.encoding),
+            filename=str(path),
+            error_recovery=self.error_recovery,
+            parser_flags=lightningcss.calc_parser_flags(**self.parser_flags),
+            unused_symbols=self.unused_symbols,
+            browsers_list=self.browsers_list,
+            minify=self.minify
+        )
         for o_path in output_paths:
             o_path.parent.mkdir(parents=True, exist_ok=True)
         output_paths[0].write_text(data, self.encoding)
@@ -45,16 +67,30 @@ def __call__(self, path: Path, output_paths: list[Path]):
 
 class HTMLMinifierStep(Step):
     encoding = 'utf-8'
+    minify_css = False
+    minify_js = False
 
     @classmethod
     def get_dependencies(cls):
         return {
-            pip_dependency('minify-html-onepass', check_name='minify_html_onepass'),
+            (
+                pip_dependency('minify-html-onepass', check_name='minify_html_onepass')
+                | pip_dependency('minify-html', check_name='minify_html')
+            ),
         }
 
     def __call__(self, path: Path, output_paths: list[Path]):
-        import minify_html_onepass
-        data = minify_html_onepass.minify(path.read_text(self.encoding))
+        params = {'minify_css': self.minify_css, 'minify_js': self.minify_js}
+        try:
+            from minify_html_onepass import minify
+        except ImportError:
+            from minify_html import minify
+            params |= {
+                'do_not_minify_doctype': True,
+                'ensure_spec_compliant_unquoted_attribute_values': True,
+                'keep_spaces_between_attributes': True,
+            }
+        data = minify(path.read_text(self.encoding), **params)
         for o_path in output_paths:
             o_path.parent.mkdir(parents=True, exist_ok=True)
         output_paths[0].write_text(data, self.encoding)