Skip to content

fix clean-css/clean-css-cli#77 #1248

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
refactor reused normalizeValue
  • Loading branch information
SuperStormer committed Mar 12, 2023
commit 72be1cd2750d9ac99e52e17e09101f26e218f308
19 changes: 1 addition & 18 deletions lib/options/format.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var systemLineBreak = require('os').EOL;

var override = require('../utils/override');
var normalizeValue = require('../utils/normalize-value');

var Breaks = {
AfterAtRule: 'afterAtRule',
Expand Down Expand Up @@ -49,11 +50,6 @@ var OPTION_NAME_VALUE_SEPARATOR = ':';
var HASH_VALUES_OPTION_SEPARATOR = ',';
var HASH_VALUES_NAME_VALUE_SEPARATOR = '=';

var FALSE_KEYWORD_1 = 'false';
var FALSE_KEYWORD_2 = 'off';
var TRUE_KEYWORD_1 = 'true';
var TRUE_KEYWORD_2 = 'on';

function breaks(value) {
var breakOptions = {};

Expand Down Expand Up @@ -171,19 +167,6 @@ function hashValuesToHash(string) {
}, {});
}

function normalizeValue(value) {
switch (value) {
case FALSE_KEYWORD_1:
case FALSE_KEYWORD_2:
return false;
case TRUE_KEYWORD_1:
case TRUE_KEYWORD_2:
return true;
default:
return value;
}
}

function mapBreakWith(value) {
switch (value) {
case 'windows':
Expand Down
18 changes: 1 addition & 17 deletions lib/options/optimization-level.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var roundingPrecisionFrom = require('./rounding-precision').roundingPrecisionFrom;

var override = require('../utils/override');
var normalizeValue = require('../utils/normalize-value');

var OptimizationLevel = {
Zero: '0',
Expand Down Expand Up @@ -53,10 +54,6 @@ DEFAULTS[OptimizationLevel.Two] = {

var ALL_KEYWORD_1 = '*';
var ALL_KEYWORD_2 = 'all';
var FALSE_KEYWORD_1 = 'false';
var FALSE_KEYWORD_2 = 'off';
var TRUE_KEYWORD_1 = 'true';
var TRUE_KEYWORD_2 = 'on';

var LIST_VALUE_SEPARATOR = ',';
var OPTION_SEPARATOR = ';';
Expand Down Expand Up @@ -156,19 +153,6 @@ function defaults(level, value) {
return options;
}

function normalizeValue(value) {
switch (value) {
case FALSE_KEYWORD_1:
case FALSE_KEYWORD_2:
return false;
case TRUE_KEYWORD_1:
case TRUE_KEYWORD_2:
return true;
default:
return value;
}
}

function convertValuesToHashes(source) {
var clonedSource = override(source, {});
var level;
Expand Down
19 changes: 19 additions & 0 deletions lib/utils/normalize-value.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
var FALSE_KEYWORD_1 = 'false';
var FALSE_KEYWORD_2 = 'off';
var TRUE_KEYWORD_1 = 'true';
var TRUE_KEYWORD_2 = 'on';

function normalizeValue(value) {
switch (value) {
case FALSE_KEYWORD_1:
case FALSE_KEYWORD_2:
return false;
case TRUE_KEYWORD_1:
case TRUE_KEYWORD_2:
return true;
default:
return value;
}
}

module.exports = normalizeValue;