@revideo/2d 0.5.10 → 0.5.11-alpha.1100

package/src/lib/code/index.ts

@@ -8,6 +8,6 @@ export * from './CodeSelection';
 export * from './CodeSignal';
 export * from './CodeTokenizer';
 export * from './DefaultHighlightStyle';
-export * from './LezerHighlighter';
 export * from './diff';
 export * from './extractRange';
+export * from './LezerHighlighter';

package/src/lib/components/Audio.ts

@@ -1,4 +1,4 @@
-import {DependencyContext, PlaybackState, viaProxy} from '@revideo/core';
+import {DependencyContext, PlaybackState} from '@revideo/core';
 import {computed, nodeName} from '../decorators';
 import {Media, MediaProps} from './Media';
 
@@ -24,7 +24,7 @@ export class Audio extends Media {
 
   @computed()
   protected audio(): HTMLAudioElement {
-    const src = viaProxy(this.fullSource());
+    const src = this.src();
     const key = `${this.key}/${src}`;
     let audio = Audio.pool[key];
     if (!audio) {

package/src/lib/components/Img.ts

@@ -9,14 +9,31 @@ import {
   SimpleSignal,
   Vector2,
   useLogger,
-  viaProxy,
 } from '@revideo/core';
 import {computed, initial, nodeName, signal} from '../decorators';
 import {DesiredLength} from '../partials';
 import {drawImage} from '../utils';
-import {Asset} from './Asset';
-import {RectProps} from './Rect';
-import imageWithoutSource from './__logs__/image-without-source.md';
+import {Rect, RectProps} from './Rect';
+
+const imageWithoutSource = `
+The image won't be visible unless you specify a source:
+
+\`\`\`tsx
+import myImage from './example.png';
+// ...
+<Img src={myImage} />;
+\`\`\`
+
+If you did this intentionally, and don't want to see this warning, set the \`src\`
+property to \`null\`:
+
+\`\`\`tsx
+<Img src={null} />
+\`\`\`
+
+[Learn more](https://motioncanvas.io/docs/media#images) about working with
+images.
+`;
 
 export interface ImgProps extends RectProps {
   /**
@@ -67,7 +84,7 @@ export interface ImgProps extends RectProps {
  * ```
  */
 @nodeName('Img')
-export class Img extends Asset {
+export class Img extends Rect {
   private static pool: Record<string, HTMLImageElement> = {};
 
   static {
@@ -82,6 +99,24 @@ export class Img extends Asset {
     }
   }
 
+  /**
+   * The source of this image.
+   *
+   * @example
+   * Using a local image:
+   * ```tsx
+   * import image from './example.png';
+   * // ...
+   * view.add(<Img src={image} />)
+   * ```
+   * Loading an image from the internet:
+   * ```tsx
+   * view.add(<Img src="https://example.com/image.png" />)
+   * ```
+   */
+  @signal()
+  public declare readonly src: SimpleSignal<string, this>;
+
   /**
    * The alpha value of this image.
    *
@@ -132,25 +167,19 @@ export class Img extends Asset {
 
   @computed()
   protected image(): HTMLImageElement {
-    const rawSrc = this.fullSource();
-    let src = '';
-    let key = '';
-    if (rawSrc) {
-      key = viaProxy(rawSrc);
-      const url = new URL(key, window.location.origin);
-      if (url.origin === window.location.origin) {
-        const hash = this.view().assetHash();
-        url.searchParams.set('asset-hash', hash);
-      }
-      src = url.toString();
+    const src = this.src();
+    const url = new URL(src, window.location.origin);
+    if (url.origin === window.location.origin) {
+      const hash = this.view().assetHash();
+      url.searchParams.set('asset-hash', hash);
     }
 
-    let image = Img.pool[key];
+    let image = Img.pool[src];
     if (!image) {
       image = document.createElement('img');
       image.crossOrigin = 'anonymous';
       image.src = src;
-      Img.pool[key] = image;
+      Img.pool[src] = image;
     }
 
     if (!image.complete) {
@@ -158,13 +187,12 @@ export class Img extends Asset {
         new Promise((resolve, reject) => {
           image.addEventListener('load', resolve);
           image.addEventListener('error', () =>
+            // TODO: example for error handling inside DependencyContext (this shouldn't be UI specific)
             reject(
               new DetailedError({
                 message: `Failed to load an image`,
                 remarks: `\
 The <code>src</code> property was set to:
-<pre><code>${rawSrc}</code></pre>
-...which resolved to the following url:
 <pre><code>${src}</code></pre>
 Make sure that source is correct and that the image exists.<br/>
 <a target='_blank' href='https://motioncanvas.io/docs/media#images'>Learn more</a>

package/src/lib/components/Layout.ts

@@ -962,9 +962,9 @@ export class Layout extends Node {
 
   @computed()
   protected applyFont() {
-    const loadingFonts = Array.from(document.fonts).filter(
-      font => font.status === 'loading',
-    );
+    const loadingFonts = document.fonts
+      ? Array.from(document.fonts).filter(font => font.status === 'loading')
+      : [];
     if (loadingFonts.length > 0) {
       DependencyContext.collectPromise(
         (async () => {

package/src/lib/components/Line.ts

@@ -20,10 +20,42 @@ import {
 } from '../curves/createCurveProfileLerp';
 import {computed, initial, nodeName, signal} from '../decorators';
 import {arc, drawLine, drawPivot, lineTo, moveTo} from '../utils';
-import lineWithoutPoints from './__logs__/line-without-points.md';
 import {Curve, CurveProps} from './Curve';
 import {Layout} from './Layout';
 
+const lineWithoutPoints = `
+The line won't be visible unless you specify at least two points:
+
+\`\`\`tsx
+<Line
+  stroke="#fff"
+  lineWidth={8}
+  points={[
+    [100, 0],
+    [0, 0],
+    [0, 100],
+  ]}
+/>
+\`\`\`
+
+Alternatively, you can define the points using the children:
+
+\`\`\`tsx
+<Line stroke="#fff" lineWidth={8}>
+  <Node x={100} />
+  <Node />
+  <Node y={100} />
+</Line>
+\`\`\`
+
+If you did this intentionally, and want to disable this message, set the
+\`points\` property to \`null\`:
+
+\`\`\`tsx
+<Line stroke="#fff" lineWidth={8} points={null} />
+\`\`\`
+`;
+
 export interface LineProps extends CurveProps {
   /**
    * {@inheritDoc Line.radius}

package/src/lib/components/Media.ts

@@ -7,12 +7,9 @@ import {
   isReactive,
   useLogger,
   useThread,
-  viaProxy,
 } from '@revideo/core';
 import {computed, initial, nodeName, signal} from '../decorators';
-import {Asset} from './Asset';
-import {RectProps} from './Rect';
-import reactivePlaybackRate from './__logs__/reactive-playback-rate.md';
+import {Rect, RectProps} from './Rect';
 
 export interface MediaProps extends RectProps {
   src?: SignalValue<string>;
@@ -25,8 +22,35 @@ export interface MediaProps extends RectProps {
   allowVolumeAmplificationInPreview?: SignalValue<boolean>;
 }
 
+const reactivePlaybackRate = `
+The \`playbackRate\` of a \`Video\` cannot be reactive.
+
+Make sure to use a concrete value and not a function:
+
+\`\`\`ts wrong
+video.playbackRate(() => 7);
+\`\`\`
+
+\`\`\`ts correct
+video.playbackRate(7);
+\`\`\`
+
+If you're using a signal, extract its value before passing it to the property:
+
+\`\`\`ts wrong
+video.playbackRate(mySignal);
+\`\`\`
+
+\`\`\`ts correct
+video.playbackRate(mySignal());
+\`\`\`
+`;
+
 @nodeName('Media')
-export abstract class Media extends Asset {
+export abstract class Media extends Rect {
+  @signal()
+  public declare readonly src: SimpleSignal<string, this>;
+
   @initial(false)
   @signal()
   public declare readonly loop: SimpleSignal<boolean, this>;
@@ -161,7 +185,7 @@ export abstract class Media extends Asset {
 
   @computed()
   protected amplify(node: HTMLMediaElement, volume: number) {
-    const key = `${viaProxy(this.fullSource())}/${this.key}`;
+    const key = `${this.src()}/${this.key}`;
 
     if (Media.amplificationPool[key]) {
       Media.amplificationPool[key].gainNode.gain.value = volume;

package/src/lib/components/Rive.ts

@@ -1,10 +1,4 @@
-import {
-  BBox,
-  SignalValue,
-  SimpleSignal,
-  useThread,
-  viaProxy,
-} from '@revideo/core';
+import {BBox, SignalValue, SimpleSignal, useThread} from '@revideo/core';
 import RiveInitializer, {
   Artboard,
   File,
@@ -13,8 +7,7 @@ import RiveInitializer, {
   RiveCanvas,
 } from '@rive-app/canvas-advanced';
 import {computed, initial, nodeName, signal} from '../decorators';
-import {Asset} from './Asset';
-import {RectProps} from './Rect';
+import {Rect, RectProps} from './Rect';
 
 export interface RiveProps extends RectProps {
   src?: SignalValue<string>;
@@ -31,7 +24,10 @@ interface RiveInstance {
 }
 
 @nodeName('Rive')
-export class Rive extends Asset {
+export class Rive extends Rect {
+  @signal()
+  public declare readonly src: SimpleSignal<string, this>;
+
   @initial(0)
   @signal()
   public declare readonly artboardId: SimpleSignal<number | string, this>;
@@ -57,7 +53,7 @@ export class Rive extends Asset {
 
   @computed()
   private async rive(): Promise<RiveInstance> {
-    const src = viaProxy(this.fullSource());
+    const src = this.src();
     const rive = await RiveInitializer({
       locateFile: () => {
         return '/@rive-wasm';

package/src/lib/components/Spline.ts

@@ -29,7 +29,33 @@ import {
 import {Curve, CurveProps} from './Curve';
 import {Knot} from './Knot';
 import {Node} from './Node';
-import splineWithInsufficientKnots from './__logs__/spline-with-insufficient-knots.md';
+
+const splineWithInsufficientKnots = `
+The spline won't be visible unless you specify at least two knots:
+
+\`\`\`tsx
+<Spline
+  stroke="#fff"
+  lineWidth={8}
+  points={[
+    [100, 0],
+    [0, 0],
+    [0, 100],
+  ]}
+/>
+\`\`\`
+
+For more control over the knot handles, you can alternatively provide the knots
+as children to the spline using the \`Knot\` component:
+
+\`\`\`tsx
+<Spline stroke="#fff" lineWidth={8}>
+  <Knot x={100} endHandle={[-50, 0]} />
+  <Knot />
+  <Knot y={100} startHandle={[-100, 50]} />
+</Spline>
+\`\`\`
+`;
 
 export interface SplineProps extends CurveProps {
   /**

package/src/lib/components/TxtLeaf.ts

@@ -15,7 +15,6 @@ import {
 } from '../decorators';
 import {Shape, ShapeProps} from './Shape';
 import {Txt} from './Txt';
-import {View2D} from './View2D';
 
 export interface TxtLeafProps extends ShapeProps {
   children?: string;
@@ -24,13 +23,6 @@ export interface TxtLeafProps extends ShapeProps {
 
 @nodeName('TxtLeaf')
 export class TxtLeaf extends Shape {
-  @lazy(() => {
-    const formatter = document.createElement('span');
-    View2D.shadowRoot.append(formatter);
-    return formatter;
-  })
-  protected static formatter: HTMLDivElement;
-
   @lazy(() => {
     try {
       return new (Intl as any).Segmenter(undefined, {
@@ -66,9 +58,11 @@ export class TxtLeaf extends Shape {
     await document.fonts?.ready;
     this.applyText(context);
     context.font = this.styles.font;
+    context.textBaseline = 'bottom';
     if ('letterSpacing' in context) {
       context.letterSpacing = `${this.letterSpacing()}px`;
     }
+    const fontOffset = context.measureText('').fontBoundingBoxAscent;
 
     const parentRect = this.element.getBoundingClientRect();
     const {width, height} = this.size();
@@ -84,7 +78,7 @@ export class TxtLeaf extends Shape {
       const rangeRect = range.getBoundingClientRect();
 
       const x = width / -2 + rangeRect.left - parentRect.left;
-      const y = height / -2 + rangeRect.top - parentRect.top;
+      const y = height / -2 + rangeRect.top - parentRect.top + fontOffset;
 
       if (lineRect.y === y) {
         lineRect.width += rangeRect.width;
@@ -107,9 +101,7 @@ export class TxtLeaf extends Shape {
     text: string,
     box: BBox,
   ) {
-    const y = box.y + box.height / 2;
-    context.save();
-    context.textBaseline = 'middle';
+    const y = box.y;
     text = text.replace(/\s+/g, ' ');
     if (this.lineWidth() <= 0) {
       context.fillText(text, box.x, y);
@@ -120,7 +112,6 @@ export class TxtLeaf extends Shape {
       context.fillText(text, box.x, y);
       context.strokeText(text, box.x, y);
     }
-    context.restore();
   }
 
   protected override getCacheBBox(): BBox {

package/src/lib/components/Video.ts

@@ -5,7 +5,6 @@ import {
   SerializedVector2,
   SignalValue,
   SimpleSignal,
-  viaProxy,
 } from '@revideo/core';
 import Hls from 'hls.js';
 import {computed, initial, nodeName, signal} from '../decorators';
@@ -112,7 +111,7 @@ export class Video extends Media {
 
   @computed()
   private video(): HTMLVideoElement {
-    const src = viaProxy(this.fullSource());
+    const src = this.src();
     const key = `${this.key}/${src}`;
     let video = Video.pool[key];
     if (!video) {
@@ -336,7 +335,7 @@ export class Video extends Media {
   private detectFileType() {
     return DependencyContext.collectPromise(
       (async () => {
-        const src = this.fullSource();
+        const src = this.src();
         const extension = src.split('?')[0].split('.').pop()?.toLowerCase();
 
         if (

package/src/lib/components/View2D.ts

@@ -11,6 +11,7 @@ export interface View2DProps extends RectProps {
 
 @nodeName('View2D')
 export class View2D extends Rect {
+  // TODO: scope this to individual player
   @lazy(() => {
     const frameID = 'revideo-2d-frame';
     let frame = document.querySelector<HTMLDivElement>(`#${frameID}`);

package/src/lib/components/__tests__/mockScene2D.ts

@@ -3,14 +3,12 @@ import {
   PlaybackManager,
   PlaybackStatus,
   ThreadGeneratorFactory,
-  ValueDispatcher,
   Vector2,
   endPlayback,
   endScene,
   startPlayback,
   startScene,
 } from '@revideo/core';
-import {ReadOnlyTimeEvents} from '@revideo/core/lib/scenes/timeEvents';
 import {afterAll, beforeAll, beforeEach} from 'vitest';
 import {Scene2D, makeScene2D} from '../../scenes';
 import {View2D} from '../View2D';
@@ -26,16 +24,14 @@ export function mockScene2D() {
   const playback = new PlaybackManager();
   const status = new PlaybackStatus(playback);
   const description = {
-    ...makeScene2D(function* () {
+    ...makeScene2D('scene 1', function* () {
       // do nothing
     }),
     name: 'test',
     size: new Vector2(1920, 1080),
     resolutionScale: 1,
-    timeEventsClass: ReadOnlyTimeEvents,
     playback: status,
   } as unknown as FullSceneDescription<ThreadGeneratorFactory<View2D>>;
-  description.onReplaced = new ValueDispatcher(description);
   const scene = new Scene2D(description);
 
   beforeAll(() => {

package/src/lib/components/index.ts

@@ -19,10 +19,10 @@ export * from './QuadBezier';
 export * from './Ray';
 export * from './Rect';
 export * from './Rive';
-export * from './SVG';
 export * from './Shape';
 export * from './Spline';
+export * from './SVG';
 export * from './Txt';
+export * from './types';
 export * from './Video';
 export * from './View2D';
-export * from './types';

package/src/lib/curves/index.ts

@@ -3,14 +3,14 @@ export * from './CubicBezierSegment';
 export * from './CurveDrawingInfo';
 export * from './CurvePoint';
 export * from './CurveProfile';
+export * from './getBezierSplineProfile';
+export * from './getCircleProfile';
+export * from './getPointAtDistance';
+export * from './getPolylineProfile';
+export * from './getRectProfile';
 export * from './KnotInfo';
 export * from './LineSegment';
 export * from './Polynomial';
 export * from './Polynomial2D';
 export * from './QuadBezierSegment';
 export * from './Segment';
-export * from './getBezierSplineProfile';
-export * from './getCircleProfile';
-export * from './getPointAtDistance';
-export * from './getPolylineProfile';
-export * from './getRectProfile';

package/src/lib/globals.d.ts

@@ -1,3 +1,2 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /// <reference types="@revideo/core/project" />
-/// <reference types="@revideo/internal" />

package/src/lib/partials/Pattern.ts

@@ -9,7 +9,6 @@ export type CanvasRepetition =
   | 'repeat-y'
   | 'no-repeat';
 
-// TODO Support custom transformation matrices
 export interface PatternProps {
   image: CanvasImageSource;
   repetition?: CanvasRepetition;

package/src/lib/scenes/Scene2D.ts

@@ -173,7 +173,7 @@ export class Scene2D extends GeneratorScene<View2D> implements Inspectable {
       ...playingVideos.map(vid => ({
         key: vid.key,
         type: 'video' as const,
-        src: vid.getUrl(),
+        src: vid.src(),
         decoder: vid.decoder(),
         playbackRate:
           typeof vid.playbackRate === 'function'
@@ -189,7 +189,7 @@ export class Scene2D extends GeneratorScene<View2D> implements Inspectable {
       ...playingAudios.map(audio => ({
         key: audio.key,
         type: 'audio' as const,
-        src: audio.fullSource(),
+        src: audio.src(),
         playbackRate:
           typeof audio.playbackRate === 'function'
             ? audio.playbackRate()
@@ -220,7 +220,6 @@ export class Scene2D extends GeneratorScene<View2D> implements Inspectable {
 
     for (const media of mediaNodes) {
       media.setVolume(media.getVolume() * volumeScale);
-      console.log(media.key);
     }
   }
 

package/src/lib/scenes/index.ts

@@ -1,3 +1,3 @@
-export * from './Scene2D';
 export * from './makeScene2D';
+export * from './Scene2D';
 export * from './useScene2D';

package/src/lib/scenes/makeScene2D.ts

@@ -1,19 +1,16 @@
-import {
-  createSceneMetadata,
-  DescriptionOf,
-  ThreadGeneratorFactory,
-} from '@revideo/core';
+import {DescriptionOf, ThreadGeneratorFactory} from '@revideo/core';
 import type {View2D} from '../components';
 import {Scene2D} from './Scene2D';
 
 export function makeScene2D(
+  name: string,
   runner: ThreadGeneratorFactory<View2D>,
 ): DescriptionOf<Scene2D> {
   return {
     klass: Scene2D,
+    name,
     config: runner,
     stack: new Error().stack,
-    meta: createSceneMetadata(),
     plugins: ['@revideo/2d/editor'],
   };
 }

package/src/lib/tsconfig.json

@@ -3,12 +3,8 @@
   "compilerOptions": {
     "types": ["node"],
     "jsx": "react-jsx",
-    "jsxImportSource": "@revideo/2d/src/lib",
-    "plugins": [
-      {
-        "transform": "@revideo/internal/transformers/markdown-literals.js"
-      }
-    ]
+    "jsxImportSource": "@revideo/2d/src/lib"
   },
-  "include": ["**/*"]
+  "include": ["**/*"],
+  "exclude": []
 }

package/lib/components/Asset.d.ts

@@ -1,24 +0,0 @@
-import { SimpleSignal } from '@revideo/core';
-import { Rect } from './Rect';
-/**
- * A component that has a source. Used as a base class for `Media` and `Img` components.
- */
-export declare abstract class Asset extends Rect {
-    /**
-     * The source of this asset.
-     *
-     * @example
-     * Using a local path, with the resource inside the /public folder:
-     * ```tsx
-     * view.add(<Img src={'/image.png} />)
-     * ```
-     * Loading a resource from the internet:
-     * ```tsx
-     * view.add(<Img src="https://example.com/image.png" />)
-     * ```
-     */
-    readonly src: SimpleSignal<string, this>;
-    assetRoot?: `${string}/`;
-    fullSource(): string;
-}
-//# sourceMappingURL=Asset.d.ts.map

package/lib/components/Asset.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Asset.d.ts","sourceRoot":"","sources":["../../src/lib/components/Asset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAe,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAE5B;;GAEG;AACH,8BACsB,KAAM,SAAQ,IAAI;IACtC;;;;;;;;;;;;OAYG;IACH,SACwB,GAAG,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAEjD,SAAS,CAAC,EAAE,GAAG,MAAM,GAAG,CAAC;IAEzB,UAAU,IAAI,MAAM;CAuB5B"}

package/lib/components/Asset.js

@@ -1,40 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { useAssetBase } from '@revideo/core';
-import { nodeName, signal } from '../decorators';
-import { Rect } from './Rect';
-/**
- * A component that has a source. Used as a base class for `Media` and `Img` components.
- */
-let Asset = class Asset extends Rect {
-    fullSource() {
-        if (!this.assetRoot) {
-            this.assetRoot = useAssetBase();
-        }
-        let src = this.src();
-        const isUrl = src.startsWith('http://') ||
-            src.startsWith('https://') ||
-            src.startsWith('data:');
-        if (isUrl) {
-            return src;
-        }
-        // We remove the trailing slash from the assetRoot
-        // and make sure there is a leading slash in the src
-        if (src[0] !== '/') {
-            src = '/' + src;
-        }
-        return this.assetRoot.slice(0, -1) + src;
-    }
-};
-__decorate([
-    signal()
-], Asset.prototype, "src", void 0);
-Asset = __decorate([
-    nodeName('Asset')
-], Asset);
-export { Asset };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXNzZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL2NvbXBvbmVudHMvQXNzZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFlLFlBQVksRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUN6RCxPQUFPLEVBQUMsUUFBUSxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUMvQyxPQUFPLEVBQUMsSUFBSSxFQUFDLE1BQU0sUUFBUSxDQUFDO0FBRTVCOztHQUVHO0FBRUksSUFBZSxLQUFLLEdBQXBCLE1BQWUsS0FBTSxTQUFRLElBQUk7SUFtQi9CLFVBQVU7UUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO1lBQ3BCLElBQUksQ0FBQyxTQUFTLEdBQUcsWUFBWSxFQUFFLENBQUM7UUFDbEMsQ0FBQztRQUVELElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNyQixNQUFNLEtBQUssR0FDVCxHQUFHLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQztZQUN6QixHQUFHLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQztZQUMxQixHQUFHLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRTFCLElBQUksS0FBSyxFQUFFLENBQUM7WUFDVixPQUFPLEdBQUcsQ0FBQztRQUNiLENBQUM7UUFFRCxrREFBa0Q7UUFDbEQsb0RBQW9EO1FBQ3BELElBQUksR0FBRyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1lBQ25CLEdBQUcsR0FBRyxHQUFHLEdBQUcsR0FBRyxDQUFDO1FBQ2xCLENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsQ0FBQztJQUMzQyxDQUFDO0NBQ0YsQ0FBQTtBQTNCeUI7SUFEdkIsTUFBTSxFQUFFO2tDQUMrQztBQWZwQyxLQUFLO0lBRDFCLFFBQVEsQ0FBQyxPQUFPLENBQUM7R0FDSSxLQUFLLENBMEMxQiJ9