Reencode flat result to always have unix line endings (#146)

* Reencode flat result to always have unix line endings

* Changeset

* Tests

* Formatting and linting fix

packages/discovery/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @l2beat/discovery
 
+## 0.44.3
+
+### Patch Changes
+
+- Flattening results always have unix line encodings
+
 ## 0.44.2
 
 ### Patch Changes

packages/discovery/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@l2beat/discovery",
   "description": "L2Beat discovery - engine & tooling utilized for keeping an eye on L2s",
-  "version": "0.44.2",
+  "version": "0.44.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {

packages/discovery/src/flatten/flattenStartingFrom.test.ts

@@ -10,12 +10,21 @@ import {
 
 describe(flattenStartingFrom.name, () => {
   const DUMMY_AST_NODE = {}
-  const LIBRARY_SOURCE = 'library Contract2 { function lf() public {} }'
-  const BASE_SOURCE = 'contract Contract3 { function bcf() public {} }'
+  const LIBRARY_SOURCE =
+    'library Contract2\r\n{\r\n function lf() public {}\r\n }'
+  const BASE_SOURCE =
+    'contract Contract3\r\n{\r\n function bcf() public {}\r\n }'
   const ROOT_SOURCE =
-    'contract Contract1 is Contract3 { function cf() public { Contract2.lf(); this.bcf(); } }'
+    'contract Contract1 is Contract3\r\n {\r\n function cf() public {\r\n Contract2.lf(); this.bcf();\r\n }\r\n }'
   const ROOT_FILE_SOURCE = `${LIBRARY_SOURCE}${BASE_SOURCE}${ROOT_SOURCE}`
 
+  const LIBRARY_SOURCE_UNIX =
+    'library Contract2\n{\n function lf() public {}\n }'
+  const BASE_SOURCE_UNIX =
+    'contract Contract3\n{\n function bcf() public {}\n }'
+  const ROOT_SOURCE_UNIX =
+    'contract Contract1 is Contract3\n {\n function cf() public {\n Contract2.lf(); this.bcf();\n }\n }'
+
   const LIBRARY_CONTRACT: ContractDeclaration = {
     name: 'Contract2',
     type: 'library',
@@ -92,7 +101,7 @@ describe(flattenStartingFrom.name, () => {
     const result = flattenStartingFrom(rootContractName, parsedFileManager)
 
     expect(result).toEqual(
-      [LIBRARY_SOURCE, BASE_SOURCE, ROOT_SOURCE].join('\n\n'),
+      [LIBRARY_SOURCE_UNIX, BASE_SOURCE_UNIX, ROOT_SOURCE_UNIX].join('\n\n'),
     )
   })
 

packages/discovery/src/flatten/flattenStartingFrom.ts

@@ -49,13 +49,17 @@ export function flattenStartingFrom(
     stack.push(...getStackEntries(foundContract))
   }
 
-  return flatSource.trimEnd()
+  return changeLineEndingsToUnix(flatSource.trimEnd())
 }
 
 function formatSource(source: string, byteRange: ByteRange): string {
   return source.slice(byteRange.start, byteRange.end + 1) + '\n\n'
 }
 
+function changeLineEndingsToUnix(source: string): string {
+  return source.replace(/\r\n/g, '\n')
+}
+
 function getUniqueContractId(entry: ContractFilePair): string {
   const hasher = createHash('sha1')
   const source = formatSource(entry.file.content, entry.contract.byteRange)