Fix types in ngeo root

camptocamp · Jan 29, 2019 · 9ea3c42 · 9ea3c42
1 parent 2596277
commit 9ea3c42
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 53 deletions.
diff --git a/src/Menu.js b/src/Menu.js
@@ -34,7 +34,7 @@ import olOverlayPositioning from 'ol/OverlayPositioning.js';
 export default class extends olOverlay {
   /**
    * @param {MenuOptions=} menuOptions Menu options.
-   * @param {olx.OverlayOptions=} options Overlay options.
+   * @param {import('ol/Overlay.js').Options=} options Overlay options.
    */
   constructor(menuOptions, options = {}) {
     super(options);
@@ -214,12 +214,8 @@ export default class extends olOverlay {
    */
   handleMapPointerMove_(evt) {
     const target = evt.originalEvent.target;
-    console.assert(target instanceof Element);
-
     const element = this.getElement();
-    console.assert(element instanceof Element);
-
-    if (element.contains(target)) {
+    if (target instanceof Element && element instanceof Element && element.contains(target)) {
       evt.coordinate = [Infinity, Infinity];
       evt.pixel = [Infinity, Infinity];
     }

diff --git a/src/Popover.js b/src/Popover.js
@@ -5,9 +5,7 @@ import olOverlay from 'ol/Overlay.js';
  * An openlayers overlay that uses bootstrap popover to produce a popup
  * for maps.
  *
- * @constructor
- * @extends {import("ol/Overlay.js").default}
- * @param {olx.OverlayOptions=} opt_options Overlay options.
+ * @param {import('ol/Overlay.js').Options=} opt_options Overlay options.
  */
 export default class extends olOverlay {
   constructor(options = {}) {
@@ -60,18 +58,17 @@ export default class extends olOverlay {
       window.setTimeout(() => {
         $(element)
           .popover({
-            'content': contentEl,
-            'html': true,
-            'placement': 'top',
-            'template': [
+            content: contentEl.get()[0],
+            html: true,
+            placement: 'top',
+            template: [
               '<div class="popover ngeo-popover" role="tooltip">',
               '  <div class="arrow"></div>',
               '  <h3 class="popover-header"></h3>',
               '  <div class="popover-body"></div>',
               '</div>'
             ].join('')
-          })
-          .popover('show');
+          }).popover('show');
       }, 0);
 
       this.closeEl_.one('click', () => {

diff --git a/src/WFSDescribeFeatureType.js b/src/WFSDescribeFeatureType.js
@@ -13,72 +13,84 @@ const NAMESPACE_URIS_ = [
 ];
 
 
+/**
+ * @typedef {Object.<string, import("ol/xml.js").Parser>} parserStructure
+ */
+
+
+/**
+ * typedef {Object.<string, parserStructure>} parsersStructure
+ * @typedef {Object<string, Object<string, import("ol/xml.js").Parser>>} parsersStructure
+ */
+
+/**
+ * @param {Array<string>} namespaceURIs Namespace URIs.
+ * @param {parserStructure} structure Structure.
+ * @return {Object<string, parserStructure>} Namespaced structure.
+ */
+function makeStructureNS(namespaceURIs, structure) {
+  return /** @type {parsersStructure} */(/** @type {any} */(olXml.makeStructureNS(namespaceURIs, structure)));
+}
+
 /**
  * @const
- * @type {!Object.<string, !Object.<string, !import("ol/XmlParser.js").default>>}
+ * @type {parsersStructure}
  * @private
  */
-const PARSERS_ = olXml.makeStructureNS(
+const PARSERS_ = makeStructureNS(
   NAMESPACE_URIS_, {
-    'element': olXml.makeObjectPropertyPusher(
-      readElement_
-    ),
-    'complexType': olXml.makeObjectPropertyPusher(
-      readComplexType_
-    )
-  });
+    element: olXml.makeObjectPropertyPusher(readElement_),
+    complexType: olXml.makeObjectPropertyPusher(readComplexType_)
+  }
+);
 
 
 /**
  * @const
- * @type {!Object.<string, !Object.<string, !import("ol/XmlParser.js").default>>}
+ * @type {parsersStructure}
  * @private
  */
-const COMPLEX_TYPE_PARSERS_ = olXml.makeStructureNS(
+const COMPLEX_TYPE_PARSERS_ = makeStructureNS(
   NAMESPACE_URIS_, {
-    'complexContent': olXml.makeObjectPropertySetter(
-      readComplexContent_
-    )
-  });
+    complexContent: olXml.makeObjectPropertySetter(readComplexContent_)
+  }
+);
 
 
 /**
  * @const
- * @type {!Object.<string, !Object.<string, !import("ol/XmlParser.js").default>>}
+ * @type {parsersStructure}
  * @private
  */
-const COMPLEX_CONTENT_PARSERS_ = olXml.makeStructureNS(
+const COMPLEX_CONTENT_PARSERS_ = makeStructureNS(
   NAMESPACE_URIS_, {
-    'extension': olXml.makeObjectPropertySetter(
-      readExtension_
-    )
-  });
+    extension: olXml.makeObjectPropertySetter(readExtension_)
+  }
+);
 
 
 /**
  * @const
- * @type {!Object.<string, !Object.<string, !import("ol/XmlParser.js").default>>}
+ * @type {parsersStructure}
  * @private
  */
-const EXTENSION_PARSERS_ = olXml.makeStructureNS(
+const EXTENSION_PARSERS_ = makeStructureNS(
   NAMESPACE_URIS_, {
-    'sequence': olXml.makeObjectPropertySetter(
-      readSequence_
-    )
-  });
+    sequence: olXml.makeObjectPropertySetter(readSequence_)
+  }
+);
 
 
 /**
  * @const
- * @type {!Object.<string, !Object.<string, !import("ol/XmlParser.js").default>>}
+ * @type {parsersStructure}
  * @private
  */
-const SEQUENCE_PARSERS_ = olXml.makeStructureNS(
+const SEQUENCE_PARSERS_ = makeStructureNS(
   NAMESPACE_URIS_, {
-    'element': olXml.makeObjectPropertyPusher(
-      readElement_
-    )
-  });
+    element: olXml.makeObjectPropertyPusher(readElement_)
+  }
+);
 
 
 /**
@@ -132,11 +144,12 @@ WFSDescribeFeatureType.prototype.readFromNode = function(node) {
 
 /**
  * @private
- * @param {Node} node Node.
+ * @param {Element} node Node.
  * @param {Array.<*>} objectStack Object stack.
  * @return {!Object.<string, string>} Attributes.
  */
 function readElement_(node, objectStack) {
+  /** @type {!Object.<string, string>} */
   const attributes = {};
   for (let i = 0, len = node.attributes.length; i < len; i++) {
     const attribute = node.attributes.item(i);
@@ -152,7 +165,7 @@ function readElement_(node, objectStack) {
 
 /**
  * @private
- * @param {Node} node Node.
+ * @param {Element} node Node.
  * @param {Array.<*>} objectStack Object stack.
  * @return {!Object.<string, string>} Object.
  */
@@ -172,7 +185,7 @@ function readComplexType_(node, objectStack) {
 
 /**
  * @private
- * @param {Node} node Node.
+ * @param {Element} node Node.
  * @param {Array.<*>} objectStack Object stack.
  * @return {!Object.<string, string>} Object.
  */
@@ -190,7 +203,7 @@ function readComplexContent_(
 
 /**
  * @private
- * @param {Node} node Node.
+ * @param {Element} node Node.
  * @param {Array.<*>} objectStack Object stack.
  * @return {!Object.<string, string>} Object.
  */
@@ -206,7 +219,7 @@ function readExtension_(node, objectStack) {
 
 /**
  * @private
- * @param {Node} node Node.
+ * @param {Element} node Node.
  * @param {Array.<*>} objectStack Object stack.
  * @return {!Object.<string, string>} Object.
  */

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,6 +7,7 @@
       "allowJs": true,
       "checkJs": true,
       "noEmit": true,
+      // "strict": true,
       "baseUrl": "./",
       "paths": {
         "ngeo/*": ["src/*"],