@remotion/cli 3.0.0-lambda.25 → 3.0.0-lambda.250

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.
Files changed (149) hide show
  1. package/dist/ansi/ansi-diff.d.ts +41 -0
  2. package/dist/ansi/ansi-diff.d.ts.map +1 -0
  3. package/dist/ansi/ansi-diff.js +227 -0
  4. package/dist/ansi/ansi-diff.js.map +1 -0
  5. package/dist/ansi/ansi-regex.d.ts +3 -0
  6. package/dist/ansi/ansi-regex.d.ts.map +1 -0
  7. package/dist/ansi/ansi-regex.js +19 -0
  8. package/dist/ansi/ansi-regex.js.map +1 -0
  9. package/dist/ansi/ansi-split.d.ts +2 -0
  10. package/dist/ansi/ansi-split.d.ts.map +1 -0
  11. package/dist/ansi/ansi-split.js +32 -0
  12. package/dist/ansi/ansi-split.js.map +1 -0
  13. package/dist/editor/components/CheckboardToggle.d.ts.map +1 -1
  14. package/dist/editor/components/CheckboardToggle.js +2 -1
  15. package/dist/editor/components/CheckboardToggle.js.map +1 -1
  16. package/dist/editor/components/ControlButton.d.ts +3 -1
  17. package/dist/editor/components/ControlButton.d.ts.map +1 -1
  18. package/dist/editor/components/ControlButton.js.map +1 -1
  19. package/dist/editor/components/CurrentComposition.js +1 -1
  20. package/dist/editor/components/CurrentComposition.js.map +1 -1
  21. package/dist/editor/components/FpsCounter.d.ts +3 -1
  22. package/dist/editor/components/FpsCounter.d.ts.map +1 -1
  23. package/dist/editor/components/FpsCounter.js +4 -3
  24. package/dist/editor/components/FpsCounter.js.map +1 -1
  25. package/dist/editor/components/KeyboardShortcutsModal.d.ts.map +1 -1
  26. package/dist/editor/components/KeyboardShortcutsModal.js +13 -2
  27. package/dist/editor/components/KeyboardShortcutsModal.js.map +1 -1
  28. package/dist/editor/components/LoadingIndicator.d.ts.map +1 -1
  29. package/dist/editor/components/LoadingIndicator.js +1 -0
  30. package/dist/editor/components/LoadingIndicator.js.map +1 -1
  31. package/dist/editor/components/LoopToggle.d.ts +6 -0
  32. package/dist/editor/components/LoopToggle.d.ts.map +1 -0
  33. package/dist/editor/components/LoopToggle.js +24 -0
  34. package/dist/editor/components/LoopToggle.js.map +1 -0
  35. package/dist/editor/components/MenuToolbar.js +1 -1
  36. package/dist/editor/components/MenuToolbar.js.map +1 -1
  37. package/dist/editor/components/NewComposition/ComboBox.d.ts +1 -0
  38. package/dist/editor/components/NewComposition/ComboBox.d.ts.map +1 -1
  39. package/dist/editor/components/NewComposition/ComboBox.js +2 -2
  40. package/dist/editor/components/NewComposition/ComboBox.js.map +1 -1
  41. package/dist/editor/components/NewComposition/NewComposition.js +1 -1
  42. package/dist/editor/components/NewComposition/NewComposition.js.map +1 -1
  43. package/dist/editor/components/PlayPause.d.ts +4 -1
  44. package/dist/editor/components/PlayPause.d.ts.map +1 -1
  45. package/dist/editor/components/PlayPause.js +13 -13
  46. package/dist/editor/components/PlayPause.js.map +1 -1
  47. package/dist/editor/components/PlaybackKeyboardShortcutsManager.d.ts +5 -0
  48. package/dist/editor/components/PlaybackKeyboardShortcutsManager.d.ts.map +1 -0
  49. package/dist/editor/components/PlaybackKeyboardShortcutsManager.js +70 -0
  50. package/dist/editor/components/PlaybackKeyboardShortcutsManager.js.map +1 -0
  51. package/dist/editor/components/PlaybackRatePersistor.d.ts +3 -0
  52. package/dist/editor/components/PlaybackRatePersistor.d.ts.map +1 -0
  53. package/dist/editor/components/PlaybackRatePersistor.js +18 -0
  54. package/dist/editor/components/PlaybackRatePersistor.js.map +1 -0
  55. package/dist/editor/components/PlaybackRateSelector.d.ts +8 -0
  56. package/dist/editor/components/PlaybackRateSelector.d.ts.map +1 -0
  57. package/dist/editor/components/PlaybackRateSelector.js +53 -0
  58. package/dist/editor/components/PlaybackRateSelector.js.map +1 -0
  59. package/dist/editor/components/Preview.d.ts.map +1 -1
  60. package/dist/editor/components/Preview.js +2 -2
  61. package/dist/editor/components/Preview.js.map +1 -1
  62. package/dist/editor/components/PreviewToolbar.d.ts.map +1 -1
  63. package/dist/editor/components/PreviewToolbar.js +10 -1
  64. package/dist/editor/components/PreviewToolbar.js.map +1 -1
  65. package/dist/editor/components/SizeSelector.d.ts.map +1 -1
  66. package/dist/editor/components/SizeSelector.js +2 -1
  67. package/dist/editor/components/SizeSelector.js.map +1 -1
  68. package/dist/editor/components/Thumbnail.d.ts.map +1 -1
  69. package/dist/editor/components/Thumbnail.js +10 -2
  70. package/dist/editor/components/Thumbnail.js.map +1 -1
  71. package/dist/editor/components/UpdateCheck.d.ts.map +1 -1
  72. package/dist/editor/components/UpdateCheck.js +15 -3
  73. package/dist/editor/components/UpdateCheck.js.map +1 -1
  74. package/dist/editor/components/layout.d.ts +6 -0
  75. package/dist/editor/components/layout.d.ts.map +1 -1
  76. package/dist/editor/components/layout.js +14 -1
  77. package/dist/editor/components/layout.js.map +1 -1
  78. package/dist/editor/state/loop.d.ts +3 -0
  79. package/dist/editor/state/loop.d.ts.map +1 -0
  80. package/dist/editor/state/loop.js +14 -0
  81. package/dist/editor/state/loop.js.map +1 -0
  82. package/dist/editor/state/playbackrate.d.ts +3 -0
  83. package/dist/editor/state/playbackrate.d.ts.map +1 -0
  84. package/dist/editor/state/playbackrate.js +20 -0
  85. package/dist/editor/state/playbackrate.js.map +1 -0
  86. package/dist/get-cli-options.d.ts +2 -0
  87. package/dist/get-cli-options.d.ts.map +1 -1
  88. package/dist/get-cli-options.js +8 -1
  89. package/dist/get-cli-options.js.map +1 -1
  90. package/dist/get-config-file-name.d.ts +1 -1
  91. package/dist/get-config-file-name.d.ts.map +1 -1
  92. package/dist/get-config-file-name.js +1 -1
  93. package/dist/get-config-file-name.js.map +1 -1
  94. package/dist/get-filename.js +1 -1
  95. package/dist/get-filename.js.map +1 -1
  96. package/dist/homepage/homepage.d.ts +3 -0
  97. package/dist/homepage/homepage.d.ts.map +1 -0
  98. package/dist/homepage/homepage.js +9 -0
  99. package/dist/homepage/homepage.js.map +1 -0
  100. package/dist/index.d.ts +10 -5
  101. package/dist/index.d.ts.map +1 -1
  102. package/dist/index.js +5 -3
  103. package/dist/index.js.map +1 -1
  104. package/dist/initialize-render-cli.d.ts +1 -1
  105. package/dist/initialize-render-cli.d.ts.map +1 -1
  106. package/dist/initialize-render-cli.js +2 -2
  107. package/dist/initialize-render-cli.js.map +1 -1
  108. package/dist/lambda-command.js +1 -1
  109. package/dist/lambda-command.js.map +1 -1
  110. package/dist/load-config.d.ts +1 -1
  111. package/dist/load-config.d.ts.map +1 -1
  112. package/dist/load-config.js +28 -18
  113. package/dist/load-config.js.map +1 -1
  114. package/dist/log.d.ts.map +1 -1
  115. package/dist/log.js +4 -4
  116. package/dist/log.js.map +1 -1
  117. package/dist/parse-command-line.d.ts +6 -1
  118. package/dist/parse-command-line.d.ts.map +1 -1
  119. package/dist/parse-command-line.js +23 -2
  120. package/dist/parse-command-line.js.map +1 -1
  121. package/dist/preview.d.ts.map +1 -1
  122. package/dist/preview.js +4 -5
  123. package/dist/preview.js.map +1 -1
  124. package/dist/progress-bar.d.ts +25 -8
  125. package/dist/progress-bar.d.ts.map +1 -1
  126. package/dist/progress-bar.js +38 -17
  127. package/dist/progress-bar.js.map +1 -1
  128. package/dist/render.d.ts.map +1 -1
  129. package/dist/render.js +145 -153
  130. package/dist/render.js.map +1 -1
  131. package/dist/setup-cache.d.ts +2 -1
  132. package/dist/setup-cache.d.ts.map +1 -1
  133. package/dist/setup-cache.js +7 -2
  134. package/dist/setup-cache.js.map +1 -1
  135. package/dist/step.d.ts +2 -0
  136. package/dist/step.d.ts.map +1 -0
  137. package/dist/step.js +3 -0
  138. package/dist/step.js.map +1 -0
  139. package/dist/still.d.ts.map +1 -1
  140. package/dist/still.js +40 -35
  141. package/dist/still.js.map +1 -1
  142. package/dist/upgrade.d.ts.map +1 -1
  143. package/dist/upgrade.js +1 -1
  144. package/dist/upgrade.js.map +1 -1
  145. package/dist/validate-ffmpeg-version.d.ts +3 -1
  146. package/dist/validate-ffmpeg-version.d.ts.map +1 -1
  147. package/dist/validate-ffmpeg-version.js +7 -3
  148. package/dist/validate-ffmpeg-version.js.map +1 -1
  149. package/package.json +9 -10
package/dist/render.js CHANGED
@@ -10,56 +10,45 @@ const fs_1 = __importDefault(require("fs"));
10
10
  const os_1 = __importDefault(require("os"));
11
11
  const path_1 = __importDefault(require("path"));
12
12
  const remotion_1 = require("remotion");
13
- const delete_directory_1 = require("./delete-directory");
14
13
  const get_cli_options_1 = require("./get-cli-options");
15
14
  const get_composition_id_1 = require("./get-composition-id");
16
- const handle_common_errors_1 = require("./handle-common-errors");
17
15
  const initialize_render_cli_1 = require("./initialize-render-cli");
18
16
  const log_1 = require("./log");
19
17
  const parse_command_line_1 = require("./parse-command-line");
20
18
  const progress_bar_1 = require("./progress-bar");
21
19
  const setup_cache_1 = require("./setup-cache");
22
20
  const validate_ffmpeg_version_1 = require("./validate-ffmpeg-version");
23
- const onError = async (info) => {
24
- log_1.Log.error();
25
- if (info.frame === null) {
26
- log_1.Log.error('The following error occured when trying to initialize the video rendering:');
27
- }
28
- else {
29
- log_1.Log.error(`The following error occurred when trying to render frame ${info.frame}:`);
30
- }
31
- (0, handle_common_errors_1.handleCommonError)(info.error);
32
- process.exit(1);
33
- };
34
21
  const render = async () => {
35
- var _a, _b;
36
22
  const startTime = Date.now();
37
23
  const file = parse_command_line_1.parsedCli._[1];
38
- const fullPath = path_1.default.join(process.cwd(), file);
39
- (0, initialize_render_cli_1.initializeRenderCli)('sequence');
40
- const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
24
+ const fullPath = renderer_1.RenderInternals.isServeUrl(file)
25
+ ? file
26
+ : path_1.default.join(process.cwd(), file);
27
+ await (0, initialize_render_cli_1.initializeRenderCli)('sequence');
28
+ const { codec, proResProfile, parallelism, frameRange, shouldOutputImageSequence, absoluteOutputFile, overwrite, inputProps, envVariables, quality, browser, crf, pixelFormat, imageFormat, browserExecutable, ffmpegExecutable, } = await (0, get_cli_options_1.getCliOptions)({ isLambda: false, type: 'series' });
41
29
  if (!absoluteOutputFile) {
42
30
  throw new Error('assertion error - expected absoluteOutputFile to not be null');
43
31
  }
44
- await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)();
45
- const browserInstance = renderer_1.RenderInternals.openBrowser(browser, {
32
+ await (0, validate_ffmpeg_version_1.checkAndValidateFfmpegVersion)({
33
+ ffmpegExecutable: remotion_1.Internals.getCustomFfmpegExecutable(),
34
+ });
35
+ const browserInstance = (0, renderer_1.openBrowser)(browser, {
46
36
  browserExecutable,
47
- shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
37
+ shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
48
38
  });
49
- if (shouldOutputImageSequence) {
50
- fs_1.default.mkdirSync(absoluteOutputFile, {
51
- recursive: true,
52
- });
53
- }
54
- const steps = shouldOutputImageSequence ? 2 : 3;
55
- const bundled = await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
56
- const { port, close } = await renderer_1.RenderInternals.serveStatic(bundled);
57
- const serveUrl = `http://localhost:${port}`;
58
- const openedBrowser = await browserInstance;
39
+ const steps = [
40
+ renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
41
+ 'rendering',
42
+ shouldOutputImageSequence ? null : 'stitching',
43
+ ].filter(remotion_1.Internals.truthy);
44
+ const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
45
+ ? Promise.resolve(fullPath)
46
+ : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
47
+ const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
48
+ const puppeteerInstance = await browserInstance;
59
49
  const comps = await (0, renderer_1.getCompositions)(serveUrl, {
60
- browser,
61
50
  inputProps,
62
- browserInstance: openedBrowser,
51
+ puppeteerInstance,
63
52
  envVariables,
64
53
  });
65
54
  const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
@@ -75,138 +64,130 @@ const render = async () => {
75
64
  const outputDir = shouldOutputImageSequence
76
65
  ? absoluteOutputFile
77
66
  : await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'react-motion-render'));
78
- if (!outputDir) {
79
- throw new Error('Assertion error: Expected outputDir to not be null');
80
- }
81
67
  log_1.Log.verbose('Output dir', outputDir);
82
- const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
68
+ const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
83
69
  let totalFrames = 0;
84
- const renderStart = Date.now();
85
- const { assetsInfo } = await (0, renderer_1.renderFrames)({
86
- config,
87
- onFrameUpdate: (frame) => {
88
- renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
89
- frames: frame,
70
+ let encodedFrames = 0;
71
+ let renderedFrames = 0;
72
+ let encodedDoneIn = null;
73
+ let renderedDoneIn = null;
74
+ let stitchStage = 'encoding';
75
+ const downloads = [];
76
+ const updateRenderProgress = () => {
77
+ if (totalFrames === null) {
78
+ throw new Error('totalFrames should not be 0');
79
+ }
80
+ return renderProgress.update((0, progress_bar_1.makeRenderingAndStitchingProgress)({
81
+ rendering: {
82
+ frames: renderedFrames,
90
83
  totalFrames,
91
84
  concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
92
- doneIn: null,
93
- steps,
94
- }));
95
- },
96
- parallelism,
97
- compositionId,
98
- outputDir,
99
- onError,
100
- onStart: ({ frameCount: fc }) => {
101
- renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
102
- frames: 0,
103
- totalFrames: fc,
104
- concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
105
- doneIn: null,
85
+ doneIn: renderedDoneIn,
106
86
  steps,
107
- }));
108
- totalFrames = fc;
109
- },
110
- inputProps,
111
- envVariables,
112
- imageFormat,
113
- quality,
114
- browser,
115
- frameRange: frameRange !== null && frameRange !== void 0 ? frameRange : null,
116
- puppeteerInstance: openedBrowser,
117
- serveUrl,
118
- });
119
- const closeBrowserPromise = openedBrowser.close();
120
- renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
121
- frames: totalFrames,
122
- totalFrames,
123
- steps,
124
- concurrency: renderer_1.RenderInternals.getActualConcurrency(parallelism),
125
- doneIn: Date.now() - renderStart,
126
- }) + '\n');
127
- if (process.env.DEBUG) {
128
- remotion_1.Internals.perf.logPerf();
129
- }
87
+ },
88
+ stitching: shouldOutputImageSequence
89
+ ? null
90
+ : {
91
+ doneIn: encodedDoneIn,
92
+ frames: encodedFrames,
93
+ stage: stitchStage,
94
+ steps,
95
+ totalFrames,
96
+ },
97
+ downloads,
98
+ }));
99
+ };
130
100
  if (shouldOutputImageSequence) {
131
- log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
132
- }
133
- else {
134
- if (typeof crf !== 'number') {
135
- throw new TypeError('CRF is unexpectedly not a number');
136
- }
137
- const stitchingProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
138
- const dirName = path_1.default.dirname(absoluteOutputFile);
139
- if (!fs_1.default.existsSync(dirName)) {
140
- fs_1.default.mkdirSync(dirName, {
141
- recursive: true,
142
- });
101
+ fs_1.default.mkdirSync(absoluteOutputFile, {
102
+ recursive: true,
103
+ });
104
+ if (imageFormat === 'none') {
105
+ log_1.Log.error('Cannot render an image sequence with a codec that renders no images.');
106
+ log_1.Log.error(`codec = ${codec}, imageFormat = ${imageFormat}`);
107
+ process.exit(1);
143
108
  }
144
- stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
145
- doneIn: null,
146
- frames: 0,
147
- steps,
148
- totalFrames,
149
- }));
150
- const stitchStart = Date.now();
151
- await (0, renderer_1.stitchFramesToVideo)({
152
- dir: outputDir,
153
- width: config.width,
154
- height: config.height,
155
- fps: config.fps,
156
- outputLocation: absoluteOutputFile,
157
- force: overwrite,
109
+ await (0, renderer_1.renderFrames)({
110
+ config,
158
111
  imageFormat,
159
- pixelFormat,
160
- codec,
161
- proResProfile,
162
- crf,
163
- assetsInfo,
164
- parallelism,
165
- onProgress: (frame) => {
166
- stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
167
- doneIn: null,
168
- frames: frame,
169
- steps,
170
- totalFrames,
171
- }));
112
+ inputProps,
113
+ onFrameUpdate: (rendered) => {
114
+ renderedFrames = rendered;
115
+ updateRenderProgress();
116
+ },
117
+ onStart: ({ frameCount }) => {
118
+ totalFrames = frameCount;
119
+ return updateRenderProgress();
172
120
  },
173
121
  onDownload: (src) => {
174
- log_1.Log.info('Downloading asset... ', src);
122
+ if (src.startsWith('data:')) {
123
+ log_1.Log.info('\nWriting Data URL to file: ', src.substring(0, 30) + '...');
124
+ }
125
+ else {
126
+ log_1.Log.info('\nDownloading asset... ', src);
127
+ }
175
128
  },
176
- webpackBundle: bundled,
177
- verbose: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
129
+ outputDir,
130
+ serveUrl,
131
+ dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
132
+ envVariables,
133
+ frameRange,
134
+ parallelism,
135
+ puppeteerInstance,
136
+ quality,
178
137
  });
179
- stitchingProgress.update((0, progress_bar_1.makeStitchingProgress)({
180
- doneIn: Date.now() - stitchStart,
181
- frames: totalFrames,
182
- steps,
183
- totalFrames,
184
- }) + '\n');
185
- log_1.Log.verbose('Cleaning up...');
186
- try {
187
- if (process.platform === 'win32') {
188
- // Properly delete directories because Windows doesn't seem to like fs.
189
- await (0, delete_directory_1.deleteDirectory)(outputDir);
190
- await (0, delete_directory_1.deleteDirectory)(bundled);
191
- }
192
- else {
193
- await Promise.all([
194
- ((_a = fs_1.default.promises.rm) !== null && _a !== void 0 ? _a : fs_1.default.promises.rmdir)(outputDir, {
195
- recursive: true,
196
- }),
197
- ((_b = fs_1.default.promises.rm) !== null && _b !== void 0 ? _b : fs_1.default.promises.rmdir)(bundled, {
198
- recursive: true,
199
- }),
200
- ]);
201
- }
202
- }
203
- catch (err) {
204
- log_1.Log.warn('Could not clean up directory.');
205
- log_1.Log.warn(err);
206
- log_1.Log.warn('Do you have minimum required Node.js version?');
207
- }
208
- log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
138
+ renderedDoneIn = Date.now() - startTime;
139
+ updateRenderProgress();
140
+ log_1.Log.info();
141
+ log_1.Log.info();
142
+ log_1.Log.info(chalk_1.default.green('\nYour image sequence is ready!'));
143
+ return;
209
144
  }
145
+ await (0, renderer_1.renderMedia)({
146
+ outputLocation: absoluteOutputFile,
147
+ codec,
148
+ composition: config,
149
+ crf,
150
+ envVariables,
151
+ ffmpegExecutable,
152
+ frameRange,
153
+ imageFormat,
154
+ inputProps,
155
+ onProgress: (update) => {
156
+ encodedDoneIn = update.encodedDoneIn;
157
+ encodedFrames = update.encodedFrames;
158
+ renderedDoneIn = update.renderedDoneIn;
159
+ stitchStage = update.stitchStage;
160
+ renderedFrames = update.renderedFrames;
161
+ updateRenderProgress();
162
+ },
163
+ puppeteerInstance,
164
+ overwrite,
165
+ parallelism,
166
+ pixelFormat,
167
+ proResProfile,
168
+ quality,
169
+ serveUrl,
170
+ onDownload: (src) => {
171
+ const id = Math.random();
172
+ const download = {
173
+ id,
174
+ name: src,
175
+ progress: 0,
176
+ };
177
+ downloads.push(download);
178
+ updateRenderProgress();
179
+ return ({ percent }) => {
180
+ download.progress = percent;
181
+ updateRenderProgress();
182
+ };
183
+ },
184
+ dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
185
+ onStart: ({ frameCount }) => {
186
+ totalFrames = frameCount;
187
+ },
188
+ });
189
+ log_1.Log.info();
190
+ log_1.Log.info();
210
191
  const seconds = Math.round((Date.now() - startTime) / 1000);
211
192
  log_1.Log.info([
212
193
  '- Total render time:',
@@ -215,8 +196,19 @@ const render = async () => {
215
196
  ].join(' '));
216
197
  log_1.Log.info('-', 'Output can be found at:');
217
198
  log_1.Log.info(chalk_1.default.cyan(`▶️ ${absoluteOutputFile}`));
218
- await closeBrowserPromise;
219
- close();
199
+ log_1.Log.verbose('Cleaning up...');
200
+ try {
201
+ await renderer_1.RenderInternals.deleteDirectory(await urlOrBundle);
202
+ }
203
+ catch (err) {
204
+ log_1.Log.warn('Could not clean up directory.');
205
+ log_1.Log.warn(err);
206
+ log_1.Log.warn('Do you have minimum required Node.js version?');
207
+ }
208
+ log_1.Log.info(chalk_1.default.green('\nYour video is ready!'));
209
+ closeServer().catch((err) => {
210
+ log_1.Log.error('Could not close web server', err);
211
+ });
220
212
  };
221
213
  exports.render = render;
222
214
  //# sourceMappingURL=render.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.tsx"],"names":[],"mappings":"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"}
@@ -1,2 +1,3 @@
1
- export declare const bundleOnCli: (fullPath: string, steps: number) => Promise<string>;
1
+ import { RenderStep } from './step';
2
+ export declare const bundleOnCli: (fullPath: string, steps: RenderStep[]) => Promise<string>;
2
3
  //# sourceMappingURL=setup-cache.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"setup-cache.d.ts","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,WAAW,aAAoB,MAAM,SAAS,MAAM,oBAmChE,CAAC"}
1
+ {"version":3,"file":"setup-cache.d.ts","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAElC,eAAO,MAAM,WAAW,aAAoB,MAAM,SAAS,UAAU,EAAE,oBAuCtE,CAAC"}
@@ -4,6 +4,7 @@ exports.bundleOnCli = void 0;
4
4
  const bundler_1 = require("@remotion/bundler");
5
5
  const remotion_1 = require("remotion");
6
6
  const log_1 = require("./log");
7
+ const parse_command_line_1 = require("./parse-command-line");
7
8
  const progress_bar_1 = require("./progress-bar");
8
9
  const bundleOnCli = async (fullPath, steps) => {
9
10
  const shouldCache = remotion_1.Internals.getWebpackCaching();
@@ -13,9 +14,13 @@ const bundleOnCli = async (fullPath, steps) => {
13
14
  await bundler_1.BundlerInternals.clearCache('production', null);
14
15
  }
15
16
  const bundleStartTime = Date.now();
16
- const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
17
+ const bundlingProgress = (0, progress_bar_1.createOverwriteableCliOutput)((0, parse_command_line_1.quietFlagProvided)());
17
18
  const bundled = await (0, bundler_1.bundle)(fullPath, (progress) => {
18
- bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({ progress: progress / 100, steps, doneIn: null }));
19
+ bundlingProgress.update((0, progress_bar_1.makeBundlingProgress)({
20
+ progress: progress / 100,
21
+ steps,
22
+ doneIn: null,
23
+ }));
19
24
  }, {
20
25
  enableCaching: shouldCache,
21
26
  });
@@ -1 +1 @@
1
- {"version":3,"file":"setup-cache.js","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAmC;AACnC,+BAA0B;AAC1B,iDAGwB;AAEjB,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAE,KAAa,EAAE,EAAE;IACpE,MAAM,WAAW,GAAG,oBAAS,CAAC,iBAAiB,EAAE,CAAC;IAClD,MAAM,kBAAkB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5E,IAAI,kBAAkB,IAAI,CAAC,WAAW,EAAE;QACvC,SAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QACtD,MAAM,0BAAgB,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAG,IAAA,2CAA4B,GAAE,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAM,EAC3B,QAAQ,EACR,CAAC,QAAQ,EAAE,EAAE;QACZ,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC,EAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC,CACrE,CAAC;IACH,CAAC,EACD;QACC,aAAa,EAAE,WAAW;KAC1B,CACD,CAAC;IACF,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;QACpB,QAAQ,EAAE,CAAC;QACX,KAAK;QACL,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe;KACpC,CAAC,GAAG,IAAI,CACT,CAAC;IACF,SAAG,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,IAAI,iBAAiB,IAAI,CAAC,kBAAkB,EAAE;QAC7C,SAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;KAChE;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAnCW,QAAA,WAAW,eAmCtB"}
1
+ {"version":3,"file":"setup-cache.js","sourceRoot":"","sources":["../src/setup-cache.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAmC;AACnC,+BAA0B;AAC1B,6DAAuD;AACvD,iDAGwB;AAGjB,MAAM,WAAW,GAAG,KAAK,EAAE,QAAgB,EAAE,KAAmB,EAAE,EAAE;IAC1E,MAAM,WAAW,GAAG,oBAAS,CAAC,iBAAiB,EAAE,CAAC;IAClD,MAAM,kBAAkB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC5E,IAAI,kBAAkB,IAAI,CAAC,WAAW,EAAE;QACvC,SAAG,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;QACtD,MAAM,0BAAgB,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;KACtD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACnC,MAAM,gBAAgB,GAAG,IAAA,2CAA4B,EAAC,IAAA,sCAAiB,GAAE,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,IAAA,gBAAM,EAC3B,QAAQ,EACR,CAAC,QAAQ,EAAE,EAAE;QACZ,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;YACpB,QAAQ,EAAE,QAAQ,GAAG,GAAG;YACxB,KAAK;YACL,MAAM,EAAE,IAAI;SACZ,CAAC,CACF,CAAC;IACH,CAAC,EACD;QACC,aAAa,EAAE,WAAW;KAC1B,CACD,CAAC;IACF,gBAAgB,CAAC,MAAM,CACtB,IAAA,mCAAoB,EAAC;QACpB,QAAQ,EAAE,CAAC;QACX,KAAK;QACL,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe;KACpC,CAAC,GAAG,IAAI,CACT,CAAC;IACF,SAAG,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,0BAAgB,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3E,IAAI,iBAAiB,IAAI,CAAC,kBAAkB,EAAE;QAC7C,SAAG,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;KAChE;IAED,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AAvCW,QAAA,WAAW,eAuCtB"}
package/dist/step.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export declare type RenderStep = 'bundling' | 'rendering' | 'stitching';
2
+ //# sourceMappingURL=step.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU,GAAG,UAAU,GAAG,WAAW,GAAG,WAAW,CAAC"}
package/dist/step.js ADDED
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=step.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"step.js","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":""}
@@ -1 +1 @@
1
- {"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,KAAK,qBA2IjB,CAAC"}
1
+ {"version":3,"file":"still.d.ts","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,KAAK,qBAsJjB,CAAC"}
package/dist/still.js CHANGED
@@ -9,6 +9,7 @@ const chalk_1 = __importDefault(require("chalk"));
9
9
  const fs_1 = require("fs");
10
10
  const path_1 = __importDefault(require("path"));
11
11
  const remotion_1 = require("remotion");
12
+ const _1 = require(".");
12
13
  const get_cli_options_1 = require("./get-cli-options");
13
14
  const get_composition_id_1 = require("./get-composition-id");
14
15
  const handle_common_errors_1 = require("./handle-common-errors");
@@ -21,8 +22,10 @@ const user_passed_output_location_1 = require("./user-passed-output-location");
21
22
  const still = async () => {
22
23
  const startTime = Date.now();
23
24
  const file = parse_command_line_1.parsedCli._[1];
24
- const fullPath = path_1.default.join(process.cwd(), file);
25
- (0, initialize_render_cli_1.initializeRenderCli)('still');
25
+ const fullPath = renderer_1.RenderInternals.isServeUrl(file)
26
+ ? file
27
+ : path_1.default.join(process.cwd(), file);
28
+ await (0, initialize_render_cli_1.initializeRenderCli)('still');
26
29
  const userOutput = path_1.default.resolve(process.cwd(), (0, user_passed_output_location_1.getUserPassedOutputLocation)());
27
30
  if (userOutput.endsWith('.jpeg') || userOutput.endsWith('.jpg')) {
28
31
  log_1.Log.verbose('Output file has a JPEG extension, therefore setting the image format to JPEG.');
@@ -45,20 +48,25 @@ const still = async () => {
45
48
  !userOutput.endsWith('.jpeg')) {
46
49
  log_1.Log.warn(`Rendering a JPEG, expected a .jpg or .jpeg extension but got ${userOutput}`);
47
50
  }
48
- const browserInstance = renderer_1.RenderInternals.openBrowser(browser, {
51
+ const browserInstance = (0, renderer_1.openBrowser)(browser, {
49
52
  browserExecutable,
50
- shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
53
+ shouldDumpIo: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
51
54
  });
52
55
  (0, fs_1.mkdirSync)(path_1.default.join(userOutput, '..'), {
53
56
  recursive: true,
54
57
  });
55
- const steps = 2;
56
- const bundled = await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
57
- const openedBrowser = await browserInstance;
58
- const comps = await (0, renderer_1.getCompositions)(bundled, {
59
- browser,
58
+ const steps = [
59
+ renderer_1.RenderInternals.isServeUrl(fullPath) ? null : 'bundling',
60
+ 'rendering',
61
+ ].filter(remotion_1.Internals.truthy);
62
+ const urlOrBundle = renderer_1.RenderInternals.isServeUrl(fullPath)
63
+ ? Promise.resolve(fullPath)
64
+ : await (0, setup_cache_1.bundleOnCli)(fullPath, steps);
65
+ const { serveUrl, closeServer } = await renderer_1.RenderInternals.prepareServer(await urlOrBundle);
66
+ const puppeteerInstance = await browserInstance;
67
+ const comps = await (0, renderer_1.getCompositions)(serveUrl, {
60
68
  inputProps,
61
- browserInstance: openedBrowser,
69
+ puppeteerInstance,
62
70
  envVariables,
63
71
  });
64
72
  const compositionId = (0, get_composition_id_1.getCompositionId)(comps);
@@ -66,32 +74,29 @@ const still = async () => {
66
74
  if (!composition) {
67
75
  throw new Error(`Cannot find composition with ID ${compositionId}`);
68
76
  }
69
- const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)();
77
+ const renderProgress = (0, progress_bar_1.createOverwriteableCliOutput)(_1.CliInternals.quietFlagProvided());
70
78
  const renderStart = Date.now();
71
- const { port, close } = await renderer_1.RenderInternals.serveStatic(bundled);
72
- const serveUrl = `http://localhost:${port}`;
73
- await (0, renderer_1.renderStill)({
74
- composition,
75
- frame: stillFrame,
76
- output: userOutput,
77
- serveUrl,
78
- quality,
79
- browser,
80
- dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel('verbose'),
81
- envVariables,
82
- imageFormat,
83
- inputProps,
84
- onError: (err) => {
85
- log_1.Log.error();
86
- log_1.Log.error('The following error occured when rendering the still:');
87
- (0, handle_common_errors_1.handleCommonError)(err);
88
- process.exit(1);
89
- },
90
- puppeteerInstance: openedBrowser,
91
- overwrite: remotion_1.Internals.getShouldOverwrite(),
92
- });
93
- const closeBrowserPromise = openedBrowser.close();
94
- close().catch((err) => {
79
+ try {
80
+ await (0, renderer_1.renderStill)({
81
+ composition,
82
+ frame: stillFrame,
83
+ output: userOutput,
84
+ serveUrl,
85
+ quality,
86
+ dumpBrowserLogs: remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'verbose'),
87
+ envVariables,
88
+ imageFormat,
89
+ inputProps,
90
+ });
91
+ }
92
+ catch (err) {
93
+ log_1.Log.error();
94
+ log_1.Log.error('The following error occured when rendering the still:');
95
+ (0, handle_common_errors_1.handleCommonError)(err);
96
+ process.exit(1);
97
+ }
98
+ const closeBrowserPromise = puppeteerInstance.close();
99
+ closeServer().catch((err) => {
95
100
  log_1.Log.error('Could not close web server', err);
96
101
  });
97
102
  renderProgress.update((0, progress_bar_1.makeRenderingProgress)({
package/dist/still.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"still.js","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"still.js","sourceRoot":"","sources":["../src/still.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,OAAO,qBAkCnB,CAAC"}
1
+ {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":"AAuCA,eAAO,MAAM,OAAO,qBAuCnB,CAAC"}
package/dist/upgrade.js CHANGED
@@ -55,7 +55,7 @@ const upgrade = async () => {
55
55
  'remotion',
56
56
  ].filter((u) => dependencies.includes(u));
57
57
  const prom = (0, execa_1.default)(tool, ['upgrade', ...toUpgrade]);
58
- if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel('info')) {
58
+ if (remotion_1.Internals.Logging.isEqualOrBelowLogLevel(remotion_1.Internals.Logging.getLogLevel(), 'info')) {
59
59
  (_a = prom.stdout) === null || _a === void 0 ? void 0 : _a.pipe(process.stdout);
60
60
  }
61
61
  await prom;
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AACxB,uCAAmC;AACnC,+BAA0B;AAE1B,MAAM,SAAS,GAAG,GAAmB,EAAE;IACtC,MAAM,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,YAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAEnD,IAAI,SAAS,IAAI,CAAC,UAAU,EAAE;QAC7B,OAAO,KAAK,CAAC;KACb;IAED,IAAI,CAAC,SAAS,IAAI,UAAU,EAAE;QAC7B,OAAO,MAAM,CAAC;KACd;IAED,IAAI,SAAS,IAAI,UAAU,EAAE;QAC5B,SAAG,CAAC,KAAK,CACR,sEAAsE,CACtE,CAAC;QACF,SAAG,CAAC,KAAK,CACR,qFAAqF,CACrF,CAAC;QACF,SAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,SAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACjE,SAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAC1D,SAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC5C,SAAG,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;IACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;;IACjC,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;QACxC,SAAG,CAAC,KAAK,CACR,2EAA2E,CAC3E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAE3D,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC;IAEzB,MAAM,SAAS,GAAG;QACjB,mBAAmB;QACnB,eAAe;QACf,yBAAyB;QACzB,oBAAoB;QACpB,uBAAuB;QACvB,wBAAwB;QACxB,kBAAkB;QAClB,iBAAiB;QACjB,eAAe;QACf,UAAU;KACV,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;IACpD,IAAI,oBAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACrD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAClC;IAED,MAAM,IAAI,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;AAC3C,CAAC,CAAC;AAlCW,QAAA,OAAO,WAkClB"}
1
+ {"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../src/upgrade.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AACxB,uCAAmC;AACnC,+BAA0B;AAE1B,MAAM,SAAS,GAAG,GAAmB,EAAE;IACtC,MAAM,uBAAuB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;IAE/D,MAAM,SAAS,GAAG,YAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,YAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAEnD,IAAI,SAAS,IAAI,CAAC,UAAU,EAAE;QAC7B,OAAO,KAAK,CAAC;KACb;IAED,IAAI,CAAC,SAAS,IAAI,UAAU,EAAE;QAC7B,OAAO,MAAM,CAAC;KACd;IAED,IAAI,SAAS,IAAI,UAAU,EAAE;QAC5B,SAAG,CAAC,KAAK,CACR,sEAAsE,CACtE,CAAC;QACF,SAAG,CAAC,KAAK,CACR,qFAAqF,CACrF,CAAC;QACF,SAAG,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,SAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACjE,SAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAC1D,SAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAC5C,SAAG,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;IACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;;IACjC,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE;QACxC,SAAG,CAAC,KAAK,CACR,2EAA2E,CAC3E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAE3D,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC;IAEzB,MAAM,SAAS,GAAG;QACjB,mBAAmB;QACnB,eAAe;QACf,yBAAyB;QACzB,oBAAoB;QACpB,uBAAuB;QACvB,wBAAwB;QACxB,kBAAkB;QAClB,iBAAiB;QACjB,eAAe;QACf,UAAU;KACV,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;IACpD,IACC,oBAAS,CAAC,OAAO,CAAC,sBAAsB,CACvC,oBAAS,CAAC,OAAO,CAAC,WAAW,EAAE,EAC/B,MAAM,CACN,EACA;QACD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAClC;IAED,MAAM,IAAI,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;AAC3C,CAAC,CAAC;AAvCW,QAAA,OAAO,WAuClB"}