lula2 0.4.0 → 0.5.0-nightly.1

package/dist/cli/server/websocketServer.js

@@ -1414,7 +1414,10 @@ function extractFamilyFromControlId(controlId) {
   }
   return controlId.substring(0, 2).toUpperCase();
 }
-function exportAsCSV(controls, metadata, res) {
+function exportAsCSV(controls, metadata, mappingsColumn, res) {
+  return exportAsCSVWithMapping(controls, metadata, { mappings: mappingsColumn }, res);
+}
+function exportAsCSVWithMapping(controls, metadata, columnMappings, res) {
   const fieldSchema = metadata?.fieldSchema?.fields || {};
   const controlIdField = metadata?.control_id_field || "id";
   const allFields = /* @__PURE__ */ new Set();
@@ -1422,49 +1425,91 @@ function exportAsCSV(controls, metadata, res) {
     Object.keys(control).forEach((key) => allFields.add(key));
   });
   const fieldMapping = [];
+  const usedDisplayNames = /* @__PURE__ */ new Set();
   if (allFields.has(controlIdField)) {
     const idSchema = fieldSchema[controlIdField];
-    fieldMapping.push({
-      fieldName: controlIdField,
-      displayName: idSchema?.original_name || "Control ID"
-    });
+    const displayName = idSchema?.original_name || "Control ID";
+    let isMappingColumn = false;
+    if (columnMappings["mappings"]) {
+      const targetDisplayName = columnMappings["mappings"];
+      if (displayName.toLowerCase() === targetDisplayName.toLowerCase()) {
+        isMappingColumn = true;
+      }
+    }
+    fieldMapping.push({ fieldName: controlIdField, displayName, isMappingColumn });
+    usedDisplayNames.add(displayName.toLowerCase());
     allFields.delete(controlIdField);
   } else if (allFields.has("id")) {
-    fieldMapping.push({
-      fieldName: "id",
-      displayName: "Control ID"
-    });
+    let isMappingColumn = false;
+    const displayName = "Control ID";
+    if (columnMappings["mappings"]) {
+      const targetDisplayName = columnMappings["mappings"];
+      if (displayName.toLowerCase() === targetDisplayName.toLowerCase()) {
+        isMappingColumn = true;
+      }
+    }
+    fieldMapping.push({ fieldName: "id", displayName, isMappingColumn });
+    usedDisplayNames.add("control id");
     allFields.delete("id");
   }
   if (allFields.has("family")) {
     const familySchema = fieldSchema["family"];
-    fieldMapping.push({
-      fieldName: "family",
-      displayName: familySchema?.original_name || "Family"
-    });
+    const displayName = familySchema?.original_name || "Family";
+    fieldMapping.push({ fieldName: "family", displayName });
+    usedDisplayNames.add(displayName.toLowerCase());
     allFields.delete("family");
   }
   Array.from(allFields).filter((field) => field !== "mappings" && field !== "mappings_count").sort().forEach((field) => {
     const schema = fieldSchema[field];
-    const displayName = schema?.original_name || field.replace(/-/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
-    fieldMapping.push({ fieldName: field, displayName });
+    const defaultDisplayName = schema?.original_name || field.replace(/-/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+    let isMappingColumn = false;
+    let finalDisplayName = defaultDisplayName;
+    if (columnMappings["mappings"]) {
+      const targetDisplayName = columnMappings["mappings"];
+      if (defaultDisplayName.toLowerCase() === targetDisplayName.toLowerCase()) {
+        isMappingColumn = true;
+        finalDisplayName = targetDisplayName;
+      }
+    }
+    if (!usedDisplayNames.has(finalDisplayName.toLowerCase())) {
+      fieldMapping.push({
+        fieldName: field,
+        displayName: finalDisplayName,
+        isMappingColumn
+      });
+      usedDisplayNames.add(finalDisplayName.toLowerCase());
+    }
   });
-  if (allFields.has("mappings_count")) {
-    fieldMapping.push({ fieldName: "mappings_count", displayName: "Mappings Count" });
-  }
-  if (allFields.has("mappings")) {
+  if (allFields.has("mappings") && (!columnMappings["mappings"] || columnMappings["mappings"] === "Mappings")) {
     fieldMapping.push({ fieldName: "mappings", displayName: "Mappings" });
   }
   const csvRows = [];
   csvRows.push(fieldMapping.map((field) => `"${field.displayName}"`).join(","));
   controls.forEach((control) => {
-    const row = fieldMapping.map(({ fieldName }) => {
-      const value = control[fieldName];
+    const row = fieldMapping.map(({ fieldName, isMappingColumn }) => {
+      let value;
+      if (isMappingColumn) {
+        const mappingsValue = control["mappings"];
+        if (Array.isArray(mappingsValue) && mappingsValue.length > 0) {
+          const mappingsStr = mappingsValue.map((m) => m.description || m.justification || "").filter((desc) => desc && desc.trim() !== "").join("\n");
+          if (mappingsStr.trim() !== "") {
+            value = mappingsStr;
+          } else {
+            value = control[fieldName];
+          }
+        } else {
+          value = control[fieldName];
+        }
+      } else {
+        value = control[fieldName];
+      }
       if (value === void 0 || value === null) return '""';
       if (fieldName === "mappings" && Array.isArray(value)) {
-        const mappingsStr = value.map(
-          (m) => `${m.status}: ${m.description.substring(0, 50)}${m.description.length > 50 ? "..." : ""}`
-        ).join("; ");
+        const mappingsStr = value.map((m) => {
+          const justification = m.description || m.justification || "";
+          const status = m.status || "Unknown";
+          return justification.trim() !== "" ? justification : `[${status}]`;
+        }).join("\n");
         return `"${mappingsStr.replace(/"/g, '""')}"`;
       }
       if (Array.isArray(value)) return `"${value.join("; ").replace(/"/g, '""')}"`;
@@ -1479,32 +1524,101 @@ function exportAsCSV(controls, metadata, res) {
   res.setHeader("Content-Disposition", `attachment; filename="${fileName}"`);
   res.send(csvContent);
 }
-async function exportAsExcel(controls, metadata, res) {
+async function exportAsExcel(controls, metadata, mappingsColumn, res) {
+  return await exportAsExcelWithMapping(controls, metadata, { mappings: mappingsColumn }, res);
+}
+async function exportAsExcelWithMapping(controls, metadata, columnMappings, res) {
   const fieldSchema = metadata?.fieldSchema?.fields || {};
   const controlIdField = metadata?.control_id_field || "id";
-  const worksheetData = controls.map((control) => {
-    const exportControl = {};
-    if (control[controlIdField]) {
-      const idSchema = fieldSchema[controlIdField];
-      const idDisplayName = idSchema?.original_name || "Control ID";
-      exportControl[idDisplayName] = control[controlIdField];
-    } else if (control.id) {
-      exportControl["Control ID"] = control.id;
+  const allFields = /* @__PURE__ */ new Set();
+  controls.forEach((control) => {
+    Object.keys(control).forEach((key) => allFields.add(key));
+  });
+  const fieldMapping = [];
+  const usedDisplayNames = /* @__PURE__ */ new Set();
+  if (allFields.has(controlIdField)) {
+    const idSchema = fieldSchema[controlIdField];
+    const displayName = idSchema?.original_name || "Control ID";
+    let isMappingColumn = false;
+    if (columnMappings["mappings"]) {
+      const targetDisplayName = columnMappings["mappings"];
+      if (displayName.toLowerCase() === targetDisplayName.toLowerCase()) {
+        isMappingColumn = true;
+      }
     }
-    if (control.family) {
-      const familySchema = fieldSchema["family"];
-      const familyDisplayName = familySchema?.original_name || "Family";
-      exportControl[familyDisplayName] = control.family;
+    fieldMapping.push({ fieldName: controlIdField, displayName, isMappingColumn });
+    usedDisplayNames.add(displayName.toLowerCase());
+    allFields.delete(controlIdField);
+  } else if (allFields.has("id")) {
+    let isMappingColumn = false;
+    const displayName = "Control ID";
+    if (columnMappings["mappings"]) {
+      const targetDisplayName = columnMappings["mappings"];
+      if (displayName.toLowerCase() === targetDisplayName.toLowerCase()) {
+        isMappingColumn = true;
+      }
+    }
+    fieldMapping.push({ fieldName: "id", displayName, isMappingColumn });
+    usedDisplayNames.add("control id");
+    allFields.delete("id");
+  }
+  if (allFields.has("family")) {
+    const familySchema = fieldSchema["family"];
+    const displayName = familySchema?.original_name || "Family";
+    fieldMapping.push({ fieldName: "family", displayName });
+    usedDisplayNames.add(displayName.toLowerCase());
+    allFields.delete("family");
+  }
+  Array.from(allFields).filter((field) => field !== "mappings" && field !== "mappings_count").sort().forEach((field) => {
+    const schema = fieldSchema[field];
+    const defaultDisplayName = schema?.original_name || field.replace(/-/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+    let isMappingColumn = false;
+    let finalDisplayName = defaultDisplayName;
+    if (columnMappings["mappings"]) {
+      const targetDisplayName = columnMappings["mappings"];
+      if (defaultDisplayName.toLowerCase() === targetDisplayName.toLowerCase()) {
+        isMappingColumn = true;
+        finalDisplayName = targetDisplayName;
+      }
+    }
+    if (!usedDisplayNames.has(finalDisplayName.toLowerCase())) {
+      fieldMapping.push({
+        fieldName: field,
+        displayName: finalDisplayName,
+        isMappingColumn
+      });
+      usedDisplayNames.add(finalDisplayName.toLowerCase());
     }
-    Object.keys(control).forEach((key) => {
-      if (key === controlIdField || key === "id" || key === "family") return;
-      const schema = fieldSchema[key];
-      const displayName = schema?.original_name || (key === "mappings_count" ? "Mappings Count" : key === "mappings" ? "Mappings" : key.replace(/-/g, " ").replace(/\b\w/g, (l) => l.toUpperCase()));
-      const value = control[key];
-      if (key === "mappings" && Array.isArray(value)) {
-        exportControl[displayName] = value.map(
-          (m) => `${m.status}: ${m.description.substring(0, 100)}${m.description.length > 100 ? "..." : ""}`
-        ).join("\n");
+  });
+  if (allFields.has("mappings") && (!columnMappings["mappings"] || columnMappings["mappings"] === "Mappings")) {
+    fieldMapping.push({ fieldName: "mappings", displayName: "Mappings" });
+  }
+  const worksheetData = controls.map((control) => {
+    const exportControl = {};
+    fieldMapping.forEach(({ fieldName, displayName, isMappingColumn }) => {
+      let value;
+      if (isMappingColumn) {
+        const mappingsValue = control["mappings"];
+        if (Array.isArray(mappingsValue) && mappingsValue.length > 0) {
+          const mappingsStr = mappingsValue.map((m) => m.description || m.justification || "").filter((desc) => desc && desc.trim() !== "").join("\n");
+          if (mappingsStr.trim() !== "") {
+            value = mappingsStr;
+          } else {
+            value = control[fieldName];
+          }
+        } else {
+          value = control[fieldName];
+        }
+      } else {
+        value = control[fieldName];
+      }
+      if (fieldName === "mappings" && Array.isArray(value)) {
+        const mappingsStr = value.map((m) => {
+          const justification = m.description || m.justification || "";
+          const status = m.status || "Unknown";
+          return justification.trim() !== "" ? justification : `[${status}]`;
+        }).join("\n");
+        exportControl[displayName] = mappingsStr;
       } else if (Array.isArray(value)) {
         exportControl[displayName] = value.join("; ");
       } else if (typeof value === "object" && value !== null) {
@@ -1918,6 +2032,7 @@ var init_spreadsheetRoutes = __esm({
     router.get("/export-controls", async (req, res) => {
       try {
         const format = req.query.format || "csv";
+        const mappingsColumn = req.query.mappingsColumn || "Mappings";
         const state = getServerState();
         const fileStore = state.fileStore;
         if (!fileStore) {
@@ -1927,7 +2042,8 @@ var init_spreadsheetRoutes = __esm({
         const mappings = await fileStore.loadMappings();
         let metadata = {};
         try {
-          const metadataPath2 = join4(state.CONTROL_SET_DIR, "lula.yaml");
+          const controlSetPath = getCurrentControlSetPath();
+          const metadataPath2 = join4(controlSetPath, "lula.yaml");
           if (existsSync3(metadataPath2)) {
             const metadataContent = readFileSync3(metadataPath2, "utf8");
             metadata = yaml4.load(metadataContent);
@@ -1955,10 +2071,10 @@ var init_spreadsheetRoutes = __esm({
         debug(`Exporting ${controlsWithMappings.length} controls as ${format}`);
         switch (format.toLowerCase()) {
           case "csv":
-            return exportAsCSV(controlsWithMappings, metadata, res);
+            return exportAsCSV(controlsWithMappings, metadata, mappingsColumn, res);
           case "excel":
           case "xlsx":
-            return await exportAsExcel(controlsWithMappings, metadata, res);
+            return await exportAsExcel(controlsWithMappings, metadata, mappingsColumn, res);
           case "json":
             return exportAsJSON(controlsWithMappings, metadata, res);
           default:
@@ -1969,6 +2085,106 @@ var init_spreadsheetRoutes = __esm({
         res.status(500).json({ error: error.message });
       }
     });
+    router.get("/export-column-headers", async (req, res) => {
+      try {
+        let metadata = {};
+        try {
+          const controlSetPath = getCurrentControlSetPath();
+          const metadataPath2 = join4(controlSetPath, "lula.yaml");
+          if (existsSync3(metadataPath2)) {
+            const metadataContent = readFileSync3(metadataPath2, "utf8");
+            metadata = yaml4.load(metadataContent);
+          } else {
+            return res.status(404).json({ error: `No lula.yaml file found in control set path: ${controlSetPath}` });
+          }
+        } catch {
+          return res.status(500).json({ error: "Failed to read lula.yaml file" });
+        }
+        const fieldSchema = metadata?.fieldSchema?.fields || {};
+        const controlIdField = metadata?.control_id_field || "id";
+        const columnHeaders = [];
+        if (fieldSchema[controlIdField]) {
+          const idSchema = fieldSchema[controlIdField];
+          const displayName = idSchema?.original_name || "Control ID";
+          columnHeaders.push({
+            value: displayName,
+            label: displayName
+          });
+        } else {
+          columnHeaders.push({ value: "Control ID", label: "Control ID" });
+        }
+        if (fieldSchema["family"]) {
+          const familySchema = fieldSchema["family"];
+          const displayName = familySchema?.original_name || "Family";
+          columnHeaders.push({
+            value: displayName,
+            label: displayName
+          });
+        }
+        Object.entries(fieldSchema).forEach(([fieldName, schema]) => {
+          if (fieldName === controlIdField || fieldName === "family" || fieldName === "mappings" || fieldName === "mappings_count") {
+            return;
+          }
+          const displayName = schema?.original_name || fieldName.replace(/-/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
+          columnHeaders.push({
+            value: displayName,
+            label: displayName
+          });
+        });
+        columnHeaders.push({ value: "Mappings", label: "Mappings (Default)" });
+        res.json({
+          columnHeaders,
+          defaultColumn: "Mappings"
+        });
+      } catch (error) {
+        res.status(500).json({ error: error.message });
+      }
+    });
+    router.post("/export-csv", async (req, res) => {
+      try {
+        const { format = "csv", _columns = [], columnMappings = {} } = req.body;
+        const state = getServerState();
+        const fileStore = state.fileStore;
+        if (!fileStore) {
+          return res.status(500).json({ error: "No control set loaded" });
+        }
+        const controls = await fileStore.loadAllControls();
+        const mappings = await fileStore.loadMappings();
+        let metadata = {};
+        try {
+          const controlSetPath = getCurrentControlSetPath();
+          const metadataPath2 = join4(controlSetPath, "lula.yaml");
+          if (existsSync3(metadataPath2)) {
+            const metadataContent = readFileSync3(metadataPath2, "utf8");
+            metadata = yaml4.load(metadataContent);
+          }
+        } catch (err) {
+          debug("Could not load metadata:", err);
+        }
+        if (!controls || controls.length === 0) {
+          return res.status(404).json({ error: "No controls found" });
+        }
+        const controlIdField = metadata?.control_id_field || "id";
+        const controlsWithMappings = controls.map((control) => {
+          const controlId = control[controlIdField] || control.id;
+          const controlMappings = mappings.filter((m) => m.control_id === controlId);
+          return {
+            ...control,
+            mappings_count: controlMappings.length,
+            mappings: controlMappings.map((m) => ({
+              uuid: m.uuid,
+              status: m.status,
+              description: m.justification || ""
+            }))
+          };
+        });
+        debug(`Exporting ${controlsWithMappings.length} controls as ${format} with column mappings`);
+        return exportAsCSVWithMapping(controlsWithMappings, metadata, columnMappings, res);
+      } catch (error) {
+        console.error("Export error:", error);
+        res.status(500).json({ error: error.message });
+      }
+    });
     router.post("/parse-excel", upload.single("file"), async (req, res) => {
       try {
         if (!req.file) {

package/dist/index.html

@@ -6,28 +6,28 @@
 		<link rel="icon" href="/lula.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		
-		<link rel="modulepreload" href="/_app/immutable/entry/start.Ca2qbK08.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/CgOk0Ct0.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/B8sFn9qB.js">
-		<link rel="modulepreload" href="/_app/immutable/entry/app.DCeR7c2L.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/start.CuWGVoVi.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/C2de20AA.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/BIY1u1I9.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/app.ChNLcnhL.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DsnmJJEf.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/AMsv4DTs.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DL7cUWpq.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DPYPcVpy.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/DBN1r830.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/D6NghQtU.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/BN4ish10.js">
 	</head>
 	<body data-sveltekit-preload-data="hover">
 		<div style="display: contents">
 			<script>
 				{
-					__sveltekit_1tcob8e = {
+					__sveltekit_1wq4dle = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.Ca2qbK08.js"),
-						import("/_app/immutable/entry/app.DCeR7c2L.js")
+						import("/_app/immutable/entry/start.CuWGVoVi.js"),
+						import("/_app/immutable/entry/app.ChNLcnhL.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});