lula2 0.6.4 → 0.6.5-nightly.0

package/dist/cli/commands/ui.js

@@ -1721,8 +1721,8 @@ var init_fileStore = __esm({
         if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
           return;
         }
-        const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-        if (!existsSync2(lulaConfigPath)) {
+        const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+        if (!existsSync2(lulaConfigPath2)) {
           return;
         }
         if (!existsSync2(this.controlsDir)) {
@@ -1880,6 +1880,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath2)) {
+            const content = readFileSync2(lulaConfigPath2, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, error);
+        }
         const entries = readdirSync(this.controlsDir);
         const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
         if (yamlFiles.length > 0) {
@@ -1898,7 +1909,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);
@@ -1921,7 +1936,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
@@ -3041,6 +3074,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)) {
@@ -3163,6 +3197,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,
@@ -3170,12 +3205,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)) {
@@ -3184,7 +3223,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);
@@ -3206,7 +3248,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]);
         }

package/dist/cli/server/index.js

@@ -1703,8 +1703,8 @@ var init_fileStore = __esm({
         if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
           return;
         }
-        const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-        if (!existsSync2(lulaConfigPath)) {
+        const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+        if (!existsSync2(lulaConfigPath2)) {
           return;
         }
         if (!existsSync2(this.controlsDir)) {
@@ -1862,6 +1862,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath2)) {
+            const content = readFileSync2(lulaConfigPath2, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, error);
+        }
         const entries = readdirSync(this.controlsDir);
         const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
         if (yamlFiles.length > 0) {
@@ -1880,7 +1891,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);
@@ -1903,7 +1918,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
@@ -3023,6 +3056,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)) {
@@ -3145,6 +3179,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,
@@ -3152,12 +3187,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)) {
@@ -3166,7 +3205,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);
@@ -3188,7 +3230,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]);
         }

package/dist/cli/server/server.js

@@ -1703,8 +1703,8 @@ var init_fileStore = __esm({
         if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
           return;
         }
-        const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-        if (!existsSync2(lulaConfigPath)) {
+        const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+        if (!existsSync2(lulaConfigPath2)) {
           return;
         }
         if (!existsSync2(this.controlsDir)) {
@@ -1862,6 +1862,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath2)) {
+            const content = readFileSync2(lulaConfigPath2, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, error);
+        }
         const entries = readdirSync(this.controlsDir);
         const yamlFiles = entries.filter((file) => file.endsWith(".yaml"));
         if (yamlFiles.length > 0) {
@@ -1880,7 +1891,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);
@@ -1903,7 +1918,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
@@ -3023,6 +3056,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)) {
@@ -3145,6 +3179,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,
@@ -3152,12 +3187,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)) {
@@ -3166,7 +3205,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);
@@ -3188,7 +3230,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]);
         }

package/dist/cli/server/serverState.js

@@ -124,8 +124,8 @@ var FileStore = class {
     if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
       return;
     }
-    const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-    if (!existsSync2(lulaConfigPath)) {
+    const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+    if (!existsSync2(lulaConfigPath2)) {
       return;
     }
     if (!existsSync2(this.controlsDir)) {
@@ -283,6 +283,17 @@ var FileStore = class {
     if (!existsSync2(this.controlsDir)) {
       return [];
     }
+    let controlOrder = null;
+    try {
+      const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+      if (existsSync2(lulaConfigPath2)) {
+        const content = readFileSync2(lulaConfigPath2, "utf8");
+        const metadata = yaml2.load(content);
+        controlOrder = metadata?.controlOrder || null;
+      }
+    } catch (error) {
+      console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, 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

@@ -267,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)) {
@@ -389,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,
@@ -396,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)) {
@@ -410,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);
@@ -432,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]);
         }

package/dist/cli/server/websocketServer.js

@@ -150,8 +150,8 @@ var init_fileStore = __esm({
         if (!this.baseDir || this.baseDir === "." || this.baseDir === process.cwd()) {
           return;
         }
-        const lulaConfigPath = join2(this.baseDir, "lula.yaml");
-        if (!existsSync2(lulaConfigPath)) {
+        const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+        if (!existsSync2(lulaConfigPath2)) {
           return;
         }
         if (!existsSync2(this.controlsDir)) {
@@ -309,6 +309,17 @@ var init_fileStore = __esm({
         if (!existsSync2(this.controlsDir)) {
           return [];
         }
+        let controlOrder = null;
+        try {
+          const lulaConfigPath2 = join2(this.baseDir, "lula.yaml");
+          if (existsSync2(lulaConfigPath2)) {
+            const content = readFileSync2(lulaConfigPath2, "utf8");
+            const metadata = yaml2.load(content);
+            controlOrder = metadata?.controlOrder || null;
+          }
+        } catch (error) {
+          console.error(`Failed to load lula.yaml for controlOrder (path: ${lulaConfigPath}):`, 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
@@ -1470,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)) {
@@ -1592,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,
@@ -1599,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)) {
@@ -1613,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);
@@ -1635,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]);
         }

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.BD6MZ_XC.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DztCq-9O.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DmBJsPtc.js">
-		<link rel="modulepreload" href="/_app/immutable/entry/app.VdrAeFMF.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/start.zJmCdi6K.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/CByqgj46.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/BnySH2DD.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/app.CLMFUJFD.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DsnmJJEf.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/BaV6jU6m.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/DBdrJbLi.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/CynYS-Ma.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/BDFhLgJd.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/6cSSDZaX.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/ipJF3Ffx.js">
 	</head>
 	<body data-sveltekit-preload-data="hover">
 		<div style="display: contents">
 			<script>
 				{
-					__sveltekit_t1ry3i = {
+					__sveltekit_1m4uc3h = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.BD6MZ_XC.js"),
-						import("/_app/immutable/entry/app.VdrAeFMF.js")
+						import("/_app/immutable/entry/start.zJmCdi6K.js"),
+						import("/_app/immutable/entry/app.CLMFUJFD.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});