Use types and code from regexplanet-common

fileformat · fileformat · commit a5ff14149a12 · 2024-10-26T10:11:41.000-04:00
diff --git a/src/app/advanced/[engine]/index.html/OptionsInput.tsx b/src/app/advanced/[engine]/index.html/OptionsInput.tsx
@@ -4,7 +4,7 @@ import { PiArrowSquareOut } from "react-icons/pi";
 
 type OptionInputProps = {
     engine: RegexEngine;
-    optionsOrNull: string[];
+    options: string[];
 };
 
 function getBackendValue(option: RegexOption): string {
@@ -15,7 +15,7 @@ function getBackendValue(option: RegexOption): string {
     return option.code;
 }
 
-export default function OptionsInput({ engine, optionsOrNull }: OptionInputProps) {
+export default function OptionsInput({ engine, options: optionsOrNull }: OptionInputProps) {
 
     const options = optionsOrNull || [];
 
diff --git a/src/app/advanced/[engine]/index.html/TestFormState.tsx b/src/app/advanced/[engine]/index.html/TestFormState.tsx
@@ -1,5 +1,4 @@
-import { TestInput } from "@/types/TestInput";
-import { TestOutput } from "@/types/TestOutput";
+import { type TestInput, type TestOutput } from "@regexplanet/common";
 
 export type TestFormState = {
     message?: string;
diff --git a/src/app/advanced/[engine]/index.html/page.tsx b/src/app/advanced/[engine]/index.html/page.tsx
@@ -5,7 +5,7 @@ import { notFound } from 'next/navigation';
 import TestForm from './TestForm';
 //import { testRegexAction } from './testRegexAction';
 //import OptionsInput from './OptionsInput';
-import { TestInput } from '@/types/TestInput';
+import { type TestInput } from '@regexplanet/common';
 import { HelpButton } from '@/components/HelpButton';
 import { cleanupSearchParam } from '@/functions/cleanupSearchParam';
 import { cleanupSearchParamArray } from '@/functions/cleanupSearchParamArray';
@@ -49,7 +49,7 @@ export default function Page({
         engine: engine.handle,
         regex: cleanupSearchParam(searchParams["regex"]),
         replacement: cleanupSearchParam(searchParams["replacement"]),
-        option: cleanupSearchParamArray(searchParams["option"]),
+        options: cleanupSearchParamArray(searchParams["option"]),
         inputs: cleanupSearchParamArray(searchParams["input"]),
     }
 
diff --git a/src/app/advanced/[engine]/index.html/testRegexAction.tsx b/src/app/advanced/[engine]/index.html/testRegexAction.tsx
@@ -1,6 +1,6 @@
 import { getEngineOrThrow } from "@/engines"
-import { TestInput } from "@/types/TestInput";
-import { TestOutput } from "@/types/TestOutput";
+import { type TestInput, type TestOutput } from "@regexplanet/common";
+
 
 export async function testRegexAction(engineHandle: string, formData: FormData) {
     'use server'
@@ -14,7 +14,7 @@ export async function testRegexAction(engineHandle: string, formData: FormData)
         engine: engineHandle,
         regex: formData.get('regex') as string,
         replacement: formData.get('replacement') as string,
-        option: formData.getAll('option') as string[],
+        options: formData.getAll('option') as string[],
         inputs: formData.getAll('input') as string[],
     }
 
diff --git a/src/app/advanced/[engine]/results.html/postpage.tsx b/src/app/advanced/[engine]/results.html/postpage.tsx
@@ -1,10 +1,9 @@
 "use server"
 import { TestResults } from "@/components/TestResults";
-import { TestOutput } from "@/types/TestOutput";
+import { type TestInput, type TestOutput } from "@regexplanet/common";
 import RootLayout from "@/app/layout";
 import { Navbar } from "@/components/Navbar";
 import { Footer } from "@/components/Footer";
-import { TestInput } from "@/types/TestInput";
 
 
 // doesn't have layout
diff --git a/src/app/advanced/[engine]/results.html/route.ts b/src/app/advanced/[engine]/results.html/route.ts
@@ -1,10 +1,10 @@
-import { TestInput } from "@/types/TestInput";
-import { TestOutput } from "@/types/TestOutput";
 import { NextRequest } from "next/server";
 //import { renderToStaticMarkup, renderToString } from "react-dom/server";
+import { notFound, redirect } from "next/navigation";
+
 import { postpage } from "./postpage";
+import { type TestInput, type TestOutput } from "@regexplanet/common";
 import { getEngine } from "@/engines";
-import { notFound, redirect } from "next/navigation";
 
 async function renderPage(
   engine: string,
@@ -50,12 +50,12 @@ export async function POST(
     engine: engine.handle,
     regex: (rawData.get("regex") || "") as string,
     replacement: (rawData.get("replacement") || "") as string,
-    option: (rawData.getAll("options") || "") as string[],
+    options: (rawData.getAll("option") || "") as string[],
     inputs: (rawData.getAll("input") || []) as string[],
   };
 
-  const response = await fetch(engine.test_url);//(testInput);
-  const testOutput = await response.json() as TestOutput;
+  const response = await fetch(engine.test_url); //(testInput);
+  const testOutput = (await response.json()) as TestOutput;
 
   const html = await renderPage(engine.handle, "post", testInput, testOutput);
 
diff --git a/src/app/share/index.html/PreviewRegex.tsx b/src/app/share/index.html/PreviewRegex.tsx
@@ -1,4 +1,4 @@
-import { TestInput } from '@/types/TestInput';
+import { type TestInput } from "@regexplanet/common";
 import { SubmitButton } from '@/components/SubmitButton';
 import { getWorkingEngine, getWorkingEngineOrThrow } from '@/engines';
 
diff --git a/src/app/share/index.html/ShareFormState.ts b/src/app/share/index.html/ShareFormState.ts
@@ -1,4 +1,4 @@
-import { TestInput } from "@/types/TestInput";
+import { type TestInput } from "@regexplanet/common";
 
 export type ShareFormState = {
   shareCode?: string;
diff --git a/src/components/TestResults.tsx b/src/components/TestResults.tsx
@@ -1,4 +1,4 @@
-import { TestOutput } from "@/types/TestOutput";
+import { type TestOutput } from "@regexplanet/common";
 
 type props = {
     testOutput: TestOutput;
diff --git a/src/engines/RegexEngine.ts b/src/engines/RegexEngine.ts
@@ -1,13 +1,10 @@
-import { TestInput } from "@/types/TestInput";
-import { TestOutput } from "@/types/TestOutput";
-
 type PortableCodes = "ignorecase" | "multiline" | "comments" | "dotall";
 
 export type RegexOption = {
   code: string;
-  legacyCode?: string;    // for the original RegexPlanet backends
-  portableCode?: PortableCodes;  // for translating this code when switching to other engines
-  numericCode?: number;    // the value for engines that use a numeric bitmask for options
+  legacyCode?: string; // for the original RegexPlanet backends
+  portableCode?: PortableCodes; // for translating this code when switching to other engines
+  numericCode?: number; // the value for engines that use a numeric bitmask for options
   description: string;
 };
 
@@ -19,7 +16,7 @@ export type RegexExtraInput = {
   defaultValue: string; // the default value to use if the user doesn't provide one
 };
 
-type RegexEngine = {
+export type RegexEngine = {
   description: string; // library or module name (do not include `short_name`)
   enabled: boolean; // always true for now
   extra_inputs?: RegexExtraInput[]; // A list of extra inputs to gather from the user
@@ -39,29 +36,3 @@ type RegexEngine = {
   status_url?: string; // URL of the status endpoint
   test_url?: string; // URL of the test endpoint
 };
-
-type TestFn = (testInput: TestInput) => Promise<TestOutput>;
-
-function generateRemoteTestFn(test_url: string): TestFn {
-  
-  return async (testInput: TestInput): Promise<TestOutput> => {
-    // this is a bogus 'as', but next build insists on it
-    const postData =
-      `regex=${encodeURIComponent(testInput.regex)}` +
-      `&replacement=${encodeURIComponent(testInput.replacement)}` +
-      `&${testInput.option.map((option) => `option=${option}`).join("&")}` +
-      `&${testInput.inputs.map((input) => `input=${input}`).join("&")}`;
-    const response = await fetch(test_url, {
-      method: "POST",
-      body: postData,
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
-    });
-    const data = await response.json();
-
-    return data as TestOutput;
-  }
-}
-
-export { generateRemoteTestFn, type RegexEngine, type TestFn };
diff --git a/src/engines/browser.ts b/src/engines/browser.ts
@@ -1,17 +1,4 @@
 import type { RegexEngine } from "./RegexEngine";
-//import { TestInput } from "@/types/TestInput";
-//import { TestOutput } from "@/types/TestOutput";
-
-/*
-const browserTest:TestFn = (testInput: TestInput): Promise<TestOutput> => {
-    const retVal:TestOutput = {
-      success: true,
-      html: `<div class="alert alert-warning">Not implemented yet</div>`,
-    }
-
-    return Promise.resolve(retVal);
-  };
-*/
 
 export const browser: RegexEngine = {
   description: "RegExp class",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { TestInput } from '@/types/TestInput';`
	`1`	`+import { type TestInput } from "@regexplanet/common";`
`2`	`2`	`import { SubmitButton } from '@/components/SubmitButton';`
`3`	`3`	`import { getWorkingEngine, getWorkingEngineOrThrow } from '@/engines';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { TestInput } from "@/types/TestInput";`
	`1`	`+import { type TestInput } from "@regexplanet/common";`
`2`	`2`
`3`	`3`	`export type ShareFormState = {`
`4`	`4`	`shareCode?: string;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { TestOutput } from "@/types/TestOutput";`
	`1`	`+import { type TestOutput } from "@regexplanet/common";`
`2`	`2`
`3`	`3`	`type props = {`
`4`	`4`	`testOutput: TestOutput;`