lula2 0.6.2 → 0.6.3-nightly.1

package/dist/cli/server/serverState.js

@@ -283,6 +283,17 @@ var FileStore = class {
     if (!existsSync2(this.controlsDir)) {
       return [];
     }
+    let controlOrder = null;
+    try {
+      const lulaConfigPath = join2(this.baseDir, "lula.yaml");
+      if (existsSync2(lulaConfigPath)) {
+        const content = readFileSync2(lulaConfigPath, "utf8");
+        const metadata = yaml2.load(content);
+        controlOrder = metadata?.controlOrder || null;
+      }
+    } catch (error) {
+      console.error("Failed to load lula.yaml for controlOrder:", error);
+    }
     const entries = readdirSync(this.controlsDir);
     const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
     if (yamlFiles.length > 0) {
@@ -301,7 +312,11 @@ var FileStore = class {
         }
       });
       const results2 = await Promise.all(promises);
-      return results2.filter((c) => c !== null);
+      const controls2 = results2.filter((c) => c !== null);
+      if (controlOrder && controlOrder.length > 0) {
+        return this.sortControlsByOrder(controls2, controlOrder);
+      }
+      return controls2;
     }
     const families = entries.filter((name) => {
       const familyPath = join2(this.controlsDir, name);
@@ -324,7 +339,25 @@ var FileStore = class {
       allPromises.push(...familyPromises);
     }
     const results = await Promise.all(allPromises);
-    return results.filter((c) => c !== null);
+    const controls = results.filter((c) => c !== null);
+    if (controlOrder && controlOrder.length > 0) {
+      return this.sortControlsByOrder(controls, controlOrder);
+    }
+    return controls;
+  }
+  /**
+   * Sort controls based on the provided order array
+   */
+  sortControlsByOrder(controls, controlOrder) {
+    const orderMap = /* @__PURE__ */ new Map();
+    controlOrder.forEach((controlId, index) => {
+      orderMap.set(controlId, index);
+    });
+    return controls.sort((a, b) => {
+      const aIndex = orderMap.get(a.id) ?? Number.MAX_SAFE_INTEGER;
+      const bIndex = orderMap.get(b.id) ?? Number.MAX_SAFE_INTEGER;
+      return aIndex - bIndex;
+    });
   }
   /**
    * Load mappings from mappings directory

package/dist/cli/server/spreadsheetRoutes.js

@@ -46,6 +46,8 @@ function getCurrentControlSetPath() {
 }
 
 // cli/server/spreadsheetRoutes.ts
+var MAX_HEADER_CANDIDATES = 5;
+var PREVIEW_COLUMNS = 4;
 var router = express.Router();
 var upload = multer({
   storage: multer.memoryStorage(),
@@ -132,7 +134,7 @@ function processImportParameters(reqBody) {
     frontendFieldSchema
   };
 }
-async function parseUploadedFile(file) {
+async function parseUploadedFile(file, sheetName) {
   const fileName = file.originalname || "";
   const isCSV = fileName.toLowerCase().endsWith(".csv");
   let rawData = [];
@@ -141,10 +143,13 @@ async function parseUploadedFile(file) {
     rawData = parseCSV(csvContent);
   } else {
     const workbook = XLSX.read(file.buffer, { type: "buffer" });
-    const worksheetName = workbook.SheetNames[0];
+    const worksheetName = sheetName || workbook.SheetNames[0];
     if (!worksheetName) {
       throw new Error("No worksheet found in file");
     }
+    if (sheetName && !workbook.SheetNames.includes(sheetName)) {
+      throw new Error(`Sheet "${sheetName}" not found in workbook`);
+    }
     const worksheet = workbook.Sheets[worksheetName];
     rawData = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: null });
   }
@@ -156,7 +161,8 @@ router.post("/import-spreadsheet", upload.single("file"), async (req, res) => {
       return res.status(400).json({ error: "No file uploaded" });
     }
     const params = processImportParameters(req.body);
-    const rawData = await parseUploadedFile(req.file);
+    const sheetName = req.body.sheetName;
+    const rawData = await parseUploadedFile(req.file, sheetName);
     const startRowIndex = parseInt(params.startRow) - 1;
     if (rawData.length <= startRowIndex) {
       return res.status(400).json({ error: "Start row exceeds sheet data" });
@@ -261,6 +267,7 @@ function processSpreadsheetData(rawData, headers, startRowIndex, params) {
         continue;
       }
       const family = extractFamilyFromControlId(controlId);
+      control._originalRowIndex = i;
       control.family = family;
       controls.push(control);
       if (!families.has(family)) {
@@ -383,6 +390,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     params.controlIdField,
     params.namingConvention
   );
+  const controlOrder = controls.sort((a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)).map((control) => control[controlIdFieldNameClean]);
   const controlSetData = {
     name: params.controlSetName,
     description: params.controlSetDescription,
@@ -390,12 +398,16 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     control_id_field: controlIdFieldNameClean,
     controlCount: controls.length,
     families: uniqueFamilies,
+    controlOrder,
     fieldSchema
   };
   writeFileSync(join2(baseDir, "lula.yaml"), yaml4.dump(controlSetData));
   const controlsDir = join2(baseDir, "controls");
   const mappingsDir = join2(baseDir, "mappings");
-  families.forEach((familyControls, family) => {
+  const sortedFamilies = Array.from(families.entries()).sort(
+    (a, b) => a[0].localeCompare(b[0])
+  );
+  sortedFamilies.forEach(([family, familyControls]) => {
     const familyDir = join2(controlsDir, family);
     const familyMappingsDir = join2(mappingsDir, family);
     if (!existsSync(familyDir)) {
@@ -404,7 +416,10 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     if (!existsSync(familyMappingsDir)) {
       mkdirSync(familyMappingsDir, { recursive: true });
     }
-    familyControls.forEach((control) => {
+    const sortedFamilyControls = familyControls.sort(
+      (a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)
+    );
+    sortedFamilyControls.forEach((control) => {
       const controlId = control[controlIdFieldNameClean];
       if (!controlId) {
         console.error("Missing control ID for control:", control);
@@ -426,7 +441,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
         filteredControl.family = control.family;
       }
       Object.keys(control).forEach((fieldName) => {
-        if (fieldName === "family") return;
+        if (fieldName === "family" || fieldName === "_originalRowIndex") return;
         if (params.justificationFields.includes(fieldName) && control[fieldName] !== void 0 && control[fieldName] !== null) {
           justificationContents.push(control[fieldName]);
         }
@@ -969,9 +984,9 @@ router.post("/parse-excel", upload.single("file"), async (req, res) => {
       const worksheet = workbook.Sheets[worksheetName];
       rows = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: null });
     }
-    const headerCandidates = rows.slice(0, 5).map((row, index) => ({
+    const headerCandidates = rows.slice(0, MAX_HEADER_CANDIDATES).map((row, index) => ({
       row: index + 1,
-      preview: row.slice(0, 4).filter((v) => v !== null).filter((v) => v !== void 0).join(", ") + (row.length > 4 ? ", ..." : "")
+      preview: row.slice(0, PREVIEW_COLUMNS).filter((v) => v !== null).filter((v) => v !== void 0).join(", ") + (row.length > 4 ? ", ..." : "")
     }));
     res.json({
       sheets,
@@ -1028,6 +1043,39 @@ router.post("/parse-excel-sheet", upload.single("file"), async (req, res) => {
     res.status(500).json({ error: "Failed to parse Excel sheet" });
   }
 });
+router.post("/parse-excel-sheet-previews", upload.single("file"), async (req, res) => {
+  try {
+    const { sheetName } = req.body;
+    if (!req.file) {
+      return res.status(400).json({ error: "No file uploaded" });
+    }
+    const fileName = req.file.originalname || "";
+    const isCSV = fileName.toLowerCase().endsWith(".csv");
+    let rows = [];
+    if (isCSV) {
+      const csvContent = req.file.buffer.toString("utf-8");
+      rows = parseCSV(csvContent);
+    } else {
+      const workbook = XLSX.read(req.file.buffer, { type: "buffer" });
+      if (!workbook.SheetNames.includes(sheetName)) {
+        return res.status(400).json({ error: `Sheet "${sheetName}" not found` });
+      }
+      const worksheet = workbook.Sheets[sheetName];
+      rows = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: null });
+    }
+    const headerCandidates = rows.slice(0, MAX_HEADER_CANDIDATES).map((row, index) => ({
+      row: index + 1,
+      preview: row.slice(0, PREVIEW_COLUMNS).filter((v) => v !== null).filter((v) => v !== void 0).join(", ") + (row.length > 4 ? ", ..." : "")
+    }));
+    res.json({
+      rowPreviews: headerCandidates,
+      totalRows: rows.length
+    });
+  } catch (error) {
+    console.error("Error getting sheet previews:", error);
+    res.status(500).json({ error: "Failed to get sheet previews" });
+  }
+});
 var spreadsheetRoutes_default = router;
 export {
   applyNamingConvention,

package/dist/cli/server/websocketServer.js

@@ -309,6 +309,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath)) {
+            const content = readFileSync2(lulaConfigPath, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error("Failed to load lula.yaml for controlOrder:", error);
+        }
         const entries = readdirSync(this.controlsDir);
         const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
         if (yamlFiles.length > 0) {
@@ -327,7 +338,11 @@ var init_fileStore = __esm({
             }
           });
           const results2 = await Promise.all(promises);
-          return results2.filter((c) => c !== null);
+          const controls2 = results2.filter((c) => c !== null);
+          if (controlOrder && controlOrder.length > 0) {
+            return this.sortControlsByOrder(controls2, controlOrder);
+          }
+          return controls2;
         }
         const families = entries.filter((name) => {
           const familyPath = join2(this.controlsDir, name);
@@ -350,7 +365,25 @@ var init_fileStore = __esm({
           allPromises.push(...familyPromises);
         }
         const results = await Promise.all(allPromises);
-        return results.filter((c) => c !== null);
+        const controls = results.filter((c) => c !== null);
+        if (controlOrder && controlOrder.length > 0) {
+          return this.sortControlsByOrder(controls, controlOrder);
+        }
+        return controls;
+      }
+      /**
+       * Sort controls based on the provided order array
+       */
+      sortControlsByOrder(controls, controlOrder) {
+        const orderMap = /* @__PURE__ */ new Map();
+        controlOrder.forEach((controlId, index) => {
+          orderMap.set(controlId, index);
+        });
+        return controls.sort((a, b) => {
+          const aIndex = orderMap.get(a.id) ?? Number.MAX_SAFE_INTEGER;
+          const bIndex = orderMap.get(b.id) ?? Number.MAX_SAFE_INTEGER;
+          return aIndex - bIndex;
+        });
       }
       /**
        * Load mappings from mappings directory
@@ -1377,7 +1410,7 @@ function processImportParameters(reqBody) {
     frontendFieldSchema
   };
 }
-async function parseUploadedFile(file) {
+async function parseUploadedFile(file, sheetName) {
   const fileName = file.originalname || "";
   const isCSV = fileName.toLowerCase().endsWith(".csv");
   let rawData = [];
@@ -1386,10 +1419,13 @@ async function parseUploadedFile(file) {
     rawData = parseCSV(csvContent);
   } else {
     const workbook = XLSX.read(file.buffer, { type: "buffer" });
-    const worksheetName = workbook.SheetNames[0];
+    const worksheetName = sheetName || workbook.SheetNames[0];
     if (!worksheetName) {
       throw new Error("No worksheet found in file");
     }
+    if (sheetName && !workbook.SheetNames.includes(sheetName)) {
+      throw new Error(`Sheet "${sheetName}" not found in workbook`);
+    }
     const worksheet = workbook.Sheets[worksheetName];
     rawData = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: null });
   }
@@ -1467,6 +1503,7 @@ function processSpreadsheetData(rawData, headers, startRowIndex, params) {
         continue;
       }
       const family = extractFamilyFromControlId(controlId);
+      control._originalRowIndex = i;
       control.family = family;
       controls.push(control);
       if (!families.has(family)) {
@@ -1589,6 +1626,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     params.controlIdField,
     params.namingConvention
   );
+  const controlOrder = controls.sort((a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)).map((control) => control[controlIdFieldNameClean]);
   const controlSetData = {
     name: params.controlSetName,
     description: params.controlSetDescription,
@@ -1596,12 +1634,16 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     control_id_field: controlIdFieldNameClean,
     controlCount: controls.length,
     families: uniqueFamilies,
+    controlOrder,
     fieldSchema
   };
   writeFileSync2(join4(baseDir, "lula.yaml"), yaml4.dump(controlSetData));
   const controlsDir = join4(baseDir, "controls");
   const mappingsDir = join4(baseDir, "mappings");
-  families.forEach((familyControls, family) => {
+  const sortedFamilies = Array.from(families.entries()).sort(
+    (a, b) => a[0].localeCompare(b[0])
+  );
+  sortedFamilies.forEach(([family, familyControls]) => {
     const familyDir = join4(controlsDir, family);
     const familyMappingsDir = join4(mappingsDir, family);
     if (!existsSync3(familyDir)) {
@@ -1610,7 +1652,10 @@ async function createOutputStructure(processedData, fieldSchema, params) {
     if (!existsSync3(familyMappingsDir)) {
       mkdirSync2(familyMappingsDir, { recursive: true });
     }
-    familyControls.forEach((control) => {
+    const sortedFamilyControls = familyControls.sort(
+      (a, b) => (a._originalRowIndex || 0) - (b._originalRowIndex || 0)
+    );
+    sortedFamilyControls.forEach((control) => {
       const controlId = control[controlIdFieldNameClean];
       if (!controlId) {
         console.error("Missing control ID for control:", control);
@@ -1632,7 +1677,7 @@ async function createOutputStructure(processedData, fieldSchema, params) {
         filteredControl.family = control.family;
       }
       Object.keys(control).forEach((fieldName) => {
-        if (fieldName === "family") return;
+        if (fieldName === "family" || fieldName === "_originalRowIndex") return;
         if (params.justificationFields.includes(fieldName) && control[fieldName] !== void 0 && control[fieldName] !== null) {
           justificationContents.push(control[fieldName]);
         }
@@ -1996,12 +2041,14 @@ function exportAsJSON(controls, metadata, res) {
   res.setHeader("Content-Disposition", `attachment; filename="${fileName}"`);
   res.json(exportData);
 }
-var router, upload, spreadsheetRoutes_default;
+var MAX_HEADER_CANDIDATES, PREVIEW_COLUMNS, router, upload, spreadsheetRoutes_default;
 var init_spreadsheetRoutes = __esm({
   "cli/server/spreadsheetRoutes.ts"() {
     "use strict";
     init_debug();
     init_serverState();
+    MAX_HEADER_CANDIDATES = 5;
+    PREVIEW_COLUMNS = 4;
     router = express.Router();
     upload = multer({
       storage: multer.memoryStorage(),
@@ -2014,7 +2061,8 @@ var init_spreadsheetRoutes = __esm({
           return res.status(400).json({ error: "No file uploaded" });
         }
         const params = processImportParameters(req.body);
-        const rawData = await parseUploadedFile(req.file);
+        const sheetName = req.body.sheetName;
+        const rawData = await parseUploadedFile(req.file, sheetName);
         const startRowIndex = parseInt(params.startRow) - 1;
         if (rawData.length <= startRowIndex) {
           return res.status(400).json({ error: "Start row exceeds sheet data" });
@@ -2226,9 +2274,9 @@ var init_spreadsheetRoutes = __esm({
           const worksheet = workbook.Sheets[worksheetName];
           rows = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: null });
         }
-        const headerCandidates = rows.slice(0, 5).map((row, index) => ({
+        const headerCandidates = rows.slice(0, MAX_HEADER_CANDIDATES).map((row, index) => ({
           row: index + 1,
-          preview: row.slice(0, 4).filter((v) => v !== null).filter((v) => v !== void 0).join(", ") + (row.length > 4 ? ", ..." : "")
+          preview: row.slice(0, PREVIEW_COLUMNS).filter((v) => v !== null).filter((v) => v !== void 0).join(", ") + (row.length > 4 ? ", ..." : "")
         }));
         res.json({
           sheets,
@@ -2285,6 +2333,39 @@ var init_spreadsheetRoutes = __esm({
         res.status(500).json({ error: "Failed to parse Excel sheet" });
       }
     });
+    router.post("/parse-excel-sheet-previews", upload.single("file"), async (req, res) => {
+      try {
+        const { sheetName } = req.body;
+        if (!req.file) {
+          return res.status(400).json({ error: "No file uploaded" });
+        }
+        const fileName = req.file.originalname || "";
+        const isCSV = fileName.toLowerCase().endsWith(".csv");
+        let rows = [];
+        if (isCSV) {
+          const csvContent = req.file.buffer.toString("utf-8");
+          rows = parseCSV(csvContent);
+        } else {
+          const workbook = XLSX.read(req.file.buffer, { type: "buffer" });
+          if (!workbook.SheetNames.includes(sheetName)) {
+            return res.status(400).json({ error: `Sheet "${sheetName}" not found` });
+          }
+          const worksheet = workbook.Sheets[sheetName];
+          rows = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: null });
+        }
+        const headerCandidates = rows.slice(0, MAX_HEADER_CANDIDATES).map((row, index) => ({
+          row: index + 1,
+          preview: row.slice(0, PREVIEW_COLUMNS).filter((v) => v !== null).filter((v) => v !== void 0).join(", ") + (row.length > 4 ? ", ..." : "")
+        }));
+        res.json({
+          rowPreviews: headerCandidates,
+          totalRows: rows.length
+        });
+      } catch (error) {
+        console.error("Error getting sheet previews:", error);
+        res.status(500).json({ error: "Failed to get sheet previews" });
+      }
+    });
     spreadsheetRoutes_default = router;
   }
 });

package/dist/index.html

@@ -6,10 +6,10 @@
 		<link rel="icon" href="/lula.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		
-		<link rel="modulepreload" href="/_app/immutable/entry/start.DtOV9FzL.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DtmRvgOL.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/start.Qohy1rto.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/B9HtV8_1.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DTWPdvjs.js">
-		<link rel="modulepreload" href="/_app/immutable/entry/app.BU_7sxPU.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/app.DI-AYM-e.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DsnmJJEf.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/BXUi170M.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/WlyXjfrM.js">
@@ -19,15 +19,15 @@
 		<div style="display: contents">
 			<script>
 				{
-					__sveltekit_tjh1f6 = {
+					__sveltekit_157sdlo = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.DtOV9FzL.js"),
-						import("/_app/immutable/entry/app.BU_7sxPU.js")
+						import("/_app/immutable/entry/start.Qohy1rto.js"),
+						import("/_app/immutable/entry/app.DI-AYM-e.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});