@efxlab/motion-canvas-2d 4.0.0

package/lib/code/CodeCursor.d.ts

@@ -0,0 +1,84 @@
+import { Vector2 } from '@efxlab/motion-canvas-core';
+import { Code } from '../components';
+import { CodeScope } from './CodeScope';
+export interface CodeFragmentDrawingInfo {
+    text: string;
+    position: Vector2;
+    characterSize: Vector2;
+    cursor: Vector2;
+    fill: string;
+    time: number;
+    alpha: number;
+}
+/**
+ * A stateful class for recursively traversing a code scope.
+ *
+ * @internal
+ */
+export declare class CodeCursor {
+    private readonly node;
+    cursor: Vector2;
+    tweenCursor: Vector2;
+    beforeCursor: Vector2;
+    afterCursor: Vector2;
+    beforeIndex: number;
+    afterIndex: number;
+    private context;
+    private monoWidth;
+    private maxWidth;
+    private lineHeight;
+    private fallbackFill;
+    private caches;
+    private highlighter;
+    private selection;
+    private selectionProgress;
+    private globalProgress;
+    private fragmentDrawingInfo;
+    private fontHeight;
+    private verticalOffset;
+    constructor(node: Code);
+    /**
+     * Prepare the cursor for the next traversal.
+     *
+     * @param context - The context used to measure and draw the code.
+     */
+    setupMeasure(context: CanvasRenderingContext2D): void;
+    setupDraw(context: CanvasRenderingContext2D): void;
+    /**
+     * Measure the desired size of the code scope.
+     *
+     * @remarks
+     * The result can be retrieved with {@link getSize}.
+     *
+     * @param scope - The code scope to measure.
+     */
+    measureSize(scope: CodeScope): void;
+    /**
+     * Get the size measured by the cursor.
+     */
+    getSize(): {
+        x: number;
+        y: number;
+    };
+    /**
+     * Get the drawing information created by the cursor.
+     */
+    getDrawingInfo(): {
+        fragments: CodeFragmentDrawingInfo[];
+        verticalOffset: number;
+        fontHeight: number;
+    };
+    /**
+     * Draw the given code scope.
+     *
+     * @param scope - The code scope to draw.
+     */
+    drawScope(scope: CodeScope): void;
+    private drawToken;
+    private calculateWidth;
+    private calculateMaxWidth;
+    private currentProgress;
+    private processSelection;
+    private isSelected;
+}
+//# sourceMappingURL=CodeCursor.d.ts.map

package/lib/code/CodeCursor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CodeCursor.d.ts","sourceRoot":"","sources":["../../src/lib/code/CodeCursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,OAAO,EACR,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAC;AAKnC,OAAO,EAAC,SAAS,EAAc,MAAM,aAAa,CAAC;AAGnD,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,qBAAa,UAAU;IAqBF,OAAO,CAAC,QAAQ,CAAC,IAAI;IApBjC,MAAM,UAAiB;IACvB,WAAW,UAAiB;IAC5B,YAAY,UAAiB;IAC7B,WAAW,UAAiB;IAC5B,WAAW,SAAK;IAChB,UAAU,SAAK;IACtB,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,YAAY,CAAsB;IAC1C,OAAO,CAAC,MAAM,CAAkD;IAChE,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,iBAAiB,CAAuB;IAChD,OAAO,CAAC,cAAc,CAAgB;IACtC,OAAO,CAAC,mBAAmB,CAAiC;IAC5D,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,cAAc,CAAK;gBAES,IAAI,EAAE,IAAI;IAE9C;;;;OAIG;IACI,YAAY,CAAC,OAAO,EAAE,wBAAwB;IAiB9C,SAAS,CAAC,OAAO,EAAE,wBAAwB;IAalD;;;;;;;OAOG;IACI,WAAW,CAAC,KAAK,EAAE,SAAS;IA8CnC;;OAEG;IACI,OAAO;;;;IAOd;;OAEG;IACI,cAAc;;;;;IAQrB;;;;OAIG;IACI,SAAS,CAAC,KAAK,EAAE,SAAS;IA6EjC,OAAO,CAAC,SAAS;IAyJjB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAkCxB,OAAO,CAAC,UAAU;CAanB"}

package/lib/code/CodeCursor.js

@@ -0,0 +1,315 @@
+import { clampRemap, Color, map, unwrap, Vector2, } from '@efxlab/motion-canvas-core';
+import { parseCodeFragment } from './CodeFragment';
+import { isCodeScope } from './CodeScope';
+import { isPointInCodeSelection } from './CodeSelection';
+/**
+ * A stateful class for recursively traversing a code scope.
+ *
+ * @internal
+ */
+export class CodeCursor {
+    node;
+    cursor = new Vector2();
+    tweenCursor = new Vector2();
+    beforeCursor = new Vector2();
+    afterCursor = new Vector2();
+    beforeIndex = 0;
+    afterIndex = 0;
+    context = {};
+    monoWidth = 0;
+    maxWidth = 0;
+    lineHeight = 0;
+    fallbackFill = new Color('white');
+    caches = null;
+    highlighter = null;
+    selection = [];
+    selectionProgress = null;
+    globalProgress = [];
+    fragmentDrawingInfo = [];
+    fontHeight = 0;
+    verticalOffset = 0;
+    constructor(node) {
+        this.node = node;
+    }
+    /**
+     * Prepare the cursor for the next traversal.
+     *
+     * @param context - The context used to measure and draw the code.
+     */
+    setupMeasure(context) {
+        const metrics = context.measureText('X');
+        this.monoWidth = metrics.width;
+        this.fontHeight =
+            metrics.fontBoundingBoxDescent + metrics.fontBoundingBoxAscent;
+        this.verticalOffset = metrics.fontBoundingBoxAscent;
+        this.context = context;
+        this.lineHeight = parseFloat(this.node.styles.lineHeight);
+        this.cursor = new Vector2();
+        this.tweenCursor = new Vector2();
+        this.beforeCursor = new Vector2();
+        this.afterCursor = new Vector2();
+        this.beforeIndex = 0;
+        this.afterIndex = 0;
+        this.maxWidth = 0;
+    }
+    setupDraw(context) {
+        this.setupMeasure(context);
+        const fill = this.node.fill();
+        this.fallbackFill =
+            fill instanceof Color ? fill : new Color('white');
+        this.caches = this.node.highlighterCache();
+        this.highlighter = this.node.highlighter();
+        this.selection = this.node.selection();
+        this.selectionProgress = this.node.selectionProgress();
+        this.fragmentDrawingInfo = [];
+        this.globalProgress = [];
+    }
+    /**
+     * Measure the desired size of the code scope.
+     *
+     * @remarks
+     * The result can be retrieved with {@link getSize}.
+     *
+     * @param scope - The code scope to measure.
+     */
+    measureSize(scope) {
+        const progress = unwrap(scope.progress);
+        for (const wrapped of scope.fragments) {
+            const possibleFragment = unwrap(wrapped);
+            if (isCodeScope(possibleFragment)) {
+                this.measureSize(possibleFragment);
+                continue;
+            }
+            if (Array.isArray(possibleFragment)) {
+                this.measureSize({
+                    progress: scope.progress,
+                    fragments: possibleFragment,
+                });
+                continue;
+            }
+            const fragment = parseCodeFragment(possibleFragment, this.context, this.monoWidth);
+            const beforeMaxWidth = this.calculateMaxWidth(fragment.before);
+            const afterMaxWidth = this.calculateMaxWidth(fragment.after);
+            const maxWidth = map(beforeMaxWidth, afterMaxWidth, progress);
+            if (maxWidth > this.maxWidth) {
+                this.maxWidth = maxWidth;
+            }
+            const beforeEnd = this.calculateWidth(fragment.before);
+            const afterEnd = this.calculateWidth(fragment.after);
+            this.cursor.x = map(beforeEnd, afterEnd, progress);
+            if (this.cursor.y === 0) {
+                this.cursor.y = 1;
+            }
+            this.cursor.y += map(fragment.before.newRows, fragment.after.newRows, progress);
+        }
+    }
+    /**
+     * Get the size measured by the cursor.
+     */
+    getSize() {
+        return {
+            x: this.maxWidth * this.monoWidth,
+            y: this.cursor.y * this.lineHeight + this.verticalOffset,
+        };
+    }
+    /**
+     * Get the drawing information created by the cursor.
+     */
+    getDrawingInfo() {
+        return {
+            fragments: this.fragmentDrawingInfo,
+            verticalOffset: this.verticalOffset,
+            fontHeight: this.fontHeight,
+        };
+    }
+    /**
+     * Draw the given code scope.
+     *
+     * @param scope - The code scope to draw.
+     */
+    drawScope(scope) {
+        const progress = unwrap(scope.progress);
+        for (const wrappedFragment of scope.fragments) {
+            const possibleFragment = unwrap(wrappedFragment);
+            if (isCodeScope(possibleFragment)) {
+                this.drawScope(possibleFragment);
+                continue;
+            }
+            if (Array.isArray(possibleFragment)) {
+                this.drawScope({
+                    progress: scope.progress,
+                    fragments: possibleFragment,
+                });
+                continue;
+            }
+            const fragment = parseCodeFragment(possibleFragment, this.context, this.monoWidth);
+            const timingOffset = 0.8;
+            let alpha = 1;
+            let offsetY = 0;
+            if (fragment.before.content !== fragment.after.content) {
+                const mirrored = Math.abs(progress - 0.5) * 2;
+                alpha = clampRemap(1, 1 - timingOffset, 1, 0, mirrored);
+                const isBigger = fragment.after.newRows > fragment.before.newRows ? 1 : -1;
+                const isBefore = progress < 0.5 ? 1 : -1;
+                const scale = isBigger * isBefore * 4;
+                offsetY = map(Math.abs(fragment.after.newRows - fragment.before.newRows) / scale, 0, mirrored);
+            }
+            this.drawToken(fragment, scope, this.cursor.addY(offsetY), this.tweenCursor, alpha);
+            this.beforeCursor.x = this.calculateWidth(fragment.before, this.beforeCursor.x);
+            this.afterCursor.x = this.calculateWidth(fragment.after, this.afterCursor.x);
+            this.beforeCursor.y += fragment.before.newRows;
+            this.afterCursor.y += fragment.after.newRows;
+            this.beforeIndex += fragment.before.content.length;
+            this.afterIndex += fragment.after.content.length;
+            this.cursor.y += map(fragment.before.newRows, fragment.after.newRows, progress);
+            const beforeEnd = this.calculateWidth(fragment.before);
+            const afterEnd = this.calculateWidth(fragment.after);
+            this.cursor.x = map(beforeEnd, afterEnd, progress);
+            this.tweenCursor.y +=
+                progress > 0.5 ? fragment.after.newRows : fragment.before.newRows;
+            this.tweenCursor.x = progress > 0.5 ? afterEnd : beforeEnd;
+        }
+    }
+    drawToken(fragment, scope, offset, tweenCursor, alpha) {
+        const progress = unwrap(scope.progress);
+        const currentProgress = this.currentProgress();
+        if (progress > 0) {
+            this.globalProgress.push(progress);
+        }
+        const code = progress < 0.5 ? fragment.before : fragment.after;
+        let hasOffset = true;
+        let width = 0;
+        let stringLength = 0;
+        let y = 0;
+        for (let i = 0; i < code.content.length; i++) {
+            let color = this.fallbackFill.serialize();
+            let char = code.content.charAt(i);
+            const selection = {
+                before: null,
+                after: null,
+            };
+            if (char === '\n') {
+                y++;
+                hasOffset = false;
+                width = 0;
+                stringLength = 0;
+                selection.before = null;
+                selection.after = null;
+                continue;
+            }
+            const beforeHighlight = this.caches &&
+                this.highlighter?.highlight(this.beforeIndex + i, this.caches.before);
+            const afterHighlight = this.caches &&
+                this.highlighter?.highlight(this.afterIndex + i, this.caches.after);
+            const highlight = progress < 0.5 ? beforeHighlight : afterHighlight;
+            if (highlight) {
+                // Handle edge cases where the highlight style changes despite the
+                // content being the same. The code doesn't fade in and out so the color
+                // has to be interpolated to avoid jarring changes.
+                if (fragment.before.content === fragment.after.content &&
+                    beforeHighlight?.color !== afterHighlight?.color) {
+                    highlight.color = Color.lerp(beforeHighlight?.color ?? this.fallbackFill, afterHighlight?.color ?? this.fallbackFill, progress).serialize();
+                }
+                if (highlight.color) {
+                    color = highlight.color;
+                }
+                let skipAhead = 0;
+                do {
+                    if (this.processSelection(selection, skipAhead, hasOffset, stringLength, y)) {
+                        break;
+                    }
+                    skipAhead++;
+                } while (skipAhead < highlight.skipAhead &&
+                    code.content.charAt(i + skipAhead) !== '\n');
+                if (skipAhead > 1) {
+                    char = code.content.slice(i, i + skipAhead);
+                }
+                i += char.length - 1;
+            }
+            else {
+                this.processSelection(selection, 0, hasOffset, stringLength, y);
+                let skipAhead = 1;
+                while (i < code.content.length - 1 &&
+                    code.content.charAt(i + 1) !== '\n') {
+                    if (this.processSelection(selection, skipAhead, hasOffset, stringLength, y)) {
+                        break;
+                    }
+                    skipAhead++;
+                    char += code.content.charAt(++i);
+                }
+            }
+            let time;
+            const selectionAfter = selection.after ?? 0;
+            const selectionBefore = selection.before ?? 0;
+            if (fragment.before.content === '') {
+                time = selectionAfter;
+            }
+            else if (fragment.after.content === '') {
+                time = selectionBefore;
+            }
+            else {
+                time = map(selectionBefore, selectionAfter, this.selectionProgress ?? currentProgress);
+            }
+            const measure = this.context.measureText(char);
+            this.fragmentDrawingInfo.push({
+                text: char,
+                position: new Vector2((hasOffset ? offset.x + width : width) * this.monoWidth, (offset.y + y) * this.lineHeight),
+                cursor: new Vector2(hasOffset ? tweenCursor.x + stringLength : stringLength, tweenCursor.y + y),
+                alpha,
+                characterSize: new Vector2(measure.width / char.length, this.fontHeight),
+                fill: color,
+                time,
+            });
+            stringLength += char.length;
+            width += Math.round(measure.width / this.monoWidth);
+        }
+    }
+    calculateWidth(metrics, x = this.cursor.x) {
+        return metrics.newRows === 0 ? x + metrics.lastWidth : metrics.lastWidth;
+    }
+    calculateMaxWidth(metrics, x = this.cursor.x) {
+        return Math.max(this.maxWidth, metrics.maxWidth, x + metrics.firstWidth);
+    }
+    currentProgress() {
+        if (this.globalProgress.length === 0) {
+            return 0;
+        }
+        let sum = 0;
+        for (const progress of this.globalProgress) {
+            sum += progress;
+        }
+        return sum / this.globalProgress.length;
+    }
+    processSelection(selection, skipAhead, hasOffset, stringLength, y) {
+        let shouldBreak = false;
+        let currentSelected = this.isSelected((hasOffset ? this.beforeCursor.x + stringLength : stringLength) +
+            skipAhead, this.beforeCursor.y + y);
+        if (selection.before !== null && selection.before !== currentSelected) {
+            shouldBreak = true;
+        }
+        else {
+            selection.before = currentSelected;
+        }
+        currentSelected = this.isSelected((hasOffset ? this.afterCursor.x + stringLength : stringLength) +
+            skipAhead, this.afterCursor.y + y, true);
+        if (selection.after !== null && selection.after !== currentSelected) {
+            shouldBreak = true;
+        }
+        else {
+            selection.after = currentSelected;
+        }
+        return shouldBreak;
+    }
+    isSelected(x, y, isAfter) {
+        const point = [y, x];
+        const maxSelection = isPointInCodeSelection(point, this.selection) ? 1 : 0;
+        if (this.node.oldSelection === null || this.selectionProgress === null) {
+            return maxSelection;
+        }
+        if (isAfter) {
+            return maxSelection;
+        }
+        return isPointInCodeSelection(point, this.node.oldSelection) ? 1 : 0;
+    }
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CodeCursor.js","sourceRoot":"","sources":["../../src/lib/code/CodeCursor.ts"],"names":[],"mappings":"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"}

package/lib/code/CodeDiffer.d.ts

@@ -0,0 +1,28 @@
+import { CodeScope, CodeTag } from './CodeScope';
+import { CodeTokenizer } from './CodeTokenizer';
+/**
+ * A function that compares two code snippets and returns a list of
+ * {@link CodeTag}s describing a transition between them.
+ */
+export type CodeDiffer = (
+/**
+ * The original code scope.
+ */
+from: CodeScope, 
+/**
+ * The new code scope.
+ */
+to: CodeScope, 
+/**
+ * The inherited tokenizer to use.
+ */
+tokenize: CodeTokenizer) => CodeTag[];
+/**
+ * Default diffing function utilizing {@link code.patienceDiff}.
+ *
+ * @param from - The original code scope.
+ * @param to - The new code scope.
+ * @param tokenize - The inherited tokenizer to use.
+ */
+export declare function defaultDiffer(from: CodeScope, to: CodeScope, tokenize: CodeTokenizer): CodeTag[];
+//# sourceMappingURL=CodeDiffer.d.ts.map

package/lib/code/CodeDiffer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CodeDiffer.d.ts","sourceRoot":"","sources":["../../src/lib/code/CodeDiffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAG9C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;AACvB;;GAEG;AACH,IAAI,EAAE,SAAS;AACf;;GAEG;AACH,EAAE,EAAE,SAAS;AACb;;GAEG;AACH,QAAQ,EAAE,aAAa,KACpB,OAAO,EAAE,CAAC;AAEf;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,SAAS,EACb,QAAQ,EAAE,aAAa,aA2CxB"}

package/lib/code/CodeDiffer.js

@@ -0,0 +1,51 @@
+import { resolveScope } from './CodeScope';
+import { patienceDiff } from './diff';
+/**
+ * Default diffing function utilizing {@link code.patienceDiff}.
+ *
+ * @param from - The original code scope.
+ * @param to - The new code scope.
+ * @param tokenize - The inherited tokenizer to use.
+ */
+export function defaultDiffer(from, to, tokenize) {
+    const fromString = resolveScope(from, false);
+    const toString = resolveScope(to, true);
+    const diff = patienceDiff(tokenize(fromString), tokenize(toString));
+    const fragments = [];
+    let before = '';
+    let after = '';
+    let lastAdded = false;
+    const flush = () => {
+        if (before !== '' || after !== '') {
+            fragments.push({
+                before,
+                after,
+            });
+            before = '';
+            after = '';
+        }
+    };
+    for (const line of diff.lines) {
+        if (line.aIndex === -1) {
+            if (after !== '' && !lastAdded) {
+                flush();
+            }
+            lastAdded = true;
+            after += line.line;
+        }
+        else if (line.bIndex === -1) {
+            if (before !== '' && lastAdded) {
+                flush();
+            }
+            lastAdded = false;
+            before += line.line;
+        }
+        else {
+            flush();
+            fragments.push(line.line);
+        }
+    }
+    flush();
+    return fragments;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29kZURpZmZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvY29kZS9Db2RlRGlmZmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBcUIsWUFBWSxFQUFDLE1BQU0sYUFBYSxDQUFDO0FBRTdELE9BQU8sRUFBQyxZQUFZLEVBQUMsTUFBTSxRQUFRLENBQUM7QUFxQnBDOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxhQUFhLENBQzNCLElBQWUsRUFDZixFQUFhLEVBQ2IsUUFBdUI7SUFFdkIsTUFBTSxVQUFVLEdBQUcsWUFBWSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztJQUM3QyxNQUFNLFFBQVEsR0FBRyxZQUFZLENBQUMsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBRXhDLE1BQU0sSUFBSSxHQUFHLFlBQVksQ0FBQyxRQUFRLENBQUMsVUFBVSxDQUFDLEVBQUUsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFFcEUsTUFBTSxTQUFTLEdBQWMsRUFBRSxDQUFDO0lBQ2hDLElBQUksTUFBTSxHQUFHLEVBQUUsQ0FBQztJQUNoQixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7SUFDZixJQUFJLFNBQVMsR0FBRyxLQUFLLENBQUM7SUFDdEIsTUFBTSxLQUFLLEdBQUcsR0FBRyxFQUFFO1FBQ2pCLElBQUksTUFBTSxLQUFLLEVBQUUsSUFBSSxLQUFLLEtBQUssRUFBRSxFQUFFLENBQUM7WUFDbEMsU0FBUyxDQUFDLElBQUksQ0FBQztnQkFDYixNQUFNO2dCQUNOLEtBQUs7YUFDTixDQUFDLENBQUM7WUFDSCxNQUFNLEdBQUcsRUFBRSxDQUFDO1lBQ1osS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUNiLENBQUM7SUFDSCxDQUFDLENBQUM7SUFFRixLQUFLLE1BQU0sSUFBSSxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUM5QixJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUN2QixJQUFJLEtBQUssS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztnQkFDL0IsS0FBSyxFQUFFLENBQUM7WUFDVixDQUFDO1lBQ0QsU0FBUyxHQUFHLElBQUksQ0FBQztZQUNqQixLQUFLLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQztRQUNyQixDQUFDO2FBQU0sSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDOUIsSUFBSSxNQUFNLEtBQUssRUFBRSxJQUFJLFNBQVMsRUFBRSxDQUFDO2dCQUMvQixLQUFLLEVBQUUsQ0FBQztZQUNWLENBQUM7WUFDRCxTQUFTLEdBQUcsS0FBSyxDQUFDO1lBQ2xCLE1BQU0sSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ3RCLENBQUM7YUFBTSxDQUFDO1lBQ04sS0FBSyxFQUFFLENBQUM7WUFDUixTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM1QixDQUFDO0lBQ0gsQ0FBQztJQUNELEtBQUssRUFBRSxDQUFDO0lBRVIsT0FBTyxTQUFTLENBQUM7QUFDbkIsQ0FBQyJ9

package/lib/code/CodeFragment.d.ts

@@ -0,0 +1,42 @@
+import { CodeMetrics } from './CodeMetrics';
+export interface CodeFragment {
+    before: CodeMetrics;
+    after: CodeMetrics;
+}
+export interface RawCodeFragment {
+    before: string;
+    after: string;
+}
+export type PossibleCodeFragment = CodeFragment | CodeMetrics | RawCodeFragment | string;
+export declare function metricsToFragment(value: CodeMetrics): CodeFragment;
+export declare function parseCodeFragment(value: PossibleCodeFragment, context: CanvasRenderingContext2D, monoWidth: number): CodeFragment;
+/**
+ * Create a code fragment that represents an insertion of code.
+ *
+ * @remarks
+ * Can be used in conjunction with {@link code.CodeSignalHelpers.edit}.
+ *
+ * @param code - The code to insert.
+ */
+export declare function insert(code: string): RawCodeFragment;
+/**
+ * Create a code fragment that represents a change from one piece of code to
+ * another.
+ *
+ * @remarks
+ * Can be used in conjunction with {@link code.CodeSignalHelpers.edit}.
+ *
+ * @param before - The code to change from.
+ * @param after - The code to change to.
+ */
+export declare function replace(before: string, after: string): RawCodeFragment;
+/**
+ * Create a code fragment that represents a removal of code.
+ *
+ * @remarks
+ * Can be used in conjunction with {@link code.CodeSignalHelpers.edit}.
+ *
+ * @param code - The code to remove.
+ */
+export declare function remove(code: string): RawCodeFragment;
+//# sourceMappingURL=CodeFragment.d.ts.map

package/lib/code/CodeFragment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CodeFragment.d.ts","sourceRoot":"","sources":["../../src/lib/code/CodeFragment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAA+B,MAAM,eAAe,CAAC;AAExE,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,WAAW,CAAC;CACpB;AACD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,oBAAoB,GAC5B,YAAY,GACZ,WAAW,GACX,eAAe,GACf,MAAM,CAAC;AAEX,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,WAAW,GAAG,YAAY,CAKlE;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,oBAAoB,EAC3B,OAAO,EAAE,wBAAwB,EACjC,SAAS,EAAE,MAAM,GAChB,YAAY,CAoBd;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAKpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,eAAe,CAKtE;AAED;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAKpD"}

package/lib/code/CodeFragment.js

@@ -0,0 +1,72 @@
+import { isCodeMetrics, measureString } from './CodeMetrics';
+export function metricsToFragment(value) {
+    return {
+        before: value,
+        after: value,
+    };
+}
+export function parseCodeFragment(value, context, monoWidth) {
+    let fragment;
+    if (typeof value === 'string') {
+        fragment = metricsToFragment(measureString(context, monoWidth, value));
+    }
+    else if (isCodeMetrics(value)) {
+        fragment = metricsToFragment(value);
+    }
+    else {
+        fragment = {
+            before: typeof value.before === 'string'
+                ? measureString(context, monoWidth, value.before)
+                : value.before,
+            after: typeof value.after === 'string'
+                ? measureString(context, monoWidth, value.after)
+                : value.after,
+        };
+    }
+    return fragment;
+}
+/**
+ * Create a code fragment that represents an insertion of code.
+ *
+ * @remarks
+ * Can be used in conjunction with {@link code.CodeSignalHelpers.edit}.
+ *
+ * @param code - The code to insert.
+ */
+export function insert(code) {
+    return {
+        before: '',
+        after: code,
+    };
+}
+/**
+ * Create a code fragment that represents a change from one piece of code to
+ * another.
+ *
+ * @remarks
+ * Can be used in conjunction with {@link code.CodeSignalHelpers.edit}.
+ *
+ * @param before - The code to change from.
+ * @param after - The code to change to.
+ */
+export function replace(before, after) {
+    return {
+        before,
+        after,
+    };
+}
+/**
+ * Create a code fragment that represents a removal of code.
+ *
+ * @remarks
+ * Can be used in conjunction with {@link code.CodeSignalHelpers.edit}.
+ *
+ * @param code - The code to remove.
+ */
+export function remove(code) {
+    return {
+        before: code,
+        after: '',
+    };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29kZUZyYWdtZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9jb2RlL0NvZGVGcmFnbWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWMsYUFBYSxFQUFFLGFBQWEsRUFBQyxNQUFNLGVBQWUsQ0FBQztBQWlCeEUsTUFBTSxVQUFVLGlCQUFpQixDQUFDLEtBQWtCO0lBQ2xELE9BQU87UUFDTCxNQUFNLEVBQUUsS0FBSztRQUNiLEtBQUssRUFBRSxLQUFLO0tBQ2IsQ0FBQztBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsaUJBQWlCLENBQy9CLEtBQTJCLEVBQzNCLE9BQWlDLEVBQ2pDLFNBQWlCO0lBRWpCLElBQUksUUFBc0IsQ0FBQztJQUMzQixJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQzlCLFFBQVEsR0FBRyxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBQ3pFLENBQUM7U0FBTSxJQUFJLGFBQWEsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ2hDLFFBQVEsR0FBRyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN0QyxDQUFDO1NBQU0sQ0FBQztRQUNOLFFBQVEsR0FBRztZQUNULE1BQU0sRUFDSixPQUFPLEtBQUssQ0FBQyxNQUFNLEtBQUssUUFBUTtnQkFDOUIsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxPQUFPLEVBQUUsU0FBUyxFQUFFLEtBQUssQ0FBQyxNQUFNLENBQUM7Z0JBQ2pELENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTTtZQUNsQixLQUFLLEVBQ0gsT0FBTyxLQUFLLENBQUMsS0FBSyxLQUFLLFFBQVE7Z0JBQzdCLENBQUMsQ0FBQyxhQUFhLENBQUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLENBQUMsS0FBSyxDQUFDO2dCQUNoRCxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUs7U0FDbEIsQ0FBQztJQUNKLENBQUM7SUFFRCxPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sVUFBVSxNQUFNLENBQUMsSUFBWTtJQUNqQyxPQUFPO1FBQ0wsTUFBTSxFQUFFLEVBQUU7UUFDVixLQUFLLEVBQUUsSUFBSTtLQUNaLENBQUM7QUFDSixDQUFDO0FBRUQ7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBTSxVQUFVLE9BQU8sQ0FBQyxNQUFjLEVBQUUsS0FBYTtJQUNuRCxPQUFPO1FBQ0wsTUFBTTtRQUNOLEtBQUs7S0FDTixDQUFDO0FBQ0osQ0FBQztBQUVEOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsTUFBTSxDQUFDLElBQVk7SUFDakMsT0FBTztRQUNMLE1BQU0sRUFBRSxJQUFJO1FBQ1osS0FBSyxFQUFFLEVBQUU7S0FDVixDQUFDO0FBQ0osQ0FBQyJ9