@tscircuit/props 0.0.669 → 0.0.671

package/dist/index.js

@@ -48,27 +48,27 @@ var commonShapeProps = z3.discriminatedUnion("shape", [
 ]);
 expectTypesMatch(true);
 
+// lib/common/url.ts
+import { z as z4 } from "zod";
+var url = z4.preprocess((value) => {
+  if (value && typeof value === "object" && "default" in value) {
+    return value.default;
+  }
+  return value;
+}, z4.string());
+
 // lib/common/cadModel.ts
 import { z as z6 } from "zod";
 
 // lib/common/point3.ts
 import { distance as distance2 } from "circuit-json";
-import { z as z4 } from "zod";
-var point3 = z4.object({
+import { z as z5 } from "zod";
+var point3 = z5.object({
   x: distance2,
   y: distance2,
   z: distance2
 });
 
-// lib/common/url.ts
-import { z as z5 } from "zod";
-var url = z5.preprocess((value) => {
-  if (value && typeof value === "object" && "default" in value) {
-    return value.default;
-  }
-  return value;
-}, z5.string());
-
 // lib/common/cadModel.ts
 var rotationPoint3 = z6.object({
   x: z6.union([z6.number(), z6.string()]),
@@ -143,9 +143,25 @@ var assemblySubassemblyProps = z7.object({
     message: "name cannot be empty"
   }),
   displayName: z7.string().optional(),
+  model: z7.string().trim().min(1).optional(),
+  modelUrl: url.refine((value) => value.trim().length > 0, {
+    message: "modelUrl cannot be empty"
+  }).optional(),
   cadModel: cadModelProp.optional(),
   children: z7.custom().optional()
-});
+}).refine(
+  (assembly) => assembly.modelUrl === void 0 || assembly.cadModel === void 0,
+  {
+    message: "Provide either modelUrl or cadModel, not both",
+    path: ["modelUrl"]
+  }
+).refine(
+  (assembly) => assembly.model === void 0 || assembly.modelUrl === void 0 && assembly.cadModel === void 0,
+  {
+    message: "Provide only one of model, modelUrl, or cadModel",
+    path: ["model"]
+  }
+);
 expectTypesMatch(true);
 
 // lib/assembly/cadassembly.ts
@@ -154,8 +170,18 @@ var assemblyCadAssemblyProps = assemblySubassemblyProps;
 // lib/assembly/device.ts
 import { z as z8 } from "zod";
 var assemblyDeviceProps = z8.object({
-  name: z8.string().optional()
-});
+  name: z8.string().optional(),
+  model: z8.string().trim().min(1).optional(),
+  modelUrl: url.refine((value) => value.trim().length > 0, {
+    message: "modelUrl cannot be empty"
+  }).optional()
+}).refine(
+  (device) => device.model === void 0 || device.modelUrl === void 0,
+  {
+    message: "Provide either model or modelUrl, not both",
+    path: ["model"]
+  }
+);
 expectTypesMatch(true);
 
 // lib/assembly/screen.ts
@@ -168,11 +194,29 @@ var positiveDistance = (fieldName) => distance.refine((value) => Number.isFinite
 });
 var assemblyScreenProps = z9.object({
   name: nonemptyString("name"),
+  model: z9.string().trim().min(1).optional(),
+  modelUrl: url.refine((value) => value.trim().length > 0, {
+    message: "modelUrl cannot be empty"
+  }).optional(),
   connectsTo: nonemptyString("connectsTo"),
   width: positiveDistance("width").optional(),
   height: positiveDistance("height").optional(),
   cadModel: nonemptyString("cadModel").optional()
 }).superRefine((screen, context) => {
+  if (screen.model !== void 0 && (screen.modelUrl !== void 0 || screen.cadModel !== void 0)) {
+    context.addIssue({
+      code: z9.ZodIssueCode.custom,
+      message: "Provide only one of model, modelUrl, or cadModel",
+      path: ["model"]
+    });
+  }
+  if (screen.modelUrl !== void 0 && screen.cadModel !== void 0) {
+    context.addIssue({
+      code: z9.ZodIssueCode.custom,
+      message: "Provide either modelUrl or cadModel, not both",
+      path: ["modelUrl"]
+    });
+  }
   const hasWidth = screen.width !== void 0;
   const hasHeight = screen.height !== void 0;
   if (hasWidth !== hasHeight) {
@@ -183,10 +227,10 @@ var assemblyScreenProps = z9.object({
     });
     return;
   }
-  if (!hasWidth && screen.cadModel === void 0) {
+  if (!hasWidth && screen.cadModel === void 0 && screen.modelUrl === void 0 && screen.model === void 0) {
     context.addIssue({
       code: z9.ZodIssueCode.custom,
-      message: "provide either width and height or cadModel",
+      message: "provide width and height, model, cadModel, or modelUrl",
       path: []
     });
   }