fix import order

hanreev · Jun 29, 2019 · 60eca3a · 60eca3a
1 parent fbfddde
commit 60eca3a
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 11 deletions.
diff --git a/@types/ol/Feature.d.ts b/@types/ol/Feature.d.ts
@@ -3,7 +3,7 @@ import Event from './events/Event';
 import Geometry from './geom/Geometry';
 import BaseObject, { ObjectEvent } from './Object';
 import RenderFeature from './render/Feature';
-import Style, { StyleLike, StyleFunction } from './style/Style';
+import Style, { StyleFunction, StyleLike } from './style/Style';
 
 export type FeatureClass = Feature | RenderFeature;
 export type FeatureLike = Feature | RenderFeature;

diff --git a/@types/ol/events/condition.d.ts b/@types/ol/events/condition.d.ts
@@ -1,4 +1,4 @@
-import { TRUE, FALSE } from '../functions';
+import { FALSE, TRUE } from '../functions';
 import MapBrowserEvent from '../MapBrowserEvent';
 
 export type Condition = ((this: any, p0: MapBrowserEvent) => boolean);

diff --git a/@types/ol/format/TopoJSON.d.ts b/@types/ol/format/TopoJSON.d.ts
@@ -1,6 +1,6 @@
 import {
-    GeometryObject,
     GeometryCollection,
+    GeometryObject,
     LineString,
     MultiLineString,
     MultiPoint,

diff --git a/@types/ol/geom/Geometry.d.ts b/@types/ol/geom/Geometry.d.ts
@@ -3,7 +3,7 @@ import { EventsKey } from '../events';
 import Event from '../events/Event';
 import { Extent } from '../extent';
 import BaseObject, { ObjectEvent } from '../Object';
-import { TransformFunction, ProjectionLike } from '../proj';
+import { ProjectionLike, TransformFunction } from '../proj';
 import GeometryType from './GeometryType';
 
 export default class Geometry extends BaseObject {

diff --git a/@types/ol/interaction/Draw.d.ts b/@types/ol/interaction/Draw.d.ts
@@ -9,7 +9,7 @@ import SimpleGeometry from '../geom/SimpleGeometry';
 import VectorLayer from '../layer/Vector';
 import { ObjectEvent } from '../Object';
 import VectorSource from '../source/Vector';
-import { StyleLike, StyleFunction } from '../style/Style';
+import { StyleFunction, StyleLike } from '../style/Style';
 import PointerInteraction from './Pointer';
 
 export type GeometryFunction = ((p0: SketchCoordType, p1?: SimpleGeometry) => SimpleGeometry);

diff --git a/@types/ol/interaction/Extent.d.ts b/@types/ol/interaction/Extent.d.ts
@@ -3,7 +3,7 @@ import { EventsKey } from '../events';
 import Event from '../events/Event';
 import { Extent } from '../extent';
 import { ObjectEvent } from '../Object';
-import { StyleLike, StyleFunction } from '../style/Style';
+import { StyleFunction, StyleLike } from '../style/Style';
 import PointerInteraction from './Pointer';
 
 export interface Options {

diff --git a/@types/ol/interaction/Modify.d.ts b/@types/ol/interaction/Modify.d.ts
@@ -10,7 +10,7 @@ import VectorLayer from '../layer/Vector';
 import MapBrowserEvent from '../MapBrowserEvent';
 import { ObjectEvent } from '../Object';
 import VectorSource from '../source/Vector';
-import { StyleLike, StyleFunction } from '../style/Style';
+import { StyleFunction, StyleLike } from '../style/Style';
 import PointerInteraction from './Pointer';
 
 export interface Options {

diff --git a/@types/ol/interaction/Select.d.ts b/@types/ol/interaction/Select.d.ts
@@ -7,7 +7,7 @@ import Layer from '../layer/Layer';
 import VectorLayer from '../layer/Vector';
 import MapBrowserEvent from '../MapBrowserEvent';
 import { ObjectEvent } from '../Object';
-import { StyleLike, StyleFunction } from '../style/Style';
+import { StyleFunction, StyleLike } from '../style/Style';
 import Interaction from './Interaction';
 
 export type FilterFunction = ((p0: FeatureLike, p1: Layer) => boolean);

diff --git a/@types/ol/layer/Vector.d.ts b/@types/ol/layer/Vector.d.ts
@@ -9,7 +9,7 @@ import { OrderFunction } from '../render';
 import RenderEvent from '../render/Event';
 import Source from '../source/Source';
 import VectorSource from '../source/Vector';
-import Style, { StyleLike, StyleFunction } from '../style/Style';
+import Style, { StyleFunction, StyleLike } from '../style/Style';
 import Layer from './Layer';
 import VectorRenderType from './VectorRenderType';
 

diff --git a/@types/ol/render/canvas/Replay.d.ts b/@types/ol/render/canvas/Replay.d.ts
@@ -4,7 +4,7 @@ import Feature from '../../Feature';
 import Geometry from '../../geom/Geometry';
 import SimpleGeometry from '../../geom/SimpleGeometry';
 import { Transform } from '../../transform';
-import { FillStrokeState, DeclutterGroup } from '../canvas';
+import { DeclutterGroup, FillStrokeState } from '../canvas';
 import RenderFeature from '../Feature';
 import VectorContext from '../VectorContext';
 

diff --git a/jsdoc/template/publish.js b/jsdoc/template/publish.js
@@ -302,7 +302,7 @@ function sortImports(expressions, _module, maxLineLength = 120) {
       /** @type {ImportMap} */
       const map = {
         default: importDefault,
-        members: importMembers ? importMembers.split(/,\s?/).sort(sortFn) : [],
+        members: importMembers ? importMembers.split(/,\s?/) : [],
       };
 
       if (!importMap[moduleName]) {
@@ -312,6 +312,7 @@ function sortImports(expressions, _module, maxLineLength = 120) {
         importMap[moduleName].members = importMap[moduleName].members.concat(map.members);
       }
 
+      importMap[moduleName].members = importMap[moduleName].members.sort(sortFn);
     });
 
   return Object.keys(importMap).sort(sortFn).map(moduleName => formatExpression(moduleName));