Updates for TypeScript v4.6.0-beta

This commit is contained in:
Andreas Hocevar
2022-01-26 14:59:24 +01:00
parent deaa0ccc2a
commit 2e5c1f2af9
10 changed files with 67 additions and 32 deletions

View File

@@ -393,7 +393,7 @@ class GML2 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/LineString.js").default} line LineString geometry.
* @param {Array<*>} objectStack Node stack.
* @private
@@ -455,7 +455,7 @@ class GML2 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/Polygon.js").default} polygon Polygon geometry.
* @param {Array<*>} objectStack Node stack.
* @private
@@ -467,7 +467,7 @@ class GML2 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/LinearRing.js").default} ring LinearRing geometry.
* @param {Array<*>} objectStack Node stack.
*/
@@ -546,7 +546,7 @@ class GML2 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/Point.js").default} point Point geometry.
* @param {Array<*>} objectStack Node stack.
*/

View File

@@ -720,7 +720,7 @@ class GML3 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/LinearRing.js").default} ring LinearRing geometry.
* @param {Array<*>} objectStack Node stack.
*/
@@ -744,7 +744,7 @@ class GML3 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/Point.js").default} point Point geometry.
* @param {Array<*>} objectStack Node stack.
*/
@@ -768,7 +768,7 @@ class GML3 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Polygon} polygon Polygon geometry.
* @param {Array<*>} objectStack Node stack.
* @private
@@ -780,7 +780,7 @@ class GML3 extends GMLBase {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {LineString} line LineString geometry.
* @param {Array<*>} objectStack Node stack.
* @private

View File

@@ -166,7 +166,7 @@ class GMLBase extends XMLFeature {
if (!featureType && node.childNodes) {
(featureType = []), (featureNS = {});
for (let i = 0, ii = node.childNodes.length; i < ii; ++i) {
const child = node.childNodes[i];
const child = /** @type {Element} */ (node.childNodes[i]);
if (child.nodeType === 1) {
const ft = child.nodeName.split(':').pop();
if (featureType.indexOf(ft) === -1) {

View File

@@ -869,7 +869,7 @@ function writeRte(node, feature, objectStack) {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Feature} feature Feature.
* @param {Array<*>} objectStack Object stack.
*/
@@ -902,7 +902,7 @@ function writeTrk(node, feature, objectStack) {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {LineString} lineString LineString.
* @param {Array<*>} objectStack Object stack.
*/

View File

@@ -2473,7 +2473,7 @@ const DOCUMENT_NODE_FACTORY = function (value, objectStack, opt_nodeName) {
};
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Array<Feature>} features Features.
* @param {Array<*>} objectStack Object stack.
* @this {KML}
@@ -2499,7 +2499,7 @@ function writeDocument(node, features, objectStack) {
const DATA_NODE_FACTORY = makeSimpleNodeFactory('Data');
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {{names: Array<string>, values: (Array<*>)}} namesAndValues Names and values.
* @param {Array<*>} objectStack Object stack.
*/
@@ -2561,7 +2561,7 @@ const GX_NODE_FACTORY = function (value, objectStack, opt_nodeName) {
};
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Object} icon Icon object.
* @param {Array<*>} objectStack Object stack.
*/
@@ -2617,7 +2617,7 @@ const ICON_STYLE_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../style/Icon.js").default} style Icon style.
* @param {Array<*>} objectStack Object stack.
*/
@@ -2712,7 +2712,7 @@ const LABEL_STYLE_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Text} style style.
* @param {Array<*>} objectStack Object stack.
*/
@@ -2758,7 +2758,7 @@ const LINE_STYLE_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Stroke} style style.
* @param {Array<*>} objectStack Object stack.
*/
@@ -2856,7 +2856,7 @@ const MULTI_GEOMETRY_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/Geometry.js").default} geometry Geometry.
* @param {Array<*>} objectStack Object stack.
*/
@@ -2927,7 +2927,7 @@ const BOUNDARY_IS_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/LinearRing.js").default} linearRing Linear ring.
* @param {Array<*>} objectStack Object stack.
*/
@@ -3180,7 +3180,7 @@ const PRIMITIVE_GEOMETRY_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("../geom/SimpleGeometry.js").default} geometry Geometry.
* @param {Array<*>} objectStack Object stack.
*/
@@ -3243,7 +3243,7 @@ const INNER_BOUNDARY_NODE_FACTORY = makeSimpleNodeFactory('innerBoundaryIs');
const OUTER_BOUNDARY_NODE_FACTORY = makeSimpleNodeFactory('outerBoundaryIs');
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Polygon} polygon Polygon.
* @param {Array<*>} objectStack Object stack.
*/
@@ -3281,7 +3281,7 @@ const POLY_STYLE_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Style} style Style.
* @param {Array<*>} objectStack Object stack.
*/
@@ -3341,7 +3341,7 @@ const STYLE_SERIALIZERS = makeStructureNS(NAMESPACE_URIS, {
});
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Object<string, Array<Style>>} styles Styles.
* @param {Array<*>} objectStack Object stack.
*/

View File

@@ -1054,7 +1054,7 @@ function writeQuery(node, featureType, objectStack) {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("./filter/Filter.js").default} filter Filter.
* @param {Array<*>} objectStack Node stack.
*/
@@ -1158,7 +1158,7 @@ function writeDuringFilter(node, filter, objectStack) {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("./filter/LogicalNary.js").default} filter Filter.
* @param {Array<*>} objectStack Node stack.
*/
@@ -1182,7 +1182,7 @@ function writeLogicalFilter(node, filter, objectStack) {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {import("./filter/Not.js").default} filter Filter.
* @param {Array<*>} objectStack Node stack.
*/
@@ -1341,7 +1341,7 @@ export function writeFilter(filter, opt_version) {
}
/**
* @param {Node} node Node.
* @param {Element} node Node.
* @param {Array<string>} featureTypes Feature types.
* @param {Array<*>} objectStack Node stack.
*/

View File

@@ -139,7 +139,7 @@ class TileJSON extends TileImage {
if (!client.status || (client.status >= 200 && client.status < 300)) {
let response;
try {
response = /** @type {TileJSON} */ (JSON.parse(client.responseText));
response = /** @type {Config} */ (JSON.parse(client.responseText));
} catch (err) {
this.handleTileJSONError();
return;

View File

@@ -8,7 +8,7 @@ import {extend} from './array.js';
* {@link module:ol/xml.makeSimpleNodeFactory}, the top `objectStack` item needs
* to have this structure.
* @typedef {Object} NodeStackItem
* @property {Node} node Node.
* @property {Element} node Node.
*/
/**