osm2geojson-lite 0.8.13 → 0.9.0

package/ts/src/xmlparser.ts

@@ -1,140 +1,181 @@
 function conditioned(evt: string): boolean {
-	return evt.match(/^(.+?)\[(.+?)\]>$/g) != null;
+    return evt.match(/^(.+?)\[(.+?)\]>$/g) !== null;
 }
 
-function parseEvent(evt: string): {[k: string]: any} {
-	let match = /^(.+?)\[(.+?)\]>$/g.exec(evt);
-	if (match)
-		return {evt: match[1] + '>', exp: match[2]};
-	return {evt: evt};
+function parseEvent(evt: string): {evt: string, exp?: string} {
+    const match = /^(.+?)\[(.+?)\]>$/g.exec(evt);
+    if (match) {
+        return {evt: match[1] + '>', exp: match[2]};
+    }
+    return {evt};
 }
 
-function genConditionFunc(cond: string): Function {
-	let body = 'return ' + cond.replace(/(\$.+?)(?=[=!.])/g, 'node.$&') + ';';
-	return new Function('node', body);
+function genConditionFunc(cond: string): (node: {[k: string]: any}) => boolean {
+    const body = 'return ' + cond.replace(/(\$.+?)(?=[=!.])/g, 'node.$&') + ';';
+    return new Function('node', body) as (node: {[k: string]: any}) => boolean;
 }
 
 export default class {
-	queryParent: boolean;
-	progressive: boolean;
-	parentMap: WeakMap<any, any>;
-	evtListeners: {[k: string]: any};
-
-	constructor(opts: any) {
-		if (opts) {
-			this.queryParent = opts.queryParent? true : false;
-			this.progressive = opts.progressive;
-			if (this.queryParent) this.parentMap = new WeakMap();
-		}
-		this.evtListeners = {};
-	}
-
-	parse(xml: string, parent?: any, dir?: string) {
-		dir = dir? dir + '.' : '';
-		let nodeRegEx = /<([^ >\/]+)(.*?)>/mg, nodeMatch: any = null, nodes: any[] = [];
-		while (nodeMatch = nodeRegEx.exec(xml)) {
-			let tag = nodeMatch[1], node: {[k: string]: any} = {$tag: tag}, fullTag = dir + tag; 
-
-			let attrText = nodeMatch[2].trim(), closed = false;
-			if (attrText.endsWith('/') || tag.startsWith('?') || tag.startsWith('!')) {
-				closed = true;
-			}
-
-			let attRegEx1 = /([^ ]+?)="(.+?)"/g, attRegEx2 = /([^ ]+?)='(.+?)'/g;
-			let attMatch: any = null, hasAttrs: boolean = false;
-			while (attMatch = attRegEx1.exec(attrText)) {
-				hasAttrs = true;
-				node[attMatch[1]] = attMatch[2];
-			}
-			if (!hasAttrs)
-				while (attMatch = attRegEx2.exec(attrText)) {
-					hasAttrs = true;
-					node[attMatch[1]] = attMatch[2];
-				}
-
-			if (!hasAttrs && attrText !== '') node.text = attrText;
-			if (this.progressive) this.emit(`<${fullTag}>`, node, parent);
-
-
-			if (!closed) {
-				let innerRegEx = new RegExp(`([^]+?)<\/${tag}>`, 'g');
-				innerRegEx.lastIndex = nodeRegEx.lastIndex;
-				let innerMatch = innerRegEx.exec(xml);
-				if (innerMatch && innerMatch[1]) {
-					nodeRegEx.lastIndex = innerRegEx.lastIndex;
-					let innerNodes = this.parse(innerMatch[1], node, fullTag);
-					if (innerNodes.length > 0) node.$innerNodes = innerNodes;
-					else node.$innerText = innerMatch[1];
-				}
-			}
-			if (this.queryParent && parent) {
-				this.parentMap.set(node, parent);
-			}
-
-			if (this.progressive) this.emit(`</${fullTag}>`, node, parent);
-
-			nodes.push(node);
-		}
-
-		return nodes;
-	}
-
-	getParent(node: any): any {
-		if (this.queryParent)
-			return this.parentMap.get(node);
-		return null;
-	}
-
-	$addListener(evt: string, func: Function) {
-		let funcs = this.evtListeners[evt];
-		if (funcs) funcs.push(func);
-		else this.evtListeners[evt] = [func];
-	}
-
-	// support javascript condition for the last tag
-	addListener(evt: string, func: Function) {
-		if (conditioned(evt)) {
-			// func.prototype = evt;
-			let ev = parseEvent(evt);	
-			(<{[k: string]: any}>func).condition = genConditionFunc(ev.exp);
-			evt = ev.evt;
-		}
-		this.$addListener(evt, func);
-	}
-
-	$removeListener(evt: string, func: Function) {
-		let funcs = this.evtListeners[evt];
-		let idx = null;
-		if (funcs && (idx = funcs.indexOf(func)) >= 0)
-			funcs.splice(idx, 1);
-	}
-
-	removeListener(evt: string, func: Function) {
-		if (conditioned(evt)) {
-			let ev = parseEvent(evt);
-			evt = ev.evt;
-		}
-		this.$removeListener(evt, func);
-	}
-
-	emit(evt: string, ...args) {
-		let funcs = this.evtListeners[evt];
-		if (funcs) {
-			for (let func of funcs) {
-				if (func.condition) {
-					if (func.condition.apply(null, args) === true)
-						func.apply(null, args);
-				} else 
-					func.apply(null, args);
-			}
-		}
-	}
-
-	on(evt: string, func: Function) {
-		this.addListener(evt, func);
-	}
-
-	off(evt: string, func: Function) {
-		this.removeListener(evt, func);
-	}
-}
+    private queryParent: boolean;
+    private progressive: boolean;
+    private parentMap: WeakMap<any, any>;
+    private evtListeners: {[k: string]: any};
+
+    constructor(opts: any) {
+        if (opts) {
+            this.queryParent = opts.queryParent ? true : false;
+            this.progressive = opts.progressive;
+            if (this.queryParent) {
+                this.parentMap = new WeakMap();
+            }
+        }
+        this.evtListeners = {};
+    }
+
+    public parse(xml: string, parent?: any, dir?: string) {
+        dir = dir ? dir + '.' : '';
+
+        const nodeRegEx = /<([^ >\/]+)(.*?)>/mg;
+        const nodes: any[] = [];
+
+        let nodeMatch = nodeRegEx.exec(xml);
+        while (nodeMatch) {
+            const tag = nodeMatch[1];
+            const node: {[k: string]: any} = {$tag: tag};
+            const fullTag = dir + tag;
+
+            const attrText = nodeMatch[2].trim();
+            let closed = false;
+
+            if (attrText.endsWith('/') || tag.startsWith('?') || tag.startsWith('!')) {
+                closed = true;
+            }
+
+            const attRegEx1 = /([^ ]+?)="(.+?)"/g;
+            const attRegEx2 = /([^ ]+?)='(.+?)'/g;
+            let attMatch = attRegEx1.exec(attrText);
+            let hasAttrs = false;
+
+            while (attMatch) {
+                hasAttrs = true;
+                node[attMatch[1]] = attMatch[2];
+                attMatch = attRegEx1.exec(attrText);
+            }
+
+            if (!hasAttrs) {
+                attMatch = attRegEx2.exec(attrText);
+                while (attMatch) {
+                    hasAttrs = true;
+                    node[attMatch[1]] = attMatch[2];
+                    attMatch = attRegEx2.exec(attrText);
+                }
+            }
+
+            if (!hasAttrs && attrText !== '') {
+                node.text = attrText;
+            }
+
+            if (this.progressive) {
+                this.emit(`<${fullTag}>`, node, parent);
+            }
+
+            if (!closed) {
+                const innerRegEx = new RegExp(`([^]+?)<\/${tag}>`, 'g');
+                innerRegEx.lastIndex = nodeRegEx.lastIndex;
+                const innerMatch = innerRegEx.exec(xml);
+                if (innerMatch && innerMatch[1]) {
+                    nodeRegEx.lastIndex = innerRegEx.lastIndex;
+                    const innerNodes = this.parse(innerMatch[1], node, fullTag);
+                    if (innerNodes.length > 0) {
+                        node.$innerNodes = innerNodes;
+                    } else {
+                        node.$innerText = innerMatch[1];
+                    }
+                }
+            }
+            if (this.queryParent && parent) {
+                this.parentMap.set(node, parent);
+            }
+
+            if (this.progressive) {
+                this.emit(`</${fullTag}>`, node, parent);
+            }
+
+            nodes.push(node);
+            nodeMatch = nodeRegEx.exec(xml);
+        }
+
+        return nodes;
+    }
+
+    public getParent(node: any): any {
+        if (this.queryParent) {
+            return this.parentMap.get(node);
+        }
+        return null;
+    }
+
+    // support javascript condition for the last tag
+    public addListener(evt: string, func: (node: {[k: string]: any}, parent?: {[k: string]: any}) => void) {
+        if (conditioned(evt)) {
+            // func.prototype = evt;
+            const ev = parseEvent(evt);
+            if (ev.exp) {
+               (func as {[k: string]: any}).condition = genConditionFunc(ev.exp);
+            }
+            evt = ev.evt;
+        }
+        this.$addListener(evt, func);
+    }
+
+    public removeListener(evt: string, func: (node: {[k: string]: any}, parent?: {[k: string]: any}) => void) {
+        if (conditioned(evt)) {
+            const ev = parseEvent(evt);
+            evt = ev.evt;
+        }
+        this.$removeListener(evt, func);
+    }
+
+    public on(evt: string, func: (node: {[k: string]: any}, parent?: {[k: string]: any}) => void) {
+        this.addListener(evt, func);
+    }
+
+    public off(evt: string, func: (node: {[k: string]: any}, parent?: {[k: string]: any}) => void) {
+        this.removeListener(evt, func);
+    }
+
+    private $addListener(evt: string, func: (node: {[k: string]: any}, parent?: {[k: string]: any}) => void) {
+        const funcs = this.evtListeners[evt];
+        if (funcs) {
+            funcs.push(func);
+        } else {
+            this.evtListeners[evt] = [func];
+        }
+    }
+
+    private $removeListener(evt: string, func: (node: {[k: string]: any}, parent?: {[k: string]: any}) => void) {
+        const funcs = this.evtListeners[evt];
+        let idx = -1;
+        if (funcs) {
+            idx = funcs.indexOf(func);
+        }
+        if (idx >= 0) {
+            funcs.splice(idx, 1);
+        }
+    }
+
+    private emit(evt: string, ...args) {
+        const funcs = this.evtListeners[evt];
+        if (funcs) {
+            for (const func of funcs) {
+                if (func.condition) {
+                    if (func.condition.apply(null, args) === true) {
+                        func.apply(null, args);
+                    }
+                } else {
+                    func.apply(null, args);
+                }
+            }
+        }
+    }
+}

package/ts/tsconfig.json

@@ -8,6 +8,10 @@
     	"lib": ["es2017"]
     },
 
+    "typeRoots": [
+	"node_modules/@types"
+    ],
+
     "include": [
         "src/*"
     ],

package/ts/tslint.json

@@ -0,0 +1,24 @@
+{
+    "defaultSeverity": "error",
+    "extends": [
+        "tslint:recommended"
+    ],
+    "jsRules": {},
+    "rules": {
+        "indent": [true, "spaces", 4],
+        "linebreak-style": [true, "LF"],
+        "quotemark": [true, "single"],
+        "semicolon": [true, "always"],
+        "no-console": false,
+        "curly": true,
+        "triple-equals": true,
+        "no-string-throw": true,
+        "no-var-keyword": true,
+        "no-trailing-whitespace": true,
+        "object-literal-key-quotes": [true, "as-needed"],
+        "max-line-length": false,
+	"max-classes-per-file": [true, 5, "exclude-class-expressions"],
+	"object-literal-sort-keys": false
+    },
+    "rulesDirectory": []
+}

package/ts/types/imports.d.ts

@@ -0,0 +1 @@
+declare module "geojson";