smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unessesary checks for values

Browse Source
This commit is contained in:
Dolan Miu
2023-01-05 21:39:46 +00:00
parent f255d4c141
commit 6defb686bb
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/values.ts
View File

@ -89,16 +89,9 @@ export const uCharHexNumber = (val: string): string => hexBinary(val, 1);
// </xsd:simpleType> // </xsd:simpleType>
export const universalMeasureValue = (val: UniversalMeasure): UniversalMeasure => { export const universalMeasureValue = (val: UniversalMeasure): UniversalMeasure => {
const unit = val.slice(-2); const unit = val.slice(-2);
if (!universalMeasureUnits.includes(unit)) {
throw new Error(`Invalid unit '${unit}' specified. Valid units are ${universalMeasureUnits.join(", ")}`);
}
const amount = val.substring(0, val.length - 2); const amount = val.substring(0, val.length - 2);
if (isNaN(Number(amount))) {
throw new Error(`Invalid value '${amount}' specified. Expected a valid number.`);
}
return `${Number(amount)}${unit}` as UniversalMeasure; return `${Number(amount)}${unit}` as UniversalMeasure;
}; };
const universalMeasureUnits = ["mm", "cm", "in", "pt", "pc", "pi"];
// <xsd:simpleType name="ST_PositiveUniversalMeasure"> // <xsd:simpleType name="ST_PositiveUniversalMeasure">
// <xsd:restriction base="ST_UniversalMeasure"> // <xsd:restriction base="ST_UniversalMeasure">
@ -167,13 +160,7 @@ export const twipsMeasureValue = (val: PositiveUniversalMeasure | number): Posit
// </xsd:restriction> // </xsd:restriction>
// </xsd:simpleType> // </xsd:simpleType>
export const percentageValue = (val: Percentage): Percentage => { export const percentageValue = (val: Percentage): Percentage => {
if (val.slice(-1) !== "%") {
throw new Error(`Invalid value '${val}'. Expected percentage value (eg '55%')`);
}
const percent = val.substring(0, val.length - 1); const percent = val.substring(0, val.length - 1);
if (isNaN(Number(percent))) {
throw new Error(`Invalid value '${percent}' specified. Expected a valid number.`);
}
return `${Number(percent)}%`; return `${Number(percent)}%`;
}; };