Merge pull request #249 from flatironinstitute/scripts-normalize-line…

…-endings

Normalize newlines before passing to scripts

gui/src/app/Scripting/ScriptEditor.tsx

@@ -5,6 +5,7 @@ import { ColorOptions, ToolbarItem } from "@SpComponents/ToolBar";
 import { FileNames } from "@SpCore/FileMapping";
 import { ProjectContext } from "@SpCore/ProjectContextProvider";
 import { ProjectKnownFiles } from "@SpCore/ProjectDataModel";
+import { normalizeLineEndings } from "@SpUtil/normalizeLineEndings";
 import {
   FunctionComponent,
   RefObject,
@@ -67,7 +68,7 @@ const ScriptEditor: FunctionComponent<ScriptEditorProps> = ({
   }, [dataKey, update]);
 
   const runCode = useCallback(() => {
-    onRun(content);
+    onRun(normalizeLineEndings(content));
   }, [content, onRun]);
 
   const unsavedChanges = useMemo(() => {

gui/src/app/util/normalizeLineEndings.ts

@@ -0,0 +1,3 @@
+export const normalizeLineEndings = (str: string) => {
+  return str.replace(/\r\n/g, "\n");
+};

gui/test/app/util/normalizeLineEndings.test.ts

@@ -0,0 +1,15 @@
+import { normalizeLineEndings } from "@SpUtil/normalizeLineEndings";
+import { describe, expect, test } from "vitest";
+
+describe("normalizeLineEndings", () => {
+  test("should replace all CRLF with LF", () => {
+    const actual = normalizeLineEndings("foo\r\nbar\r\nbaz\r\n");
+    expect(actual).toBe("foo\nbar\nbaz\n");
+  });
+
+  test("leaves LF alone", () => {
+    const before = "foo\nbar\nbaz\n";
+    const actual = normalizeLineEndings(before);
+    expect(actual).toBe(before);
+  });
+});