mountaineer 0.5.2.dev3__tar.gz → 0.5.2.dev4__tar.gz

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

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

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mountaineer
-Version: 0.5.2.dev3
+Version: 0.5.2.dev4
 Requires-Dist: pydantic
 Requires-Dist: fastapi
 Requires-Dist: inflection

{mountaineer-0.5.2.dev3 → mountaineer-0.5.2.dev4}/mountaineer/__tests__/client_builder/test_builder.py

@@ -83,13 +83,58 @@ def test_generate_link_aggregator(builder: ClientBuilder):
     builder.generate_link_aggregator()
 
 
+def test_generate_link_aggregator_ignores_layout(builder: ClientBuilder):
+    class ExampleLayout(LayoutControllerBase):
+        async def render(self) -> None:
+            pass
+
+    builder.app.register(ExampleLayout())
+    builder.generate_link_aggregator()
+
+    global_code_dir = builder.view_root.get_managed_code_dir()
+    global_links = (global_code_dir / "links.ts").read_text()
+    assert "ExampleLayout" not in global_links
+    assert "ExampleHomeControllerGetLinks" in global_links
+    assert "ExampleDetailControllerGetLinks" in global_links
+
+
 def test_generate_view_servers(builder: ClientBuilder):
     builder.generate_view_servers()
 
 
-def test_generate_index_file(builder: ClientBuilder):
+@pytest.mark.parametrize("empty_links", [True, False])
+def test_generate_index_file_ignores_empty(builder: ClientBuilder, empty_links: bool):
+    # Create some stub files. We simulate a case where the links file
+    # is created but empty
+    file_contents = "import React from 'react';\n"
+    for controller_definition in builder.app.controllers:
+        controller_code_dir = builder.view_root.get_controller_view_path(
+            controller_definition.controller
+        ).get_managed_code_dir()
+
+        (controller_code_dir / "actions.ts").write_text(file_contents)
+        (controller_code_dir / "models.ts").write_text(file_contents)
+        (controller_code_dir / "useServer.ts").write_text(file_contents)
+        if empty_links:
+            (controller_code_dir / "links.ts").write_text("")
+
     builder.generate_index_file()
 
+    # Read the index file for each controller
+    for controller_definition in builder.app.controllers:
+        controller_code_dir = builder.view_root.get_controller_view_path(
+            controller_definition.controller
+        ).get_managed_code_dir()
+
+        index_file = controller_code_dir / "index.ts"
+        assert index_file.exists()
+        imported_dependencies = index_file.read_text().split("\n")
+        assert imported_dependencies == [
+            "export * from './actions';",
+            "export * from './models';",
+            "export * from './useServer';",
+        ]
+
 
 def test_cache_is_outdated_no_cache(builder: ClientBuilder):
     # No cache

{mountaineer-0.5.2.dev3 → mountaineer-0.5.2.dev4}/mountaineer/client_builder/builder.py

@@ -317,6 +317,12 @@ class ClientBuilder:
         # For each controller, import the links and export them
         for controller_definition in self.app.controllers:
             controller = controller_definition.controller
+
+            # Layout controllers don't have links, so the import path won't be
+            # able to find a valid file reference
+            if isinstance(controller, LayoutControllerBase):
+                continue
+
             controller_code_dir = self.view_root.get_controller_view_path(
                 controller
             ).get_managed_code_dir()
@@ -462,10 +468,15 @@ class ClientBuilder:
 
             chunks: list[str] = []
 
-            chunks.append("export * from './actions';")
-            chunks.append("export * from './links';")
-            chunks.append("export * from './models';")
-            chunks.append("export * from './useServer';")
+            # Depending on our build pipeline, some of these files might not exist
+            # or be empty (no module exports). We want to make sure that we don't
+            # try to re-export empty values or Typescript will fail to compile
+            # with error TS2306: File 'myfile.ts' is not a module.
+            export_paths = ["actions", "links", "models", "useServer"]
+            for export_path in export_paths:
+                file = controller_code_dir / f"{export_path}.ts"
+                if file.exists() and file.read_text().strip():
+                    chunks.append(f"export * from './{export_path}';")
 
             (controller_code_dir / "index.ts").write_text("\n".join(chunks))
 

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

@@ -96,8 +96,11 @@ export const __request = async (params: FetchParams) => {
     }
 
     // Otherwise we have an unhandled error, rethrow as a generic error
-    const error = new FetchErrorBase<any>(-1, e.toString());
-    error.stack = e.stack;
+    const errorText = e instanceof Error ? e.toString() : "Unknown error";
+    const errorStack = e instanceof Error ? e.stack : undefined;
+
+    const error = new FetchErrorBase<any>(-1, errorText);
+    error.stack = errorStack;
     throw error;
   }
 };

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

@@ -9,7 +9,7 @@ exclude = [ "fixtures", "ci_webapp", "create_mountaineer_app", "media", "docs_we
 
 [tool.poetry]
 name = "mountaineer"
-version = "0.5.2.dev3"
+version = "0.5.2.dev4"
 description = ""
 authors = [ "Pierce Freeman <pierce@freeman.vc>",]
 readme = "README.md"