@motionscript/code 0.1.0-alpha.0 → 0.1.0-alpha.10

package/src/highlight.ts

@@ -54,6 +54,28 @@ const LANGUAGE_ALIASES: Record<string, string> = {
     shell: "javascript", // no shell grammar bundled; fall back rather than throw
 };
 
+/** Names that mean "no grammar, on purpose": drawn as plain text without a warning. */
+const PLAIN_LANGUAGES = new Set(["", "text", "plaintext"]);
+
+const warned = new Set<string>();
+
+/** One `console.warn` per `kind:name` for the life of the process, so a listing redrawn every frame says it once. */
+function warnOnce(kind: string, name: string, message: string): void {
+    const key = `${kind}:${name}`;
+    if (warned.has(key)) return;
+    warned.add(key);
+    console.warn(`[Code] ${message}`);
+}
+
+/**
+ * The source as the highlighter and the commands see it: lines joined by `\n`.
+ * A `\r\n` (or a lone `\r`) from a file or a clipboard would otherwise survive
+ * as a character at the end of a line, measured and drawn as a token.
+ */
+export function normalizeSource(code: string): string {
+    return code.indexOf("\r") === -1 ? code : code.replace(/\r\n?/g, "\n");
+}
+
 function resolveLanguageKey(language: string): string {
     const key = language.toLowerCase();
     return LANGUAGE_ALIASES[key] ?? key;
@@ -80,11 +102,18 @@ export function registerCodeTheme(style: CodeHighlightStyle): void {
 /**
  * Resolve a theme reference (a registered name, or a CodeHighlightStyle object)
  * to a concrete style. Unknown names fall back to the Motion Canvas default so a
- * stray theme string never throws.
+ * stray theme string never throws, with one warning per name.
  */
 export function resolveTheme(theme: CodeTheme): CodeHighlightStyle {
     if (typeof theme !== "string") return theme;
-    return themesByName.get(theme) ?? DefaultHighlightStyle;
+    const style = themesByName.get(theme);
+    if (style) return style;
+    warnOnce(
+        "theme",
+        theme,
+        `unknown theme "${theme}"; using "${DefaultHighlightStyle.name}". Built-in themes: ${Object.keys(BUILTIN_THEMES).join(", ")}; register others with registerCodeTheme.`,
+    );
+    return DefaultHighlightStyle;
 }
 
 /** Has `language` finished loading its parser? */
@@ -97,7 +126,9 @@ function isLanguageLoaded(language: string): boolean {
  * but kept in the signature for API parity with the former Shiki implementation).
  * Resolves once every requested language's parser is available. Unknown languages
  * resolve without loading anything — {@link canHighlight} stays false for them and
- * the node renders them as plain text.
+ * the node renders them as plain text, with one warning per language. A grammar
+ * whose import is rejected is reported the same way and is tried again by the
+ * next call.
  */
 export function ensureHighlighter(
     _themes: string[] = DEFAULT_THEMES,
@@ -110,7 +141,17 @@ export function ensureHighlighter(
         if (loadedParsers.has(key)) continue;
 
         const loader = LANGUAGE_LOADERS[key];
-        if (!loader) continue; // unsupported language; leave it unhighlighted
+        if (!loader) {
+            // Unsupported language; leave it unhighlighted, and say so.
+            if (!PLAIN_LANGUAGES.has(key)) {
+                warnOnce(
+                    "language",
+                    key,
+                    `no grammar for language "${lang}"; drawing it as plain text. Supported: ${Object.keys(LANGUAGE_LOADERS).join(", ")} (aliases: ${Object.keys(LANGUAGE_ALIASES).join(", ")}).`,
+                );
+            }
+            continue;
+        }
 
         let job = inFlightLangs.get(key);
         if (!job) {
@@ -119,7 +160,14 @@ export function ensureHighlighter(
                     loadedParsers.set(key, parser);
                     return parser;
                 })
-                .catch(() => null)
+                .catch((error: unknown) => {
+                    warnOnce(
+                        "load",
+                        key,
+                        `could not load the "${lang}" grammar; drawing it as plain text: ${error instanceof Error ? error.message : String(error)}`,
+                    );
+                    return null;
+                })
                 .finally(() => inFlightLangs.delete(key));
             inFlightLangs.set(key, job);
         }
@@ -248,6 +296,7 @@ export function highlightToTokens(
     language: string,
     theme: CodeTheme = DefaultHighlightStyle,
 ): { content: string; color?: string }[][] {
+    code = normalizeSource(code);
     const style = resolveTheme(theme);
     const cache = prepareHighlight(code, language, style);
 

package/src/layout.ts

@@ -1,4 +1,4 @@
-import type { InsetsResolved, MeasureContext2D, RenderContext2D } from "@motionscript/core";
+import type { InsetsResolved, MeasureContext2D, RenderContext2D } from "@motionscript/sdk";
 import type { TokenAdvanceCache } from "./measure-cache";
 import type { IdLine } from "./tokens";