toml-combine 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

toml_combine/combiner.py

@@ -4,7 +4,7 @@ import copy
 import dataclasses
 from collections.abc import Mapping, Sequence
 from functools import partial
-from typing import Any
+from typing import Any, TypeVar
 
 from . import exceptions
 
@@ -89,7 +89,10 @@ def override_sort_key(
     return tuple(result)
 
 
-def merge_configs(a: Any, b: Any, /) -> Any:
+T = TypeVar("T", dict, list, str, int, float, bool)
+
+
+def merge_configs(a: T, b: T, /) -> T:
     """
     Recursively merge two configuration dictionaries, with b taking precedence.
     """
@@ -100,7 +103,7 @@ def merge_configs(a: Any, b: Any, /) -> Any:
         return b
 
     result = a.copy()
-    for key, b_value in b.items():
+    for key, b_value in b.items():  # type: ignore
         if a_value := a.get(key):
             result[key] = merge_configs(a_value, b_value)
         else:
@@ -183,4 +186,4 @@ def generate_for_mapping(
         if mapping_matches_override(mapping=mapping, override=override):
             result = merge_configs(result, override.config)
 
-    return {"dimensions": mapping, **result}
+    return result

toml_combine/toml.py

@@ -22,6 +22,6 @@ def dumps(config: dict) -> str:
     # features. The easiest way to turn tomlkit objects into plain dicts and strings
     # is through a json round-trip.
     try:
-        return tomlkit.dumps(json.loads(json.dumps(config)))
+        return tomlkit.dumps(json.loads(json.dumps(config)), sort_keys=False)
     except tomlkit.exceptions.TOMLKitError as e:
         raise exceptions.TomlEncodeError from e

{toml_combine-0.2.0.dist-info → toml_combine-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toml-combine
-Version: 0.2.0
+Version: 0.4.0
 Summary: A tool for combining complex configurations in TOML format.
 Author-email: Joachim Jablon <ewjoachim@gmail.com>
 License-Expression: MIT
@@ -131,8 +131,7 @@ list and use that name as a key. Also, yes, you'll loose ordering.
 When you call the tool either with the CLI or the lib (see both below), you will have to
 provide a mapping of the desired dimentions. These values will be compared to overrides
 to apply overrides when relevant. It's ok to omit some dimensions, corresponding
-overrides won't be selected. The mapping you pass is also returned in the output as a
-dict under the `dimensions` key.
+overrides won't be selected.
 
 By default, the output is `toml` though you can switch to `json` with `--format=json`
 
@@ -160,7 +159,6 @@ result = toml_combine.combine(config_file=config_file, environment="staging")
 
 print(result)
 {
-  "dimensions": {"environment": "staging"},
   "fruits": {"apple": {"color": "red"}, "orange": {"color": "orange"}}
 }
 ```
@@ -203,13 +201,10 @@ container.env.ENABLE_EXPENSIVE_MONITORING = false
 This produces the following configs:
 
 ```console
-$ uv run toml-combine example.toml --environment=production --service=frontend
+$ toml-combine example.toml --environment=production --service=frontend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-frontend"
-[dimensions]
-environment = "production"
-service = "frontend"
 
 [container]
 image_name = "my-image-frontend"
@@ -220,9 +215,6 @@ $ toml-combine example.toml --environment=production --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "production"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"
@@ -234,9 +226,6 @@ $ toml-combine example.toml --environment=staging --service=frontend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-frontend"
-[dimensions]
-environment = "staging"
-service = "frontend"
 
 [container]
 image_name = "my-image-frontend"
@@ -247,9 +236,6 @@ $ toml-combine example.toml --environment=staging --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "staging"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"
@@ -264,9 +250,6 @@ $ toml-combine example.toml --environment=dev --service=backend
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
 name = "service-backend"
-[dimensions]
-environment = "dev"
-service = "backend"
 
 [container]
 image_name = "my-image-backend"

{toml_combine-0.2.0.dist-info → toml_combine-0.4.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 toml_combine/__init__.py,sha256=TDkOwwEM-nS6hOh79u9Qae6g2Q6VfANpPpnKGfSgu80,84
 toml_combine/__main__.py,sha256=hmF8N8xX6UEApzbKTVZ-4E1HU5-rjgUkdXNLO-mF6vo,100
 toml_combine/cli.py,sha256=hG03eDKz7xU-ydJIa1kDuu6WlFzNS3GTMJ6zals9M9c,2843
-toml_combine/combiner.py,sha256=LLjBFNKz4sjwiyOM5hq9JaqvyNuogdzdyWJbGS5hpXs,5500
+toml_combine/combiner.py,sha256=RhhCevncnVvxFYNywvtVWkVMpiqtF0mq_APjg76Tg4Q,5546
 toml_combine/exceptions.py,sha256=tAFTDRSg6d10bBruBhsasZXrNNgLTmr_nKfvIsRR_yU,991
 toml_combine/lib.py,sha256=Iw7F8SCyQMlhaqSD2vtnmM6jbnrgzCZeX0d-LTM3VVg,1683
-toml_combine/toml.py,sha256=hqWEdBQiM960uga_9A6gXRhWhT2gVZT8IiLRc3jkyT8,797
-toml_combine-0.2.0.dist-info/METADATA,sha256=tuHxaP5V3DhE0unQt-XOnsL_TmCrNGP3mpxrSLuk30E,7777
-toml_combine-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-toml_combine-0.2.0.dist-info/entry_points.txt,sha256=dXUQNom54uZt_7ylEG81iNYMamYpaFo9-ItcZJU6Uzc,58
-toml_combine-0.2.0.dist-info/RECORD,,
+toml_combine/toml.py,sha256=iBV8xj0qWcvGp2AZaML8FCT3i2X9DL7iA6jd-wcP5Bc,814
+toml_combine-0.4.0.dist-info/METADATA,sha256=WKLq2pGpPRwfLhdpBuqxoAtCwVKXipgcega_4GTl_r4,7347
+toml_combine-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+toml_combine-0.4.0.dist-info/entry_points.txt,sha256=dXUQNom54uZt_7ylEG81iNYMamYpaFo9-ItcZJU6Uzc,58
+toml_combine-0.4.0.dist-info/RECORD,,