mountaineer 0.9.0.dev3__tar.gz → 0.9.0.dev4__tar.gz

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/Cargo.lock

@@ -535,7 +535,7 @@ dependencies = [
 
 [[package]]
 name = "mountaineer"
-version = "0.9.0-dev3"
+version = "0.9.0-dev4"
 dependencies = [
  "criterion",
  "deno_core_icudata",

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/Cargo.toml

@@ -15,7 +15,7 @@ harness = false
 
 [package]
 name = "mountaineer"
-version = "0.9.0-dev3"
+version = "0.9.0-dev4"
 edition = "2021"
 
 [dependencies]

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mountaineer
-Version: 0.9.0.dev3
+Version: 0.9.0.dev4
 Requires-Dist: pydantic >=2.5.3, <3.0.0
 Requires-Dist: fastapi >=0.114.1, <1.0.0
 Requires-Dist: inflection >=0.5.1, <1.0.0

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/mountaineer/__tests__/client_builder/test_parser.py

@@ -116,13 +116,13 @@ class RenderResponse(RenderBase):
 
 
 # Controller hierarchy
-class BaseExampleController(ControllerBase):
+class BaseExampleController:
     @passthrough
     def base_action(self) -> ControllerResponse:  # type: ignore
         pass
 
 
-class ExampleController(BaseExampleController):
+class ExampleController(ControllerBase, BaseExampleController):
     url = "/test/{path_param}"
     view_path = "/test.tsx"
 

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/mountaineer/__tests__/static/harness/jest.config.js

@@ -1,4 +1,4 @@
 module.exports = {
   preset: "ts-jest",
-  testEnvironment: "node",
+  testEnvironment: "jsdom",
 };

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/mountaineer/__tests__/static/harness/package.json

@@ -11,6 +11,7 @@
   "devDependencies": {
     "@types/jest": "^29.5.13",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.5"
+    "ts-jest": "^29.2.5",
+    "jest-environment-jsdom": "^29.7.0"
   }
 }

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/mountaineer/client_builder/parser.py

@@ -316,9 +316,15 @@ class ControllerParser:
         if controller in self.parsed_controllers:
             return self.parsed_controllers[controller]
 
-        # Get all valid superclasses in MRO order
+        # Get all valid superclasses in MRO order. Include any controller that is either explicitly a subclass
+        # of ControllerBase or has client functions defined on it.
         controller_classes = self._get_valid_parent_classes(
-            controller, ControllerBase, (ControllerBase, LayoutControllerBase)
+            controller,
+            base_require_predicate=lambda base: (
+                issubclass(base, ControllerBase)
+                or len(list(get_client_functions_cls(base))) > 0
+            ),
+            base_exclude_classes=(ControllerBase, LayoutControllerBase),
         )
 
         # Get render model from the concrete controller
@@ -356,7 +362,7 @@ class ControllerParser:
 
         # Get all valid superclasses in MRO order, excluding BaseModel and above
         model_classes = self._get_valid_parent_classes(
-            model, BaseModel, (BaseModel, RenderBase)
+            model, base_require=BaseModel, base_exclude_classes=(BaseModel, RenderBase)
         )
 
         # Parse direct superclasses (excluding the model itself)
@@ -656,9 +662,7 @@ class ControllerParser:
             for controller, model in metadata.return_models.items()
         }
 
-    def _parse_actions(
-        self, controller: Type[ControllerBase]
-    ) -> dict[str, ActionWrapper]:
+    def _parse_actions(self, controller: type) -> dict[str, ActionWrapper]:
         """Parse all actions in a controller"""
         actions: dict[str, ActionWrapper] = {}
 
@@ -719,7 +723,12 @@ class ControllerParser:
         return wrapper
 
     def _get_valid_parent_classes(
-        self, cls: type, base_require: type, base_exclude_classes: tuple[type, ...]
+        self,
+        cls: type,
+        *,
+        base_require: type | None = None,
+        base_require_predicate: Callable[[type], bool] | None = None,
+        base_exclude_classes: tuple[type, ...],
     ) -> list[type]:
         """
         Helper to get valid MRO parents, excluding certain base classes
@@ -731,6 +740,7 @@ class ControllerParser:
             if (
                 base not in base_exclude_classes
                 and base is not object
-                and issubclass(base, base_require)
+                and (not base_require or issubclass(base, base_require))
+                and (not base_require_predicate or base_require_predicate(base))
             )
         ]

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/mountaineer/static/api.ts

@@ -128,7 +128,7 @@ export const __request = async (params: FetchParams) => {
   }
 
   // Process URL and path parameters
-  let url = new URL(params.url);
+  let url = new URL(params.url, window.location.href);
 
   // Fill path parameters
   for (const [key, value] of Object.entries(params.path || {})) {
@@ -293,7 +293,7 @@ interface GetLinkParams {
 
 export const __getLink = (params: GetLinkParams) => {
   // Format the URL using the standard URL API
-  const url = new URL(params.rawUrl);
+  const url = new URL(params.rawUrl, window.location.href);
 
   // Fill path parameters
   for (const [key, value] of Object.entries(params.pathParameters)) {

{mountaineer-0.9.0.dev3 → mountaineer-0.9.0.dev4}/pyproject.toml

@@ -9,7 +9,7 @@ exclude = [ "fixtures", "ci_webapp", "create_mountaineer_app", "media", "docs_we
 
 [tool.poetry]
 name = "mountaineer"
-version = "0.9.0.dev3"
+version = "0.9.0.dev4"
 description = "Mountaineer is a batteries-included web framework for Python."
 authors = [ "Pierce Freeman <pierce@freeman.vc>",]
 readme = "README.md"