From 5dec4a3a82c97f3a80c86a60f49167b18267a7e5 Mon Sep 17 00:00:00 2001
From: Congcong Cai <congcongcai0907@163.com>
Date: Fri, 17 Nov 2023 15:53:00 +0800
Subject: [PATCH] fix: string field with false value in `asconfig.js` (#2802)

Co-authored-by: Zhenya.Liu <zhenya.liu@partner.bmw.com>
---
 package.json         |  3 ++-
 tests/cli/options.js | 39 +++++++++++++++++++++++----------------
 util/options.js      |  1 +
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 38e4f49ab1..c35597e8c6 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "build": "node scripts/build",
     "watch": "node scripts/build --watch",
     "coverage": "npx c8 -- npm test",
-    "test": "npm run test:parser && npm run test:compiler -- --parallel && npm run test:browser && npm run test:asconfig && npm run test:transform",
+    "test": "npm run test:parser && npm run test:compiler -- --parallel && npm run test:browser && npm run test:asconfig && npm run test:transform && npm run test:cli",
     "test:parser": "node --enable-source-maps tests/parser",
     "test:compiler": "node --enable-source-maps --no-warnings tests/compiler",
     "test:browser": "node --enable-source-maps tests/browser",
@@ -85,6 +85,7 @@
     "test:transform": "npm run test:transform:esm && npm run test:transform:cjs",
     "test:transform:esm": "node bin/asc tests/compiler/empty --transform ./tests/transform/index.js --noEmit && node bin/asc tests/compiler/empty --transform ./tests/transform/simple.js --noEmit",
     "test:transform:cjs": "node bin/asc tests/compiler/empty --transform ./tests/transform/cjs/index.js --noEmit && node bin/asc tests/compiler/empty --transform ./tests/transform/cjs/simple.js --noEmit",
+    "test:cli": "node tests/cli/options.js",
     "asbuild": "npm run asbuild:debug && npm run asbuild:release",
     "asbuild:debug": "node bin/asc --config src/asconfig.json --target debug",
     "asbuild:release": "node bin/asc --config src/asconfig.json --target release",
diff --git a/tests/cli/options.js b/tests/cli/options.js
index 637aae3493..1eed2763ce 100644
--- a/tests/cli/options.js
+++ b/tests/cli/options.js
@@ -2,18 +2,21 @@ import assert from "assert";
 import * as optionsUtil from "../../util/options.js";
 
 const config = {
-  "enable": {
-    "type": "S",
-    "mutuallyExclusive": "disable"
+  enable: {
+    type: "S",
+    mutuallyExclusive: "disable",
   },
-  "disable": {
-    "type": "S",
-    "mutuallyExclusive": "enable"
+  disable: {
+    type: "S",
+    mutuallyExclusive: "enable",
+  },
+  other: {
+    type: "S",
+    default: ["x"],
+  },
+  bool_input_for_string: {
+    type: "s",
   },
-  "other": {
-    "type": "S",
-    "default": ["x"]
-  }
 };
 
 // Present in both should concat
@@ -33,17 +36,21 @@ assert.deepStrictEqual(merged.enable, ["c"]);
 assert.deepStrictEqual(merged.disable, ["a", "b"]);
 
 // Populating defaults should work after the fact
-optionsUtil.addDefaults(config, merged = {});
+optionsUtil.addDefaults(config, (merged = {}));
 assert.deepStrictEqual(merged.other, ["x"]);
 
-optionsUtil.addDefaults(config, merged = { other: ["y"] });
+optionsUtil.addDefaults(config, (merged = { other: ["y"] }));
 assert.deepStrictEqual(merged.other, ["y"]);
 
+// String test
+assert.deepStrictEqual(merged.bool_input_for_string, undefined);
+merged = optionsUtil.merge(config, {}, { bool_input_for_string: false });
+assert.deepStrictEqual(merged.bool_input_for_string, undefined);
+merged = optionsUtil.merge(config, {}, { bool_input_for_string: true });
+assert.deepStrictEqual(merged.bool_input_for_string, "");
+
 // Complete usage test
-let result = optionsUtil.parse([
-  "--enable", "a",
-  "--disable", "b",
-], config, false);
+let result = optionsUtil.parse(["--enable", "a", "--disable", "b"], config, false);
 
 merged = optionsUtil.merge(config, result.options, { enable: ["b", "c"] });
 merged = optionsUtil.merge(config, merged, { disable: ["a", "d"] });
diff --git a/util/options.js b/util/options.js
index d0633b19e2..7b1c2de69a 100644
--- a/util/options.js
+++ b/util/options.js
@@ -150,6 +150,7 @@ function sanitizeValue(value, type) {
       case "f": return Number(value) || 0;
       case "s": {
         if (value === true) return "";
+        if (value === false) return null;
         return String(value);
       }
       case "I": {