wexample-wex-addon-dev-javascript 7.13.1__tar.gz → 7.15.0__tar.gz

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-wex-addon-dev-javascript
-Version: 7.13.1
+Version: 7.15.0
 Summary: Python dev addon for wex
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -13,8 +13,8 @@ Requires-Dist: attrs>=23.1.0
 Requires-Dist: cattrs>=23.1.0
 Requires-Dist: wexample-api>=6.6.0
 Requires-Dist: wexample-filestate-javascript>=6.5.0
-Requires-Dist: wexample-wex-addon-ai>=11.1.0
-Requires-Dist: wexample-wex-addon-app>=25.4.0
+Requires-Dist: wexample-wex-addon-ai>=11.3.0
+Requires-Dist: wexample-wex-addon-app>=26.1.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 
 # wex_addon_dev_javascript
 
-Version: 7.13.1
+Version: 7.15.0
 
 Python dev addon for wex
 
@@ -106,8 +106,8 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - cattrs: >=23.1.0
 - wexample-api: >=6.6.0
 - wexample-filestate-javascript: >=6.5.0
-- wexample-wex-addon-ai: >=11.1.0
-- wexample-wex-addon-app: >=25.4.0
+- wexample-wex-addon-ai: >=11.3.0
+- wexample-wex-addon-app: >=26.1.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/README.md

@@ -1,6 +1,6 @@
 # wex_addon_dev_javascript
 
-Version: 7.13.1
+Version: 7.15.0
 
 Python dev addon for wex
 
@@ -84,8 +84,8 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 - cattrs: >=23.1.0
 - wexample-api: >=6.6.0
 - wexample-filestate-javascript: >=6.5.0
-- wexample-wex-addon-ai: >=11.1.0
-- wexample-wex-addon-app: >=25.4.0
+- wexample-wex-addon-ai: >=11.3.0
+- wexample-wex-addon-app: >=26.1.0
 
 ## Versioning & Compatibility Policy
 

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-wex-addon-dev-javascript"
-version = "7.13.1"
+version = "7.15.0"
 description = "Python dev addon for wex"
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -22,8 +22,8 @@ dependencies = [
     "cattrs>=23.1.0",
     "wexample-api>=6.6.0",
     "wexample-filestate-javascript>=6.5.0",
-    "wexample-wex-addon-ai>=11.1.0",
-    "wexample-wex-addon-app>=25.4.0",
+    "wexample-wex-addon-ai>=11.3.0",
+    "wexample-wex-addon-app>=26.1.0",
 ]
 
 [project.readme]

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/common/npm_registry_gateway.py

@@ -41,4 +41,4 @@ class NpmRegistryGateway(AbstractGateway):
         )
         if response is None or response.status_code != 200:
             return False
-        return version in (response.json().get("versions") or {})
+        return version in response.json().get("versions", {})

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/file/javascript_package_json_file.py

@@ -69,7 +69,7 @@ class JavascriptPackageJsonFile(AppDependenciesConfigFileMixin, JsonFile):
 
         self._apply_default_publish_config(content)
 
-        return super().dumps(content or {})
+        return super().dumps(content)
 
     def get_dependencies_versions(
         self, optional: bool = False, group: str = "dev"
@@ -101,34 +101,29 @@ class JavascriptPackageJsonFile(AppDependenciesConfigFileMixin, JsonFile):
         # Default strategy: publish built artifacts (dist) so consumers don't need
         # to transpile TS/ESM sources from node_modules.
         if exports is None and (files is None or (uses_src and not uses_dist)):
-            content.setdefault("files", ["dist"])
-            content.setdefault(
-                "exports",
-                {
+            if "files" not in content:
+                content["files"] = ["dist"]
+            if "exports" not in content:
+                content["exports"] = {
                     "./*": {
                         "types": "./dist/*.d.ts",
                         "default": "./dist/*.js",
                     }
-                },
-            )
-            content.setdefault(
-                "typesVersions",
-                {
+                }
+            if "typesVersions" not in content:
+                content["typesVersions"] = {
                     "*": {
                         "*": ["dist/*"],
                     }
-                },
-            )
+                }
             return
 
         if uses_src and not uses_dist:
-            if files is None:
-                content.setdefault("files", ["src"])
-            content.setdefault(
-                "typesVersions",
-                {
+            if files is None and "files" not in content:
+                content["files"] = ["src"]
+            if "typesVersions" not in content:
+                content["typesVersions"] = {
                     "*": {
                         "*": ["src/*"],
                     }
-                },
-            )
+                }

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/file/javascript_tsconfig_json_file.py

@@ -10,7 +10,7 @@ class JavascriptTsconfigJsonFile(JsonFile):
         content = content or self.read_parsed()
 
         compiler_options = content.get("compilerOptions")
-        if compiler_options is None or not isinstance(compiler_options, dict):
+        if not isinstance(compiler_options, dict):
             compiler_options = {}
             content["compilerOptions"] = compiler_options
 

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/services/vite/commands/service/install.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 from typing import TYPE_CHECKING
 
 from wexample_cli.const.tags import AudienceTag, EffectTag, ScopeTag
@@ -12,6 +13,9 @@ if TYPE_CHECKING:
     from wexample_cli.context.execution_context import ExecutionContext
     from wexample_wex_addon_app.service.app_service import AppService
 
+_DEFINE_CONFIG_RE = re.compile(r"(defineConfig\(\s*\{)")
+_VITE_CONFIG_NAMES = ("vite.config.ts", "vite.config.js")
+
 
 @command(
     type=COMMAND_TYPE_SERVICE,
@@ -30,11 +34,9 @@ def vite__service__install(
     context: ExecutionContext,
     service: AppService,
 ) -> None:
-    import re
-
     app_path = service.app_workdir.get_path()
 
-    for config_name in ["vite.config.ts", "vite.config.js"]:
+    for config_name in _VITE_CONFIG_NAMES:
         config_path = app_path / config_name
         if not config_path.exists():
             continue
@@ -52,16 +54,16 @@ def vite__service__install(
                 "defineConfig()",
                 "defineConfig({ vite: { server: { allowedHosts: true } } })",
             )
-        elif re.search(r"defineConfig\(\s*\{", content):
-            content = re.sub(
-                r"(defineConfig\(\s*\{)",
+        else:
+            new_content, n = _DEFINE_CONFIG_RE.subn(
                 r"\1 vite: { server: { allowedHosts: true } },",
                 content,
                 count=1,
             )
-        else:
-            context.io.log(f"  {config_name}: unrecognized format, skipping")
-            return
+            if not n:
+                context.io.log(f"  {config_name}: unrecognized format, skipping")
+                return
+            content = new_content
 
         config_path.write_text(content)
         context.io.log(f"  ✓ {config_name}: allowedHosts patched")

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/services/vite/commands/service/ready.py

@@ -41,7 +41,10 @@ def vite__service__ready(
     runtime = service.app_workdir.get_runtime_config()
     app_project_name = runtime.search("app.project_name").get_str()
     container_name = f"{app_project_name}_vite"
-    port = service.manifest.get("vars", {}).get("VITE_PORT", {}).get("default", "8080")
+    try:
+        port = service.manifest["vars"]["VITE_PORT"]["default"]
+    except (KeyError, TypeError):
+        port = "8080"
 
     result = subprocess.run(
         [

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/workdir/javascript_package_workdir.py

@@ -45,35 +45,33 @@ class JavascriptPackageWorkdir(JavascriptWorkdir):
         raw_value = super().prepare_value(raw_value=raw_value)
         children = raw_value["children"]
 
-        children.extend(
-            [
-                {
-                    "name": ".github",
-                    "type": DiskItemType.DIRECTORY,
-                    "should_exist": True,
-                    "children": [
-                        {
-                            "name": "workflows",
-                            "type": DiskItemType.DIRECTORY,
-                            "should_exist": True,
-                            "children": [
-                                {
-                                    "name": "publish.yml",
-                                    "type": DiskItemType.FILE,
-                                    "should_exist": True,
-                                    "content": file_read(
-                                        module_get_path(
-                                            wexample_wex_addon_dev_javascript
-                                        )
-                                        / "resources"
-                                        / "package_publish.yml"
-                                    ),
-                                }
-                            ],
-                        }
-                    ],
-                }
-            ]
+        children.append(
+            {
+                "name": ".github",
+                "type": DiskItemType.DIRECTORY,
+                "should_exist": True,
+                "children": [
+                    {
+                        "name": "workflows",
+                        "type": DiskItemType.DIRECTORY,
+                        "should_exist": True,
+                        "children": [
+                            {
+                                "name": "publish.yml",
+                                "type": DiskItemType.FILE,
+                                "should_exist": True,
+                                "content": file_read(
+                                    module_get_path(
+                                        wexample_wex_addon_dev_javascript
+                                    )
+                                    / "resources"
+                                    / "package_publish.yml"
+                                ),
+                            }
+                        ],
+                    }
+                ],
+            }
         )
 
         return raw_value
@@ -107,12 +105,7 @@ class JavascriptPackageWorkdir(JavascriptWorkdir):
             check=False,
             capture=True,
         )
-        ts_files = [
-            f
-            for f in changed_files.stdout.splitlines()
-            if f.endswith(".ts") or f.endswith(".tsx")
-        ]
-        if not ts_files:
+        if not any(f.endswith((".ts", ".tsx")) for f in changed_files.stdout.splitlines()):
             self.log("Only non-TypeScript files changed in src/, treating as minor.")
             return UPGRADE_TYPE_INTERMEDIATE
 

{wexample_wex_addon_dev_javascript-7.13.1 → wexample_wex_addon_dev_javascript-7.15.0}/src/wexample_wex_addon_dev_javascript/workdir/javascript_workdir.py

@@ -47,11 +47,7 @@ class JavascriptWorkdir(WithAiWorkdirMixin, CodeBaseWorkdir):
 
         options = super().get_options_providers()
 
-        options.extend(
-            [
-                JavascriptOptionsProvider,
-            ]
-        )
+        options.append(JavascriptOptionsProvider)
 
         return options