@treasuryspatial/viewer-kit 0.2.37 → 0.2.38

package/dist/uploads/grasshopper.d.ts

@@ -5,9 +5,14 @@ export type SolveGrasshopperOptions = {
     preview?: Record<string, unknown>;
     onStatus?: (status: string) => void;
     allowEmptyGeometry?: boolean;
+    ensureMesh?: boolean;
 };
-export declare function solveGrasshopperFile(file: File, { apiRoute, values, preview, onStatus, allowEmptyGeometry }?: SolveGrasshopperOptions): Promise<GrasshopperSolveResult>;
+export declare function solveGrasshopperFile(file: File, { apiRoute, values, preview, onStatus, allowEmptyGeometry, ensureMesh, }?: SolveGrasshopperOptions): Promise<GrasshopperSolveResult>;
 export declare function warmGrasshopperSolver(file: File, { apiRoute, preview, onStatus, }?: Omit<SolveGrasshopperOptions, "values" | "allowEmptyGeometry">): Promise<GrasshopperSolveResult>;
+export type EnsureGrasshopperGeometryOptions = {
+    allowEmptyGeometry?: boolean;
+};
+export declare function ensureGrasshopperGeometry3dm(result: GrasshopperSolveResult, { allowEmptyGeometry }?: EnsureGrasshopperGeometryOptions): Promise<GrasshopperSolveResult>;
 export declare const mapGrasshopperInputType: (inputType?: string) => string;
 export declare const buildGrasshopperValues: (inputs: GrasshopperInput[], valuesByKey: Record<string, unknown>, keyResolver?: (input: GrasshopperInput, index: number) => string) => GrasshopperValue[];
 export declare const buildGrasshopperDefaults: (inputs: GrasshopperInput[], keyResolver?: (input: GrasshopperInput, index: number) => string) => Record<string, unknown>;

package/dist/uploads/grasshopper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grasshopper.d.ts","sourceRoot":"","sources":["../../src/uploads/grasshopper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA0D1F,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAyBF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,EAAE,QAA0B,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAE,uBAA4B,GAC1G,OAAO,CAAC,sBAAsB,CAAC,CAsCjC;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,EACE,QAA0B,EAC1B,OAAO,EACP,QAAQ,GACT,GAAE,IAAI,CAAC,uBAAuB,EAAE,QAAQ,GAAG,oBAAoB,CAAM,GACrE,OAAO,CAAC,sBAAsB,CAAC,CASjC;AAED,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,KAAG,MAM5D,CAAC;AAsBF,eAAO,MAAM,sBAAsB,GACjC,QAAQ,gBAAgB,EAAE,EAC1B,aAAa,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,KAC/D,gBAAgB,EAkBlB,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,gBAAgB,EAAE,EAC1B,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,KAC/D,MAAM,CAAC,MAAM,EAAE,OAAO,CAexB,CAAC"}
+{"version":3,"file":"grasshopper.d.ts","sourceRoot":"","sources":["../../src/uploads/grasshopper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA0D1F,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAyBF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,EACE,QAA0B,EAC1B,MAAM,EACN,OAAO,EACP,QAAQ,EACR,kBAAkB,EAClB,UAAiB,GAClB,GAAE,uBAA4B,GAC9B,OAAO,CAAC,sBAAsB,CAAC,CA0CjC;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,IAAI,EACV,EACE,QAA0B,EAC1B,OAAO,EACP,QAAQ,GACT,GAAE,IAAI,CAAC,uBAAuB,EAAE,QAAQ,GAAG,oBAAoB,CAAM,GACrE,OAAO,CAAC,sBAAsB,CAAC,CASjC;AAED,MAAM,MAAM,gCAAgC,GAAG;IAC7C,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,sBAAsB,EAC9B,EAAE,kBAAkB,EAAE,GAAE,gCAAqC,GAC5D,OAAO,CAAC,sBAAsB,CAAC,CAkBjC;AAED,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,KAAG,MAM5D,CAAC;AAsBF,eAAO,MAAM,sBAAsB,GACjC,QAAQ,gBAAgB,EAAE,EAC1B,aAAa,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,KAC/D,gBAAgB,EAkBlB,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,gBAAgB,EAAE,EAC1B,cAAc,CAAC,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,KAC/D,MAAM,CAAC,MAAM,EAAE,OAAO,CAexB,CAAC"}

package/dist/uploads/grasshopper.js

@@ -74,14 +74,15 @@ const extractSolvePayload = (payload) => {
         errors: Array.isArray(data?.errors ?? data?.Errors) ? (data?.errors ?? data?.Errors) : undefined,
     };
 };
-export async function solveGrasshopperFile(file, { apiRoute = "/api/gh-solve", values, preview, onStatus, allowEmptyGeometry } = {}) {
+export async function solveGrasshopperFile(file, { apiRoute = "/api/gh-solve", values, preview, onStatus, allowEmptyGeometry, ensureMesh = true, } = {}) {
     onStatus?.("preparing payload");
     const uploadFile = await normalizeGhxInputs(file, onStatus);
     const formData = new FormData();
     formData.append("algo", uploadFile);
     formData.append("values", JSON.stringify(values ?? []));
-    if (preview) {
-        formData.append("preview", JSON.stringify(preview));
+    const previewPayload = preview ?? (ensureMesh ? { meshOnly: true } : undefined);
+    if (previewPayload) {
+        formData.append("preview", JSON.stringify(previewPayload));
     }
     const route = allowEmptyGeometry && apiRoute
         ? `${apiRoute}${apiRoute.includes("?") ? "&" : "?"}allowEmpty=1`
@@ -107,6 +108,9 @@ export async function solveGrasshopperFile(file, { apiRoute = "/api/gh-solve", v
     if (!parsed.hasGeometry && !allowEmptyGeometry) {
         throw new Error("Grasshopper solve returned no geometry");
     }
+    if (ensureMesh) {
+        return ensureGrasshopperGeometry3dm(parsed, { allowEmptyGeometry });
+    }
     return parsed;
 }
 export async function warmGrasshopperSolver(file, { apiRoute = "/api/gh-solve", preview, onStatus, } = {}) {
@@ -119,6 +123,26 @@ export async function warmGrasshopperSolver(file, { apiRoute = "/api/gh-solve",
         allowEmptyGeometry: true,
     });
 }
+export async function ensureGrasshopperGeometry3dm(result, { allowEmptyGeometry } = {}) {
+    if (result.geometry3dm)
+        return result;
+    if (!Array.isArray(result.values) || result.values.length === 0) {
+        if (!allowEmptyGeometry) {
+            throw new Error("Grasshopper solve returned no geometry");
+        }
+        return result;
+    }
+    const { grasshopperResultTo3dmBase64 } = await import("@treasuryspatial/rhino-bridge");
+    const converted = await grasshopperResultTo3dmBase64(result);
+    if (!converted.geometry3dm && !allowEmptyGeometry) {
+        throw new Error("Grasshopper solve returned no renderable geometry");
+    }
+    return {
+        ...result,
+        geometry3dm: converted.geometry3dm,
+        hasGeometry: Boolean(converted.geometry3dm),
+    };
+}
 export const mapGrasshopperInputType = (inputType) => {
     const normalized = (inputType ?? "").toLowerCase();
     if (normalized === "integer" || normalized === "int")

package/dist/uploads/index.d.ts

@@ -1,6 +1,6 @@
 import type { UploadFileKind, UploadLimits } from "./types";
 export type { UploadFileKind, UploadLimits, UploadResult, GrasshopperInput, GrasshopperSolveResult, GrasshopperValue, Geometry3dmSolveResult, Geometry3dmSolveStats, MeshLoadResult, MeshLoadStats, } from "./types";
-export { solveGrasshopperFile, warmGrasshopperSolver, buildGrasshopperValues, buildGrasshopperDefaults, mapGrasshopperInputType, } from "./grasshopper";
+export { solveGrasshopperFile, warmGrasshopperSolver, ensureGrasshopperGeometry3dm, buildGrasshopperValues, buildGrasshopperDefaults, mapGrasshopperInputType, } from "./grasshopper";
 export { solveGeometry3dmFile } from "./geometry3dm";
 export { loadMeshFile } from "./mesh";
 export declare const detectUploadKind: (file: File) => UploadFileKind;

package/dist/uploads/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/uploads/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,YAAY,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,qBAAqB,EACrB,cAAc,EACd,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,eAAO,MAAM,gBAAgB,GAAI,MAAM,IAAI,KAAG,cAY7C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAGnC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/uploads/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,YAAY,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,qBAAqB,EACrB,cAAc,EACd,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,GACxB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,eAAO,MAAM,gBAAgB,GAAI,MAAM,IAAI,KAAG,cAY7C,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,YAGnC,CAAC"}

package/dist/uploads/index.js

@@ -1,4 +1,4 @@
-export { solveGrasshopperFile, warmGrasshopperSolver, buildGrasshopperValues, buildGrasshopperDefaults, mapGrasshopperInputType, } from "./grasshopper";
+export { solveGrasshopperFile, warmGrasshopperSolver, ensureGrasshopperGeometry3dm, buildGrasshopperValues, buildGrasshopperDefaults, mapGrasshopperInputType, } from "./grasshopper";
 export { solveGeometry3dmFile } from "./geometry3dm";
 export { loadMeshFile } from "./mesh";
 export const detectUploadKind = (file) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treasuryspatial/viewer-kit",
-  "version": "0.2.37",
+  "version": "0.2.38",
   "type": "module",
   "license": "UNLICENSED",
   "main": "./dist/index.js",