Merge pull request #7 from bvanjoi/next

release: 0.0.5

Author: bvanjoi

Cargo.toml

@@ -12,9 +12,8 @@ crate-type = ["cdylib"]
 [dependencies]
 napi = "2"
 napi-derive = "2"
-nodejs-resolver = "0.0.14"
+nodejs-resolver = "0.0.15"
 serde = { version = "1.0.137", features = ["derive"] }
-serde_json = "1.0.81"
 
 [build-dependencies]
 napi-build = "1"

__test__/index.spec.ts

@@ -21,7 +21,7 @@ test('resolve do not exist file', (t) => {
     count += 1
   } catch (err: any) {
     encounterError = true
-    t.assert((err.message as string).includes('Resolve ./lib failed in'))
+    t.assert((err.message as string).includes('Resolve \'./lib\' failed in'))
   }
   t.is(count, 1)
   t.is(encounterError, true)
@@ -36,3 +36,27 @@ test('extensions options', (t) => {
   t.is(result.path, path.resolve(__dirname, './fixture/lib.ts'))
   t.is(result.status, true)
 })
+
+
+test('alias options', (t) => {
+  const resolverOptions: RawResolverOptions = {
+    alias: [
+      {
+        key: '@alias',
+        value: './fixture',
+      },
+      {
+        key: '@false',
+        value: undefined, // undefine -> None (represent `false`).
+      }
+    ]
+  }
+  const resolver = factory.create(resolverOptions)
+  const result = factory.resolve(resolver, __dirname, '@alias/lib')
+  t.is(result.path, path.resolve(__dirname, './fixture/lib.js'))
+  t.is(result.status, true)
+
+  const result2 = factory.resolve(resolver, __dirname, '@false/lib')
+  t.is(result2.path, undefined)
+  t.is(result2.status, false)
+})

index.d.ts

@@ -9,10 +9,14 @@ export class ExternalObject<T> {
     [K: symbol]: T
   }
 }
+export interface Alias {
+  key: string
+  value?: string
+}
 export interface RawResolverOptions {
   extensions?: Array<string>
   enforceExtension?: boolean | undefined | null
-  alias?: Record<string, string | undefined | null>
+  alias?: Array<Alias>
   aliasFields?: Array<string>
   conditionNames?: Array<string>
   symlinks?: boolean

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs-resolver",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "node binding for nodejs-resolver",
   "main": "index.js",
   "license": "MIT",

src/lib.rs

@@ -2,16 +2,23 @@ use napi::bindgen_prelude::External;
 use napi_derive::napi;
 use nodejs_resolver::{Resolver, ResolverOptions};
 use serde::Deserialize;
-use std::collections::HashMap;
 use std::path::Path;
 
+#[derive(Debug, Clone, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[napi(object)]
+pub struct Alias {
+  pub key: String,
+  pub value: Option<String>,
+}
+
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[napi(object)]
 pub struct RawResolverOptions {
   pub extensions: Option<Vec<String>>,
   pub enforce_extension: Option<Option<bool>>,
-  pub alias: Option<HashMap<String, Option<String>>>,
+  pub alias: Option<Vec<Alias>>,
   pub alias_fields: Option<Vec<String>>,
   pub condition_names: Option<Vec<String>>,
   pub symlinks: Option<bool>,
@@ -29,7 +36,10 @@ impl RawResolverOptions {
     ResolverOptions {
       enforce_extension: self.enforce_extension.unwrap_or(default.enforce_extension),
       extensions: self.extensions.to_owned().unwrap_or(default.extensions),
-      alias: self.alias.to_owned().unwrap_or(default.alias),
+      alias: self
+        .alias
+        .to_owned()
+        .map_or(default.alias, |alias| parse_alias(alias)),
       alias_fields: self.alias_fields.to_owned().unwrap_or(default.alias_fields),
       condition_names: self
         .condition_names
@@ -51,13 +61,18 @@ impl RawResolverOptions {
   }
 }
 
+fn parse_alias(alias: Vec<Alias>) -> Vec<(String, Option<String>)> {
+  alias
+    .into_iter()
+    .map(|item| (item.key, item.value))
+    .collect()
+}
+
 #[napi(object)]
 pub struct ResolverInternal {}
 
 #[napi(ts_return_type = "ExternalObject<ResolverInternal>")]
 pub fn create(options: RawResolverOptions) -> Result<External<Resolver>, napi::Error> {
-  // let options: RawResolverOptions = serde_json::from_str(options.as_str())
-  //   .map_err(|err| napi::Error::new(napi::Status::InvalidArg, err.to_string()))?;
   let resolver = Resolver::new(options.normalized());
   Ok(External::new(resolver))
 }