@revideo/2d 0.2.5 → 0.2.6-alpha.906
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/code/CodeCursor.d.ts +74 -74
- package/lib/code/CodeCursor.js +286 -352
- package/lib/code/CodeDiffer.d.ts +16 -21
- package/lib/code/CodeDiffer.js +41 -39
- package/lib/code/CodeFragment.d.ts +8 -16
- package/lib/code/CodeFragment.js +36 -36
- package/lib/code/CodeHighlighter.d.ts +59 -59
- package/lib/code/CodeHighlighter.js +1 -1
- package/lib/code/CodeMetrics.d.ts +8 -12
- package/lib/code/CodeMetrics.js +24 -26
- package/lib/code/CodeRange.d.ts +5 -21
- package/lib/code/CodeRange.js +124 -131
- package/lib/code/CodeScope.d.ts +8 -18
- package/lib/code/CodeScope.js +61 -59
- package/lib/code/CodeSelection.d.ts +4 -9
- package/lib/code/CodeSelection.js +8 -8
- package/lib/code/CodeSignal.d.ts +47 -74
- package/lib/code/CodeSignal.js +189 -206
- package/lib/code/CodeTokenizer.d.ts +1 -1
- package/lib/code/CodeTokenizer.js +41 -41
- package/lib/code/DefaultHighlightStyle.d.ts +2 -2
- package/lib/code/DefaultHighlightStyle.js +96 -96
- package/lib/code/LezerHighlighter.d.ts +19 -21
- package/lib/code/LezerHighlighter.js +101 -101
- package/lib/code/diff.d.ts +9 -12
- package/lib/code/diff.js +205 -218
- package/lib/code/extractRange.d.ts +4 -7
- package/lib/code/extractRange.js +71 -79
- package/lib/code/index.d.ts +1 -1
- package/lib/code/index.js +1 -1
- package/lib/components/Audio.d.ts +11 -11
- package/lib/components/Audio.d.ts.map +1 -1
- package/lib/components/Audio.js +109 -115
- package/lib/components/Bezier.d.ts +18 -18
- package/lib/components/Bezier.js +75 -86
- package/lib/components/Circle.d.ts +90 -95
- package/lib/components/Circle.js +74 -85
- package/lib/components/Code.d.ts +211 -244
- package/lib/components/Code.d.ts.map +1 -1
- package/lib/components/Code.js +269 -317
- package/lib/components/CodeBlock.d.ts +67 -109
- package/lib/components/CodeBlock.d.ts.map +1 -1
- package/lib/components/CodeBlock.js +373 -414
- package/lib/components/CubicBezier.d.ts +36 -36
- package/lib/components/CubicBezier.js +49 -52
- package/lib/components/Curve.d.ts +198 -208
- package/lib/components/Curve.js +269 -270
- package/lib/components/Grid.d.ts +42 -47
- package/lib/components/Grid.js +56 -63
- package/lib/components/Icon.d.ts +50 -55
- package/lib/components/Icon.js +50 -58
- package/lib/components/Img.d.ts +79 -86
- package/lib/components/Img.d.ts.map +1 -1
- package/lib/components/Img.js +181 -193
- package/lib/components/Knot.d.ts +78 -97
- package/lib/components/Knot.js +60 -81
- package/lib/components/Latex.d.ts +12 -12
- package/lib/components/Latex.js +65 -77
- package/lib/components/Layout.d.ts +413 -455
- package/lib/components/Layout.d.ts.map +1 -1
- package/lib/components/Layout.js +681 -666
- package/lib/components/Line.d.ts +49 -61
- package/lib/components/Line.js +193 -216
- package/lib/components/Media.d.ts +35 -35
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +134 -135
- package/lib/components/Node.d.ts +830 -875
- package/lib/components/Node.d.ts.map +1 -1
- package/lib/components/Node.js +1314 -1383
- package/lib/components/Path.d.ts +14 -35
- package/lib/components/Path.js +89 -100
- package/lib/components/Polygon.d.ts +55 -60
- package/lib/components/Polygon.js +66 -71
- package/lib/components/QuadBezier.d.ts +29 -29
- package/lib/components/QuadBezier.js +45 -50
- package/lib/components/Ray.d.ts +28 -28
- package/lib/components/Ray.js +64 -71
- package/lib/components/Rect.d.ts +108 -115
- package/lib/components/Rect.js +72 -78
- package/lib/components/SVG.d.ts +139 -165
- package/lib/components/SVG.js +541 -609
- package/lib/components/Shape.d.ts +35 -44
- package/lib/components/Shape.d.ts.map +1 -1
- package/lib/components/Shape.js +127 -112
- package/lib/components/Spline.d.ts +40 -46
- package/lib/components/Spline.js +175 -190
- package/lib/components/Txt.d.ts +44 -55
- package/lib/components/Txt.d.ts.map +1 -1
- package/lib/components/Txt.js +155 -156
- package/lib/components/TxtLeaf.d.ts +16 -20
- package/lib/components/TxtLeaf.d.ts.map +1 -1
- package/lib/components/TxtLeaf.js +2 -2
- package/lib/components/Video.d.ts +45 -41
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +207 -138
- package/lib/components/View2D.d.ts +22 -21
- package/lib/components/View2D.d.ts.map +1 -1
- package/lib/components/View2D.js +89 -98
- package/lib/components/index.d.ts +1 -1
- package/lib/components/index.js +1 -1
- package/lib/components/types.d.ts +9 -22
- package/lib/components/types.js +1 -1
- package/lib/curves/ArcSegment.d.ts +24 -36
- package/lib/curves/ArcSegment.js +94 -145
- package/lib/curves/CircleSegment.d.ts +16 -26
- package/lib/curves/CircleSegment.js +49 -56
- package/lib/curves/CubicBezierSegment.d.ts +13 -18
- package/lib/curves/CubicBezierSegment.js +46 -79
- package/lib/curves/CurveDrawingInfo.d.ts +9 -9
- package/lib/curves/CurveDrawingInfo.js +1 -1
- package/lib/curves/CurvePoint.d.ts +13 -13
- package/lib/curves/CurvePoint.js +1 -1
- package/lib/curves/CurveProfile.d.ts +5 -5
- package/lib/curves/CurveProfile.js +1 -1
- package/lib/curves/KnotInfo.d.ts +8 -8
- package/lib/curves/KnotInfo.js +1 -1
- package/lib/curves/LineSegment.d.ts +14 -19
- package/lib/curves/LineSegment.js +42 -42
- package/lib/curves/Polynomial.d.ts +110 -110
- package/lib/curves/Polynomial.js +239 -249
- package/lib/curves/Polynomial2D.d.ts +20 -20
- package/lib/curves/Polynomial2D.js +42 -46
- package/lib/curves/PolynomialSegment.d.ts +37 -42
- package/lib/curves/PolynomialSegment.js +81 -83
- package/lib/curves/QuadBezierSegment.d.ts +12 -12
- package/lib/curves/QuadBezierSegment.js +41 -71
- package/lib/curves/Segment.d.ts +7 -12
- package/lib/curves/Segment.js +3 -2
- package/lib/curves/UniformPolynomialCurveSampler.d.ts +34 -34
- package/lib/curves/UniformPolynomialCurveSampler.js +62 -68
- package/lib/curves/createCurveProfileLerp.d.ts +6 -17
- package/lib/curves/createCurveProfileLerp.js +208 -211
- package/lib/curves/getBezierSplineProfile.d.ts +4 -8
- package/lib/curves/getBezierSplineProfile.js +101 -145
- package/lib/curves/getCircleProfile.d.ts +4 -10
- package/lib/curves/getCircleProfile.js +40 -72
- package/lib/curves/getPathProfile.d.ts +2 -2
- package/lib/curves/getPathProfile.js +112 -135
- package/lib/curves/getPointAtDistance.d.ts +4 -7
- package/lib/curves/getPointAtDistance.js +12 -12
- package/lib/curves/getPolylineProfile.d.ts +4 -8
- package/lib/curves/getPolylineProfile.js +54 -67
- package/lib/curves/getRectProfile.d.ts +4 -9
- package/lib/curves/getRectProfile.js +52 -117
- package/lib/curves/index.d.ts +1 -1
- package/lib/curves/index.js +1 -1
- package/lib/decorators/canvasStyleSignal.d.ts +3 -3
- package/lib/decorators/canvasStyleSignal.js +10 -10
- package/lib/decorators/colorSignal.d.ts +1 -1
- package/lib/decorators/colorSignal.js +7 -7
- package/lib/decorators/compound.d.ts +2 -4
- package/lib/decorators/compound.js +23 -43
- package/lib/decorators/computed.d.ts +1 -1
- package/lib/decorators/computed.js +9 -9
- package/lib/decorators/defaultStyle.d.ts +2 -5
- package/lib/decorators/defaultStyle.js +11 -11
- package/lib/decorators/filtersSignal.d.ts +8 -28
- package/lib/decorators/filtersSignal.js +64 -87
- package/lib/decorators/index.d.ts +1 -1
- package/lib/decorators/index.js +1 -1
- package/lib/decorators/initializers.d.ts +2 -5
- package/lib/decorators/initializers.js +19 -18
- package/lib/decorators/nodeName.d.ts +1 -1
- package/lib/decorators/nodeName.js +4 -4
- package/lib/decorators/signal.d.ts +20 -40
- package/lib/decorators/signal.js +104 -113
- package/lib/decorators/spacingSignal.d.ts +1 -1
- package/lib/decorators/spacingSignal.js +13 -13
- package/lib/decorators/vector2Signal.d.ts +7 -13
- package/lib/decorators/vector2Signal.js +13 -15
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/jsx-dev-runtime.d.ts +3 -3
- package/lib/jsx-dev-runtime.js +3 -3
- package/lib/jsx-runtime.d.ts +9 -19
- package/lib/jsx-runtime.js +18 -18
- package/lib/partials/Filter.d.ts +16 -24
- package/lib/partials/Filter.js +69 -69
- package/lib/partials/Gradient.d.ts +24 -30
- package/lib/partials/Gradient.js +58 -69
- package/lib/partials/Pattern.d.ts +9 -14
- package/lib/partials/Pattern.js +24 -30
- package/lib/partials/ShaderConfig.d.ts +74 -81
- package/lib/partials/ShaderConfig.js +23 -22
- package/lib/partials/index.d.ts +1 -1
- package/lib/partials/index.js +1 -1
- package/lib/partials/types.d.ts +6 -19
- package/lib/partials/types.js +1 -1
- package/lib/scenes/Scene2D.d.ts +23 -42
- package/lib/scenes/Scene2D.d.ts.map +1 -1
- package/lib/scenes/Scene2D.js +152 -161
- package/lib/scenes/index.d.ts +1 -1
- package/lib/scenes/index.js +1 -1
- package/lib/scenes/makeScene2D.d.ts +5 -7
- package/lib/scenes/makeScene2D.js +10 -10
- package/lib/scenes/useScene2D.d.ts +2 -2
- package/lib/scenes/useScene2D.js +3 -3
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/CanvasUtils.d.ts +21 -93
- package/lib/utils/CanvasUtils.js +105 -186
- package/lib/utils/diff.d.ts +18 -25
- package/lib/utils/diff.js +87 -84
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/is.d.ts +2 -4
- package/lib/utils/is.js +2 -2
- package/lib/utils/makeSignalExtensions.d.ts +4 -11
- package/lib/utils/makeSignalExtensions.js +17 -17
- package/package.json +5 -5
- package/src/lib/components/Audio.ts +2 -2
- package/src/lib/components/Code.ts +4 -2
- package/src/lib/components/CodeBlock.ts +1 -1
- package/src/lib/components/Img.ts +2 -2
- package/src/lib/components/Layout.ts +2 -2
- package/src/lib/components/Media.ts +3 -1
- package/src/lib/components/Node.ts +9 -9
- package/src/lib/components/Shape.ts +2 -2
- package/src/lib/components/Txt.ts +2 -2
- package/src/lib/components/TxtLeaf.ts +1 -1
- package/src/lib/components/Video.ts +120 -8
- package/src/lib/components/View2D.ts +6 -2
- package/src/lib/scenes/Scene2D.ts +4 -3
package/lib/code/diff.js
CHANGED
|
@@ -14,221 +14,206 @@
|
|
|
14
14
|
* {@link https://github.com/jonTrent/PatienceDiff}
|
|
15
15
|
*/
|
|
16
16
|
export function patienceDiff(aLines, bLines) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Finds all unique values in lines[start...end], inclusive. This
|
|
19
|
+
* function is used in preparation for determining the longest common
|
|
20
|
+
* subsequence.
|
|
21
|
+
*
|
|
22
|
+
* @param lines - The array to search
|
|
23
|
+
* @param start - The starting index (inclusive)
|
|
24
|
+
* @param end - The ending index (inclusive)
|
|
25
|
+
* @returns A map of the unique lines to their index
|
|
26
|
+
*/
|
|
27
|
+
function findUnique(lines, start, end) {
|
|
28
|
+
const lineMap = new Map();
|
|
29
|
+
for (let i = start; i <= end; i++) {
|
|
30
|
+
const line = lines[i];
|
|
31
|
+
const data = lineMap.get(line);
|
|
32
|
+
if (data) {
|
|
33
|
+
data.count++;
|
|
34
|
+
data.index = i;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
lineMap.set(line, { count: 1, index: i });
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
const newMap = new Map();
|
|
41
|
+
for (const [key, value] of lineMap) {
|
|
42
|
+
if (value.count === 1) {
|
|
43
|
+
newMap.set(key, value.index);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return newMap;
|
|
38
47
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
48
|
+
/**
|
|
49
|
+
* Finds all the unique common entries between aArray[aStart...aEnd] and
|
|
50
|
+
* bArray[bStart...bEnd], inclusive. This function uses findUnique to pare
|
|
51
|
+
* down the aArray and bArray ranges first, before then walking the
|
|
52
|
+
* comparison between the two arrays.
|
|
53
|
+
*
|
|
54
|
+
*
|
|
55
|
+
* @param aArray - The original array
|
|
56
|
+
* @param aStart - The start of the original array to search
|
|
57
|
+
* @param aEnd - The end of the original array to search, inclusive
|
|
58
|
+
* @param bArray - The new array
|
|
59
|
+
* @param bStart - the start of the new array to search
|
|
60
|
+
* @param bEnd - The end of the new array to search, inclusive
|
|
61
|
+
* @returns a Map, with the key as the common line between aArray and
|
|
62
|
+
* bArray, with the value as an object containing the array indices of the
|
|
63
|
+
* matching uniqe lines.
|
|
64
|
+
*/
|
|
65
|
+
function uniqueCommon(aArray, aStart, aEnd, bArray, bStart, bEnd) {
|
|
66
|
+
const aUnique = findUnique(aArray, aStart, aEnd);
|
|
67
|
+
const bUnique = findUnique(bArray, bStart, bEnd);
|
|
68
|
+
return [...aUnique.entries()].reduce((paired, [key, value]) => {
|
|
69
|
+
const bIndex = bUnique.get(key);
|
|
70
|
+
if (bIndex !== undefined) {
|
|
71
|
+
paired.set(key, {
|
|
72
|
+
aIndex: value,
|
|
73
|
+
bIndex,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
return paired;
|
|
77
|
+
}, new Map());
|
|
44
78
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
aIndex: value,
|
|
72
|
-
bIndex,
|
|
79
|
+
/**
|
|
80
|
+
* Takes a map from the unique common lines between two arrays and determines
|
|
81
|
+
* the longest common subsequence.
|
|
82
|
+
*
|
|
83
|
+
* @see uniqueCommon
|
|
84
|
+
*
|
|
85
|
+
* @param abMap - The map of unique common lines between two arrays.
|
|
86
|
+
* @returns An array of objects containing the indices of the longest common
|
|
87
|
+
* subsequence.
|
|
88
|
+
*/
|
|
89
|
+
function longestCommonSubsequence(abMap) {
|
|
90
|
+
const jagged = [];
|
|
91
|
+
abMap.forEach(value => {
|
|
92
|
+
let i = 0;
|
|
93
|
+
while (jagged[i] && jagged[i].at(-1).bIndex < value.bIndex) {
|
|
94
|
+
i++;
|
|
95
|
+
}
|
|
96
|
+
if (i > 0) {
|
|
97
|
+
value.prev = jagged[i - 1].at(-1);
|
|
98
|
+
}
|
|
99
|
+
if (!jagged[i]) {
|
|
100
|
+
jagged[i] = [value];
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
jagged[i].push(value);
|
|
104
|
+
}
|
|
73
105
|
});
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
* @returns An array of objects containing the indices of the longest common
|
|
86
|
-
* subsequence.
|
|
87
|
-
*/
|
|
88
|
-
function longestCommonSubsequence(abMap) {
|
|
89
|
-
const jagged = [];
|
|
90
|
-
abMap.forEach(value => {
|
|
91
|
-
let i = 0;
|
|
92
|
-
while (jagged[i] && jagged[i].at(-1).bIndex < value.bIndex) {
|
|
93
|
-
i++;
|
|
94
|
-
}
|
|
95
|
-
if (i > 0) {
|
|
96
|
-
value.prev = jagged[i - 1].at(-1);
|
|
97
|
-
}
|
|
98
|
-
if (!jagged[i]) {
|
|
99
|
-
jagged[i] = [value];
|
|
100
|
-
} else {
|
|
101
|
-
jagged[i].push(value);
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
// Pull out the longest common subsequence
|
|
105
|
-
let lcs = [];
|
|
106
|
-
if (jagged.length > 0) {
|
|
107
|
-
lcs = [jagged.at(-1).at(-1)];
|
|
108
|
-
let cursor = lcs.at(-1);
|
|
109
|
-
while (cursor?.prev) {
|
|
110
|
-
cursor = cursor.prev;
|
|
111
|
-
lcs.push(cursor);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
return lcs.reverse();
|
|
115
|
-
}
|
|
116
|
-
/**
|
|
117
|
-
* Keeps track of the aLines that have been deleted, are shared between aLines
|
|
118
|
-
* and bLines, and bLines that have been inserted.
|
|
119
|
-
*/
|
|
120
|
-
const result = [];
|
|
121
|
-
let deleted = 0;
|
|
122
|
-
let inserted = 0;
|
|
123
|
-
function addToResult(aIndex, bIndex) {
|
|
124
|
-
if (bIndex < 0) {
|
|
125
|
-
deleted++;
|
|
126
|
-
} else if (aIndex < 0) {
|
|
127
|
-
inserted++;
|
|
128
|
-
}
|
|
129
|
-
result.push({
|
|
130
|
-
line: 0 <= aIndex ? aLines[aIndex] : bLines[bIndex],
|
|
131
|
-
aIndex,
|
|
132
|
-
bIndex,
|
|
133
|
-
moved: false,
|
|
134
|
-
});
|
|
135
|
-
}
|
|
136
|
-
function addSubMatch(aStart, aEnd, bStart, bEnd) {
|
|
137
|
-
// Match any lines at the beginning of aLines and bLines.
|
|
138
|
-
while (
|
|
139
|
-
aStart <= aEnd &&
|
|
140
|
-
bStart <= bEnd &&
|
|
141
|
-
aLines[aStart] === bLines[bStart]
|
|
142
|
-
) {
|
|
143
|
-
addToResult(aStart++, bStart++);
|
|
106
|
+
// Pull out the longest common subsequence
|
|
107
|
+
let lcs = [];
|
|
108
|
+
if (jagged.length > 0) {
|
|
109
|
+
lcs = [jagged.at(-1).at(-1)];
|
|
110
|
+
let cursor = lcs.at(-1);
|
|
111
|
+
while (cursor?.prev) {
|
|
112
|
+
cursor = cursor.prev;
|
|
113
|
+
lcs.push(cursor);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return lcs.reverse();
|
|
144
117
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
bLines,
|
|
166
|
-
bStart,
|
|
167
|
-
bEnd,
|
|
168
|
-
);
|
|
169
|
-
if (uniqueCommonMap.size === 0) {
|
|
170
|
-
while (aStart <= aEnd) {
|
|
171
|
-
addToResult(aStart++, -1);
|
|
172
|
-
}
|
|
173
|
-
while (bStart <= bEnd) {
|
|
174
|
-
addToResult(-1, bStart++);
|
|
175
|
-
}
|
|
176
|
-
} else {
|
|
177
|
-
recurseLCS(aStart, aEnd, bStart, bEnd, uniqueCommonMap);
|
|
118
|
+
/**
|
|
119
|
+
* Keeps track of the aLines that have been deleted, are shared between aLines
|
|
120
|
+
* and bLines, and bLines that have been inserted.
|
|
121
|
+
*/
|
|
122
|
+
const result = [];
|
|
123
|
+
let deleted = 0;
|
|
124
|
+
let inserted = 0;
|
|
125
|
+
function addToResult(aIndex, bIndex) {
|
|
126
|
+
if (bIndex < 0) {
|
|
127
|
+
deleted++;
|
|
128
|
+
}
|
|
129
|
+
else if (aIndex < 0) {
|
|
130
|
+
inserted++;
|
|
131
|
+
}
|
|
132
|
+
result.push({
|
|
133
|
+
line: 0 <= aIndex ? aLines[aIndex] : bLines[bIndex],
|
|
134
|
+
aIndex,
|
|
135
|
+
bIndex,
|
|
136
|
+
moved: false,
|
|
137
|
+
});
|
|
178
138
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
139
|
+
function addSubMatch(aStart, aEnd, bStart, bEnd) {
|
|
140
|
+
// Match any lines at the beginning of aLines and bLines.
|
|
141
|
+
while (aStart <= aEnd &&
|
|
142
|
+
bStart <= bEnd &&
|
|
143
|
+
aLines[aStart] === bLines[bStart]) {
|
|
144
|
+
addToResult(aStart++, bStart++);
|
|
145
|
+
}
|
|
146
|
+
// Match any lines at the end of aLines and bLines, but don't place them
|
|
147
|
+
// in the "result" array just yet, as the lines between these matches at
|
|
148
|
+
// the beginning and the end need to be analyzed first.
|
|
149
|
+
const aEndTemp = aEnd;
|
|
150
|
+
while (aStart <= aEnd && bStart <= bEnd && aLines[aEnd] === bLines[bEnd]) {
|
|
151
|
+
aEnd--;
|
|
152
|
+
bEnd--;
|
|
153
|
+
}
|
|
154
|
+
// Now, check to determine with the remaining lines in the subsequence
|
|
155
|
+
// whether there are any unique common lines between aLines and bLines.
|
|
156
|
+
//
|
|
157
|
+
// If not, add the subsequence to the result (all aLines having been
|
|
158
|
+
// deleted, and all bLines having been inserted).
|
|
159
|
+
//
|
|
160
|
+
// If there are unique common lines between aLines and bLines, then let's
|
|
161
|
+
// recursively perform the patience diff on the subsequence.
|
|
162
|
+
const uniqueCommonMap = uniqueCommon(aLines, aStart, aEnd, bLines, bStart, bEnd);
|
|
163
|
+
if (uniqueCommonMap.size === 0) {
|
|
164
|
+
while (aStart <= aEnd) {
|
|
165
|
+
addToResult(aStart++, -1);
|
|
166
|
+
}
|
|
167
|
+
while (bStart <= bEnd) {
|
|
168
|
+
addToResult(-1, bStart++);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
recurseLCS(aStart, aEnd, bStart, bEnd, uniqueCommonMap);
|
|
173
|
+
}
|
|
174
|
+
// Finally, let's add the matches at the end to the result.
|
|
175
|
+
while (aEnd < aEndTemp) {
|
|
176
|
+
addToResult(++aEnd, ++bEnd);
|
|
177
|
+
}
|
|
182
178
|
}
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
addSubMatch(
|
|
215
|
-
lcs[i].aIndex,
|
|
216
|
-
lcs[i + 1].aIndex - 1,
|
|
217
|
-
lcs[i].bIndex,
|
|
218
|
-
lcs[i + 1].bIndex - 1,
|
|
219
|
-
);
|
|
220
|
-
}
|
|
221
|
-
if (lcs[i].aIndex <= aEnd || lcs[i].bIndex <= bEnd) {
|
|
222
|
-
addSubMatch(lcs[i].aIndex, aEnd, lcs[i].bIndex, bEnd);
|
|
223
|
-
}
|
|
179
|
+
/**
|
|
180
|
+
* Finds the longest common subsequence between the arrays
|
|
181
|
+
* aLines[aStart...aEnd] and bLines[bStart...bEnd], inclusive. Then for each
|
|
182
|
+
* subsequence, recursively performs another LCS search (via addSubMatch),
|
|
183
|
+
* until there are none found, at which point the subsequence is dumped to
|
|
184
|
+
* the result.
|
|
185
|
+
*
|
|
186
|
+
* @param aStart - The start of the original array to search
|
|
187
|
+
* @param aEnd - The end of the original array to search, inclusive
|
|
188
|
+
* @param bStart - The start of the new array to search
|
|
189
|
+
* @param bEnd - The end of the new array to search, inclusive
|
|
190
|
+
* @param uniqueCommonMap - A map of the unique common lines between
|
|
191
|
+
* aLines[aStart...aEnd] and bLines[bStart...bEnd], inclusive.
|
|
192
|
+
*/
|
|
193
|
+
function recurseLCS(aStart, aEnd, bStart, bEnd, uniqueCommonMap = uniqueCommon(aLines, aStart, aEnd, bLines, bStart, bEnd)) {
|
|
194
|
+
const lcs = longestCommonSubsequence(uniqueCommonMap);
|
|
195
|
+
if (lcs.length === 0) {
|
|
196
|
+
addSubMatch(aStart, aEnd, bStart, bEnd);
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
if (aStart < lcs[0].aIndex || bStart < lcs[0].bIndex) {
|
|
200
|
+
addSubMatch(aStart, lcs[0].aIndex - 1, bStart, lcs[0].bIndex - 1);
|
|
201
|
+
}
|
|
202
|
+
let i;
|
|
203
|
+
for (i = 0; i < lcs.length - 1; i++) {
|
|
204
|
+
addSubMatch(lcs[i].aIndex, lcs[i + 1].aIndex - 1, lcs[i].bIndex, lcs[i + 1].bIndex - 1);
|
|
205
|
+
}
|
|
206
|
+
if (lcs[i].aIndex <= aEnd || lcs[i].bIndex <= bEnd) {
|
|
207
|
+
addSubMatch(lcs[i].aIndex, aEnd, lcs[i].bIndex, bEnd);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
224
210
|
}
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
};
|
|
211
|
+
recurseLCS(0, aLines.length - 1, 0, bLines.length - 1);
|
|
212
|
+
return {
|
|
213
|
+
lines: result,
|
|
214
|
+
lineCountDeleted: deleted,
|
|
215
|
+
lineCountInserted: inserted,
|
|
216
|
+
};
|
|
232
217
|
}
|
|
233
218
|
/**
|
|
234
219
|
* Utility function for debugging patienceDiff.
|
|
@@ -236,14 +221,16 @@ export function patienceDiff(aLines, bLines) {
|
|
|
236
221
|
* @internal
|
|
237
222
|
*/
|
|
238
223
|
export function printDiff(diff) {
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
});
|
|
224
|
+
diff.lines.forEach(line => {
|
|
225
|
+
if (line.bIndex < 0) {
|
|
226
|
+
console.log(`- ${line.line}`);
|
|
227
|
+
}
|
|
228
|
+
else if (line.aIndex < 0) {
|
|
229
|
+
console.log(`+ ${line.line}`);
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
console.log(` ${line.line}`);
|
|
233
|
+
}
|
|
234
|
+
});
|
|
248
235
|
}
|
|
249
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/lib/code/diff.ts"],"names":[],"mappings":"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"}
|
|
236
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"diff.js","sourceRoot":"","sources":["../../src/lib/code/diff.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {CodeRange} from './CodeRange';
|
|
2
|
-
import {CodeTag} from './CodeScope';
|
|
1
|
+
import { CodeRange } from './CodeRange';
|
|
2
|
+
import { CodeTag } from './CodeScope';
|
|
3
3
|
/**
|
|
4
4
|
* Transform the fragments to isolate the given range into its own fragment.
|
|
5
5
|
*
|
|
@@ -13,8 +13,5 @@ import {CodeTag} from './CodeScope';
|
|
|
13
13
|
* @returns A tuple containing the transformed fragments and the index of the
|
|
14
14
|
* isolated fragment within.
|
|
15
15
|
*/
|
|
16
|
-
export declare function extractRange(
|
|
17
|
-
|
|
18
|
-
fragments: CodeTag[],
|
|
19
|
-
): [CodeTag[], number];
|
|
20
|
-
//# sourceMappingURL=extractRange.d.ts.map
|
|
16
|
+
export declare function extractRange(range: CodeRange, fragments: CodeTag[]): [CodeTag[], number];
|
|
17
|
+
//# sourceMappingURL=extractRange.d.ts.map
|