yarn-spinner-runner-ts 0.1.2 → 0.1.4-a
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/README.md +102 -88
- package/dist/compile/compiler.js +4 -4
- package/dist/compile/compiler.js.map +1 -1
- package/dist/compile/ir.d.ts +3 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/markup/parser.d.ts +3 -0
- package/dist/markup/parser.js +332 -0
- package/dist/markup/parser.js.map +1 -0
- package/dist/markup/types.d.ts +17 -0
- package/dist/markup/types.js +2 -0
- package/dist/markup/types.js.map +1 -0
- package/dist/model/ast.d.ts +3 -0
- package/dist/parse/parser.js +57 -8
- package/dist/parse/parser.js.map +1 -1
- package/dist/react/DialogueExample.js +13 -10
- package/dist/react/DialogueExample.js.map +1 -1
- package/dist/react/DialogueScene.d.ts +2 -1
- package/dist/react/DialogueScene.js +95 -26
- package/dist/react/DialogueScene.js.map +1 -1
- package/dist/react/DialogueView.d.ts +18 -4
- package/dist/react/DialogueView.js +84 -7
- package/dist/react/DialogueView.js.map +1 -1
- package/dist/react/MarkupRenderer.d.ts +8 -0
- package/dist/react/MarkupRenderer.js +64 -0
- package/dist/react/MarkupRenderer.js.map +1 -0
- package/dist/react/TypingText.d.ts +14 -0
- package/dist/react/TypingText.js +78 -0
- package/dist/react/TypingText.js.map +1 -0
- package/dist/react/useYarnRunner.js +10 -1
- package/dist/react/useYarnRunner.js.map +1 -1
- package/dist/runtime/commands.js +12 -1
- package/dist/runtime/commands.js.map +1 -1
- package/dist/runtime/results.d.ts +3 -0
- package/dist/runtime/runner.d.ts +7 -0
- package/dist/runtime/runner.js +161 -14
- package/dist/runtime/runner.js.map +1 -1
- package/dist/tests/custom_functions.test.d.ts +1 -0
- package/dist/tests/custom_functions.test.js +129 -0
- package/dist/tests/custom_functions.test.js.map +1 -0
- package/dist/tests/markup.test.d.ts +1 -0
- package/dist/tests/markup.test.js +46 -0
- package/dist/tests/markup.test.js.map +1 -0
- package/dist/tests/nodes_lines.test.js +25 -1
- package/dist/tests/nodes_lines.test.js.map +1 -1
- package/dist/tests/options.test.js +30 -1
- package/dist/tests/options.test.js.map +1 -1
- package/dist/tests/story_end.test.d.ts +1 -0
- package/dist/tests/story_end.test.js +37 -0
- package/dist/tests/story_end.test.js.map +1 -0
- package/dist/tests/typing-text.test.d.ts +1 -0
- package/dist/tests/typing-text.test.js +12 -0
- package/dist/tests/typing-text.test.js.map +1 -0
- package/docs/actor-transition.md +34 -0
- package/docs/markup.md +34 -19
- package/docs/scenes-actors-setup.md +1 -0
- package/docs/typing-animation.md +44 -0
- package/eslint.config.cjs +3 -0
- package/examples/browser/index.html +1 -1
- package/examples/browser/main.tsx +0 -2
- package/package.json +1 -1
- package/src/compile/compiler.ts +4 -4
- package/src/compile/ir.ts +3 -2
- package/src/index.ts +3 -0
- package/src/markup/parser.ts +372 -0
- package/src/markup/types.ts +22 -0
- package/src/model/ast.ts +17 -13
- package/src/parse/parser.ts +60 -8
- package/src/react/DialogueExample.tsx +27 -51
- package/src/react/DialogueScene.tsx +143 -44
- package/src/react/DialogueView.tsx +150 -14
- package/src/react/MarkupRenderer.tsx +110 -0
- package/src/react/TypingText.tsx +127 -0
- package/src/react/dialogue.css +26 -13
- package/src/react/useYarnRunner.tsx +13 -1
- package/src/runtime/commands.ts +14 -1
- package/src/runtime/results.ts +3 -1
- package/src/runtime/runner.ts +170 -14
- package/src/tests/custom_functions.test.ts +140 -0
- package/src/tests/markup.test.ts +62 -0
- package/src/tests/nodes_lines.test.ts +35 -1
- package/src/tests/options.test.ts +39 -1
- package/src/tests/story_end.test.ts +42 -0
|
@@ -4,8 +4,9 @@ export interface DialogueSceneProps {
|
|
|
4
4
|
speaker?: string;
|
|
5
5
|
scenes: SceneCollection;
|
|
6
6
|
className?: string;
|
|
7
|
+
actorTransitionDuration?: number;
|
|
7
8
|
}
|
|
8
9
|
/**
|
|
9
10
|
* Visual scene component that displays background and actor images
|
|
10
11
|
*/
|
|
11
|
-
export declare function DialogueScene({ sceneName, speaker, scenes, className }: DialogueSceneProps): import("react/jsx-runtime").JSX.Element;
|
|
12
|
+
export declare function DialogueScene({ sceneName, speaker, scenes, className, actorTransitionDuration, }: DialogueSceneProps): import("react/jsx-runtime").JSX.Element;
|
|
@@ -1,20 +1,39 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { useState, useEffect } from "react";
|
|
2
|
+
import { useState, useEffect, useMemo, useRef } from "react";
|
|
3
3
|
/**
|
|
4
4
|
* Visual scene component that displays background and actor images
|
|
5
5
|
*/
|
|
6
|
-
export function DialogueScene({ sceneName, speaker, scenes, className }) {
|
|
6
|
+
export function DialogueScene({ sceneName, speaker, scenes, className, actorTransitionDuration = 350, }) {
|
|
7
7
|
const [currentBackground, setCurrentBackground] = useState(null);
|
|
8
8
|
const [backgroundOpacity, setBackgroundOpacity] = useState(1);
|
|
9
9
|
const [nextBackground, setNextBackground] = useState(null);
|
|
10
10
|
const [lastSceneName, setLastSceneName] = useState(undefined);
|
|
11
11
|
const [lastSpeaker, setLastSpeaker] = useState(undefined);
|
|
12
|
+
const [activeActor, setActiveActor] = useState(null);
|
|
13
|
+
const [previousActor, setPreviousActor] = useState(null);
|
|
14
|
+
const [currentActorVisible, setCurrentActorVisible] = useState(false);
|
|
15
|
+
const [previousActorVisible, setPreviousActorVisible] = useState(false);
|
|
16
|
+
const previousActorTimeoutRef = useRef(null);
|
|
12
17
|
// Get scene config - use last scene if current node has no scene
|
|
13
18
|
const activeSceneName = sceneName || lastSceneName;
|
|
14
19
|
const sceneConfig = activeSceneName ? scenes.scenes[activeSceneName] : undefined;
|
|
15
20
|
const backgroundImage = sceneConfig?.background;
|
|
16
|
-
|
|
17
|
-
const
|
|
21
|
+
const activeSpeakerName = speaker || lastSpeaker;
|
|
22
|
+
const resolvedActor = useMemo(() => {
|
|
23
|
+
if (!sceneConfig || !activeSpeakerName) {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
const actorEntries = Object.entries(sceneConfig.actors);
|
|
27
|
+
const matchingActor = actorEntries.find(([actorName]) => actorName.toLowerCase() === activeSpeakerName.toLowerCase());
|
|
28
|
+
if (!matchingActor) {
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
const [actorName, actorConfig] = matchingActor;
|
|
32
|
+
if (!actorConfig?.image) {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
return { name: actorName, image: actorConfig.image };
|
|
36
|
+
}, [sceneConfig, activeSpeakerName]);
|
|
18
37
|
// Track last speaker - update when speaker is provided, keep when undefined
|
|
19
38
|
useEffect(() => {
|
|
20
39
|
if (speaker) {
|
|
@@ -53,31 +72,81 @@ export function DialogueScene({ sceneName, speaker, scenes, className }) {
|
|
|
53
72
|
}
|
|
54
73
|
// Never clear background - keep it until a new one is explicitly set
|
|
55
74
|
}, [backgroundImage, currentBackground, sceneName, lastSceneName]);
|
|
75
|
+
// Handle actor portrait transitions (cross-fade between speakers)
|
|
76
|
+
useEffect(() => {
|
|
77
|
+
let fadeOutTimeout = null;
|
|
78
|
+
setActiveActor((currentActor) => {
|
|
79
|
+
const currentImage = currentActor?.image ?? null;
|
|
80
|
+
const currentName = currentActor?.name ?? null;
|
|
81
|
+
const nextImage = resolvedActor?.image ?? null;
|
|
82
|
+
const nextName = resolvedActor?.name ?? null;
|
|
83
|
+
if (currentImage === nextImage && currentName === nextName) {
|
|
84
|
+
return currentActor;
|
|
85
|
+
}
|
|
86
|
+
if (currentActor) {
|
|
87
|
+
setPreviousActor(currentActor);
|
|
88
|
+
setPreviousActorVisible(true);
|
|
89
|
+
fadeOutTimeout = setTimeout(() => {
|
|
90
|
+
setPreviousActorVisible(false);
|
|
91
|
+
}, 0);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
setPreviousActor(null);
|
|
95
|
+
setPreviousActorVisible(false);
|
|
96
|
+
}
|
|
97
|
+
setCurrentActorVisible(false);
|
|
98
|
+
return resolvedActor;
|
|
99
|
+
});
|
|
100
|
+
return () => {
|
|
101
|
+
if (fadeOutTimeout !== null) {
|
|
102
|
+
clearTimeout(fadeOutTimeout);
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
}, [resolvedActor]);
|
|
106
|
+
useEffect(() => {
|
|
107
|
+
if (!activeActor) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
const fadeInTimeout = setTimeout(() => {
|
|
111
|
+
setCurrentActorVisible(true);
|
|
112
|
+
}, 0);
|
|
113
|
+
return () => {
|
|
114
|
+
clearTimeout(fadeInTimeout);
|
|
115
|
+
};
|
|
116
|
+
}, [activeActor]);
|
|
117
|
+
// Remove previous actor once fade-out completes
|
|
118
|
+
useEffect(() => {
|
|
119
|
+
if (!previousActor) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
if (previousActorTimeoutRef.current) {
|
|
123
|
+
clearTimeout(previousActorTimeoutRef.current);
|
|
124
|
+
}
|
|
125
|
+
previousActorTimeoutRef.current = setTimeout(() => {
|
|
126
|
+
setPreviousActor(null);
|
|
127
|
+
previousActorTimeoutRef.current = null;
|
|
128
|
+
}, actorTransitionDuration);
|
|
129
|
+
return () => {
|
|
130
|
+
if (previousActorTimeoutRef.current) {
|
|
131
|
+
clearTimeout(previousActorTimeoutRef.current);
|
|
132
|
+
previousActorTimeoutRef.current = null;
|
|
133
|
+
}
|
|
134
|
+
};
|
|
135
|
+
}, [previousActor, actorTransitionDuration]);
|
|
56
136
|
// Default background color when no scene
|
|
57
137
|
const defaultBgColor = "rgba(26, 26, 46, 1)"; // Dark blue-purple
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
138
|
+
const handleActorImageError = (actorName, imageUrl) => () => {
|
|
139
|
+
console.error(`Failed to load actor image for ${actorName}:`, imageUrl);
|
|
140
|
+
};
|
|
141
|
+
const sceneStyle = {
|
|
142
|
+
backgroundColor: currentBackground ? undefined : defaultBgColor,
|
|
143
|
+
backgroundImage: currentBackground ? `url(${currentBackground})` : undefined,
|
|
144
|
+
opacity: backgroundOpacity,
|
|
145
|
+
["--yd-actor-transition"]: `${Math.max(actorTransitionDuration, 0)}ms`,
|
|
146
|
+
};
|
|
147
|
+
return (_jsxs("div", { className: `yd-scene ${className || ""}`, style: sceneStyle, children: [nextBackground && (_jsx("div", { className: "yd-scene-next", style: {
|
|
63
148
|
backgroundImage: `url(${nextBackground})`,
|
|
64
149
|
opacity: 1 - backgroundOpacity,
|
|
65
|
-
} })),
|
|
66
|
-
// Use current speaker if available, otherwise use last speaker to keep image visible
|
|
67
|
-
const activeSpeaker = speaker || lastSpeaker;
|
|
68
|
-
// Type guard: ensure activeSpeaker is defined
|
|
69
|
-
if (!activeSpeaker)
|
|
70
|
-
return null;
|
|
71
|
-
// Find the actor that matches the speaker (case-insensitive)
|
|
72
|
-
const speakingActorName = sceneActors.find(actorName => actorName.toLowerCase() === activeSpeaker.toLowerCase());
|
|
73
|
-
if (!speakingActorName)
|
|
74
|
-
return null;
|
|
75
|
-
const actorConfig = sceneConfig.actors[speakingActorName];
|
|
76
|
-
if (!actorConfig?.image)
|
|
77
|
-
return null;
|
|
78
|
-
return (_jsx("img", { className: "yd-actor", src: actorConfig.image, alt: speakingActorName, onError: (e) => {
|
|
79
|
-
console.error(`Failed to load actor image for ${speakingActorName}:`, actorConfig.image, e);
|
|
80
|
-
} }, speakingActorName));
|
|
81
|
-
})()] }));
|
|
150
|
+
} })), previousActor && (_jsx("img", { className: `yd-actor yd-actor--previous ${previousActorVisible ? "yd-actor--visible" : ""}`, src: previousActor.image, alt: previousActor.name, onError: handleActorImageError(previousActor.name, previousActor.image) }, `${previousActor.name}-previous`)), activeActor && (_jsx("img", { className: `yd-actor yd-actor--current ${currentActorVisible ? "yd-actor--visible" : ""}`, src: activeActor.image, alt: activeActor.name, onError: handleActorImageError(activeActor.name, activeActor.image) }, `${activeActor.name}-current`))] }));
|
|
82
151
|
}
|
|
83
152
|
//# sourceMappingURL=DialogueScene.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DialogueScene.js","sourceRoot":"","sources":["../../src/react/DialogueScene.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DialogueScene.js","sourceRoot":"","sources":["../../src/react/DialogueScene.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,23 @@
|
|
|
1
|
-
import type { RuntimeResult } from "../runtime/results.js";
|
|
2
1
|
import type { SceneCollection } from "../scene/types.js";
|
|
2
|
+
import type { IRProgram } from "../compile/ir.js";
|
|
3
3
|
export interface DialogueViewProps {
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
program: IRProgram;
|
|
5
|
+
startNode?: string;
|
|
6
6
|
className?: string;
|
|
7
7
|
scenes?: SceneCollection;
|
|
8
|
+
actorTransitionDuration?: number;
|
|
9
|
+
functions?: Record<string, (...args: unknown[]) => unknown>;
|
|
10
|
+
onStoryEnd?: (info: {
|
|
11
|
+
variables: Readonly<Record<string, unknown>>;
|
|
12
|
+
storyEnd: true;
|
|
13
|
+
}) => void;
|
|
14
|
+
enableTypingAnimation?: boolean;
|
|
15
|
+
typingSpeed?: number;
|
|
16
|
+
showTypingCursor?: boolean;
|
|
17
|
+
cursorCharacter?: string;
|
|
18
|
+
autoAdvanceAfterTyping?: boolean;
|
|
19
|
+
autoAdvanceDelay?: number;
|
|
20
|
+
pauseBeforeAdvance?: number;
|
|
8
21
|
}
|
|
9
|
-
export declare function DialogueView({
|
|
22
|
+
export declare function DialogueView({ program, startNode, className, scenes, actorTransitionDuration, functions, onStoryEnd, enableTypingAnimation, typingSpeed, // Characters per second (50 cps = ~20ms per character)
|
|
23
|
+
showTypingCursor, cursorCharacter, autoAdvanceAfterTyping, autoAdvanceDelay, pauseBeforeAdvance, }: DialogueViewProps): import("react/jsx-runtime").JSX.Element | null;
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import React from "react";
|
|
2
|
+
import React, { useRef, useEffect, useState } from "react";
|
|
3
3
|
import { DialogueScene } from "./DialogueScene.js";
|
|
4
|
+
import { TypingText } from "./TypingText.js";
|
|
5
|
+
import { useYarnRunner } from "./useYarnRunner.js";
|
|
6
|
+
import { MarkupRenderer } from "./MarkupRenderer.js";
|
|
4
7
|
// Helper to parse CSS string into object
|
|
5
8
|
function parseCss(cssStr) {
|
|
6
9
|
if (!cssStr)
|
|
@@ -62,31 +65,105 @@ function parseCss(cssStr) {
|
|
|
62
65
|
});
|
|
63
66
|
return styles;
|
|
64
67
|
}
|
|
65
|
-
export function DialogueView({
|
|
68
|
+
export function DialogueView({ program, startNode = "Start", className, scenes, actorTransitionDuration = 350, functions, onStoryEnd, enableTypingAnimation = false, typingSpeed = 50, // Characters per second (50 cps = ~20ms per character)
|
|
69
|
+
showTypingCursor = true, cursorCharacter = "|", autoAdvanceAfterTyping = false, autoAdvanceDelay = 500, pauseBeforeAdvance = 0, }) {
|
|
70
|
+
const { result, advance } = useYarnRunner(program, {
|
|
71
|
+
startAt: startNode,
|
|
72
|
+
functions,
|
|
73
|
+
variables: {},
|
|
74
|
+
onStoryEnd,
|
|
75
|
+
});
|
|
66
76
|
const sceneName = result?.type === "text" || result?.type === "options" ? result.scene : undefined;
|
|
67
77
|
const speaker = result?.type === "text" ? result.speaker : undefined;
|
|
68
78
|
const sceneCollection = scenes || { scenes: {} };
|
|
79
|
+
const [typingComplete, setTypingComplete] = useState(false);
|
|
80
|
+
const [currentTextKey, setCurrentTextKey] = useState(0);
|
|
81
|
+
const [skipTyping, setSkipTyping] = useState(false);
|
|
82
|
+
const advanceTimeoutRef = useRef(null);
|
|
83
|
+
// Reset typing completion when text changes
|
|
84
|
+
useEffect(() => {
|
|
85
|
+
if (result?.type === "text") {
|
|
86
|
+
setTypingComplete(false);
|
|
87
|
+
setSkipTyping(false);
|
|
88
|
+
setCurrentTextKey((prev) => prev + 1); // Force re-render of TypingText
|
|
89
|
+
}
|
|
90
|
+
// Cleanup any pending advance timeouts when text changes
|
|
91
|
+
return () => {
|
|
92
|
+
if (advanceTimeoutRef.current) {
|
|
93
|
+
clearTimeout(advanceTimeoutRef.current);
|
|
94
|
+
advanceTimeoutRef.current = null;
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
}, [result?.type === "text" ? result.text : null]);
|
|
98
|
+
// Handle auto-advance after typing completes
|
|
99
|
+
useEffect(() => {
|
|
100
|
+
if (autoAdvanceAfterTyping &&
|
|
101
|
+
typingComplete &&
|
|
102
|
+
result?.type === "text" &&
|
|
103
|
+
!result.isDialogueEnd) {
|
|
104
|
+
const timer = setTimeout(() => {
|
|
105
|
+
advance();
|
|
106
|
+
}, autoAdvanceDelay);
|
|
107
|
+
return () => clearTimeout(timer);
|
|
108
|
+
}
|
|
109
|
+
}, [autoAdvanceAfterTyping, typingComplete, result, advance, autoAdvanceDelay]);
|
|
69
110
|
if (!result) {
|
|
70
111
|
return (_jsx("div", { className: `yd-empty ${className || ""}`, children: _jsx("p", { children: "Dialogue ended or not started." }) }));
|
|
71
112
|
}
|
|
72
113
|
if (result.type === "text") {
|
|
73
114
|
const nodeStyles = parseCss(result.nodeCss);
|
|
74
|
-
|
|
115
|
+
const displayText = result.text || "\u00A0";
|
|
116
|
+
const shouldShowContinue = !result.isDialogueEnd && !enableTypingAnimation;
|
|
117
|
+
// Handle story end and call onStoryEnd if provided
|
|
118
|
+
if (result.isDialogueEnd && onStoryEnd && 'variables' in result) {
|
|
119
|
+
onStoryEnd({
|
|
120
|
+
variables: result.variables,
|
|
121
|
+
storyEnd: true
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
const handleClick = () => {
|
|
125
|
+
if (result.isDialogueEnd)
|
|
126
|
+
return;
|
|
127
|
+
// If typing is in progress, skip it; otherwise advance
|
|
128
|
+
if (enableTypingAnimation && !typingComplete) {
|
|
129
|
+
// Skip typing animation
|
|
130
|
+
setSkipTyping(true);
|
|
131
|
+
setTypingComplete(true);
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
// Clear any pending timeout
|
|
135
|
+
if (advanceTimeoutRef.current) {
|
|
136
|
+
clearTimeout(advanceTimeoutRef.current);
|
|
137
|
+
advanceTimeoutRef.current = null;
|
|
138
|
+
}
|
|
139
|
+
// Apply pause before advance if configured
|
|
140
|
+
if (pauseBeforeAdvance > 0) {
|
|
141
|
+
advanceTimeoutRef.current = setTimeout(() => {
|
|
142
|
+
advance();
|
|
143
|
+
advanceTimeoutRef.current = null;
|
|
144
|
+
}, pauseBeforeAdvance);
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
advance();
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
};
|
|
151
|
+
return (_jsxs("div", { className: "yd-container", children: [_jsx(DialogueScene, { sceneName: sceneName, speaker: speaker, scenes: sceneCollection, actorTransitionDuration: actorTransitionDuration }), _jsx("div", { className: `yd-dialogue-box ${result.isDialogueEnd ? "yd-text-box-end" : ""} ${className || ""}`, style: nodeStyles, onClick: handleClick, children: _jsxs("div", { className: "yd-text-box", children: [result.speaker && (_jsx("div", { className: "yd-speaker", children: result.speaker })), _jsx("p", { className: `yd-text ${result.speaker ? "yd-text-with-speaker" : ""}`, children: enableTypingAnimation ? (_jsx(TypingText, { text: displayText, markup: result.markup, typingSpeed: typingSpeed, showCursor: showTypingCursor, cursorCharacter: cursorCharacter, disabled: skipTyping, onComplete: () => setTypingComplete(true) }, currentTextKey)) : (_jsx(MarkupRenderer, { text: displayText, markup: result.markup })) }), shouldShowContinue && (_jsx("div", { className: "yd-continue", children: "\u25BC" }))] }) })] }));
|
|
75
152
|
}
|
|
76
153
|
if (result.type === "options") {
|
|
77
154
|
const nodeStyles = parseCss(result.nodeCss);
|
|
78
|
-
return (_jsxs("div", { className: "yd-container", children: [_jsx(DialogueScene, { sceneName: sceneName, speaker: speaker, scenes: sceneCollection }), _jsx("div", { className: `yd-options-container ${className || ""}`, children: _jsxs("div", { className: "yd-options-box", style: nodeStyles, children: [_jsx("div", { className: "yd-options-title", children: "Choose an option:" }), _jsx("div", { className: "yd-options-list", children: result.options.map((option, index) => {
|
|
155
|
+
return (_jsxs("div", { className: "yd-container", children: [_jsx(DialogueScene, { sceneName: sceneName, speaker: speaker, scenes: sceneCollection, actorTransitionDuration: actorTransitionDuration }), _jsx("div", { className: `yd-options-container ${className || ""}`, children: _jsxs("div", { className: "yd-options-box", style: nodeStyles, children: [_jsx("div", { className: "yd-options-title", children: "Choose an option:" }), _jsx("div", { className: "yd-options-list", children: result.options.map((option, index) => {
|
|
79
156
|
const optionStyles = parseCss(option.css);
|
|
80
|
-
return (_jsx("button", { className: "yd-option-button", onClick: () =>
|
|
157
|
+
return (_jsx("button", { className: "yd-option-button", onClick: () => advance(index), style: optionStyles, children: _jsx(MarkupRenderer, { text: option.text, markup: option.markup }) }, index));
|
|
81
158
|
}) })] }) })] }));
|
|
82
159
|
}
|
|
83
160
|
// Command result - auto-advance
|
|
84
161
|
if (result.type === "command") {
|
|
85
162
|
// Auto-advance commands after a brief moment
|
|
86
163
|
React.useEffect(() => {
|
|
87
|
-
const timer = setTimeout(() =>
|
|
164
|
+
const timer = setTimeout(() => advance(), 50);
|
|
88
165
|
return () => clearTimeout(timer);
|
|
89
|
-
}, [result.command,
|
|
166
|
+
}, [result.command, advance]);
|
|
90
167
|
return (_jsx("div", { className: `yd-command ${className || ""}`, children: _jsxs("p", { children: ["Executing: ", result.command] }) }));
|
|
91
168
|
}
|
|
92
169
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DialogueView.js","sourceRoot":"","sources":["../../src/react/DialogueView.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DialogueView.js","sourceRoot":"","sources":["../../src/react/DialogueView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { MarkupParseResult } from "../markup/types.js";
|
|
2
|
+
interface MarkupRendererProps {
|
|
3
|
+
text: string;
|
|
4
|
+
markup?: MarkupParseResult;
|
|
5
|
+
length?: number;
|
|
6
|
+
}
|
|
7
|
+
export declare function MarkupRenderer({ text, markup, length }: MarkupRendererProps): import("react/jsx-runtime").JSX.Element;
|
|
8
|
+
export {};
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import React from "react";
|
|
3
|
+
const DEFAULT_HTML_TAGS = new Set(["b", "em", "small", "strong", "sub", "sup", "ins", "del", "mark"]);
|
|
4
|
+
export function MarkupRenderer({ text, markup, length }) {
|
|
5
|
+
const maxLength = length ?? text.length;
|
|
6
|
+
if (!markup || markup.segments.length === 0) {
|
|
7
|
+
return _jsx(_Fragment, { children: text.slice(0, maxLength) });
|
|
8
|
+
}
|
|
9
|
+
const pieces = [];
|
|
10
|
+
const limit = Math.max(0, Math.min(maxLength, markup.text.length));
|
|
11
|
+
markup.segments.forEach((segment, index) => {
|
|
12
|
+
if (segment.selfClosing) {
|
|
13
|
+
if (segment.start <= limit) {
|
|
14
|
+
pieces.push({
|
|
15
|
+
text: "",
|
|
16
|
+
wrappers: segment.wrappers,
|
|
17
|
+
selfClosing: true,
|
|
18
|
+
key: `self-${index}`,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const start = Math.max(0, Math.min(segment.start, limit));
|
|
24
|
+
const end = Math.max(start, Math.min(segment.end, limit));
|
|
25
|
+
if (end <= start) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const segmentText = markup.text.slice(start, end);
|
|
29
|
+
pieces.push({
|
|
30
|
+
text: segmentText,
|
|
31
|
+
wrappers: segment.wrappers,
|
|
32
|
+
key: `seg-${index}-${start}-${end}`,
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
if (pieces.length === 0) {
|
|
36
|
+
return _jsx(_Fragment, { children: text.slice(0, maxLength) });
|
|
37
|
+
}
|
|
38
|
+
return (_jsx(_Fragment, { children: pieces.map((piece, pieceIndex) => renderPiece(piece, pieceIndex)) }));
|
|
39
|
+
}
|
|
40
|
+
function renderPiece(piece, pieceIndex) {
|
|
41
|
+
const baseKey = `${piece.key}-${pieceIndex}`;
|
|
42
|
+
if (piece.selfClosing) {
|
|
43
|
+
return piece.wrappers.reduceRight((child, wrapper, wrapperIndex) => createWrapperElement(wrapper, `${baseKey}-wrapper-${wrapperIndex}`, child), null);
|
|
44
|
+
}
|
|
45
|
+
const content = piece.wrappers.reduceRight((child, wrapper, wrapperIndex) => createWrapperElement(wrapper, `${baseKey}-wrapper-${wrapperIndex}`, child), piece.text);
|
|
46
|
+
return _jsx(React.Fragment, { children: content }, baseKey);
|
|
47
|
+
}
|
|
48
|
+
function createWrapperElement(wrapper, key, children) {
|
|
49
|
+
const tagName = DEFAULT_HTML_TAGS.has(wrapper.name) ? wrapper.name : "span";
|
|
50
|
+
const className = wrapper.type === "custom" ? `yd-markup-${sanitizeClassName(wrapper.name)}` : undefined;
|
|
51
|
+
const dataAttributes = {};
|
|
52
|
+
for (const [propertyName, value] of Object.entries(wrapper.properties)) {
|
|
53
|
+
dataAttributes[`data-markup-${propertyName}`] = String(value);
|
|
54
|
+
}
|
|
55
|
+
return React.createElement(tagName, {
|
|
56
|
+
key,
|
|
57
|
+
className,
|
|
58
|
+
...dataAttributes,
|
|
59
|
+
}, children);
|
|
60
|
+
}
|
|
61
|
+
function sanitizeClassName(name) {
|
|
62
|
+
return name.toLowerCase().replace(/[^a-z0-9_-]/g, "-");
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=MarkupRenderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MarkupRenderer.js","sourceRoot":"","sources":["../../src/react/MarkupRenderer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { MarkupParseResult } from "../markup/types.js";
|
|
2
|
+
export interface TypingTextProps {
|
|
3
|
+
text: string;
|
|
4
|
+
markup?: MarkupParseResult;
|
|
5
|
+
typingSpeed?: number;
|
|
6
|
+
showCursor?: boolean;
|
|
7
|
+
cursorCharacter?: string;
|
|
8
|
+
cursorBlinkDuration?: number;
|
|
9
|
+
cursorClassName?: string;
|
|
10
|
+
className?: string;
|
|
11
|
+
onComplete?: () => void;
|
|
12
|
+
disabled?: boolean;
|
|
13
|
+
}
|
|
14
|
+
export declare function TypingText({ text, markup, typingSpeed, showCursor, cursorCharacter, cursorBlinkDuration, cursorClassName, className, onComplete, disabled, }: TypingTextProps): import("react/jsx-runtime").JSX.Element;
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { useState, useEffect, useRef } from "react";
|
|
3
|
+
import { MarkupRenderer } from "./MarkupRenderer.js";
|
|
4
|
+
export function TypingText({ text, markup, typingSpeed = 100, showCursor = true, cursorCharacter = "|", cursorBlinkDuration = 530, cursorClassName = "", className = "", onComplete, disabled = false, }) {
|
|
5
|
+
const [displayedLength, setDisplayedLength] = useState(disabled ? text.length : 0);
|
|
6
|
+
const [cursorVisible, setCursorVisible] = useState(true);
|
|
7
|
+
const cursorIntervalRef = useRef(null);
|
|
8
|
+
const typingTimeoutRef = useRef(null);
|
|
9
|
+
const onCompleteRef = useRef(onComplete);
|
|
10
|
+
useEffect(() => {
|
|
11
|
+
onCompleteRef.current = onComplete;
|
|
12
|
+
}, [onComplete]);
|
|
13
|
+
// Handle cursor blinking
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
if (!showCursor || disabled) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
cursorIntervalRef.current = setInterval(() => {
|
|
19
|
+
setCursorVisible((prev) => !prev);
|
|
20
|
+
}, cursorBlinkDuration);
|
|
21
|
+
return () => {
|
|
22
|
+
if (cursorIntervalRef.current) {
|
|
23
|
+
clearInterval(cursorIntervalRef.current);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
}, [showCursor, cursorBlinkDuration, disabled]);
|
|
27
|
+
// Handle typing animation
|
|
28
|
+
useEffect(() => {
|
|
29
|
+
if (disabled) {
|
|
30
|
+
setDisplayedLength(text.length);
|
|
31
|
+
if (onCompleteRef.current && text.length > 0) {
|
|
32
|
+
onCompleteRef.current();
|
|
33
|
+
}
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
// Reset when text changes
|
|
37
|
+
setDisplayedLength(0);
|
|
38
|
+
if (text.length === 0) {
|
|
39
|
+
if (onCompleteRef.current) {
|
|
40
|
+
onCompleteRef.current();
|
|
41
|
+
}
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
let index = 0;
|
|
45
|
+
const typeNextCharacter = () => {
|
|
46
|
+
if (index < text.length) {
|
|
47
|
+
index += 1;
|
|
48
|
+
setDisplayedLength(index);
|
|
49
|
+
if (typingSpeed <= 0) {
|
|
50
|
+
requestAnimationFrame(typeNextCharacter);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
typingTimeoutRef.current = setTimeout(typeNextCharacter, typingSpeed);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
else if (onCompleteRef.current) {
|
|
57
|
+
onCompleteRef.current();
|
|
58
|
+
}
|
|
59
|
+
};
|
|
60
|
+
if (typingSpeed <= 0) {
|
|
61
|
+
requestAnimationFrame(typeNextCharacter);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
typingTimeoutRef.current = setTimeout(typeNextCharacter, typingSpeed);
|
|
65
|
+
}
|
|
66
|
+
return () => {
|
|
67
|
+
if (typingTimeoutRef.current) {
|
|
68
|
+
clearTimeout(typingTimeoutRef.current);
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
}, [text, disabled, typingSpeed]);
|
|
72
|
+
const visibleLength = markup ? Math.min(displayedLength, markup.text.length) : Math.min(displayedLength, text.length);
|
|
73
|
+
return (_jsxs("span", { className: className, children: [_jsx("span", { children: markup ? (_jsx(MarkupRenderer, { text: text, markup: markup, length: visibleLength })) : (text.slice(0, visibleLength)) }), showCursor && !disabled && (_jsx("span", { className: `yd-typing-cursor ${cursorClassName}`, style: {
|
|
74
|
+
opacity: cursorVisible ? 1 : 0,
|
|
75
|
+
transition: `opacity ${cursorBlinkDuration / 2}ms ease-in-out`,
|
|
76
|
+
}, children: cursorCharacter }))] }));
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=TypingText.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TypingText.js","sourceRoot":"","sources":["../../src/react/TypingText.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAerD,MAAM,UAAU,UAAU,CAAC,EACzB,IAAI,EACJ,MAAM,EACN,WAAW,GAAG,GAAG,EACjB,UAAU,GAAG,IAAI,EACjB,eAAe,GAAG,GAAG,EACrB,mBAAmB,GAAG,GAAG,EACzB,eAAe,GAAG,EAAE,EACpB,SAAS,GAAG,EAAE,EACd,UAAU,EACV,QAAQ,GAAG,KAAK,GACA;IAChB,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,iBAAiB,GAAG,MAAM,CAAwC,IAAI,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,MAAM,CAAuC,IAAI,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAEzC,SAAS,CAAC,GAAG,EAAE;QACb,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC;IACrC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,yBAAyB;IACzB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,UAAU,IAAI,QAAQ,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE;YAC3C,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,EAAE,mBAAmB,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE;YACV,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC9B,aAAa,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,UAAU,EAAE,mBAAmB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEhD,0BAA0B;IAC1B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE,CAAC;YACb,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,aAAa,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7C,aAAa,CAAC,OAAO,EAAE,CAAC;YAC1B,CAAC;YACD,OAAO;QACT,CAAC;QAED,0BAA0B;QAC1B,kBAAkB,CAAC,CAAC,CAAC,CAAC;QAEtB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC1B,aAAa,CAAC,OAAO,EAAE,CAAC;YAC1B,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,iBAAiB,GAAG,GAAG,EAAE;YAC7B,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBACxB,KAAK,IAAI,CAAC,CAAC;gBACX,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC1B,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;oBACrB,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;gBAC3C,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,OAAO,GAAG,UAAU,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;iBAAM,IAAI,aAAa,CAAC,OAAO,EAAE,CAAC;gBACjC,aAAa,CAAC,OAAO,EAAE,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;YACrB,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;QAC3C,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,OAAO,GAAG,UAAU,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,GAAG,EAAE;YACV,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBAC7B,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAElC,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEtH,OAAO,CACL,gBAAM,SAAS,EAAE,SAAS,aACxB,yBACG,MAAM,CAAC,CAAC,CAAC,CACR,KAAC,cAAc,IAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAI,CACtE,CAAC,CAAC,CAAC,CACF,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAC7B,GACI,EACN,UAAU,IAAI,CAAC,QAAQ,IAAI,CAC1B,eACE,SAAS,EAAE,oBAAoB,eAAe,EAAE,EAChD,KAAK,EAAE;oBACL,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC9B,UAAU,EAAE,WAAW,mBAAmB,GAAG,CAAC,gBAAgB;iBAC/D,YAEA,eAAe,GACX,CACR,IACI,CACR,CAAC;AACJ,CAAC"}
|
|
@@ -3,10 +3,19 @@ import { YarnRunner } from "../runtime/runner.js";
|
|
|
3
3
|
export function useYarnRunner(program, options) {
|
|
4
4
|
const runnerRef = useRef(null);
|
|
5
5
|
const [result, setResult] = useState(null);
|
|
6
|
-
|
|
6
|
+
const optionsRef = useRef(options);
|
|
7
|
+
// Update runner if functions change
|
|
8
|
+
if (runnerRef.current &&
|
|
9
|
+
JSON.stringify(optionsRef.current.functions) !== JSON.stringify(options.functions)) {
|
|
10
|
+
runnerRef.current = new YarnRunner(program, options);
|
|
11
|
+
setResult(runnerRef.current.currentResult);
|
|
12
|
+
optionsRef.current = options;
|
|
13
|
+
}
|
|
14
|
+
// Initialize runner if not exists
|
|
7
15
|
if (!runnerRef.current) {
|
|
8
16
|
runnerRef.current = new YarnRunner(program, options);
|
|
9
17
|
setResult(runnerRef.current.currentResult);
|
|
18
|
+
optionsRef.current = options;
|
|
10
19
|
}
|
|
11
20
|
const runner = runnerRef.current;
|
|
12
21
|
const advance = useCallback((optionIndex) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useYarnRunner.js","sourceRoot":"","sources":["../../src/react/useYarnRunner.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,UAAU,EAAsB,MAAM,sBAAsB,CAAC;AAItE,MAAM,UAAU,aAAa,CAC3B,OAAkB,EAClB,OAAsB;IAMtB,MAAM,SAAS,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAuB,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useYarnRunner.js","sourceRoot":"","sources":["../../src/react/useYarnRunner.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACtD,OAAO,EAAE,UAAU,EAAsB,MAAM,sBAAsB,CAAC;AAItE,MAAM,UAAU,aAAa,CAC3B,OAAkB,EAClB,OAAsB;IAMtB,MAAM,SAAS,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAClD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAuB,IAAI,CAAC,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnC,oCAAoC;IACpC,IACE,SAAS,CAAC,OAAO;QACjB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EAClF,CAAC;QACD,SAAS,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;IAC/B,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACvB,SAAS,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC3C,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;IAC/B,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC;IAEjC,MAAM,OAAO,GAAG,WAAW,CACzB,CAAC,WAAoB,EAAE,EAAE;QACvB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5B,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC,EACD,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AACrC,CAAC"}
|
package/dist/runtime/commands.js
CHANGED
|
@@ -17,14 +17,25 @@ export function parseCommand(content) {
|
|
|
17
17
|
for (let i = 0; i < trimmed.length; i++) {
|
|
18
18
|
const char = trimmed[i];
|
|
19
19
|
if ((char === '"' || char === "'") && !inQuotes) {
|
|
20
|
+
// If we have accumulated non-quoted content (e.g. a function name and "(")
|
|
21
|
+
// push it as its own part before entering quoted mode. This prevents the
|
|
22
|
+
// surrounding text from being merged into the quoted content when we
|
|
23
|
+
// later push the quoted value.
|
|
24
|
+
if (current.trim()) {
|
|
25
|
+
parts.push(current.trim());
|
|
26
|
+
current = "";
|
|
27
|
+
}
|
|
20
28
|
inQuotes = true;
|
|
21
29
|
quoteChar = char;
|
|
22
30
|
continue;
|
|
23
31
|
}
|
|
24
32
|
if (char === quoteChar && inQuotes) {
|
|
25
33
|
inQuotes = false;
|
|
34
|
+
// Preserve the surrounding quotes in the parsed part so callers that
|
|
35
|
+
// reassemble the expression (e.g. declare handlers) keep string literals
|
|
36
|
+
// intact instead of losing quote characters.
|
|
37
|
+
parts.push(quoteChar + current + quoteChar);
|
|
26
38
|
quoteChar = "";
|
|
27
|
-
parts.push(current);
|
|
28
39
|
current = "";
|
|
29
40
|
continue;
|
|
30
41
|
}
|