lecodes-cli 0.1.7 → 0.3.0

package/runtime/sdk/ui/UIImage.ts

@@ -1,13 +1,28 @@
 import type { FetchResponse } from "../runtime/fetch"
 import type { SvgSourceValue as SvgSource } from "../runtime/misc"
 import type { File } from "../runtime/fetch"
+import { Canvas, isCanvas } from "../canvas/Canvas"
 import { Element, type AnimateStyle, type Color, type ElementStyle, type OnLayoutCallback, type Style } from "./UINode"
 
 export type UIImageStyle = ElementStyle & { borderRadius?: number, objectFit?: "cover" | "contain" | "fill", tintColor?: Color }
 
+/** A baked Canvas surface as an image source. The UI backend resolves it to a UI texture — see
+ *  docs/canvas-contract.md ("Pending"). */
+export type CanvasImageSource = { canvasSurface: number }
+
+/** Accepted image sources. A Canvas is baked to a surface marker on assign. */
+export type ImageSource = string | FetchResponse | File | SvgSource | Canvas
+
+const toSrc = (src: ImageSource): string | FetchResponse | File | SvgSource | CanvasImageSource =>
+  isCanvas(src) ? { canvasSurface: src._bakeSurface() } : src
+
+/** The stored/resolved image source (a Canvas is resolved to a surface marker). */
+export type ResolvedImageSource = string | FetchResponse | File | SvgSource | CanvasImageSource
+
 export interface UIImage {
   readonly type: "image",
-  src: string | FetchResponse | File | SvgSource,
+  get src(): ResolvedImageSource
+  set src(value: ImageSource)
   style: Style<this, UIImageStyle>
   animateTo: AnimateStyle<this, UIImageStyle>
   animateFrom: AnimateStyle<this, UIImageStyle>
@@ -23,23 +38,23 @@ export interface UIImage {
 }
 
 class ImageElement extends Element<"image"> {
-  private _src: string | FetchResponse | File | SvgSource
+  private _src: ResolvedImageSource
   // Current source sub-rect; undefined until the first setSourceRect. Kept on the node (not
   // just sent as a command) so a crop set while detached (_id == 0) is reapplied at mount —
   // the viewer reads it when it creates the element.
   private _sourceRect?: [number, number, number, number]
-  constructor(style: any, src: string | FetchResponse | File | SvgSource) {
+  constructor(style: any, src: ImageSource) {
     super("image", style)
-    this._src = src
+    this._src = toSrc(src)
   }
 
-  get src() {
+  get src(): ResolvedImageSource {
     return this._src
   }
-  set src(value) {
-    this._src = value
+  set src(value: ImageSource) {
+    this._src = toSrc(value)
     if (this._id !== 0) {
-      _creatorUI.updateNode(this._id, "src", value)
+      _creatorUI.updateNode(this._id, "src", this._src)
     }
   }
 
@@ -57,9 +72,9 @@ class ImageElement extends Element<"image"> {
   }
 }
 
-export function UIImage(src: string | FetchResponse | File | SvgSource): UIImage
-export function UIImage(style: UIImageStyle, src: string | FetchResponse | File | SvgSource): UIImage
-export function UIImage(...args: [string | FetchResponse | File | SvgSource] | [UIImageStyle, string | FetchResponse | File | SvgSource]): UIImage {
+export function UIImage(src: ImageSource): UIImage
+export function UIImage(style: UIImageStyle, src: ImageSource): UIImage
+export function UIImage(...args: [ImageSource] | [UIImageStyle, ImageSource]): UIImage {
   if (args.length === 1) {
     return new ImageElement({}, args[0])
   } else {

package/runtime/sdk/ui/UIScreen.ts

@@ -3,7 +3,12 @@ import { ContainerElement, type AnimateStyle, type BaseStyle, type Color, type C
 
 export type UIScreenStyle = ContainerStyle & DrawableStyle & PaddingStyle & ScrollStyle & BaseStyle & ScrollStyle & { refreshControlColor?: Color }
 
-export interface UIScreen <Scrollable extends boolean = boolean> {
+// Default to `false`: a bare `UIScreen` means the non-scrollable screen the `UIScreen(...)`
+// constructor returns, so `const s: UIScreen = UIScreen([...])` type-checks. The type is invariant
+// in `Scrollable` (the fluent `style()` puts `this` in a contravariant position), so a `boolean`
+// default wouldn't accept the constructor's `UIScreen<false>`. Opt into scrolling via
+// `.makeScrollable(): UIScreen<true>`; write `UIScreen<boolean>` explicitly when you need the union.
+export interface UIScreen <Scrollable extends boolean = false> {
   readonly type: "screen",
   scrollable: Scrollable,
   style: Style<this, UIScreenStyle>,
@@ -31,7 +36,7 @@ export interface UIScreen <Scrollable extends boolean = boolean> {
 
   onLayout(onLayout: OnLayoutCallback): this
 
-  onTouchStart(callback: (ev: TouchStartEvent<UIScreen>) => void): this,
+  onTouchStart(callback: (ev: TouchStartEvent<UIScreen<boolean>>) => void): this,
 }
 
 export class ScreenElement extends ContainerElement<"screen"> {