SVG2DrawIOLib 1.1.2__tar.gz → 1.2.0__tar.gz

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
         run: ruff check src tests
 
       - name: Run mypy type checking
-        run: mypy src
+        run: mypy --strict src tests
 
       - name: Run bandit security checks
         run: bandit -r src -ll

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/.pre-commit-config.yaml

@@ -24,9 +24,9 @@ repos:
         additional_dependencies:
           - types-click
           - types-setuptools
+          - pytest
         args: [--strict]
-        files: ^src/
-        exclude: ^src/SVG2DrawIOLib/cli/
+        files: ^(src|tests)/
 
   - repo: https://github.com/PyCQA/bandit
     rev: 1.9.3

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/CHANGELOG.md

@@ -5,6 +5,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] - 2026-02-08
+
+### Added
+
+- **Improved ViewBox Adjustment with Transforms**: Significantly improved viewBox adjustment accuracy for SVGs with transforms. The svgelements-based bbox calculation now correctly handles transformed elements (translate, scale, rotate, skew, matrix) while still excluding non-rendering containers (defs, clipPath, mask, symbol, pattern, marker). This reduces unnecessary padding in many real-world icons that use transforms, which are common in exported SVGs. The manual fallback still conservatively skips transforms for compatibility.
+- **Enhanced CSS Injection**: Significantly improved CSS class generation for color editing in DrawIO with support for real-world SVG authoring patterns:
+  - **CSS Modes**: New `--css-mode` option with three modes:
+    - `fill` (default): Generate CSS rules for fill colors only
+    - `stroke`: Generate CSS rules for stroke colors only
+    - `both`: Generate CSS rules for both fill and stroke colors
+  - **Style Attribute Parsing**: Now parses `style="fill:#fff;stroke:#000"` attributes in addition to direct `fill` and `stroke` attributes
+  - **fill="none" Handling**: Properly respects `fill="none"` and `stroke="none"` - no longer forces colors on stroke-only or fill-only paths
+  - **currentColor Support**: New `--preserve-current-color` flag (default: true) to preserve `currentColor` values for theme-aware icons
+  - **Default Stroke Color**: New `--css-stroke-color` option to set default stroke color (used with `--css-mode stroke` or `both`)
+  - Available in both `create` and `add` commands
+  - Makes split-paths workflow more consistently colorable in DrawIO
+- **Extract Command**: New `extract` CLI command for extracting icons from DrawIO libraries back to individual SVG files. This is the inverse operation of `create`, allowing users to recover SVG files from library files. Supports extracting all icons or specific icons by name, with optional overwrite functionality.
+- **Rename Command**: New `rename` CLI command for renaming icons within a DrawIO library. Allows renaming a single icon while preserving its content. Supports optional `--overwrite` flag to replace an existing icon with the new name.
+- **Inspect Command**: New `inspect` CLI command for displaying detailed information about icons in a DrawIO library. Shows dimensions, shape type, CSS classes, and inline styles for each icon. Supports inspecting all icons or specific icons by name, with optional `--show-svg` flag to display the decoded SVG content. Includes `--json` flag for machine-readable JSON output.
+- **Validate Command**: New `validate` CLI command for comprehensive validation of DrawIO library files. Validates XML structure, JSON format, icon integrity (required fields, dimensions, base64 encoding, compression), mxGraphModel structure, and SVG content (namespace, viewBox/dimensions, empty SVG detection). Provides detailed error and warning messages with color-coded status output. Includes `LibraryValidator` service class following SOLID principles for separation of concerns.
+- **CLI Command Groups**: Reorganized CLI commands into three logical groups for better discoverability: Library Management Commands (create, add, remove, extract, rename), Library Inspection Commands (list, inspect, validate), and SVG Processing Commands (split-paths).
+- **Split by Folder**: New `--split-by-folder` flag for `create` command that creates separate library files for each subdirectory when used with `--recursive`. Output filename is modified with subdirectory name (e.g., `FontAwesome.xml` becomes `FontAwesome-Regular.xml`, `FontAwesome-Solid.xml`, `FontAwesome-Brands.xml`). This is useful for organizing icon sets that are already grouped by category in the filesystem.
+
+### Changed
+
+- **Refactored CLI Commands**: Improved separation of concerns following SOLID principles. Business logic has been extracted from CLI commands into reusable service classes:
+  - Created `IconAnalyzer` service for extracting and analyzing icon content (used by `extract` and `inspect` commands)
+  - Added `LibraryManager.rename_icon()` method for icon renaming logic (used by `rename` command)
+  - CLI commands are now thin orchestration layers that delegate to service classes
+  - All business logic is now testable independently of the CLI layer
+- **Test Organization**: Improved test file organization for consistency. Each CLI command now has its own dedicated test file (`test_cli_extract.py`, `test_cli_rename.py`, etc.) following the same pattern as other command tests.
+
+### Fixed
+
+- **List Command Table Width**: Fixed table width calculation in `list` command to prevent title text wrapping. The table now properly sizes to accommodate whichever is wider: the title text, column header, or icon names. This ensures clean, readable output regardless of filename or icon name length.
+- **Type Checking Configuration**: Fixed mypy configuration inconsistency between local pre-commit and GitHub CI. Removed CLI directory exclusion from local pre-commit config and added tests directory to both local and CI mypy checks. All 107 type errors across test files have been resolved with proper type annotations and assertions. Both local and CI environments now run `mypy --strict src tests` consistently.
+
 ## [1.1.2] - 2026-02-08
 
 ### Fixed

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SVG2DrawIOLib
-Version: 1.1.2
+Version: 1.2.0
 Summary: Generate DrawIO shape libraries from SVGs
 Project-URL: Homepage, https://github.com/jamesbconner/SVG2DrawIOLib
 Project-URL: Documentation, https://github.com/jamesbconner/SVG2DrawIOLib#readme

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/pyproject.toml

@@ -143,3 +143,7 @@ ignore_missing_imports = true
 [[tool.mypy.overrides]]
 module = "rich_click.*"
 ignore_missing_imports = true
+
+[[tool.mypy.overrides]]
+module = "SVG2DrawIOLib.cli.*"
+disable_error_code = ["untyped-decorator"]

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/src/SVG2DrawIOLib/__about__.py

@@ -1,3 +1,3 @@
 """Package version information."""
 
-__version__ = "1.1.2"
+__version__ = "1.2.0"

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/src/SVG2DrawIOLib/cli/__init__.py

@@ -47,7 +47,13 @@ rc.rich_click.COMMAND_GROUPS = {
     "SVG2DrawIOLib": [
         {
             "name": "Library Management Commands",
-            "commands": ["create", "add", "remove", "list"],
+            "commands": [
+                "create",
+                "add",
+                "remove",
+                "extract",
+                "rename",
+            ],
             "table_styles": {
                 "show_lines": True,
                 "row_styles": ["none"],
@@ -55,6 +61,20 @@ rc.rich_click.COMMAND_GROUPS = {
                 "box": "ROUNDED",
             },
         },
+        {
+            "name": "Library Inspection Commands",
+            "commands": [
+                "list",
+                "inspect",
+                "validate",
+            ],
+            "table_styles": {
+                "show_lines": True,
+                "row_styles": ["none"],
+                "border_style": "cyan",
+                "box": "ROUNDED",
+            },
+        },
         {
             "name": "SVG Processing Commands",
             "commands": ["split-paths"],
@@ -81,11 +101,19 @@ rc.rich_click.OPTION_GROUPS = {
         },
         {
             "name": "Styling Options",
-            "options": ["--css", "--css-color", "--namespace", "--tag"],
+            "options": [
+                "--css",
+                "--css-color",
+                "--css-mode",
+                "--css-stroke-color",
+                "--preserve-current-color",
+                "--namespace",
+                "--tag",
+            ],
         },
         {
             "name": "General Options",
-            "options": ["--recursive", "--verbose", "--quiet", "--help"],
+            "options": ["--recursive", "--split-by-folder", "--verbose", "--quiet", "--help"],
         },
     ],
     "SVG2DrawIOLib add": [
@@ -99,7 +127,13 @@ rc.rich_click.OPTION_GROUPS = {
         },
         {
             "name": "Styling Options",
-            "options": ["--css"],
+            "options": [
+                "--css",
+                "--css-color",
+                "--css-mode",
+                "--css-stroke-color",
+                "--preserve-current-color",
+            ],
         },
         {
             "name": "General Options",

{svg2drawiolib-1.1.2 → svg2drawiolib-1.2.0}/src/SVG2DrawIOLib/cli/add.py

@@ -59,6 +59,31 @@ from SVG2DrawIOLib.svg_processor import SVGProcessor
     default=False,
     help="Add CSS classes to new icons for color editing.",
 )
+@rc.option(
+    "--css-mode",
+    type=rc.Choice(["fill", "stroke", "both"], case_sensitive=False),
+    default="fill",
+    show_default=True,
+    help="CSS mode: 'fill' for fill colors, 'stroke' for stroke colors, 'both' for both (requires --css).",
+)
+@rc.option(
+    "--css-color",
+    default="#000000",
+    show_default=True,
+    help="Default CSS fill color (requires --css).",
+)
+@rc.option(
+    "--css-stroke-color",
+    default="#000000",
+    show_default=True,
+    help="Default CSS stroke color (requires --css with --css-mode stroke or both).",
+)
+@rc.option(
+    "--preserve-current-color/--no-preserve-current-color",
+    default=True,
+    show_default=True,
+    help="Preserve 'currentColor' values in CSS (requires --css).",
+)
 @rc.option(
     "--verbose",
     "-v",
@@ -86,6 +111,10 @@ def add(
     width: float | None,
     height: float | None,
     css: bool,
+    css_mode: str,
+    css_color: str,
+    css_stroke_color: str,
+    preserve_current_color: bool,
     verbose: bool,
     quiet: bool,
     recursive: bool,
@@ -200,7 +229,13 @@ def add(
             logger.info("Using default sizing: max dimension 40 (aspect ratio preserved)")
 
         # Create processing options
-        options = SVGProcessingOptions(add_css=css)
+        options = SVGProcessingOptions(
+            add_css=css,
+            css_mode=css_mode,
+            css_color=css_color,
+            css_stroke_color=css_stroke_color,
+            preserve_current_color=preserve_current_color,
+        )
 
         # Process new SVG files
         processor = SVGProcessor(options)
@@ -233,7 +268,6 @@ def add(
             source_files=svg_files,
         )
 
-        logger.info(f"Successfully updated library: {library_file}")
         console.print(
             f"[green]✓[/green] Updated library with {metadata.icon_count} total icon(s): "
             f"[cyan]{library_file}[/cyan]"

svg2drawiolib-1.2.0/src/SVG2DrawIOLib/cli/create.py

@@ -0,0 +1,314 @@
+"""Create command - Create a new DrawIO library from SVG files."""
+
+import logging
+from pathlib import Path
+
+import rich_click as rc
+
+from SVG2DrawIOLib.cli.create_helpers import (
+    collect_svg_files,
+    determine_sizing_strategy,
+    generate_output_path,
+    group_files_by_folder,
+    process_svg_files,
+)
+from SVG2DrawIOLib.cli.helpers import console, setup_logging
+from SVG2DrawIOLib.library_manager import LibraryManager
+from SVG2DrawIOLib.models import SVGProcessingOptions
+
+
+@rc.command()
+@rc.argument(
+    "svg_paths",
+    nargs=-1,
+    required=True,
+    type=rc.Path(exists=True, path_type=Path),
+    metavar="PATHS...",
+)
+@rc.option(
+    "--output",
+    "-o",
+    type=rc.Path(path_type=Path),
+    required=True,
+    help="Output library file path (e.g., my-library.xml).",
+)
+@rc.option(
+    "--max-size",
+    "-s",
+    type=float,
+    help="Maximum dimension (width or height) in pixels. Icons are scaled proportionally.",
+)
+@rc.option(
+    "--width",
+    "-w",
+    type=float,
+    help="Fixed width in pixels (overrides --max-size).",
+)
+@rc.option(
+    "--height",
+    "-h",
+    type=float,
+    help="Fixed height in pixels (overrides --max-size).",
+)
+@rc.option(
+    "--css/--no-css",
+    "-c/-C",
+    default=False,
+    help="Add CSS classes to enable color editing in DrawIO.",
+)
+@rc.option(
+    "--css-mode",
+    type=rc.Choice(["fill", "stroke", "both"], case_sensitive=False),
+    default="fill",
+    show_default=True,
+    help="CSS mode: 'fill' for fill colors, 'stroke' for stroke colors, 'both' for both (requires --css).",
+)
+@rc.option(
+    "--css-color",
+    default="#000000",
+    show_default=True,
+    help="Default CSS fill color (requires --css).",
+)
+@rc.option(
+    "--css-stroke-color",
+    default="#000000",
+    show_default=True,
+    help="Default CSS stroke color (requires --css with --css-mode stroke or both).",
+)
+@rc.option(
+    "--preserve-current-color/--no-preserve-current-color",
+    default=True,
+    show_default=True,
+    help="Preserve 'currentColor' values in CSS (requires --css).",
+)
+@rc.option(
+    "--namespace",
+    "-n",
+    default="http://www.w3.org/2000/svg",
+    show_default=True,
+    help="XML namespace for SVG elements.",
+)
+@rc.option(
+    "--tag",
+    "-t",
+    default="path",
+    show_default=True,
+    help="XML tag to add CSS classes to (requires --css).",
+)
+@rc.option(
+    "--verbose",
+    "-v",
+    is_flag=True,
+    help="Enable verbose debug logging.",
+)
+@rc.option(
+    "--quiet",
+    "-q",
+    is_flag=True,
+    help="Suppress all output except errors.",
+)
+@rc.option(
+    "--recursive",
+    "-R",
+    is_flag=True,
+    help="Recursively search directories for SVG files.",
+)
+@rc.option(
+    "--split-by-folder",
+    "-S",
+    is_flag=True,
+    help="Create separate libraries for each subdirectory (requires --recursive). "
+    "Output filename will be modified with subdirectory name (e.g., lib.xml -> lib-FolderName.xml).",
+)
+def create(
+    svg_paths: tuple[Path, ...],
+    output: Path,
+    max_size: float | None,
+    width: float | None,
+    height: float | None,
+    css: bool,
+    css_mode: str,
+    css_color: str,
+    css_stroke_color: str,
+    preserve_current_color: bool,
+    namespace: str,
+    tag: str,
+    verbose: bool,
+    quiet: bool,
+    recursive: bool,
+    split_by_folder: bool,
+) -> None:
+    """[bold cyan]Create a new DrawIO library from SVG files.[/]
+
+    \b
+    \nConverts one or more SVG files into a DrawIO library XML file.
+    Icons can be scaled proportionally or set to fixed dimensions.
+
+    \b
+    Accepts individual SVG files, directories, or a mix of both.
+    Use --recursive to search subdirectories.
+
+    \b
+    Scaling Options:
+        --max-size: Scale icons proportionally (longest side = max-size)
+        --width/--height: Set fixed dimensions (ignores aspect ratio)
+        Neither: Use default 40x40 pixels
+
+    \b
+    Examples:
+        Create from individual files:
+        $ SVG2DrawIOLib create icon1.svg icon2.svg -o lib.xml
+
+
+        Create from directory:
+        $ SVG2DrawIOLib create icons/ -o lib.xml
+
+
+        Create from directory recursively:
+        $ SVG2DrawIOLib create icons/ -o lib.xml --recursive
+
+
+        Create separate libraries per subdirectory:
+        $ SVG2DrawIOLib create icons/ -o FontAwesome.xml -R --split-by-folder
+        # Creates: FontAwesome-Regular.xml, FontAwesome-Solid.xml, etc.
+
+
+        Create with proportional scaling (max 64px):
+        $ SVG2DrawIOLib create icons/ -o lib.xml --max-size 64 -R
+
+
+        Create with fixed dimensions:
+        $ SVG2DrawIOLib create icons/*.svg -o lib.xml -w 50 -h 50
+
+
+        Enable color editing:
+        $ SVG2DrawIOLib create icons/ -o lib.xml --css
+
+
+        Enable stroke color editing:
+        $ SVG2DrawIOLib create icons/ -o lib.xml --css --css-mode stroke
+
+
+        Enable both fill and stroke editing:
+        $ SVG2DrawIOLib create icons/ -o lib.xml --css --css-mode both
+    """
+    setup_logging(verbose, quiet)
+    logger = logging.getLogger(__name__)
+
+    try:
+        # Validate conflicting options
+        if split_by_folder and not recursive:
+            console.print("[red]Error:[/red] --split-by-folder requires --recursive", style="bold")
+            raise rc.ClickException("--split-by-folder requires --recursive")
+
+        # Collect all SVG files from paths
+        svg_files = collect_svg_files(svg_paths, recursive)
+        base_dirs = [p for p in svg_paths if p.is_dir()]
+
+        # Validate we found files
+        if not svg_files:
+            console.print("[red]Error:[/red] No SVG files found in specified paths", style="bold")
+            raise rc.ClickException("No SVG files found in specified paths")
+
+        # If split-by-folder, group files by their immediate subdirectory
+        folder_groups: dict[str, list[Path]] = {}
+        if split_by_folder:
+            if not base_dirs:
+                console.print(
+                    "[red]Error:[/red] --split-by-folder requires at least one directory path",
+                    style="bold",
+                )
+                raise rc.ClickException("--split-by-folder requires at least one directory path")
+
+            folder_groups = group_files_by_folder(svg_files, base_dirs)
+
+            if not folder_groups:
+                console.print(
+                    "[yellow]Warning:[/yellow] No subdirectories found, creating single library",
+                    style="bold",
+                )
+                split_by_folder = False
+            else:
+                logger.info(
+                    f"Split by folder: found {len(folder_groups)} subdirectories with SVG files"
+                )
+
+        # Determine sizing strategy
+        max_dimension, has_sizing_warning = determine_sizing_strategy(width, height, max_size)
+        if has_sizing_warning:
+            console.print(
+                "[yellow]Warning:[/yellow] Both --width and --height must be specified for fixed dimensions. "
+                "Using default sizing instead.",
+                style="bold",
+            )
+
+        # Create processing options
+        options = SVGProcessingOptions(
+            add_css=css,
+            css_mode=css_mode,
+            css_color=css_color,
+            css_stroke_color=css_stroke_color,
+            preserve_current_color=preserve_current_color,
+            xml_namespace=namespace,
+            css_tag=tag,
+        )
+
+        # Initialize library manager
+        manager = LibraryManager()
+
+        if split_by_folder:
+            # Create separate libraries for each folder
+            created_libraries = []
+
+            for folder_name, folder_files in sorted(folder_groups.items()):
+                logger.info(f"Processing folder '{folder_name}' with {len(folder_files)} file(s)")
+
+                try:
+                    icons = process_svg_files(folder_files, options, width, height, max_dimension)
+                except Exception as e:
+                    logger.error(f"Failed to process folder '{folder_name}': {e}")
+                    if verbose:
+                        raise
+                    raise rc.ClickException(f"Failed to process folder '{folder_name}': {e}") from e
+
+                # Generate output filename with folder name
+                folder_output = generate_output_path(output, folder_name)
+
+                # Create library for this folder
+                metadata = manager.create_library(icons, folder_output, source_files=folder_files)
+                created_libraries.append((folder_output, metadata.icon_count))
+
+            # Summary
+            console.print(f"[green]✓[/green] Created {len(created_libraries)} libraries by folder:")
+            for lib_path, icon_count in created_libraries:
+                console.print(f"  [cyan]{lib_path.name}[/cyan]: {icon_count} icon(s)")
+
+        else:
+            # Create single library with all files
+            try:
+                icons = process_svg_files(svg_files, options, width, height, max_dimension)
+            except Exception as e:
+                logger.error(f"Failed to process SVG files: {e}")
+                if verbose:
+                    raise
+                raise rc.ClickException(f"Failed to process SVG files: {e}") from e
+
+            # Create library
+            metadata = manager.create_library(icons, output, source_files=svg_files)
+
+            console.print(
+                f"[green]✓[/green] Created library with {metadata.icon_count} icon(s): "
+                f"[cyan]{output}[/cyan]"
+            )
+
+    except KeyboardInterrupt:
+        console.print("\n[yellow]Interrupted by user[/yellow]")
+        raise rc.Abort() from None
+    except rc.ClickException:
+        # Re-raise ClickException from inner handlers without wrapping
+        raise
+    except Exception as e:
+        logger.error(f"Failed to create library: {e}")
+        if verbose:
+            raise
+        raise rc.ClickException(f"Failed to create library: {e}") from e