oxc-parser 0.33.0 → 0.34.0

package/README.md

@@ -15,8 +15,7 @@ test(oxc.parseSync(sourceText, options));
 test(await oxc.parseAsync(sourceText, options));
 
 function test(ret) {
-  const program = JSON.parse(ret.program);
-  assert(program.body.length == 1);
+  assert(ret.program.body.length == 1);
   assert(ret.errors.length == 0);
 }
 ```

package/bindings.js

@@ -0,0 +1,368 @@
+// prettier-ignore
+/* eslint-disable */
+/* auto-generated by NAPI-RS */
+
+const { readFileSync } = require('fs')
+
+let nativeBinding = null
+const loadErrors = []
+
+const isMusl = () => {
+  let musl = false
+  if (process.platform === 'linux') {
+    musl = isMuslFromFilesystem()
+    if (musl === null) {
+      musl = isMuslFromReport()
+    }
+    if (musl === null) {
+      musl = isMuslFromChildProcess()
+    }
+  }
+  return musl
+}
+
+const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
+
+const isMuslFromFilesystem = () => {
+  try {
+    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
+  } catch {
+    return null
+  }
+}
+
+const isMuslFromReport = () => {
+  const report = typeof process.report.getReport === 'function' ? process.report.getReport() : null
+  if (!report) {
+    return null
+  }
+  if (report.header && report.header.glibcVersionRuntime) {
+    return false
+  }
+  if (Array.isArray(report.sharedObjects)) {
+    if (report.sharedObjects.some(isFileMusl)) {
+      return true
+    }
+  }
+  return false
+}
+
+const isMuslFromChildProcess = () => {
+  try {
+    return require('child_process').execSync('ldd --version', { encoding: 'utf8' }).includes('musl')
+  } catch (e) {
+    // If we reach this case, we don't know if the system is musl or not, so is better to just fallback to false
+    return false
+  }
+}
+
+function requireNative() {
+  if (process.platform === 'android') {
+    if (process.arch === 'arm64') {
+      try {
+        return require('./parser.android-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-android-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm') {
+      try {
+        return require('./parser.android-arm-eabi.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-android-arm-eabi')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
+    }
+  } else if (process.platform === 'win32') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./parser.win32-x64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-win32-x64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'ia32') {
+      try {
+        return require('./parser.win32-ia32-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-win32-ia32-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./parser.win32-arm64-msvc.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-win32-arm64-msvc')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
+    }
+  } else if (process.platform === 'darwin') {
+    try {
+        return require('./parser.darwin-universal.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-darwin-universal')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    if (process.arch === 'x64') {
+      try {
+        return require('./parser.darwin-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-darwin-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./parser.darwin-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-darwin-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
+    }
+  } else if (process.platform === 'freebsd') {
+    if (process.arch === 'x64') {
+      try {
+        return require('./parser.freebsd-x64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-freebsd-x64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 'arm64') {
+      try {
+        return require('./parser.freebsd-arm64.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-freebsd-arm64')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
+    }
+  } else if (process.platform === 'linux') {
+    if (process.arch === 'x64') {
+      if (isMusl()) {
+        try {
+        return require('./parser.linux-x64-musl.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-x64-musl')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./parser.linux-x64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-x64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'arm64') {
+      if (isMusl()) {
+        try {
+        return require('./parser.linux-arm64-musl.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-arm64-musl')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./parser.linux-arm64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-arm64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'arm') {
+      if (isMusl()) {
+        try {
+        return require('./parser.linux-arm-musleabihf.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-arm-musleabihf')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./parser.linux-arm-gnueabihf.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-arm-gnueabihf')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'riscv64') {
+      if (isMusl()) {
+        try {
+        return require('./parser.linux-riscv64-musl.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-riscv64-musl')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      } else {
+        try {
+        return require('./parser.linux-riscv64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-riscv64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+      }
+    } else if (process.arch === 'ppc64') {
+      try {
+        return require('./parser.linux-ppc64-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-ppc64-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else if (process.arch === 's390x') {
+      try {
+        return require('./parser.linux-s390x-gnu.node')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+      try {
+        return require('@oxc-parser/binding-linux-s390x-gnu')
+      } catch (e) {
+        loadErrors.push(e)
+      }
+
+    } else {
+      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
+    }
+  } else {
+    loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
+  }
+}
+
+nativeBinding = requireNative()
+
+if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
+  try {
+    nativeBinding = require('./parser.wasi.cjs')
+  } catch (err) {
+    if (process.env.NAPI_RS_FORCE_WASI) {
+      console.error(err)
+    }
+  }
+  if (!nativeBinding) {
+    try {
+      nativeBinding = require('@oxc-parser/binding-wasm32-wasi')
+    } catch (err) {
+      if (process.env.NAPI_RS_FORCE_WASI) {
+        console.error(err)
+      }
+    }
+  }
+}
+
+if (!nativeBinding) {
+  if (loadErrors.length > 0) {
+    // TODO Link to documentation with potential fixes
+    //  - The package owner could build/publish bindings for this arch
+    //  - The user may need to bundle the correct files
+    //  - The user may need to re-install node_modules to get new packages
+    throw new Error('Failed to load native binding', { cause: loadErrors })
+  }
+  throw new Error(`Failed to load native binding`)
+}
+
+module.exports.moduleLexerAsync = nativeBinding.moduleLexerAsync
+module.exports.moduleLexerSync = nativeBinding.moduleLexerSync
+module.exports.parseAsync = nativeBinding.parseAsync
+module.exports.parseSync = nativeBinding.parseSync
+module.exports.parseWithoutReturn = nativeBinding.parseWithoutReturn

package/index.d.ts

@@ -91,7 +91,7 @@ export declare function moduleLexerSync(sourceText: string, options?: ParserOpti
 export declare function parseAsync(sourceText: string, options?: ParserOptions | undefined | null): Promise<ParseResult>
 
 export interface ParseResult {
-  program: string
+  program: import("@oxc-project/types").Program
   comments: Array<Comment>
   errors: Array<string>
 }

package/index.js

@@ -1,368 +1,16 @@
-// prettier-ignore
-/* eslint-disable */
-/* auto-generated by NAPI-RS */
-
-const { readFileSync } = require('fs')
-
-let nativeBinding = null
-const loadErrors = []
-
-const isMusl = () => {
-  let musl = false
-  if (process.platform === 'linux') {
-    musl = isMuslFromFilesystem()
-    if (musl === null) {
-      musl = isMuslFromReport()
-    }
-    if (musl === null) {
-      musl = isMuslFromChildProcess()
-    }
-  }
-  return musl
-}
-
-const isFileMusl = (f) => f.includes('libc.musl-') || f.includes('ld-musl-')
-
-const isMuslFromFilesystem = () => {
-  try {
-    return readFileSync('/usr/bin/ldd', 'utf-8').includes('musl')
-  } catch {
-    return null
-  }
-}
-
-const isMuslFromReport = () => {
-  const report = typeof process.report.getReport === 'function' ? process.report.getReport() : null
-  if (!report) {
-    return null
-  }
-  if (report.header && report.header.glibcVersionRuntime) {
-    return false
-  }
-  if (Array.isArray(report.sharedObjects)) {
-    if (report.sharedObjects.some(isFileMusl)) {
-      return true
-    }
-  }
-  return false
-}
-
-const isMuslFromChildProcess = () => {
-  try {
-    return require('child_process').execSync('ldd --version', { encoding: 'utf8' }).includes('musl')
-  } catch (e) {
-    // If we reach this case, we don't know if the system is musl or not, so is better to just fallback to false
-    return false
-  }
-}
-
-function requireNative() {
-  if (process.platform === 'android') {
-    if (process.arch === 'arm64') {
-      try {
-        return require('./parser.android-arm64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-android-arm64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm') {
-      try {
-        return require('./parser.android-arm-eabi.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-android-arm-eabi')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on Android ${process.arch}`))
-    }
-  } else if (process.platform === 'win32') {
-    if (process.arch === 'x64') {
-      try {
-        return require('./parser.win32-x64-msvc.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-win32-x64-msvc')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'ia32') {
-      try {
-        return require('./parser.win32-ia32-msvc.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-win32-ia32-msvc')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm64') {
-      try {
-        return require('./parser.win32-arm64-msvc.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-win32-arm64-msvc')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on Windows: ${process.arch}`))
-    }
-  } else if (process.platform === 'darwin') {
-    try {
-        return require('./parser.darwin-universal.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-darwin-universal')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    if (process.arch === 'x64') {
-      try {
-        return require('./parser.darwin-x64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-darwin-x64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm64') {
-      try {
-        return require('./parser.darwin-arm64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-darwin-arm64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on macOS: ${process.arch}`))
-    }
-  } else if (process.platform === 'freebsd') {
-    if (process.arch === 'x64') {
-      try {
-        return require('./parser.freebsd-x64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-freebsd-x64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 'arm64') {
-      try {
-        return require('./parser.freebsd-arm64.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-freebsd-arm64')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on FreeBSD: ${process.arch}`))
-    }
-  } else if (process.platform === 'linux') {
-    if (process.arch === 'x64') {
-      if (isMusl()) {
-        try {
-        return require('./parser.linux-x64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-x64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./parser.linux-x64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-x64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'arm64') {
-      if (isMusl()) {
-        try {
-        return require('./parser.linux-arm64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-arm64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./parser.linux-arm64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-arm64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'arm') {
-      if (isMusl()) {
-        try {
-        return require('./parser.linux-arm-musleabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-arm-musleabihf')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./parser.linux-arm-gnueabihf.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-arm-gnueabihf')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'riscv64') {
-      if (isMusl()) {
-        try {
-        return require('./parser.linux-riscv64-musl.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-riscv64-musl')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      } else {
-        try {
-        return require('./parser.linux-riscv64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-riscv64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-      }
-    } else if (process.arch === 'ppc64') {
-      try {
-        return require('./parser.linux-ppc64-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-ppc64-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else if (process.arch === 's390x') {
-      try {
-        return require('./parser.linux-s390x-gnu.node')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-      try {
-        return require('@oxc-parser/binding-linux-s390x-gnu')
-      } catch (e) {
-        loadErrors.push(e)
-      }
-
-    } else {
-      loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
-    }
-  } else {
-    loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
-  }
-}
-
-nativeBinding = requireNative()
-
-if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
-  try {
-    nativeBinding = require('./parser.wasi.cjs')
-  } catch (err) {
-    if (process.env.NAPI_RS_FORCE_WASI) {
-      console.error(err)
-    }
-  }
-  if (!nativeBinding) {
-    try {
-      nativeBinding = require('@oxc-parser/binding-wasm32-wasi')
-    } catch (err) {
-      if (process.env.NAPI_RS_FORCE_WASI) {
-        console.error(err)
-      }
-    }
-  }
-}
-
-if (!nativeBinding) {
-  if (loadErrors.length > 0) {
-    // TODO Link to documentation with potential fixes
-    //  - The package owner could build/publish bindings for this arch
-    //  - The user may need to bundle the correct files
-    //  - The user may need to re-install node_modules to get new packages
-    throw new Error('Failed to load native binding', { cause: loadErrors })
-  }
-  throw new Error(`Failed to load native binding`)
-}
-
-module.exports.moduleLexerAsync = nativeBinding.moduleLexerAsync
-module.exports.moduleLexerSync = nativeBinding.moduleLexerSync
-module.exports.parseAsync = nativeBinding.parseAsync
-module.exports.parseSync = nativeBinding.parseSync
-module.exports.parseWithoutReturn = nativeBinding.parseWithoutReturn
+const bindings = require('./bindings.js');
+
+module.exports.moduleLexerAsync = bindings.moduleLexerAsync;
+module.exports.moduleLexerSync = bindings.moduleLexerSync;
+module.exports.parseWithoutReturn = bindings.parseWithoutReturn;
+
+module.exports.parseAsync = async function parseAsync(...args) {
+  const result = await bindings.parseAsync(...args);
+  result.program = JSON.parse(result.program);
+  return result;
+};
+module.exports.parseSync = function parseSync(...args) {
+  const result = bindings.parseSync(...args);
+  result.program = JSON.parse(result.program);
+  return result;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxc-parser",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "Oxc Parser Node API",
   "keywords": [
     "Parser"
@@ -20,16 +20,20 @@
   "main": "index.js",
   "files": [
     "index.d.ts",
-    "index.js"
+    "index.js",
+    "bindings.js"
   ],
+  "devDependencies": {
+    "@oxc-project/types": "^0.34.0"
+  },
   "optionalDependencies": {
-    "@oxc-parser/binding-win32-x64-msvc": "0.33.0",
-    "@oxc-parser/binding-win32-arm64-msvc": "0.33.0",
-    "@oxc-parser/binding-linux-x64-gnu": "0.33.0",
-    "@oxc-parser/binding-linux-arm64-gnu": "0.33.0",
-    "@oxc-parser/binding-linux-x64-musl": "0.33.0",
-    "@oxc-parser/binding-linux-arm64-musl": "0.33.0",
-    "@oxc-parser/binding-darwin-x64": "0.33.0",
-    "@oxc-parser/binding-darwin-arm64": "0.33.0"
+    "@oxc-parser/binding-win32-x64-msvc": "0.34.0",
+    "@oxc-parser/binding-win32-arm64-msvc": "0.34.0",
+    "@oxc-parser/binding-linux-x64-gnu": "0.34.0",
+    "@oxc-parser/binding-linux-arm64-gnu": "0.34.0",
+    "@oxc-parser/binding-linux-x64-musl": "0.34.0",
+    "@oxc-parser/binding-linux-arm64-musl": "0.34.0",
+    "@oxc-parser/binding-darwin-x64": "0.34.0",
+    "@oxc-parser/binding-darwin-arm64": "0.34.0"
   }
 }