import/export

Author: m-kessel

lasso/src/components/CodeSnippet/CodeSnippetCard.tsx

@@ -127,10 +127,15 @@ export const CodeSnippetCard: React.FC<CodeSnippetProps> = ({ snippet }) => (
             <Typography variant="subtitle2" sx={{ mb: 0.5 }}>
                 Source:
             </Typography>
+            <Box sx={{maxHeight: 350,
+                overflow: "auto"
+            }}>
             <CodeBlock
                 language="java">
                 {snippet.content}
             </CodeBlock>
+            </Box>
+
             {/* <Box
                 component="pre"
                 sx={{

lasso/src/components/HubFeatures/HubFeatures.tsx

@@ -10,11 +10,37 @@ export class TDSExamples {
     decode(java.lang.String)->byte[]
 }`,
             sheets: [{
-              name: "testEncode",
-              signature: "()",
-              jsonl: `{"cells": {"A1": {}, "B1": "create", "C1": "Base64"}}
+                name: "testEncode",
+                signature: "()",
+                body: `{"cells": {"A1": {}, "B1": "create", "C1": "Base64"}}
 {"cells": {"A2": "\\"SGVsbG8gV29ybGQh\\".getBytes()", "B2": "encode", "C2": "A1", "D2": "\\"Hello World!\\".getBytes()"}}`,
-              invocations: []
+                invocations: []
+            }]
+        },
+        BASE64_PARAMETERIZED: {
+            label: "Base64 (Parameterized Sheets)",
+            lql: `Base64 {
+    encode(byte[])->byte[]
+    decode(java.lang.String)->byte[]
+}`,
+            sheets: [{
+                name: "testEncode",
+                signature: "(p1=byte[])",
+                body: `{"cells":{"A1":{},"B1":"create","C1":"Base64"}}\n{"cells":{"A2":"\\"SGVsbG8gV29ybGQh\\".getBytes()","B2":"encode","C2":"A1","D2":"?p1"}}`,
+                invocations: [
+                    {
+                        id: 0,
+                        sequenceSheetName: "testEncode",
+                        signature: "",
+                        params: ["\"Hello World!\".getBytes()"]
+                    },
+
+                    {
+                        id: 1,
+                        sequenceSheetName: "testEncode",
+                        signature: "",
+                        params: ["\"Hello World\".getBytes()"]
+                    }]
             }]
         },
         STACK: {
@@ -26,14 +52,14 @@ export class TDSExamples {
     size()->int
 }`,
             sheets: [{
-              name: "testPush",
-              signature: "()",
-              jsonl: `{"cells":{"A1":{},"B1":"create","C1":"Stack"}}
+                name: "testPush",
+                signature: "()",
+                body: `{"cells":{"A1":{},"B1":"create","C1":"Stack"}}
 {"cells":{"A2":{},"B2":"push","C2":"A1","D2":"\\"Hello World!\\""}}
 {"cells":{"A3":"D2","B3":"peek","C3":"A1"}}
 {"cells":{"A4":"D2","B4":"pop","C4":"A1"}}
 {"cells":{"A5":0,"B5":"size","C5":"A1"}}`,
-              invocations: []
+                invocations: []
             }]
         }
     }
@@ -443,12 +469,12 @@ study(name: 'Stack') {
                       row '', 'push', 'A1', '"Hi"'
                       row '', 'size', 'A1'
                   },
-                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: "Hello World!") {
+                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: '"Hello World!"') {
                       row '', 'create', 'Stack'
                       row '', 'push', 'A1', '?p1'
                       row '', 'size', 'A1'
                   },
-                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: "Bla blub!") // e.g., parameterized
+                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: '"Bla blub!"') // e.g., parameterized
                 ]
         )
     }
@@ -502,12 +528,12 @@ study(name: 'Stack') {
                       row '',  'push',   'A1',     '"Hi"'
                       row '',  'size',   'A1'
                   },
-                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: "Hello World!") {
+                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: '"Hello World!"') {
                       row '',  'create', 'Stack'
                       row '',  'push',   'A1',     '?p1'
                       row '',  'size',   'A1'
                   },
-                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: "Bla blub!") // e.g., parameterized
+                  test(name: 'testPushParameterized(p1=java.lang.String)', p1: '"Bla blub!"') // e.g., parameterized
                 ]
         )
     }

lasso/src/components/SSN/SequenceSheetEditor.tsx

@@ -11,7 +11,6 @@ import DownloadIcon from "@mui/icons-material/Download";
 import RemoveCircleOutlineIcon from "@mui/icons-material/RemoveCircleOutline";
 import AddIcon from "@mui/icons-material/Add";
 import RemoveIcon from "@mui/icons-material/Remove";
-import { sequenceSheetsToGroovyDSL } from "./ssnutilities";
 
 const BASE_COLS = ["A", "B", "C", "D"];
 const OPERATION_NAMES = ["create", "push", "pop", "size"];
@@ -118,6 +117,17 @@ export interface SequenceSheetData {
   rows: any[];
   invocations: Invocation[];
 }
+export interface SequenceSheetDataModel {
+  name: string;
+  signature: string;
+  body: string;
+  invocations: Invocation[];
+}
+export interface SequenceSheetSetModel {
+  sheets: SequenceSheetDataModel[];
+  interfaceSpecification: string;
+}
+
 interface SequenceSheetEditorProps {
   value: SequenceSheetData;
   onChange: (next: SequenceSheetData) => void;
@@ -181,7 +191,7 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
     handleChangeField("rows", nextRows);
     return newRow;
   };
-  const handleExport = () => {
+  const handleExportJSONL = () => {
     const jsonl = gridToJSONL(value.rows, value.columns);
 
     // const sheet1 = {
@@ -201,17 +211,29 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
     a.click();
     a.remove();
     setSnackMsg("Exported as file.");
-};
-  const handleImport = () => {
-    const result = jsonlToRows(importText);
+  };
+
+  const handleImport = (text: string) => {
+    const model: SequenceSheetDataModel = JSON.parse(text);
+
+    const result = jsonlToRows(model.body);
     if ("error" in result) {
       setSnackMsg(result.error);
     } else {
       const importedRows = result.rows.map((row, idx) => ({
         ...row,
         id: idx,
       }));
-      onChange({ ...value, columns: result.cols, rows: importedRows });
+
+      const newValue: SequenceSheetData = {
+        name: model.name,
+        signature: model.signature,
+        columns: result.cols,
+        rows: importedRows,
+        invocations: model.invocations
+      };
+
+      onChange(newValue);
       setSnackMsg("Imported!");
     }
   };
@@ -248,12 +270,12 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
   };
 
   // --- Invocations Logic ---
-  const handleAddInvocation = () => {
+  const handleAddInvocation = (sequenceSheetName: string) => {
     handleChangeField("invocations", [
       ...value.invocations,
       {
         id: nextInvId,
-        sequenceSheetName: "",
+        sequenceSheetName: sequenceSheetName,
         signature: "",
         params: [""],
       },
@@ -287,9 +309,9 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
       value.invocations.map((inv) =>
         inv.id === invId
           ? {
-              ...inv,
-              params: inv.params.map((v, idx) => (idx === paramIdx ? paramVal : v)),
-            }
+            ...inv,
+            params: inv.params.map((v, idx) => (idx === paramIdx ? paramVal : v)),
+          }
           : inv
       )
     );
@@ -414,7 +436,7 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
         <Button
           variant="outlined"
           startIcon={<DownloadIcon />}
-          onClick={handleExport}
+          onClick={handleExportJSONL}
         >
           Export JSONL
         </Button>
@@ -482,7 +504,7 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
       <Typography variant="h6" sx={{ mt: 6 }}>Invocations of Sequence Sheets</Typography>
       <Button
         startIcon={<AddIcon />}
-        onClick={handleAddInvocation}
+        onClick={(e) => handleAddInvocation(value.name)}
         sx={{ mt: 1, mb: 2 }}
         variant="contained"
       >
@@ -501,6 +523,7 @@ export const SequenceSheetEditor: React.FC<SequenceSheetEditorProps> = ({
                 <TextField
                   label="Sequence Sheet Name"
                   value={inv.sequenceSheetName}
+                  disabled={true}
                   onChange={e =>
                     handleInvocationFieldChange(inv.id, "sequenceSheetName", e.target.value)
                   }

lasso/src/components/SSN/ssnutilities.tsx

@@ -1,3 +1,5 @@
+import { Invocation } from "./SequenceSheetEditor";
+
 type SequenceSheetJsonLRow = {
     cells: Record<string, any>
 };
@@ -60,18 +62,57 @@ function sequenceSheetRowsJsonlToGroovyRows(jsonl: string, columns?: string[]):
     });
 }
 
+export function extractParamNames(input: string): string[] {
+  // Remove leading/trailing whitespace and any surrounding parentheses
+  const cleaned = input.trim().replace(/^\(|\)$/g, '');
+
+  // If the string is empty after cleaning, return []
+  if (!cleaned) return [];
+
+  // Split on commas to get individual key-value pairs
+  const pairs = cleaned.split(',');
+
+  // Extract key names
+  const keys = pairs.map(pair => {
+    const match = /^\s*([^=]+)\s*=/.exec(pair);
+    return match ? match[1].trim() : null;
+  }).filter((key): key is string => !!key); // Filters out any nulls
+
+  return keys;
+}
+
 /**
  * Converts a list of sequence sheets in JSONL to Groovy DSL.
  * @param sheets Array of { name: string, jsonl: string, columns: string[] }
  * @returns String of Groovy DSL representing all sheets.
  */
 export function sequenceSheetsToGroovyDSL(
-    sheets: { name: string; signature: string; jsonl: string; columns?: string[] }[]
+    sheets: { name: string; signature: string; jsonl: string; invocations: Invocation[]; columns?: string[] }[]
 ): string {
-    const sheetBlocks = sheets.map(sheet => {
+    const sheetBlocks = sheets.flatMap(sheet => {
+        const paramNames = extractParamNames(sheet.signature);
         const title = sheet.name.replace(/'/g, "\\'") + sheet.signature; // Escape any single quote in name
         const bodyRows = sequenceSheetRowsJsonlToGroovyRows(sheet.jsonl, sheet.columns);
-        return `  test(name: '${title}') {\n    ${bodyRows.join('\n    ')}\n  }`;
+
+        console.log(paramNames)
+
+        if(sheet.invocations.length > 0) {
+            // array
+            return sheet.invocations.map((inv, index) => {
+                const parameters = inv.params.map((p, pIndex) => `${paramNames[pIndex]}:'${p}'`).join(', ');
+
+                if(index == 0) {
+                    // declare entire sheet
+                    return `  test(name: '${title}', ${parameters}) {\n    ${bodyRows.join('\n    ')}\n  }`;
+                } else {
+                    // just invocation
+                    return `  test(name: '${title}', ${parameters})`;
+                }
+            });
+        } else {
+            // array
+            return [`  test(name: '${title}') {\n    ${bodyRows.join('\n    ')}\n  }`];
+        }
     });
     // Output as a Groovy list
     return '[\n' + sheetBlocks.join(',\n') + '\n]';

lasso/src/pages/generation.md

@@ -12,6 +12,7 @@ LASSO's Sequence Sheet Notation (SSN) allows for a unique form of code generatio
 ### Examples
 
 * [**Base64 encoding**](lasso/ssn?recommendation=gen&example=BASE64)
+* [**Base64 encoding (Parameterized Tests)**](lasso/ssn?recommendation=gen&example=BASE64_PARAMETERIZED)
 * [**Stack**](lasso/ssn?recommendation=gen&example=STACK)
 
 ## Research

lasso/src/pages/lasso/result.tsx

@@ -306,60 +306,6 @@ DRAFT
                             {ab.codeUnits.length} Code Module(s)
                           </Typography>
 
-                          {/* <br />
-                          <Typography variant="body2" color="text.secondary">
-                            <Link
-                              href={`/web/lasso/search?query=*:*&filter=executionId:${executionId}&ds=lasso_quickstart`}
-                              target="_blank"
-                              rel="noopener"
-                              underline="hover"
-                            >
-                              Click here
-                            </Link> to view all <b>code modules</b>.
-                          </Typography>
-                          <br /> */}
-
-
-                          {/* <List dense={true}>
-
-                            {ab.codeUnits.map((codeUnit) => (
-
-                              <ListItem key={codeUnit.id}>
-                                <ListItemIcon>
-                                  <Code />
-                                </ListItemIcon>
-                                <ListItemText
-                                  primary={codeUnit.packagename + "." + codeUnit.name}
-                                  secondary={
-                                    <React.Fragment>
-                                      <Typography
-                                        component="span"
-                                        variant="body2"
-                                        sx={{ color: 'text.primary', display: 'inline' }}
-                                      >
-                                        <small>{codeUnit.id}</small>
-                                      </Typography>
-                                      <CodeBlock language="java">{codeUnit.content ? codeUnit.content : "n/a"}</CodeBlock>
-
-                                      <Typography variant="body2" color="text.secondary">
-                                        Learn more about <b>this code module</b>:                                       <Link
-                                          href={`/web/lasso/search?query=*:*&filter=id:${codeUnit.id}&ds=${codeUnit.dataSource}`}
-                                          target="_blank"
-                                          rel="noopener"
-                                          underline="hover"
-                                        >
-                                          Details
-                                        </Link>
-                                      </Typography>
-
-                                    </React.Fragment>
-                                  }
-                                ></ListItemText>
-
-                              </ListItem>
-                            ))}
-                          </List> */}
-
                           <Grid container spacing={3} sx={{ mt: 1 }}>
                             {ab.codeUnits.map((codeUnit) => (
                               <Grid item xs={12} key={codeUnit.id}>