@field/cascade 0.8.0 → 0.10.0

package/dist/contracts/validate.js

@@ -19,9 +19,9 @@ export const CAPABILITIES_BY_ENVIRONMENT = {
 };
 const ALLOWED = CAPABILITIES_BY_ENVIRONMENT;
 const fields = (names) => new Set(names.split(" "));
-const TOP_FIELDS = fields("apiVersion runsOn container capabilities label description icon inputs outputs props");
-const DATA_FIELDS = fields("kind type default description variadic min max step accept control options");
-const OUTPUT_FIELDS = fields("kind type description");
+const TOP_FIELDS = fields("apiVersion runsOn container capabilities source label description icon inputs outputs props");
+const DATA_FIELDS = fields("kind type default description variadic min max step accept control options schema fields");
+const OUTPUT_FIELDS = fields("kind type description schema fields");
 const PROP_FIELDS = fields("type default label description min max step accept control options expression action");
 function diagnostic(code, message, path) {
     return { phase: "definition", code: `definition/${code}`, message, path };
@@ -94,6 +94,8 @@ export function validateNodeDefinition(value) {
         value.container !== "subnet" &&
         value.container !== "feedback")
         add("invalid-container", "container must be subnet or feedback", "container");
+    if (value.source !== undefined && value.source !== "live")
+        add("invalid-source", "source must be \"live\" when present", "source");
     const allowed = ALLOWED[environment] ?? [];
     if (value.capabilities !== undefined && !Array.isArray(value.capabilities))
         add("invalid-capabilities", "capabilities must be an array", "capabilities");
@@ -193,6 +195,8 @@ export function validateNodeDefinition(value) {
                 add("invalid-type", `${String(type)} is not a Cascade type`, `${path}.type`);
                 continue;
             }
+            if (section !== "props")
+                result.push(...bundleDiagnostics(raw, type, section, path));
             if (type === "texture" && environment !== "browser")
                 add("texture-not-portable", "texture is browser-only", `${path}.type`);
             if (type === "texture" && "default" in raw)
@@ -229,6 +233,58 @@ export function validateNodeDefinition(value) {
     }
     return result;
 }
+/** `schema` and `fields` on a port: bundle-only, and well-formed. */
+function bundleDiagnostics(raw, type, section, path) {
+    const result = [];
+    const add = (code, message, at) => result.push(diagnostic(code, message, at));
+    for (const key of ["schema", "fields"])
+        if (key in raw && type !== "bundle")
+            add("bundle-metadata", `${key} is only valid on a bundle port`, `${path}.${key}`);
+    if (type !== "bundle")
+        return result;
+    if ("schema" in raw && (typeof raw.schema !== "string" || !IDENTIFIER.test(raw.schema)))
+        add("invalid-schema", "schema must be an identifier", `${path}.schema`);
+    if (!("fields" in raw))
+        return result;
+    const declared = raw.fields;
+    if (section === "inputs") {
+        if (!Array.isArray(declared)) {
+            add("invalid-fields", "an input's fields list the field names it reads", `${path}.fields`);
+            return result;
+        }
+        const seen = new Set();
+        for (const [index, field] of declared.entries()) {
+            if (typeof field !== "string" || !IDENTIFIER.test(field))
+                add("invalid-field", `${String(field)} is not a valid field name`, `${path}.fields[${index}]`);
+            else if (seen.has(field))
+                add("duplicate-field", `${field} is listed twice`, `${path}.fields[${index}]`);
+            else
+                seen.add(field);
+        }
+        return result;
+    }
+    if (!isRecord(declared)) {
+        add("invalid-fields", "an output's fields map each field name to its type", `${path}.fields`);
+        return result;
+    }
+    for (const [field, definition] of Object.entries(declared)) {
+        const at = `${path}.fields.${field}`;
+        if (!IDENTIFIER.test(field) || RESERVED.has(field))
+            add("invalid-field", `${field} is not a valid field name`, at);
+        const fieldType = typeof definition === "string"
+            ? definition
+            : isRecord(definition) ? definition.type : undefined;
+        if (isRecord(definition))
+            for (const key of Object.keys(definition))
+                if (key !== "type" && key !== "description")
+                    add("unknown-field", `${at}.${key} is not allowed`, `${at}.${key}`);
+        if (!validType(fieldType))
+            add("invalid-type", `${String(fieldType)} is not a Cascade type`, at);
+        else if (fieldType === "texture")
+            add("texture-not-portable", "a bundle field cannot hold a texture", at);
+    }
+    return result;
+}
 export function assertNodeDefinition(value) {
     const diagnostics = validateNodeDefinition(value);
     if (diagnostics.length)

package/dist/contracts/values.d.ts

@@ -2,7 +2,7 @@ import type { Camera } from "./camera.js";
 import type { Color } from "./color.js";
 import type { Light, Scene } from "./scene.js";
 import type { Geometry, GeometryFileRef, GeometryJson, GeometrySerialized } from "./geometry.js";
-export declare const CORE_TYPES: readonly ["float", "int", "bool", "string", "vec2", "vec3", "vec4", "vec2i", "vec3i", "vec4i", "mat2", "mat3", "mat4", "image", "texture", "geometry", "points", "lines", "polyline", "mesh", "rects", "color", "camera", "scene", "light", "asset", "array", "object", "any"];
+export declare const CORE_TYPES: readonly ["float", "int", "bool", "string", "vec2", "vec3", "vec4", "vec2i", "vec3i", "vec4i", "mat2", "mat3", "mat4", "image", "texture", "geometry", "points", "lines", "polyline", "mesh", "rects", "color", "camera", "scene", "light", "asset", "array", "object", "bundle", "any"];
 export type CoreType = (typeof CORE_TYPES)[number];
 export type NamespacedType = `${string}.${string}`;
 export type CascadeType = CoreType | NamespacedType;
@@ -96,7 +96,7 @@ export interface AssetRef {
     readonly mediaType?: string;
 }
 export type SerializableValue = JsonValue | AssetRef | ImageRef | GeometryJson | GeometryFileRef;
-export type ValueForType<T extends CascadeType> = T extends "float" | "int" ? number : T extends "bool" ? boolean : T extends "string" ? string : T extends "vec2" ? Vec2 : T extends "vec3" ? Vec3 : T extends "vec4" ? Vec4 : T extends "vec2i" ? Vec2i : T extends "vec3i" ? Vec3i : T extends "vec4i" ? Vec4i : T extends "mat2" ? Mat2 : T extends "mat3" ? Mat3 : T extends "mat4" ? Mat4 : T extends "color" ? Color : T extends "camera" ? Camera : T extends "scene" ? Scene : T extends "light" ? Light : T extends "image" ? ImageRef : T extends "texture" ? TextureHandle : T extends "geometry" ? Geometry : T extends "points" ? PointSet : T extends "lines" ? LineSegments : T extends "polyline" ? Polyline : T extends "mesh" ? Mesh : T extends "rects" ? Rects : T extends "asset" ? AssetRef : T extends "array" ? readonly unknown[] : T extends "object" ? Readonly<Record<string, unknown>> : unknown;
-export type SerializableValueForType<T extends CascadeType> = T extends "texture" ? never : T extends "geometry" ? GeometrySerialized : T extends "array" ? readonly JsonValue[] : T extends "object" ? Readonly<Record<string, JsonValue>> : T extends "any" | NamespacedType ? JsonValue : ValueForType<T>;
+export type ValueForType<T extends CascadeType> = T extends "float" | "int" ? number : T extends "bool" ? boolean : T extends "string" ? string : T extends "vec2" ? Vec2 : T extends "vec3" ? Vec3 : T extends "vec4" ? Vec4 : T extends "vec2i" ? Vec2i : T extends "vec3i" ? Vec3i : T extends "vec4i" ? Vec4i : T extends "mat2" ? Mat2 : T extends "mat3" ? Mat3 : T extends "mat4" ? Mat4 : T extends "color" ? Color : T extends "camera" ? Camera : T extends "scene" ? Scene : T extends "light" ? Light : T extends "image" ? ImageRef : T extends "texture" ? TextureHandle : T extends "geometry" ? Geometry : T extends "points" ? PointSet : T extends "lines" ? LineSegments : T extends "polyline" ? Polyline : T extends "mesh" ? Mesh : T extends "rects" ? Rects : T extends "asset" ? AssetRef : T extends "array" ? readonly unknown[] : T extends "object" | "bundle" ? Readonly<Record<string, unknown>> : unknown;
+export type SerializableValueForType<T extends CascadeType> = T extends "texture" ? never : T extends "geometry" ? GeometrySerialized : T extends "array" ? readonly JsonValue[] : T extends "object" | "bundle" ? Readonly<Record<string, JsonValue>> : T extends "any" | NamespacedType ? JsonValue : ValueForType<T>;
 export {};
 //# sourceMappingURL=values.d.ts.map

package/dist/contracts/values.js

@@ -27,6 +27,7 @@ export const CORE_TYPES = [
     "asset",
     "array",
     "object",
+    "bundle",
     "any",
 ];
 const TYPE_ALIASES = {

package/dist/index.html

@@ -6,11 +6,11 @@
   <!-- Pinterest browser extension: no Save buttons over canvases and previews -->
   <meta name="pinterest" content="nopin">
   <title>Cascade</title>
-  <script type="module" crossorigin src="/assets/index-CMiBdEuT.js"></script>
-  <link rel="modulepreload" crossorigin href="/assets/legacy-ZA7textG.js">
-  <link rel="modulepreload" crossorigin href="/assets/index-client-BI2H82FJ.js">
+  <script type="module" crossorigin src="/assets/index-DyvDC6pS.js"></script>
+  <link rel="modulepreload" crossorigin href="/assets/legacy-CTEeXeqF.js">
+  <link rel="modulepreload" crossorigin href="/assets/index-client-DqYmKstU.js">
   <link rel="modulepreload" crossorigin href="/assets/nodeTypeUtils-BDJsc2Ks.js">
-  <link rel="stylesheet" crossorigin href="/assets/index-DMIuml9a.css">
+  <link rel="stylesheet" crossorigin href="/assets/index-7vae6YFC.css">
 </head>
 <body>
   <div id="app"></div>

package/dist/player/app.js

@@ -474,7 +474,7 @@ var BrowserPlayer = class {
     }
     if (typeof value === "string") {
       return new Blob([value], {
-        type: value.trimStart().startsWith("<svg") ? "image/svg+xml" : "text/plain;charset=utf-8"
+        type: isSvgText(value) ? "image/svg+xml" : "text/plain;charset=utf-8"
       });
     }
     if ((isGeometry(value) || isScene(value)) && this.displayedElement instanceof HTMLCanvasElement)
@@ -572,7 +572,7 @@ var BrowserPlayer = class {
     let next;
     let nextRelease;
     const asset = isAssetRef(value) ? value : void 0;
-    if (asset || typeof value === "string" && value.trimStart().startsWith("<svg")) {
+    if (asset || isSvgText(value)) {
       let url;
       if (asset) {
         const lease = await this.context.assets.resolveUrl(asset);
@@ -692,13 +692,13 @@ function createUi(hostDocument, root) {
   root.append(toolbar, error, output);
   return { play, frame, error, output };
 }
-function renderSceneCanvas(hostDocument, scene, width, height) {
+function renderSceneCanvas(hostDocument, scene, width, height, stroke = [1, 1, 1, 1]) {
   let canvas;
   const camera = scene.camera ?? fitCamera(scene, width, height);
   renderScene(scene.geometry, {
     camera,
     size: [width, height],
-    stroke: [1, 1, 1, 1],
+    stroke: [...stroke],
     strokeWidth: 1,
     opacity: 1,
     pointRadius: 1,
@@ -753,7 +753,7 @@ function preferredOutput(result) {
   for (const [nodeId, outputs] of result.outputs) {
     for (const [port, value] of outputs) {
       fallback = { nodeId, port };
-      if (isAssetRef(value) || isScene(value) || isGeometry(value) || typeof value === "string" && value.trimStart().startsWith("<svg"))
+      if (isAssetRef(value) || isScene(value) || isGeometry(value) || isSvgText(value))
         preferred = { nodeId, port };
     }
   }
@@ -805,6 +805,18 @@ function requireFinite(value, label) {
 function asError(value) {
   return value instanceof Error ? value : new Error(String(value));
 }
+function isSvgText(value) {
+  return typeof value === "string" && /^\s*(?:<\?xml[^>]*>\s*)?(?:<!--[\s\S]*?-->\s*|<!DOCTYPE[^>]*>\s*)*<svg[\s>]/i.test(value.slice(0, 2e3));
+}
 export {
+  asError,
+  canvasBlob,
+  cleanupAll,
+  isAssetRef,
+  isGeometry,
+  isImageAsset,
+  isSvgText,
+  jsonReplacer,
+  renderSceneCanvas,
   startPlayer
 };