Skip to content

fix: string field with false value in asconfig.js #2802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 17, 2023
Merged

fix: string field with false value in asconfig.js #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbe6e90
fix: string field with false value in asconfig.js
Oct 24, 2023
c6b89b9
Merge branch 'main' into pr-2775
HerrCai0907 Nov 17, 2023
b0bb1c4
update test
HerrCai0907 Nov 17, 2023
75f0016
clean
HerrCai0907 Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,15 @@
"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",
"test:asconfig": "cd tests/asconfig && npm run test",
"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",
Expand Down
39 changes: 23 additions & 16 deletions tests/cli/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"] });
Expand Down
1 change: 1 addition & 0 deletions util/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down