ducpy 3.3.6__tar.gz → 3.3.7__tar.gz

{ducpy-3.3.6 → ducpy-3.3.7}/Cargo.lock

@@ -412,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "ducpy-native"
-version = "3.3.6"
+version = "3.3.7"
 dependencies = [
  "duc",
  "pyo3",

{ducpy-3.3.6 → ducpy-3.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ducpy
-Version: 3.3.6
+Version: 3.3.7
 Classifier: License :: OSI Approved :: MIT License
 Requires-Dist: nanoid>=2.0.0
 License-File: LICENSE

{ducpy-3.3.6 → ducpy-3.3.7}/packages/ducpy/crate/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ducpy-native"
-version = "3.3.6"
+version = "3.3.7"
 edition = "2021"
 description = "Python native extension for the duc file format (used by ducpy)"
 publish = false

{ducpy-3.3.6 → ducpy-3.3.7}/packages/ducrs/Cargo.toml

@@ -7,6 +7,17 @@ license = "MIT"
 authors = ["Ducflair support@ducflair.com"]
 repository = "https://github.com/ducflair/duc/tree/main/packages/ducrs"
 readme = "README.md"
+include = [
+  "src/**",
+  "build.rs",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE",
+  "schema/duc.sql",
+  "schema/version_control.sql",
+  "schema/search.sql",
+  "schema/migrations/*.sql",
+]
 
 [dependencies]
 base64 = "0.21.5"

{ducpy-3.3.6 → ducpy-3.3.7}/src/ducpy/builders/state_builders.py

@@ -446,9 +446,9 @@ def create_local_state_from_base(base: BaseStateParams, **kwargs) -> DucLocalSta
         current_item_stroke=kwargs.get('current_item_stroke', None),
         current_item_background=kwargs.get('current_item_background', None),
         current_item_opacity=kwargs.get('current_item_opacity', 1.0),
-        current_item_font_family=kwargs.get('current_item_font_family', "Virgil"),
+        current_item_font_family=kwargs.get('current_item_font_family', "Roboto Mono"),
         current_item_font_size=kwargs.get('current_item_font_size', 20.0),
-        current_item_text_align=kwargs.get('current_item_text_align', None),
+        current_item_text_align=kwargs.get('current_item_text_align', TEXT_ALIGN.LEFT),
         current_item_roundness=kwargs.get('current_item_roundness', 0.0),
         current_item_start_line_head=kwargs.get('current_item_start_line_head', None),
         current_item_end_line_head=kwargs.get('current_item_end_line_head', None),
@@ -457,7 +457,7 @@ def create_local_state_from_base(base: BaseStateParams, **kwargs) -> DucLocalSta
         objects_snap_mode_enabled=kwargs.get('objects_snap_mode_enabled', True),
         grid_mode_enabled=kwargs.get('grid_mode_enabled', True),
         outline_mode_enabled=kwargs.get('outline_mode_enabled', False),
-        manual_save_mode=kwargs.get('manual_save_mode', None),
+        manual_save_mode=kwargs.get('manual_save_mode', False),
         decimal_places=kwargs.get('decimal_places', 2),
     )
 

{ducpy-3.3.6 → ducpy-3.3.7}/src/ducpy/serialize.py

@@ -16,7 +16,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import ducpy_native
 from ducpy.utils.convert import (deep_snake_to_camel, snake_to_camel,
-                                 to_serializable)
+                                 to_serializable, _flatten_dict)
 
 logger = logging.getLogger(__name__)
 
@@ -104,22 +104,6 @@ _ELEMENT_CLASS_TO_TYPE: Dict[str, str] = {
     "DucModelElement": "model",
 }
 
-# Keys in the asdict() output that should be flattened (merged into the parent),
-# mirroring Rust's #[serde(flatten)] on base / styles / linear_base / stack_element_base.
-_FLATTEN_KEYS = frozenset({"base", "styles", "linear_base", "stack_element_base"})
-
-
-def _flatten_dict(d: dict) -> dict:
-    """Recursively flatten nested dicts whose key is in ``_FLATTEN_KEYS``."""
-    result: dict = {}
-    for k, v in d.items():
-        if k in _FLATTEN_KEYS and isinstance(v, dict):
-            result.update(_flatten_dict(v))
-        else:
-            result[k] = v
-    return result
-
-
 def _element_to_camel(wrapper_or_element: Any) -> dict:
     """Convert an element (or ElementWrapper) to the camelCase dict Rust expects."""
     el = wrapper_or_element

{ducpy-3.3.6 → ducpy-3.3.7}/src/ducpy/utils/convert.py

@@ -65,11 +65,19 @@ def deep_snake_to_camel(obj: Any) -> Any:
 
 
 def _flatten_dict(d: dict) -> dict:
-    """Recursively flatten keys that Rust serde #[serde(flatten)] would flatten."""
+    """Recursively flatten keys that Rust serde #[serde(flatten)] would flatten.
+
+    Walks the entire dict so that nested flatten keys (e.g. ``stack_element_base``
+    -> ``stack_base`` -> ``styles``) are all merged into the appropriate level.
+    """
     result: dict = {}
     for k, v in d.items():
-        if k in _FLATTEN_KEYS and isinstance(v, dict):
-            result.update(_flatten_dict(v))
+        if isinstance(v, dict):
+            v = _flatten_dict(v)
+            if k in _FLATTEN_KEYS:
+                result.update(v)
+            else:
+                result[k] = v
         else:
             result[k] = v
     return result

ducpy-3.3.6/packages/ducrs/.gitignore

@@ -1,21 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
-
-# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
-# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
-# MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
-
-# RustRover
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/

ducpy-3.3.6/packages/ducrs/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "ducrs",
-  "version": "0.0.0-development",
-  "private": true,
-  "scripts": {
-    "build": "cargo build --release",
-    "test": "cargo test",
-    "semantic-release": "semantic-release"
-  },
-  "devDependencies": {
-    "semantic-release": "^24.1.2"
-  }
-}

ducpy-3.3.6/packages/ducrs/release.config.cjs

@@ -1,31 +0,0 @@
-module.exports = {
-  branches: ["main", { name: "next", prerelease: true }, { name: "dev", prerelease: true }],
-  plugins: [
-    [
-      require.resolve("../../scripts/semrel-path-filter.cjs"),
-      {
-        paths: [
-          "packages/ducrs"
-        ],
-        analyzer: { preset: "conventionalcommits" },
-        notes: { preset: "conventionalcommits" },
-      },
-    ],
-    [
-      "@semantic-release/github",
-    ],
-    [
-      "@semantic-release/exec",
-      {
-        // Prepare step: Set the crate version and build the project
-        prepareCmd:
-          "cargo set-version ${nextRelease.version} && cargo build --release",
-
-        // Publish step: Publish the crate to crates.io
-        publishCmd:
-          "cargo publish --allow-dirty --token ${process.env.CARGO_REGISTRY_TOKEN}",
-      },
-    ],
-  ],
-  tagFormat: "ducrs@${version}",
-};

ducpy-3.3.6/packages/ducrs/sst-env.d.ts

@@ -1,10 +0,0 @@
-/* This file is auto-generated by SST. Do not edit. */
-/* tslint:disable */
-/* eslint-disable */
-/* deno-fmt-ignore-file */
-/* biome-ignore-all lint: auto-generated */
-
-/// <reference path="../../sst-env.d.ts" />
-
-import "sst"
-export {}

ducpy-3.3.6/packages/ducrs/tests/.gitignore

@@ -1,2 +0,0 @@
-inputs
-output