@jacobknightley/fabric-format 0.0.1 → 0.0.2

package/dist/cli.js

@@ -86,30 +86,12 @@ async function formatFile(content, filePath) {
     return formatted;
 }
 /**
- * Detect the line ending style used in content.
- */
-function detectLineEnding(content) {
-    if (content.includes('\r\n')) {
-        return '\r\n';
-    }
-    return '\n';
-}
-/**
- * Normalize line endings to Unix style.
+ * Normalize line endings to LF (Unix style).
+ * This library standardizes on LF for all output.
  */
 function normalizeLineEndings(content) {
     return content.replace(/\r\n/g, '\n');
 }
-/**
- * Convert line endings to the specified style.
- */
-function convertLineEndings(content, lineEnding) {
-    const normalized = normalizeLineEndings(content);
-    if (lineEnding === '\r\n') {
-        return normalized.replace(/\n/g, '\r\n');
-    }
-    return normalized;
-}
 /** Print main help */
 function printHelp() {
     console.log(`fabfmt - Fabric Notebook Formatter (Spark SQL & Python)
@@ -307,12 +289,10 @@ async function cmdFormat(args) {
     for (const file of files) {
         try {
             const content = fs.readFileSync(file, 'utf-8');
-            const originalLineEnding = detectLineEnding(content);
             const normalizedContent = normalizeLineEndings(content);
             const formatted = await formatFile(normalizedContent, file);
-            const formattedWithOriginalEndings = convertLineEndings(formatted, originalLineEnding);
-            if (formattedWithOriginalEndings !== content) {
-                fs.writeFileSync(file, formattedWithOriginalEndings, 'utf-8');
+            if (formatted !== normalizedContent) {
+                fs.writeFileSync(file, formatted, 'utf-8');
                 console.log(`Formatted ${file}`);
                 formattedCount++;
             }

package/dist/notebook-formatter.js

@@ -37,7 +37,7 @@ const PYTHON_CONFIG = {
     metadataMarker: '# METADATA ********************',
     magicPrefix: '# MAGIC ',
     magicSqlCommand: '# MAGIC %%sql',
-    emptyMagic: '# MAGIC',
+    emptyMagic: '# MAGIC ',
     supportsRawSql: false,
     defaultLanguage: 'python',
 };
@@ -47,7 +47,7 @@ const SCALA_CONFIG = {
     metadataMarker: '// METADATA ********************',
     magicPrefix: '// MAGIC ',
     magicSqlCommand: '// MAGIC %%sql',
-    emptyMagic: '// MAGIC',
+    emptyMagic: '// MAGIC ',
     supportsRawSql: false,
     defaultLanguage: 'scala',
 };
@@ -57,7 +57,7 @@ const SPARKSQL_CONFIG = {
     metadataMarker: '-- METADATA ********************',
     magicPrefix: '-- MAGIC ',
     magicSqlCommand: '-- MAGIC %%sql',
-    emptyMagic: '-- MAGIC',
+    emptyMagic: '-- MAGIC ',
     supportsRawSql: true,
     defaultLanguage: 'sparksql',
 };
@@ -73,13 +73,9 @@ const R_CONFIG = {
 // INTERNAL UTILITIES
 // ============================================================================
 /**
- * Detect line ending style.
+ * Line ending constant - this library standardizes on LF.
  */
-function detectLineEnding(content) {
-    if (content.includes('\r\n'))
-        return '\r\n';
-    return '\n';
-}
+const LINE_ENDING = '\n';
 /**
  * Get language config based on file extension.
  * The file extension determines the default language and comment syntax.
@@ -203,7 +199,9 @@ function stripMagicPrefix(line, config) {
     if (line.startsWith(config.magicPrefix)) {
         return line.slice(config.magicPrefix.length);
     }
-    if (line.trim() === config.emptyMagic) {
+    // Check for empty magic line (with or without trailing space)
+    const trimmed = line.trim();
+    if (trimmed === config.emptyMagic.trim()) {
         return '';
     }
     return line;
@@ -332,7 +330,7 @@ export function parseNotebook(content, fileExtension) {
 /**
  * Replace a cell's content in the file.
  */
-function replaceCell(fileContent, cell, formattedContent, config, lineEnding) {
+function replaceCell(fileContent, cell, formattedContent, config) {
     const lines = fileContent.split(/\r?\n/);
     let newLines;
     if (cell.isMagicCell) {
@@ -343,7 +341,7 @@ function replaceCell(fileContent, cell, formattedContent, config, lineEnding) {
     }
     const before = lines.slice(0, cell.contentStartLine);
     const after = lines.slice(cell.contentEndLine + 1);
-    return [...before, ...newLines, ...after].join(lineEnding);
+    return [...before, ...newLines, ...after].join(LINE_ENDING);
 }
 /**
  * Format all cells in a Fabric notebook.
@@ -370,7 +368,6 @@ export async function formatNotebook(content, fileExtension, options) {
     if (!notebook.isFabricNotebook || notebook.cells.length === 0 || !notebook.config) {
         return { content, stats };
     }
-    const lineEnding = detectLineEnding(content);
     // Initialize Python formatter if needed
     if (formatPythonCells) {
         try {
@@ -397,7 +394,7 @@ export async function formatNotebook(content, fileExtension, options) {
             const formatResult = formatCell(cell.content, 'sparksql');
             if (formatResult.changed) {
                 // replaceCell will add back MAGIC prefixes if needed
-                result = replaceCell(result, cell, formatResult.formatted, notebook.config, lineEnding);
+                result = replaceCell(result, cell, formatResult.formatted, notebook.config);
                 stats.sparkSqlCellsFormatted++;
             }
             if (formatResult.error) {
@@ -409,7 +406,7 @@ export async function formatNotebook(content, fileExtension, options) {
             const formatResult = formatCell(cell.content, 'python');
             if (formatResult.changed) {
                 // replaceCell will add back MAGIC prefixes if needed
-                result = replaceCell(result, cell, formatResult.formatted, notebook.config, lineEnding);
+                result = replaceCell(result, cell, formatResult.formatted, notebook.config);
                 stats.pythonCellsFormatted++;
             }
             if (formatResult.error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jacobknightley/fabric-format",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "module",
   "description": "A fast, opinionated formatter for Microsoft Fabric notebooks with Spark SQL and Python support",
   "main": "dist/index.js",