Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the isString helper function

Browse Source 
The call-sites are replaced by direct `typeof`-checks instead, which removes unnecessary function calls. Note that in the `src/`-folder we already had more `typeof`-cases than `isString`-calls.
This commit is contained in:
Jonas Jenwald 2022-02-23 17:02:19 +01:00
parent 6bd4e0f5af
commit 99cd24ce3e
9 changed files with 47 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/annotation.js
View File

@ -24,7 +24,6 @@ import {
escapeString, escapeString,
getModificationDate, getModificationDate,
isAscii, isAscii,
isString,
OPS, OPS,
RenderingIntentFlag, RenderingIntentFlag,
shadow, shadow,
@ -542,9 +541,8 @@ class Annotation {
* annotation was last modified * annotation was last modified
*/ */
setModificationDate(modificationDate) { setModificationDate(modificationDate) {
this.modificationDate = isString(modificationDate) this.modificationDate =
? modificationDate typeof modificationDate === "string" ? modificationDate : null;
: null;
} }
/** /**
@ -1121,7 +1119,7 @@ class MarkupAnnotation extends Annotation {
* annotation was originally created * annotation was originally created
*/ */
setCreationDate(creationDate) { setCreationDate(creationDate) {
this.creationDate = isString(creationDate) ? creationDate : null; this.creationDate = typeof creationDate === "string" ? creationDate : null;
} }
_setDefaultAppearance({ _setDefaultAppearance({
@ -1258,9 +1256,8 @@ class WidgetAnnotation extends Annotation {
const defaultAppearance = const defaultAppearance =
getInheritableProperty({ dict, key: "DA" }) || params.acroForm.get("DA"); getInheritableProperty({ dict, key: "DA" }) || params.acroForm.get("DA");
this._defaultAppearance = isString(defaultAppearance) this._defaultAppearance =
? defaultAppearance typeof defaultAppearance === "string" ? defaultAppearance : "";
: "";
data.defaultAppearanceData = parseDefaultAppearance( data.defaultAppearanceData = parseDefaultAppearance(
this._defaultAppearance this._defaultAppearance
); );
@ -1305,11 +1302,11 @@ class WidgetAnnotation extends Annotation {
_decodeFormValue(formValue) { _decodeFormValue(formValue) {
if (Array.isArray(formValue)) { if (Array.isArray(formValue)) {
return formValue return formValue
.filter(item => isString(item)) .filter(item => typeof item === "string")
.map(item => stringToPDFString(item)); .map(item => stringToPDFString(item));
} else if (formValue instanceof Name) { } else if (formValue instanceof Name) {
return stringToPDFString(formValue.name); return stringToPDFString(formValue.name);
} else if (isString(formValue)) { } else if (typeof formValue === "string") {
return stringToPDFString(formValue); return stringToPDFString(formValue);
} }
return null; return null;
@ -1788,7 +1785,7 @@ class TextWidgetAnnotation extends WidgetAnnotation {
const dict = params.dict; const dict = params.dict;
// The field value is always a string. // The field value is always a string.
if (!isString(this.data.fieldValue)) { if (typeof this.data.fieldValue !== "string") {
this.data.fieldValue = ""; this.data.fieldValue = "";
} }
@ -2452,7 +2449,7 @@ class ChoiceWidgetAnnotation extends WidgetAnnotation {
// item is selected or an array of strings if multiple items are selected. // item is selected or an array of strings if multiple items are selected.
// For consistency in the API and convenience in the display layer, we // For consistency in the API and convenience in the display layer, we
// always make the field value an array with zero, one or multiple items. // always make the field value an array with zero, one or multiple items.
if (isString(this.data.fieldValue)) { if (typeof this.data.fieldValue === "string") {
this.data.fieldValue = [this.data.fieldValue]; this.data.fieldValue = [this.data.fieldValue];
} else if (!this.data.fieldValue) { } else if (!this.data.fieldValue) {
this.data.fieldValue = []; this.data.fieldValue = [];

45
src/core/catalog.js
View File

@ -25,7 +25,6 @@ import {
DocumentActionEventType, DocumentActionEventType,
FormatError, FormatError,
info, info,
isString,
objectSize, objectSize,
PermissionFlag, PermissionFlag,
shadow, shadow,
@ -424,12 +423,14 @@ class Catalog {
const group = this.xref.fetchIfRef(groupRef); const group = this.xref.fetchIfRef(groupRef);
groups.push({ groups.push({
id: groupRef.toString(), id: groupRef.toString(),
name: isString(group.get("Name")) name:
? stringToPDFString(group.get("Name")) typeof group.get("Name") === "string"
: null, ? stringToPDFString(group.get("Name"))
intent: isString(group.get("Intent")) : null,
? stringToPDFString(group.get("Intent")) intent:
: null, typeof group.get("Intent") === "string"
? stringToPDFString(group.get("Intent"))
: null,
}); });
} }
config = this._readOptionalContentConfig(defaultConfig, groupRefs); config = this._readOptionalContentConfig(defaultConfig, groupRefs);
@ -521,12 +522,14 @@ class Catalog {
MAX_NESTED_LEVELS = 10; MAX_NESTED_LEVELS = 10;
return { return {
name: isString(config.get("Name")) name:
? stringToPDFString(config.get("Name")) typeof config.get("Name") === "string"
: null, ? stringToPDFString(config.get("Name"))
creator: isString(config.get("Creator")) : null,
? stringToPDFString(config.get("Creator")) creator:
: null, typeof config.get("Creator") === "string"
? stringToPDFString(config.get("Creator"))
: null,
baseState: baseState:
config.get("BaseState") instanceof Name config.get("BaseState") instanceof Name
? config.get("BaseState").name ? config.get("BaseState").name
@ -676,7 +679,7 @@ class Catalog {
if (labelDict.has("P")) { if (labelDict.has("P")) {
const p = labelDict.get("P"); const p = labelDict.get("P");
if (!isString(p)) { if (typeof p !== "string") {
throw new FormatError("Invalid prefix in PageLabel dictionary."); throw new FormatError("Invalid prefix in PageLabel dictionary.");
} }
prefix = stringToPDFString(p); prefix = stringToPDFString(p);
@ -1467,7 +1470,7 @@ class Catalog {
for (const obj of action.get("Fields") || []) { for (const obj of action.get("Fields") || []) {
if (obj instanceof Ref) { if (obj instanceof Ref) {
refs.push(obj.toString()); refs.push(obj.toString());
} else if (isString(obj)) { } else if (typeof obj === "string") {
fields.push(stringToPDFString(obj)); fields.push(stringToPDFString(obj));
} }
} }
@ -1499,7 +1502,7 @@ class Catalog {
// We assume that we found a FileSpec dictionary // We assume that we found a FileSpec dictionary
// and fetch the URL without checking any further. // and fetch the URL without checking any further.
url = urlDict.get("F") || null; url = urlDict.get("F") || null;
} else if (isString(urlDict)) { } else if (typeof urlDict === "string") {
url = urlDict; url = urlDict;
} }
@ -1509,9 +1512,9 @@ class Catalog {
if (remoteDest instanceof Name) { if (remoteDest instanceof Name) {
remoteDest = remoteDest.name; remoteDest = remoteDest.name;
} }
if (isString(url)) { if (typeof url === "string") {
const baseUrl = url.split("#")[0]; const baseUrl = url.split("#")[0];
if (isString(remoteDest)) { if (typeof remoteDest === "string") {
url = baseUrl + "#" + remoteDest; url = baseUrl + "#" + remoteDest;
} else if (Array.isArray(remoteDest)) { } else if (Array.isArray(remoteDest)) {
url = baseUrl + "#" + JSON.stringify(remoteDest); url = baseUrl + "#" + JSON.stringify(remoteDest);
@ -1538,7 +1541,7 @@ class Catalog {
if (jsAction instanceof BaseStream) { if (jsAction instanceof BaseStream) {
js = jsAction.getString(); js = jsAction.getString();
} else if (isString(jsAction)) { } else if (typeof jsAction === "string") {
js = jsAction; js = jsAction;
} }
@ -1563,7 +1566,7 @@ class Catalog {
dest = destDict.get("Dest"); dest = destDict.get("Dest");
} }
if (isString(url)) { if (typeof url === "string") {
const absoluteUrl = createValidAbsoluteUrl(url, docBaseUrl, { const absoluteUrl = createValidAbsoluteUrl(url, docBaseUrl, {
addDefaultProtocol: true, addDefaultProtocol: true,
tryConvertEncoding: true, tryConvertEncoding: true,
@ -1577,7 +1580,7 @@ class Catalog {
if (dest instanceof Name) { if (dest instanceof Name) {
dest = dest.name; dest = dest.name;
} }
if (isString(dest) || Array.isArray(dest)) { if (typeof dest === "string" || Array.isArray(dest)) {
resultObj.dest = dest; resultObj.dest = dest;
} }
} }

9
src/core/cmap.js
View File

@ -16,7 +16,6 @@
import { import {
CMapCompressionType, CMapCompressionType,
FormatError, FormatError,
isString,
unreachable, unreachable,
warn, warn,
} from "../shared/util.js"; } from "../shared/util.js";
@ -767,7 +766,7 @@ const CMapFactory = (function CMapFactoryClosure() {
} }
function expectString(obj) { function expectString(obj) {
if (!isString(obj)) { if (typeof obj !== "string") {
throw new FormatError("Malformed CMap: expected string."); throw new FormatError("Malformed CMap: expected string.");
} }
} }
@ -812,7 +811,7 @@ const CMapFactory = (function CMapFactoryClosure() {
expectString(obj); expectString(obj);
const high = strToInt(obj); const high = strToInt(obj);
obj = lexer.getObj(); obj = lexer.getObj();
if (Number.isInteger(obj) || isString(obj)) { if (Number.isInteger(obj) || typeof obj === "string") {
const dstLow = Number.isInteger(obj) ? String.fromCharCode(obj) : obj; const dstLow = Number.isInteger(obj) ? String.fromCharCode(obj) : obj;
cMap.mapBfRange(low, high, dstLow); cMap.mapBfRange(low, high, dstLow);
} else if (isCmd(obj, "[")) { } else if (isCmd(obj, "[")) {
@ -878,12 +877,12 @@ const CMapFactory = (function CMapFactoryClosure() {
if (isCmd(obj, "endcodespacerange")) { if (isCmd(obj, "endcodespacerange")) {
return; return;
} }
if (!isString(obj)) { if (typeof obj !== "string") {
break; break;
} }
const low = strToInt(obj); const low = strToInt(obj);
obj = lexer.getObj(); obj = lexer.getObj();
if (!isString(obj)) { if (typeof obj !== "string") {
break; break;
} }
const high = strToInt(obj); const high = strToInt(obj);

7
src/core/evaluator.js
View File

@ -24,7 +24,6 @@ import {
IDENTITY_MATRIX, IDENTITY_MATRIX,
info, info,
isArrayEqual, isArrayEqual,
isString,
OPS, OPS,
shadow, shadow,
stringToPDFString, stringToPDFString,
@ -1784,7 +1783,7 @@ class PartialEvaluator {
var state = stateManager.state; var state = stateManager.state;
for (i = 0; i < arrLength; ++i) { for (i = 0; i < arrLength; ++i) {
const arrItem = arr[i]; const arrItem = arr[i];
if (isString(arrItem)) { if (typeof arrItem === "string") {
Array.prototype.push.apply( Array.prototype.push.apply(
combinedGlyphs, combinedGlyphs,
self.handleText(arrItem, state) self.handleText(arrItem, state)
@ -3974,10 +3973,10 @@ class PartialEvaluator {
let fontName = descriptor.get("FontName"); let fontName = descriptor.get("FontName");
let baseFont = dict.get("BaseFont"); let baseFont = dict.get("BaseFont");
// Some bad PDFs have a string as the font name. // Some bad PDFs have a string as the font name.
if (isString(fontName)) { if (typeof fontName === "string") {
fontName = Name.get(fontName); fontName = Name.get(fontName);
} }
if (isString(baseFont)) { if (typeof baseFont === "string") {
baseFont = Name.get(baseFont); baseFont = Name.get(baseFont);
} }

4
src/core/murmurhash3.js
View File

@ -17,7 +17,7 @@
* Hashes roughly 100 KB per millisecond on i7 3.4 GHz. * Hashes roughly 100 KB per millisecond on i7 3.4 GHz.
*/ */
import { isArrayBuffer, isString } from "../shared/util.js"; import { isArrayBuffer } from "../shared/util.js";
const SEED = 0xc3d2e1f0; const SEED = 0xc3d2e1f0;
// Workaround for missing math precision in JS. // Workaround for missing math precision in JS.
@ -32,7 +32,7 @@ class MurmurHash3_64 {
update(input) { update(input) {
let data, length; let data, length;
if (isString(input)) { if (typeof input === "string") {
data = new Uint8Array(input.length * 2); data = new Uint8Array(input.length * 2);
length = 0; length = 0;
for (let i = 0, ii = input.length; i < ii; i++) { for (let i = 0, ii = input.length; i < ii; i++) {

6
src/core/struct_tree.js
View File

@ -14,7 +14,7 @@
*/ */
import { Dict, isName, Name, Ref } from "./primitives.js"; import { Dict, isName, Name, Ref } from "./primitives.js";
import { isString, stringToPDFString, warn } from "../shared/util.js"; import { stringToPDFString, warn } from "../shared/util.js";
import { NumberTree } from "./name_number_tree.js"; import { NumberTree } from "./name_number_tree.js";
const MAX_DEPTH = 40; const MAX_DEPTH = 40;
@ -295,11 +295,11 @@ class StructTreePage {
obj.children = []; obj.children = [];
parent.children.push(obj); parent.children.push(obj);
const alt = node.dict.get("Alt"); const alt = node.dict.get("Alt");
if (isString(alt)) { if (typeof alt === "string") {
obj.alt = stringToPDFString(alt); obj.alt = stringToPDFString(alt);
} }
const lang = node.dict.get("Lang"); const lang = node.dict.get("Lang");
if (isString(lang)) { if (typeof lang === "string") {
obj.lang = stringToPDFString(lang); obj.lang = stringToPDFString(lang);
} }

10
src/display/display_utils.js
View File

@ -19,13 +19,7 @@ import {
BaseStandardFontDataFactory, BaseStandardFontDataFactory,
BaseSVGFactory, BaseSVGFactory,
} from "./base_factory.js"; } from "./base_factory.js";
import { import { BaseException, stringToBytes, Util, warn } from "../shared/util.js";
BaseException,
isString,
stringToBytes,
Util,
warn,
} from "../shared/util.js";
const SVG_NS = "http://www.w3.org/2000/svg"; const SVG_NS = "http://www.w3.org/2000/svg";
@ -482,7 +476,7 @@ class PDFDateString {
* @returns {Date|null} * @returns {Date|null}
*/ */
static toDateObject(input) { static toDateObject(input) {
if (!input || !isString(input)) { if (!input || typeof input !== "string") {
return null; return null;
} }

5
src/shared/util.js
View File

@ -1030,10 +1030,6 @@ function utf8StringToString(str) {
return unescape(encodeURIComponent(str)); return unescape(encodeURIComponent(str));
} }
function isString(v) {
return typeof v === "string";
}
function isArrayBuffer(v) { function isArrayBuffer(v) {
return typeof v === "object" && v !== null && v.byteLength !== undefined; return typeof v === "object" && v !== null && v.byteLength !== undefined;
} }
@ -1138,7 +1134,6 @@ export {
IsEvalSupportedCached, IsEvalSupportedCached,
IsLittleEndianCached, IsLittleEndianCached,
isSameOrigin, isSameOrigin,
isString,
MissingPDFException, MissingPDFException,
objectFromMap, objectFromMap,
objectSize, objectSize,

15
test/unit/util_spec.js
View File

@ -22,7 +22,6 @@ import {
isArrayBuffer, isArrayBuffer,
isAscii, isAscii,
isSameOrigin, isSameOrigin,
isString,
string32, string32,
stringToBytes, stringToBytes,
stringToPDFString, stringToPDFString,
@ -73,20 +72,6 @@ describe("util", function () {
}); });
}); });
describe("isString", function () {
it("handles string values", function () {
expect(isString("foo")).toEqual(true);
expect(isString("")).toEqual(true);
});
it("handles non-string values", function () {
expect(isString(true)).toEqual(false);
expect(isString(1)).toEqual(false);
expect(isString(null)).toEqual(false);
expect(isString(undefined)).toEqual(false);
});
});
describe("string32", function () { describe("string32", function () {
it("converts unsigned 32-bit integers to strings", function () { it("converts unsigned 32-bit integers to strings", function () {
expect(string32(0x74727565)).toEqual("true"); expect(string32(0x74727565)).toEqual("true");