Merge pull request #448 from moonbitlang/allow_alias_not_set

allow alias not set when path provided
moonbitlang · Nov 5, 2024 · 3e1c6b7 · 3e1c6b7
2 parents f3e703d + 65f6e0d
commit 3e1c6b7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/crates/moon/tests/test_cases/fancy_import.in/import004/main/moon.pkg.json b/crates/moon/tests/test_cases/fancy_import.in/import004/main/moon.pkg.json
@@ -11,8 +11,7 @@
       "alias": "lib3"
     },
     {
-      "path": "moonbitlang/import004/lib4",
-      "alias": ""
+      "path": "moonbitlang/import004/lib4"
     }
   ]
 }
diff --git a/crates/moonbuild/template/pkg.schema.json b/crates/moonbuild/template/pkg.schema.json
@@ -253,12 +253,14 @@
         {
           "type": "object",
           "required": [
-            "alias",
             "path"
           ],
           "properties": {
             "alias": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "path": {
               "type": "string"

diff --git a/crates/moonutil/src/package.rs b/crates/moonutil/src/package.rs
@@ -145,7 +145,7 @@ pub enum PkgJSONImportItem {
     String(String),
     Object {
         path: String,
-        alias: String,
+        alias: Option<String>,
         value: Option<Vec<String>>,
     },
 }
@@ -503,13 +503,13 @@ pub fn convert_pkg_json_to_package(j: MoonPkgJSON) -> anyhow::Result<MoonPkg> {
                                 path,
                                 alias,
                                 value: _,
-                            } => {
-                                if alias.is_empty() {
-                                    imports.push(Import::Simple(path));
-                                } else {
-                                    imports.push(Import::Alias { path, alias })
+                            } => match alias {
+                                None => imports.push(Import::Simple(path)),
+                                Some(alias) if alias.is_empty() => {
+                                    imports.push(Import::Simple(path))
                                 }
-                            }
+                                Some(alias) => imports.push(Import::Alias { path, alias }),
+                            },
                         }
                     }
                 }

diff --git a/docs/manual-zh/src/source/pkg_json_schema.html b/docs/manual-zh/src/source/pkg_json_schema.html
@@ -291,12 +291,14 @@
         {
           "type": "object",
           "required": [
-            "alias",
             "path"
           ],
           "properties": {
             "alias": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "path": {
               "type": "string"

diff --git a/docs/manual/src/source/pkg_json_schema.html b/docs/manual/src/source/pkg_json_schema.html
@@ -291,12 +291,14 @@
         {
           "type": "object",
           "required": [
-            "alias",
             "path"
           ],
           "properties": {
             "alias": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "path": {
               "type": "string"