fix: windows crlf

Author: rvagg

bin/to-js.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-import parser from '../lib/parser.cjs'
-import { transformError } from '../lib/util.js'
+import { fromDSL } from '../lib/from-dsl.js'
 import { pkgDecjsor } from './util.js'
 import { collectInput } from './collect-input.js'
 import { Builder, safeReference } from '../lib/typed.js'
@@ -21,7 +20,7 @@ export async function toJS (files, options) {
   for (const { filename, contents } of input) {
     try {
       /** @type {any} */
-      const parsed = parser.parse(contents)
+      const parsed = fromDSL(contents)
       if (!schema) {
         schema = parsed
       } else {
@@ -35,7 +34,7 @@ export async function toJS (files, options) {
       }
     } catch (err) {
       // @ts-ignore
-      console.error(`Error parsing ${filename}: ${transformError(err).message}`)
+      console.error(`Error parsing ${filename}: ${err.message}`)
       process.exit(1)
     }
   }

bin/to-json.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-import parser from '../lib/parser.cjs'
-import { transformError } from '../lib/util.js'
+import { fromDSL } from '../lib/from-dsl.js'
 import { collectInput } from './collect-input.js'
 
 /**
@@ -33,7 +32,7 @@ export async function toJSON (files, options) {
   let schema = null
   for (const { filename, contents } of input) {
     try {
-      const parsed = /** @type {Schema} */(parser.parse(contents, parseOptions))
+      const parsed = fromDSL(contents, parseOptions)
       if (schema == null) {
         schema = parsed
       } else {
@@ -62,7 +61,7 @@ export async function toJSON (files, options) {
       }
     } catch (err) {
       // @ts-ignore
-      console.error(`Error parsing ${filename}: ${transformError(err).message}`)
+      console.error(`Error parsing ${filename}: ${err.message}`)
       process.exit(1)
     }
   }

bin/to-schema.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 
-import parser from '../lib/parser.cjs'
+import { fromDSL } from '../lib/from-dsl.js'
 import { toDSL } from '../lib/to-dsl.js'
-import { transformError } from '../lib/util.js'
 import { collectInput } from './collect-input.js'
 
 let indent = '  '
@@ -22,7 +21,7 @@ export async function toSchema (files, options) {
   let schema
   for (const { filename, contents } of input) {
     try {
-      const parsed = parser.parse(contents)
+      const parsed = fromDSL(contents)
       if (!schema) {
         schema = parsed
       } else {
@@ -36,10 +35,12 @@ export async function toSchema (files, options) {
       }
     } catch (err) {
       // @ts-ignore
-      console.error(`Error parsing ${filename}: ${transformError(err).message}`)
+      console.error(`Error parsing ${filename}: ${err.message}`)
       process.exit(1)
     }
   }
 
-  console.log(toDSL(schema, indent))
+  if (schema) {
+    console.log(toDSL(schema, indent))
+  }
 }

bin/to-tsdefs.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-import parser from '../lib/parser.cjs'
-import { transformError } from '../lib/util.js'
+import { fromDSL } from '../lib/from-dsl.js'
 import { pkgDecjsor } from './util.js'
 import { collectInput } from './collect-input.js'
 import { generateTypeScript } from '../lib/gen.js'
@@ -21,7 +20,7 @@ export async function toTSDefs (files, _options) {
   for (const { filename, contents } of input) {
     try {
       /** @type {any} */
-      const parsed = parser.parse(contents, { includeComments: true, includeAnnotations: true })
+      const parsed = fromDSL(contents, { includeComments: true, includeAnnotations: true })
       if (!schema) {
         schema = parsed
       } else {
@@ -35,7 +34,7 @@ export async function toTSDefs (files, _options) {
       }
     } catch (err) {
       // @ts-ignore
-      console.error(`Error parsing ${filename}: ${transformError(err).message}`)
+      console.error(`Error parsing ${filename}: ${err.message}`)
       process.exit(1)
     }
   }

bin/validate.js

@@ -1,5 +1,4 @@
-import parser from '../lib/parser.cjs'
-import { transformError } from '../lib/util.js'
+import { fromDSL } from '../lib/from-dsl.js'
 import { collectInput } from './collect-input.js'
 
 /**
@@ -12,10 +11,10 @@ export async function validate (files, _) {
 
   for (const { filename, contents } of input) {
     try {
-      parser.parse(contents)
+      fromDSL(contents)
     } catch (err) {
       // @ts-ignore
-      console.error(`Could not validate ${filename}: ${transformError(err).message}`) // discard useless extra info
+      console.error(`Could not validate ${filename}: ${err.message}`) // discard useless extra info
       process.exit(1)
     }
     console.error(`Validated ${filename} ...`)

lib/from-dsl.js

@@ -12,7 +12,9 @@ import { transformError } from './util.js'
  */
 export function fromDSL (input, options = {}) {
   try {
-    return /** @type {Schema} */(parser.parse(input, options))
+    // Normalize line endings to LF for consistent behavior across platforms
+    const normalizedInput = input.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
+    return /** @type {Schema} */(parser.parse(normalizedInput, options))
   } catch (err) {
     throw transformError(err)
   }