@tscircuit/props 0.0.670 → 0.0.671

package/lib/assembly/device.ts

@@ -7,16 +7,27 @@ export interface AssemblyDeviceProps {
   name?: string
   /** Imported CAD model URL. Mutually exclusive with cadModel where supported. */
   modelUrl?: string
+  /** Modelprinter/footprinter string, trimmed; mutually exclusive with other model sources. */
+  model?: string
 }
 
-export const assemblyDeviceProps = z.object({
-  name: z.string().optional(),
-  modelUrl: url
-    .refine((value) => value.trim().length > 0, {
-      message: "modelUrl cannot be empty",
-    })
-    .optional(),
-})
+export const assemblyDeviceProps = z
+  .object({
+    name: z.string().optional(),
+    model: z.string().trim().min(1).optional(),
+    modelUrl: url
+      .refine((value) => value.trim().length > 0, {
+        message: "modelUrl cannot be empty",
+      })
+      .optional(),
+  })
+  .refine(
+    (device) => device.model === undefined || device.modelUrl === undefined,
+    {
+      message: "Provide either model or modelUrl, not both",
+      path: ["model"],
+    },
+  )
 
 export type AssemblyDevicePropsInput = z.input<typeof assemblyDeviceProps>
 

package/lib/assembly/screen.ts

@@ -8,6 +8,8 @@ export interface AssemblyScreenProps {
   name: string
   /** Imported CAD model URL. Mutually exclusive with cadModel where supported. */
   modelUrl?: string
+  /** Modelprinter/footprinter string, trimmed; mutually exclusive with other model sources. */
+  model?: string
   /** Selector for the connector that the screen attaches to. */
   connectsTo: string
   /**
@@ -22,7 +24,7 @@ export interface AssemblyScreenProps {
   height?: Distance
   /**
    * Advanced modelprinter string used to render the screen assembly. Required
-   * when `width`, `height`, and `modelUrl` are omitted.
+   * when `width`, `height`, `model`, and `modelUrl` are omitted.
    */
   cadModel?: string
 }
@@ -40,6 +42,7 @@ const positiveDistance = (fieldName: "width" | "height") =>
 export const assemblyScreenProps = z
   .object({
     name: nonemptyString("name"),
+    model: z.string().trim().min(1).optional(),
     modelUrl: url
       .refine((value) => value.trim().length > 0, {
         message: "modelUrl cannot be empty",
@@ -51,6 +54,16 @@ export const assemblyScreenProps = z
     cadModel: nonemptyString("cadModel").optional(),
   })
   .superRefine((screen, context) => {
+    if (
+      screen.model !== undefined &&
+      (screen.modelUrl !== undefined || screen.cadModel !== undefined)
+    ) {
+      context.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Provide only one of model, modelUrl, or cadModel",
+        path: ["model"],
+      })
+    }
     if (screen.modelUrl !== undefined && screen.cadModel !== undefined) {
       context.addIssue({
         code: z.ZodIssueCode.custom,
@@ -73,11 +86,12 @@ export const assemblyScreenProps = z
     if (
       !hasWidth &&
       screen.cadModel === undefined &&
-      screen.modelUrl === undefined
+      screen.modelUrl === undefined &&
+      screen.model === undefined
     ) {
       context.addIssue({
         code: z.ZodIssueCode.custom,
-        message: "provide width and height, cadModel, or modelUrl",
+        message: "provide width and height, model, cadModel, or modelUrl",
         path: [],
       })
     }

package/lib/assembly/subassembly.ts

@@ -9,6 +9,8 @@ export interface AssemblySubassemblyProps {
   name: string
   /** Imported CAD model URL. Mutually exclusive with cadModel where supported. */
   modelUrl?: string
+  /** Modelprinter/footprinter string, trimmed; mutually exclusive with other model sources. */
+  model?: string
   /** Human-facing alternate to the stable name. */
   displayName?: string
   /** Optional CAD geometry using the existing component cadModel formats. */
@@ -23,6 +25,7 @@ export const assemblySubassemblyProps = z
       message: "name cannot be empty",
     }),
     displayName: z.string().optional(),
+    model: z.string().trim().min(1).optional(),
     modelUrl: url
       .refine((value) => value.trim().length > 0, {
         message: "modelUrl cannot be empty",
@@ -39,6 +42,15 @@ export const assemblySubassemblyProps = z
       path: ["modelUrl"],
     },
   )
+  .refine(
+    (assembly) =>
+      assembly.model === undefined ||
+      (assembly.modelUrl === undefined && assembly.cadModel === undefined),
+    {
+      message: "Provide only one of model, modelUrl, or cadModel",
+      path: ["model"],
+    },
+  )
 
 export type AssemblySubassemblyPropsInput = z.input<
   typeof assemblySubassemblyProps

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/props",
-  "version": "0.0.670",
+  "version": "0.0.671",
   "description": "Props for tscircuit builtin component types",
   "main": "dist/index.js",
   "type": "module",