Test functionality working

Author: fileformat

src/app/advanced/[engine]/index.html/TestForm.tsx

@@ -8,6 +8,7 @@ import OptionsInput from './OptionsInput';
 
 type TestFormProps = {
     engine: RegexEngine;
+    testUrl?: string;       // override for use during engine development
     testInput: TestInput;
 }
 
@@ -16,8 +17,10 @@ async function runTest(test_url:string, testInput: TestInput): Promise<TestOutpu
     const postData =
         `regex=${encodeURIComponent(testInput.regex)}` +
         `&replacement=${encodeURIComponent(testInput.replacement)}` +
-        `&${testInput.option.map((option) => `option=${option}`).join("&")}` +
-        `&${testInput.inputs.map((input) => `input=${input}`).join("&")}`;
+        `&${testInput.option.map((option) => `option=${encodeURIComponent(option)}`).join("&")}` +
+        `&${testInput.inputs.map((input) => `input=${encodeURIComponent(input)}`).join("&")}`;
+
+    console.log("posting", test_url, postData);
 
     const response = await fetch(test_url, {
         method: "POST",
@@ -45,17 +48,17 @@ export default function TestForm(props: TestFormProps) {
     ));
     console.log("render", testInput.inputs);
 
-
     const onSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
         event.preventDefault();
         const form = event.currentTarget;
         const formData = new FormData(form);
         const localInput = formDataToTestInput( props.engine.handle, formData);
-        console.log(props.engine.test_url, localInput);
+        const testUrl = props.testUrl || props.engine.test_url;
+        console.log(testUrl, localInput);
         setTestInput(localInput);
         setTestOutput(null);
-        if (props.engine.test_url) {
-            setTestOutput(await runTest(props.engine.test_url, localInput));
+        if (testUrl) {
+            setTestOutput(await runTest(testUrl, localInput));
         }
     };
 
@@ -96,13 +99,17 @@ export default function TestForm(props: TestFormProps) {
     }
 
     return (
-        <>
+        <>  
+            {
+                props.testUrl ? <div className="alert alert-warning">Testing against {props.testUrl}!</div> : <></>
+            }
             {(testInput.regex ?
                 (testOutput ? <TestResults testOutput={testOutput} /> : <><h2>Results</h2><p>Loading...</p></>)
                 : <></>)
             }
             <h2>Expression to test</h2>
-            <form method="post" action="results.html" onSubmit={onSubmit}>
+            <form method="get" action="index.html" onSubmit={onSubmit}>
+                { props.testUrl ? <input type="hidden" name="testurl" value={props.testUrl} /> : <></> }
                 <div className="mb-3">
                     <label htmlFor="regex" className="form-label">Regular Expression</label>
                     <input type="text" className="form-control" id="regex" name="regex" defaultValue={testInput.regex} />

src/app/advanced/[engine]/index.html/page.tsx

@@ -7,6 +7,8 @@ import TestForm from './TestForm';
 //import OptionsInput from './OptionsInput';
 import { TestInput } from '@/types/TestInput';
 import { HelpButton } from '@/components/HelpButton';
+import { cleanupSearchParam } from '@/functions/cleanupSearchParam';
+import { cleanupSearchParamArray } from '@/functions/cleanupSearchParamArray';
 
 export async function generateMetadata({ params }: { params: { engine: string } }) {
     const engine = getEngine(params.engine);
@@ -20,7 +22,13 @@ export async function generateMetadata({ params }: { params: { engine: string }
     }
 }
 
-export default function Page({ params }: { params: { engine: string } }) {
+export default function Page({
+    params,
+    searchParams,
+}: {
+    params: { engine: string }
+    searchParams: { [key: string]: string | string[] | undefined }
+}) {
     const engine = getEngine(params.engine);
     if (!engine) {
         return notFound();
@@ -39,10 +47,14 @@ export default function Page({ params }: { params: { engine: string } }) {
 
     const testInput:TestInput = {
         engine: engine.handle,
-        regex: '',
-        replacement: '',
-        option: [],
-        inputs: ["", "", "", "", ""],
+        regex: cleanupSearchParam(searchParams["regex"]),
+        replacement: cleanupSearchParam(searchParams["replacement"]),
+        option: cleanupSearchParamArray(searchParams["option"]),
+        inputs: cleanupSearchParamArray(searchParams["input"]),
+    }
+
+    while (testInput.inputs.length < 5) {
+        testInput.inputs.push("");
     }
 
     return (
@@ -54,7 +66,7 @@ export default function Page({ params }: { params: { engine: string } }) {
             <ShareLinks url={`https://regexplanet.com/advanced/${engine.handle}/index.html`} text={`Test your ${engine.short_name} regular expression`} />
             <hr />
             {flash}
-            <TestForm engine={engine} testInput={testInput} />
+            <TestForm engine={engine} testUrl={cleanupSearchParam(searchParams["testurl"])} testInput={testInput} />
         </>
     );
     /*

src/engines/bun.ts

@@ -24,21 +24,22 @@ export const bun: RegexEngine = {
       code: "d",
       description: "Generate indices for substring matches. (hasIndices)",
     },
-    { code: "g", legacyCode: "global", description: "Global search. (global)" },
+    { code: "g", description: "Global search. (global)" },
     {
       code: "i",
-      legacyCode: "ignorecase",
       description: "Case-insensitive search. (ignoreCase)",
+      portableCode: "ignorecase",
     },
     {
       code: "m",
-      legacyCode: "multiline",
+      portableCode: "multiline",
       description:
         "Allows ^ and $ to match next to newline characters. (multiline)",
     },
     {
       code: "s",
       description: "Allows . to match newline characters. (dotAll)",
+      portableCode: "dotall",
     },
     {
       code: "u",

src/functions/cleanupSearchParamArray.ts

@@ -0,0 +1,12 @@
+export function cleanupSearchParamArray(value: string | string[] | null | undefined, defaultValue?: string[]): string[] {
+    defaultValue = defaultValue || [];
+
+    if (!value) {
+        return defaultValue;
+    }
+    if (Array.isArray(value)) {
+        return value;
+    }
+    
+    return [value];
+}