feat: add support for riscv64 linux gnu

node/binding.js

@@ -1,29 +1,69 @@
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
 const { existsSync, readFileSync } = require('fs')
 const { join } = require('path')
 
 const { platform, arch } = process
 
 let nativeBinding = null
 let localFileExisted = false
-let isMusl = false
 let loadError = null
 
-switch (platform) {
-  case 'android':
-    if (arch !== 'arm64') {
-      throw new Error(`Unsupported architecture on Android ${arch}`)
-    }
-    localFileExisted = existsSync(
-      join(__dirname, 'magic-string-rs.android-arm64.node'),
-    )
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
     try {
-      if (localFileExisted) {
-        nativeBinding = require('./magic-string-rs.android-arm64.node')
-      } else {
-        nativeBinding = require('@napi-rs/magic-string-android-arm64')
-      }
+      const lddPath = require('child_process')
+        .execSync('which ldd')
+        .toString()
+        .trim()
+      return readFileSync(lddPath, 'utf8').includes('musl')
     } catch (e) {
-      loadError = e
+      return true
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'magic-string-rs.android-arm64.node'),
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./magic-string-rs.android-arm64.node')
+          } else {
+            nativeBinding = require('@napi-rs/magic-string-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(
+          join(__dirname, 'magic-string-rs.android-arm-eabi.node'),
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./magic-string-rs.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('@napi-rs/magic-string-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Android ${arch}`)
     }
     break
   case 'win32':
@@ -75,6 +115,17 @@ switch (platform) {
     }
     break
   case 'darwin':
+    localFileExisted = existsSync(
+      join(__dirname, 'magic-string-rs.darwin-universal.node'),
+    )
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./magic-string-rs.darwin-universal.node')
+      } else {
+        nativeBinding = require('@napi-rs/magic-string-darwin-universal')
+      }
+      break
+    } catch {}
     switch (arch) {
       case 'x64':
         localFileExisted = existsSync(
@@ -128,8 +179,7 @@ switch (platform) {
   case 'linux':
     switch (arch) {
       case 'x64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(
             join(__dirname, 'magic-string-rs.linux-x64-musl.node'),
           )
@@ -158,8 +208,7 @@ switch (platform) {
         }
         break
       case 'arm64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(
             join(__dirname, 'magic-string-rs.linux-arm64-musl.node'),
           )
@@ -201,6 +250,49 @@ switch (platform) {
           loadError = e
         }
         break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'magic-string-rs.linux-riscv64-musl.node'),
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./magic-string-rs.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('@napi-rs/magic-string-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'magic-string-rs.linux-riscv64-gnu.node'),
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./magic-string-rs.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('@napi-rs/magic-string-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
+        localFileExisted = existsSync(
+          join(__dirname, 'magic-string-rs.linux-s390x-gnu.node'),
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./magic-string-rs.linux-s390x-gnu.node')
+          } else {
+            nativeBinding = require('@napi-rs/magic-string-linux-s390x-gnu')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
       default:
         throw new Error(`Unsupported architecture on Linux: ${arch}`)
     }

node/index.d.ts

@@ -3,26 +3,30 @@
 
 /* auto-generated by NAPI-RS */
 
-export class ExternalObject<T> {
-  readonly '': {
-    readonly '': unique symbol
-    [K: symbol]: T
-  }
+export interface GenerateDecodedMapOptions {
+  file?: string
+  sourceRoot?: string
+  source?: string
+  includeContent: boolean
+  hires: boolean
+}
+export interface OverwriteOptions {
+  contentOnly: boolean
 }
 /** Only for .d.ts type generation */
 export interface DecodedMap {
-  file?: string | undefined | null
+  file?: string
   sources: Array<string | undefined | null>
-  sourceRoot?: string | undefined | null
+  sourceRoot?: string
   sourcesContent: Array<string | undefined | null>
   names: Array<string>
   mappings: Array<Array<Array<number>>>
 }
 /** Only for .d.ts generation */
 export interface GenerateDecodedMapOptions {
-  file?: string | undefined | null
-  sourceRoot?: string | undefined | null
-  source?: string | undefined | null
+  file?: string
+  sourceRoot?: string
+  source?: string
   includeContent: boolean
   hires: boolean
 }

node/npm/linux-arm64-gnu/package.json

@@ -37,5 +37,8 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "repository": "https://github.com/h-a-n-a/magic-string-rs.git"
+  "repository": "https://github.com/h-a-n-a/magic-string-rs.git",
+  "libc": [
+    "glibc"
+  ]
 }

node/npm/linux-arm64-musl/package.json

@@ -37,5 +37,8 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "repository": "https://github.com/h-a-n-a/magic-string-rs.git"
+  "repository": "https://github.com/h-a-n-a/magic-string-rs.git",
+  "libc": [
+    "musl"
+  ]
 }

node/npm/linux-riscv64-gnu/README.md

@@ -0,0 +1,3 @@
+# `@napi-rs/magic-string-linux-riscv64-gnu`
+
+This is the **riscv64gc-unknown-linux-gnu** binary for `@napi-rs/magic-string`

node/npm/linux-riscv64-gnu/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "@napi-rs/magic-string-linux-riscv64-gnu",
+  "version": "0.3.4",
+  "os": [
+    "linux"
+  ],
+  "cpu": [
+    "riscv64"
+  ],
+  "main": "magic-string-rs.linux-riscv64-gnu.node",
+  "files": [
+    "magic-string-rs.linux-riscv64-gnu.node"
+  ],
+  "description": "rusty magic-string",
+  "keywords": [
+    "magic-string",
+    "string",
+    "napi",
+    "N-API",
+    "napi-rs"
+  ],
+  "authors": [
+    {
+      "name": "h-a-n-a",
+      "email": "[email protected]"
+    },
+    {
+      "name": "LongYinan",
+      "email": "[email protected]"
+    }
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "repository": "https://github.com/h-a-n-a/magic-string-rs.git",
+  "libc": [
+    "glibc"
+  ]
+}

node/npm/linux-x64-gnu/package.json

@@ -37,5 +37,8 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "repository": "https://github.com/h-a-n-a/magic-string-rs.git"
+  "repository": "https://github.com/h-a-n-a/magic-string-rs.git",
+  "libc": [
+    "glibc"
+  ]
 }

node/npm/linux-x64-musl/package.json

@@ -37,5 +37,8 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "repository": "https://github.com/h-a-n-a/magic-string-rs.git"
+  "repository": "https://github.com/h-a-n-a/magic-string-rs.git",
+  "libc": [
+    "musl"
+  ]
 }

node/package.json

@@ -55,7 +55,8 @@
         "aarch64-unknown-linux-musl",
         "aarch64-pc-windows-msvc",
         "aarch64-linux-android",
-        "armv7-linux-androideabi"
+        "armv7-linux-androideabi",
+        "riscv64gc-unknown-linux-gnu"
       ]
     }
   },

package.json

@@ -27,7 +27,7 @@
     "test": "mocha -r @swc-node/register node/tests/**/*.spec.ts"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^2.0.0",
+    "@napi-rs/cli": "^2.17.0",
     "@swc-node/register": "^1.4.0",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.11.12",

yarn.lock

@@ -86,10 +86,10 @@
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@napi-rs/cli@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-2.1.0.tgz#c0d34051e7488d6e7f2ffd14ba06909fa68b491d"
-  integrity sha512-1qXXjODcXqYsBQcmIFxlsg8yh2JDRPg/GJryDxXFOu8L2tscmVPGiPgSfEX3MI1r7jPUxVePKk/Gbv9k22fASw==
+"@napi-rs/cli@^2.17.0":
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-2.18.0.tgz#3064f142e65c87d14e6ddc38e5425aa29a8871eb"
+  integrity sha512-lfSRT7cs3iC4L+kv9suGYQEezn5Nii7Kpu+THsYVI0tA1Vh59LH45p4QADaD7hvIkmOz79eEGtoKQ9nAkAPkzA==
 
 "@napi-rs/triples@^1.0.3":
   version "1.1.0"