Merge pull request #14640 from Snuffleupagus/update-TypeScript

Update TypeScript to version `4.6.2` and work-around stricter type checks
This commit is contained in:
Tim van der Meij 2022-03-09 20:35:24 +01:00 committed by GitHub
commit 23d1abee0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 12 deletions

14
package-lock.json generated
View File

@ -60,7 +60,7 @@
"terser": "^5.12.0", "terser": "^5.12.0",
"through2": "^4.0.2", "through2": "^4.0.2",
"ttest": "^3.0.0", "ttest": "^3.0.0",
"typescript": "^4.5.5", "typescript": "^4.6.2",
"typogr": "^0.6.8", "typogr": "^0.6.8",
"vinyl": "^2.2.1", "vinyl": "^2.2.1",
"vinyl-fs": "^3.0.3", "vinyl-fs": "^3.0.3",
@ -17571,9 +17571,9 @@
"dev": true "dev": true
}, },
"node_modules/typescript": { "node_modules/typescript": {
"version": "4.5.5", "version": "4.6.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
"integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
"dev": true, "dev": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
@ -32286,9 +32286,9 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "4.5.5", "version": "4.6.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz",
"integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==", "integrity": "sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==",
"dev": true "dev": true
}, },
"typogr": { "typogr": {

View File

@ -53,7 +53,7 @@
"terser": "^5.12.0", "terser": "^5.12.0",
"through2": "^4.0.2", "through2": "^4.0.2",
"ttest": "^3.0.0", "ttest": "^3.0.0",
"typescript": "^4.5.5", "typescript": "^4.6.2",
"typogr": "^0.6.8", "typogr": "^0.6.8",
"vinyl": "^2.2.1", "vinyl": "^2.2.1",
"vinyl-fs": "^3.0.3", "vinyl-fs": "^3.0.3",

View File

@ -57,7 +57,7 @@ class BaseCanvasFactory {
} }
/** /**
* @private * @ignore
*/ */
_createCanvas(width, height) { _createCanvas(width, height) {
unreachable("Abstract method `_createCanvas` called."); unreachable("Abstract method `_createCanvas` called.");
@ -96,7 +96,7 @@ class BaseCMapReaderFactory {
} }
/** /**
* @private * @ignore
*/ */
_fetchData(url, compressionType) { _fetchData(url, compressionType) {
unreachable("Abstract method `_fetchData` called."); unreachable("Abstract method `_fetchData` called.");
@ -129,7 +129,7 @@ class BaseStandardFontDataFactory {
} }
/** /**
* @private * @ignore
*/ */
_fetchData(url) { _fetchData(url) {
unreachable("Abstract method `_fetchData` called."); unreachable("Abstract method `_fetchData` called.");
@ -165,7 +165,7 @@ class BaseSVGFactory {
} }
/** /**
* @private * @ignore
*/ */
_createSVG(type) { _createSVG(type) {
unreachable("Abstract method `_createSVG` called."); unreachable("Abstract method `_createSVG` called.");

View File

@ -37,6 +37,9 @@ class DOMCanvasFactory extends BaseCanvasFactory {
this._document = ownerDocument; this._document = ownerDocument;
} }
/**
* @ignore
*/
_createCanvas(width, height) { _createCanvas(width, height) {
const canvas = this._document.createElement("canvas"); const canvas = this._document.createElement("canvas");
canvas.width = width; canvas.width = width;
@ -91,6 +94,9 @@ async function fetchData(url, asTypedArray = false) {
} }
class DOMCMapReaderFactory extends BaseCMapReaderFactory { class DOMCMapReaderFactory extends BaseCMapReaderFactory {
/**
* @ignore
*/
_fetchData(url, compressionType) { _fetchData(url, compressionType) {
return fetchData(url, /* asTypedArray = */ this.isCompressed).then(data => { return fetchData(url, /* asTypedArray = */ this.isCompressed).then(data => {
return { cMapData: data, compressionType }; return { cMapData: data, compressionType };
@ -99,12 +105,18 @@ class DOMCMapReaderFactory extends BaseCMapReaderFactory {
} }
class DOMStandardFontDataFactory extends BaseStandardFontDataFactory { class DOMStandardFontDataFactory extends BaseStandardFontDataFactory {
/**
* @ignore
*/
_fetchData(url) { _fetchData(url) {
return fetchData(url, /* asTypedArray = */ true); return fetchData(url, /* asTypedArray = */ true);
} }
} }
class DOMSVGFactory extends BaseSVGFactory { class DOMSVGFactory extends BaseSVGFactory {
/**
* @ignore
*/
_createSVG(type) { _createSVG(type) {
return document.createElementNS(SVG_NS, type); return document.createElementNS(SVG_NS, type);
} }

View File

@ -55,6 +55,9 @@ if ((typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && isNodeJS) {
}; };
NodeCanvasFactory = class extends BaseCanvasFactory { NodeCanvasFactory = class extends BaseCanvasFactory {
/**
* @ignore
*/
_createCanvas(width, height) { _createCanvas(width, height) {
const Canvas = __non_webpack_require__("canvas"); const Canvas = __non_webpack_require__("canvas");
return Canvas.createCanvas(width, height); return Canvas.createCanvas(width, height);
@ -62,6 +65,9 @@ if ((typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && isNodeJS) {
}; };
NodeCMapReaderFactory = class extends BaseCMapReaderFactory { NodeCMapReaderFactory = class extends BaseCMapReaderFactory {
/**
* @ignore
*/
_fetchData(url, compressionType) { _fetchData(url, compressionType) {
return fetchData(url).then(data => { return fetchData(url).then(data => {
return { cMapData: data, compressionType }; return { cMapData: data, compressionType };
@ -70,6 +76,9 @@ if ((typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && isNodeJS) {
}; };
NodeStandardFontDataFactory = class extends BaseStandardFontDataFactory { NodeStandardFontDataFactory = class extends BaseStandardFontDataFactory {
/**
* @ignore
*/
_fetchData(url) { _fetchData(url) {
return fetchData(url); return fetchData(url);
} }