Fix external import with same member name

.eslintrc.json

@@ -33,7 +33,10 @@
     ],
     "quotes": [
       "error",
-      "single"
+      "single",
+      {
+        "allowTemplateLiterals": true
+      }
     ],
     "semi": [
       "error",

@types/ol/format/GeoJSON.d.ts

@@ -1,6 +1,7 @@
 import {
     Feature,
     FeatureCollection,
+    GeoJSON as GeoJSON_1,
     Geometry,
     GeometryCollection,
     LineString,
@@ -30,7 +31,7 @@ export type GeoJSONLineString = LineString;
 export type GeoJSONMultiLineString = MultiLineString;
 export type GeoJSONMultiPoint = MultiPoint;
 export type GeoJSONMultiPolygon = MultiPolygon;
-export type GeoJSONObject = GeoJSON;
+export type GeoJSONObject = GeoJSON_1;
 export type GeoJSONPoint = Point;
 export type GeoJSONPolygon = Polygon;
 export interface Options {

README.md

@@ -35,7 +35,7 @@ There are several ways to use this package. Please choose one:
     ...
     "devDependencies": {
       ...
-      "@hanreev/types-ol": "^2.0.5",
+      "@hanreev/types-ol": "^2.0.6",
       "@types/ol": "file:node_modules/@hanreev/types-ol/ol",
       ...
     }
@@ -71,29 +71,6 @@ There are several ways to use this package. Please choose one:
   }
   ```
 
-- Using `compilerOptions.typeRoots` and `compilerOptions.types` in `tsconfig.json`
-
-  ```js
-  // file: tsconfig.json
-
-  {
-    "compilerOptions": {
-      ...
-      "baseUrl": "./",
-      "typeRoots": [
-        "node_modules/@types",
-        "node_modules/@hanreev/types-ol"
-      ],
-      "types": [
-        "ol",
-        ...
-      ],
-      ...
-    }
-  }
-  ```
-
-
 
 
 ## Configuring and Building TypeScript declaration files
@@ -156,11 +133,14 @@ Configuration is located at `jsdoc/conf.json`
 
 ## Changelog
 
+- **v2.0.6**
+  - Fix external import with same member name--e.g., `GeoJSON` from `geojson` module in `ol/format/GeoJSON`
+  - Order module members by kind
 - **v2.0.5**
   - Fix anonymous function parameters type
   - Fix union types
 - **v2.0.4**
-  - Fix optional parameters in function type. Ex: third parameter of `{function(*, Array<*>, string=): (Node|undefined)}`
+  - Fix optional parameters in function type--e.g., third parameter of `{function(*, Array<*>, string=): (Node|undefined)}`
   - Test files fixes
 - **v2.0.3**
   - OpenLayers 5.3.3 source

jsdoc/template/publish.js

@@ -148,7 +148,7 @@ function registerImport(_module, val) {
 
   let doclet = find({ longname: val })[0];
 
-  if (!doclet) {
+  if (!doclet && moduleName.startsWith('ol')) {
     doclet = find({ name: importName, memberof: _module.longname })[0];
     if (doclet)
       return importName;
@@ -373,7 +373,7 @@ function stringifyType(parsedType, _module, undefinedLiteral = true) {
       params = functionType.params.map((param, i) => {
         let name = `p${i}`;
         if (param.optional) name += '?';
-        return `${name}: ${stringifyType(param, _module, false)}`
+        return `${name}: ${stringifyType(param, _module, false)}`;
       });
 
     if (functionType.this)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanreev/types-ol",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "OpenLayers 5+ TypeScript declaration",
   "author": "Rifa'i M. Hanif <[email protected]>",
   "repository": {