refactor(api): clean up imports and improve formatting in GeoJSON and SVG nodes

Author: bchapuis

apps/api/package.json

@@ -51,7 +51,6 @@
     "@hono-rate-limiter/cloudflare": "^0.2.2",
     "@hono/oauth-providers": "^0.7.1",
     "@hono/zod-validator": "^0.5.0",
-    "@resvg/resvg-wasm": "^2.6.2",
     "@sendgrid/mail": "^8.1.5",
     "@turf/helpers": "^7.2.0",
     "@turf/turf": "^7.2.0",

apps/api/src/nodes/cloudflare-node-registry.ts

@@ -94,7 +94,6 @@ import { PolygonSmoothNode } from "./geo/polygon-smooth-node";
 import { PolygonTangentsNode } from "./geo/polygon-tangents-node";
 import { PolygonToLineNode } from "./geo/polygon-to-line-node";
 import { PolygonizeNode } from "./geo/polygonize-node";
-import { SvgToPngNode } from "./image/svg-to-png-node";
 import { RewindNode } from "./geo/rewind-node";
 import { RhumbBearingNode } from "./geo/rhumb-bearing-node";
 import { RhumbDestinationNode } from "./geo/rhumb-destination-node";
@@ -150,6 +149,7 @@ import { StableDiffusionV15Img2ImgNode } from "./image/stable-diffusion-v1-5-img
 import { StableDiffusionV15InpaintingNode } from "./image/stable-diffusion-v1-5-inpainting-node";
 import { StableDiffusionXLBase10Node } from "./image/stable-diffusion-xl-base-1-0-node";
 import { StableDiffusionXLLightningNode } from "./image/stable-diffusion-xl-lightning-node";
+import { SvgToPngNode } from "./image/svg-to-png-node";
 import { UformGen2Qwen500mNode } from "./image/uform-gen2-qwen-500m-node";
 import { WebcamNode } from "./image/webcam-node";
 import { JavaScriptEditorNode } from "./javascript/javascript-editor-node";

apps/api/src/nodes/geo/geojson-node.ts

@@ -30,14 +30,13 @@ export class GeoJsonNode extends ExecutableNode {
       {
         name: "geojsonType",
         type: "string",
-        description: "The type of GeoJSON (Point, LineString, Feature, FeatureCollection, etc.)",
+        description:
+          "The type of GeoJSON (Point, LineString, Feature, FeatureCollection, etc.)",
         hidden: true,
       },
     ],
   };
 
-
-
   public async execute(context: NodeContext): Promise<NodeExecution> {
     try {
       const { json } = context.inputs;
@@ -59,9 +58,7 @@ export class GeoJsonNode extends ExecutableNode {
       return this.createErrorResult("Invalid GeoJSON");
     } catch (err) {
       const error = err as Error;
-      return this.createErrorResult(
-        `Error parsing GeoJSON: ${error.message}`
-      );
+      return this.createErrorResult(`Error parsing GeoJSON: ${error.message}`);
     }
   }
 
@@ -71,14 +68,14 @@ export class GeoJsonNode extends ExecutableNode {
       if (!Array.isArray(data.features)) {
         return false;
       }
-      
+
       // Validate each feature in the collection
       for (const feature of data.features) {
         if (!booleanValid(feature)) {
           return false;
         }
       }
-      
+
       return true;
     }
 

apps/api/src/nodes/geo/geojson-to-svg-node.test.ts

@@ -1,6 +1,7 @@
-import { beforeEach, describe, it, expect } from "vitest";
-import { GeoJsonToSvgNode } from "./geojson-to-svg-node";
+import { beforeEach, describe, expect, it } from "vitest";
+
 import { NodeContext } from "../types";
+import { GeoJsonToSvgNode } from "./geojson-to-svg-node";
 
 describe("GeoJsonToSvgNode", () => {
   const createMockContext = (inputs: Record<string, any>): NodeContext => ({
@@ -28,8 +29,12 @@ describe("GeoJsonToSvgNode", () => {
     expect(GeoJsonToSvgNode.nodeType.id).toBe("geojson-to-svg");
     expect(GeoJsonToSvgNode.nodeType.name).toBe("GeoJSON to SVG");
     expect(GeoJsonToSvgNode.nodeType.type).toBe("geojson-to-svg");
-    expect(GeoJsonToSvgNode.nodeType.description).toContain("identity projection");
-    expect(GeoJsonToSvgNode.nodeType.description).toContain("separate path elements");
+    expect(GeoJsonToSvgNode.nodeType.description).toContain(
+      "identity projection"
+    );
+    expect(GeoJsonToSvgNode.nodeType.description).toContain(
+      "separate path elements"
+    );
     expect(GeoJsonToSvgNode.nodeType.tags).toContain("Geo");
     expect(GeoJsonToSvgNode.nodeType.tags).toContain("Image");
   });
@@ -99,19 +104,19 @@ describe("GeoJsonToSvgNode", () => {
     const minYInput = inputs.find((i) => i.name === "minY");
     const maxXInput = inputs.find((i) => i.name === "maxX");
     const maxYInput = inputs.find((i) => i.name === "maxY");
-    
+
     expect(minXInput).toBeDefined();
     expect(minXInput?.description).toContain("Minimum X coordinate");
     expect(minXInput?.description).toContain("left boundary");
-    
+
     expect(minYInput).toBeDefined();
     expect(minYInput?.description).toContain("Minimum Y coordinate");
     expect(minYInput?.description).toContain("bottom boundary");
-    
+
     expect(maxXInput).toBeDefined();
     expect(maxXInput?.description).toContain("Maximum X coordinate");
     expect(maxXInput?.description).toContain("right boundary");
-    
+
     expect(maxYInput).toBeDefined();
     expect(maxYInput?.description).toContain("Maximum Y coordinate");
     expect(maxYInput?.description).toContain("top boundary");
@@ -121,9 +126,9 @@ describe("GeoJsonToSvgNode", () => {
     const inputs = GeoJsonToSvgNode.nodeType.inputs;
     const minXInput = inputs.find((i) => i.name === "minX");
     const maxYInput = inputs.find((i) => i.name === "maxY");
-    
+
     // All viewport parameters are optional
     expect(minXInput?.required).toBe(false);
     expect(maxYInput?.required).toBe(false);
   });
-}); 
+});

apps/api/src/nodes/geo/geojson-to-svg-node.ts

@@ -1,5 +1,5 @@
 import { NodeExecution, NodeType } from "@dafthunk/types";
-import { geojsonToSvg, type GeoJSONSvgOptions } from "@dafthunk/utils";
+import { type GeoJSONSvgOptions, geojsonToSvg } from "@dafthunk/utils";
 
 import { ExecutableNode } from "../types";
 import { NodeContext } from "../types";
@@ -9,7 +9,8 @@ export class GeoJsonToSvgNode extends ExecutableNode {
     id: "geojson-to-svg",
     name: "GeoJSON to SVG",
     type: "geojson-to-svg",
-    description: "Renders GeoJSON data into an SVG file using d3-geo with identity projection. Creates separate path elements for each geometry with appropriate styling.",
+    description:
+      "Renders GeoJSON data into an SVG file using d3-geo with identity projection. Creates separate path elements for each geometry with appropriate styling.",
     tags: ["Geo", "Image"],
     icon: "map",
     inputs: [
@@ -68,28 +69,32 @@ export class GeoJsonToSvgNode extends ExecutableNode {
       {
         name: "minX",
         type: "number",
-        description: "Minimum X coordinate (left boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
+        description:
+          "Minimum X coordinate (left boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
         required: false,
         hidden: true,
       },
       {
         name: "minY",
         type: "number",
-        description: "Minimum Y coordinate (bottom boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
+        description:
+          "Minimum Y coordinate (bottom boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
         required: false,
         hidden: true,
       },
       {
         name: "maxX",
         type: "number",
-        description: "Maximum X coordinate (right boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
+        description:
+          "Maximum X coordinate (right boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
         required: false,
         hidden: true,
       },
       {
         name: "maxY",
         type: "number",
-        description: "Maximum Y coordinate (top boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
+        description:
+          "Maximum Y coordinate (top boundary) of the viewport. If not provided, auto-fits to GeoJSON extent.",
         required: false,
         hidden: true,
       },
@@ -145,7 +150,9 @@ export class GeoJsonToSvgNode extends ExecutableNode {
       }
 
       if (result.paths.length === 0) {
-        return this.createErrorResult("Failed to generate SVG paths from GeoJSON");
+        return this.createErrorResult(
+          "Failed to generate SVG paths from GeoJSON"
+        );
       }
 
       // Convert SVG string to Uint8Array
@@ -159,7 +166,9 @@ export class GeoJsonToSvgNode extends ExecutableNode {
       });
     } catch (err) {
       const error = err as Error;
-      return this.createErrorResult(`Error rendering GeoJSON to SVG: ${error.message}`);
+      return this.createErrorResult(
+        `Error rendering GeoJSON to SVG: ${error.message}`
+      );
     }
   }
-} 
+}

apps/api/src/nodes/image/svg-to-png-node.test.ts

@@ -5,7 +5,8 @@ import { NodeContext } from "../types";
 import { SvgToPngNode } from "./svg-to-png-node";
 
 describe("SvgToPngNode", () => {
-  const simpleSvg = '<svg width="100" height="100" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" fill="red"/></svg>';
+  const simpleSvg =
+    '<svg width="100" height="100" xmlns="http://www.w3.org/2000/svg"><rect width="100" height="100" fill="red"/></svg>';
   const simpleSvgImage = {
     data: new TextEncoder().encode(simpleSvg),
     mimeType: "image/svg+xml",
@@ -181,7 +182,7 @@ describe("SvgToPngNode", () => {
     } as unknown as Node);
 
     const nonSvgImage = {
-      data: new Uint8Array([0x89, 0x50, 0x4E, 0x47]), // PNG header
+      data: new Uint8Array([0x89, 0x50, 0x4e, 0x47]), // PNG header
       mimeType: "image/png",
     };
 
@@ -197,4 +198,4 @@ describe("SvgToPngNode", () => {
     expect(result.status).toBe("error");
     expect(result.error).toContain("Input must be SVG content");
   });
-}); 
+});

apps/api/src/nodes/image/svg-to-png-node.ts

@@ -11,8 +11,7 @@ export class SvgToPngNode extends ExecutableNode {
     id: "svg-to-png",
     name: "SVG to PNG",
     type: "svg-to-png",
-    description:
-      "Renders SVG content to PNG format using the Resvg library. Accepts SVG image input from GeoJSON to SVG node.",
+    description: "Renders SVG content to PNG format using the Resvg library.",
     tags: ["Image"],
     icon: "file-image", // Icon suggesting image conversion
     inlinable: true,
@@ -46,7 +45,8 @@ export class SvgToPngNode extends ExecutableNode {
       {
         name: "backgroundColor",
         type: "string",
-        description: "Background color (e.g., 'white', 'transparent', '#FF0000').",
+        description:
+          "Background color (e.g., 'white', 'transparent', '#FF0000').",
         required: false,
         value: "transparent",
         hidden: true,
@@ -73,7 +73,9 @@ export class SvgToPngNode extends ExecutableNode {
 
       // Check if it's SVG content
       if (svgInput.mimeType !== "image/svg+xml") {
-        return this.createErrorResult("Input must be SVG content (image/svg+xml).");
+        return this.createErrorResult(
+          "Input must be SVG content (image/svg+xml)."
+        );
       }
 
       // Convert Uint8Array to string
@@ -86,15 +88,20 @@ export class SvgToPngNode extends ExecutableNode {
       const width = inputs.width as number | undefined;
       const height = inputs.height as number | undefined;
       const scale = (inputs.scale as number) || 1.0;
-      const backgroundColor = (inputs.backgroundColor as string) || "transparent";
+      const backgroundColor =
+        (inputs.backgroundColor as string) || "transparent";
 
       // Validate numeric inputs
       if (width !== undefined && (width <= 0 || width > 8192)) {
-        return this.createErrorResult("Width must be between 1 and 8192 pixels.");
+        return this.createErrorResult(
+          "Width must be between 1 and 8192 pixels."
+        );
       }
 
       if (height !== undefined && (height <= 0 || height > 8192)) {
-        return this.createErrorResult("Height must be between 1 and 8192 pixels.");
+        return this.createErrorResult(
+          "Height must be between 1 and 8192 pixels."
+        );
       }
 
       if (scale <= 0 || scale > 10) {
@@ -145,7 +152,9 @@ export class SvgToPngNode extends ExecutableNode {
 
       return this.createSuccessResult({ image: imageParameter });
     } catch (error) {
-      return this.createErrorResult(`Failed to render SVG: ${error instanceof Error ? error.message : String(error)}`);
+      return this.createErrorResult(
+        `Failed to render SVG: ${error instanceof Error ? error.message : String(error)}`
+      );
     }
   }
-} 
+}

apps/api/src/nodes/json/json-to-geojson-node.test.ts

@@ -1,13 +1,13 @@
-import { describe, expect, it } from "vitest";
 import { Node } from "@dafthunk/types";
+import { describe, expect, it } from "vitest";
 
-import { JsonToGeojsonNode } from "./json-to-geojson-node";
 import { NodeContext } from "../types";
+import { JsonToGeojsonNode } from "./json-to-geojson-node";
 
 describe("JsonToGeojsonNode", () => {
   const createMockContext = (inputs: Record<string, any>): NodeContext => ({
     nodeId: "test-node",
-    workflowId: "test-workflow", 
+    workflowId: "test-workflow",
     organizationId: "test-org",
     inputs,
     env: {} as any,
@@ -44,7 +44,11 @@ describe("JsonToGeojsonNode", () => {
       const node = createNode();
       const lineString = {
         type: "LineString",
-        coordinates: [[0, 0], [10, 10], [20, 0]],
+        coordinates: [
+          [0, 0],
+          [10, 10],
+          [20, 0],
+        ],
       };
 
       const context = createMockContext({ json: lineString });
@@ -58,7 +62,15 @@ describe("JsonToGeojsonNode", () => {
       const node = createNode();
       const polygon = {
         type: "Polygon",
-        coordinates: [[[0, 0], [10, 0], [10, 10], [0, 10], [0, 0]]],
+        coordinates: [
+          [
+            [0, 0],
+            [10, 0],
+            [10, 10],
+            [0, 10],
+            [0, 0],
+          ],
+        ],
       };
 
       const context = createMockContext({ json: polygon });
@@ -225,8 +237,8 @@ describe("JsonToGeojsonNode", () => {
 
     it("should return error for missing type property", async () => {
       const node = createNode();
-      const context = createMockContext({ 
-        json: { coordinates: [10, 20] } 
+      const context = createMockContext({
+        json: { coordinates: [10, 20] },
       });
 
       const result = await node.execute(context);
@@ -237,8 +249,8 @@ describe("JsonToGeojsonNode", () => {
 
     it("should return error for invalid GeoJSON type", async () => {
       const node = createNode();
-      const context = createMockContext({ 
-        json: { type: "InvalidType", coordinates: [10, 20] } 
+      const context = createMockContext({
+        json: { type: "InvalidType", coordinates: [10, 20] },
       });
 
       const result = await node.execute(context);
@@ -249,8 +261,8 @@ describe("JsonToGeojsonNode", () => {
 
     it("should return error for invalid geometry structure", async () => {
       const node = createNode();
-      const context = createMockContext({ 
-        json: { type: "Point", coordinates: "not an array" } 
+      const context = createMockContext({
+        json: { type: "Point", coordinates: "not an array" },
       });
 
       const result = await node.execute(context);
@@ -259,4 +271,4 @@ describe("JsonToGeojsonNode", () => {
       expect(result.error).toContain("Invalid GeoJSON format");
     });
   });
-});
+});