wkt-parse-and-geojson 1.0.1 → 1.0.2

package/dist/index.cjs.js

@@ -94,6 +94,15 @@ class WKTParser {
         }
         return this.advance();
     }
+    skipComma() {
+        if (this.peek().type === 'COMMA') {
+            this.advance();
+        }
+    }
+    isDone() {
+        const t = this.peek();
+        return t.type === 'RPAREN' || t.type === 'EOF';
+    }
     parseGeometry() {
         const token = this.peek();
         if (token.type !== 'WORD') {
@@ -166,7 +175,13 @@ class WKTParser {
         if (this.isEmptyGeometry()) {
             return { type: 'Polygon', coordinates: [] };
         }
-        const rings = this.parseCoordinateListList();
+        this.consume('LPAREN');
+        const rings = [];
+        while (!this.isDone()) {
+            rings.push(this.parseCoordinatesList());
+            this.skipComma();
+        }
+        this.consume('RPAREN');
         return { type: 'Polygon', coordinates: rings };
     }
     // ── MULTIPOINT ───────────────────────────────────────────────────
@@ -178,7 +193,7 @@ class WKTParser {
         }
         this.advance(); // consume outer (
         const coords = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+        while (!this.isDone()) {
             if (this.peek().type === 'LPAREN') {
                 // 标准写法: MULTIPOINT ((x y), (x y))
                 this.advance(); // consume (
@@ -189,9 +204,7 @@ class WKTParser {
                 // 非标准写法: MULTIPOINT (x y, x y)
                 coords.push(this.parseCoordinates());
             }
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
+            this.skipComma();
         }
         this.consume('RPAREN');
         return { type: 'MultiPoint', coordinates: coords };
@@ -205,11 +218,9 @@ class WKTParser {
         }
         this.advance(); // consume outer (
         const lines = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+        while (!this.isDone()) {
             lines.push(this.parseCoordinatesList());
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
+            this.skipComma();
         }
         this.consume('RPAREN');
         return { type: 'MultiLineString', coordinates: lines };
@@ -221,7 +232,13 @@ class WKTParser {
         if (this.isEmptyGeometry()) {
             return { type: 'MultiPolygon', coordinates: [] };
         }
-        const polys = this.parseCoordinateListListList();
+        this.consume('LPAREN');
+        const polys = [];
+        while (!this.isDone()) {
+            polys.push(this.parseCoordinateListList());
+            this.skipComma();
+        }
+        this.consume('RPAREN');
         return { type: 'MultiPolygon', coordinates: polys };
     }
     // ── GEOMETRYCOLLECTION ───────────────────────────────────────────
@@ -270,11 +287,9 @@ class WKTParser {
     parseCoordinatesList() {
         this.consume('LPAREN');
         const coords = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+        while (!this.isDone()) {
             coords.push(this.parseCoordinates());
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
+            this.skipComma();
         }
         this.consume('RPAREN');
         return coords;
@@ -294,21 +309,6 @@ class WKTParser {
         this.consume('RPAREN');
         return lists;
     }
-    /** 解析多边形列表（MultiPolygon 级别）：( ((...)), ((...)) ) */
-    parseCoordinateListListList() {
-        if (this.peek().type !== 'LPAREN')
-            return [];
-        this.advance(); // consume outer (
-        const lists = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
-            lists.push(this.parseCoordinateListList());
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
-        }
-        this.consume('RPAREN');
-        return lists;
-    }
 }
 /** 将 WKT 字符串解析为 GeoJSON Geometry 对象 */
 function parse(wkt) {

package/dist/index.esm.js

@@ -92,6 +92,15 @@ class WKTParser {
         }
         return this.advance();
     }
+    skipComma() {
+        if (this.peek().type === 'COMMA') {
+            this.advance();
+        }
+    }
+    isDone() {
+        const t = this.peek();
+        return t.type === 'RPAREN' || t.type === 'EOF';
+    }
     parseGeometry() {
         const token = this.peek();
         if (token.type !== 'WORD') {
@@ -164,7 +173,13 @@ class WKTParser {
         if (this.isEmptyGeometry()) {
             return { type: 'Polygon', coordinates: [] };
         }
-        const rings = this.parseCoordinateListList();
+        this.consume('LPAREN');
+        const rings = [];
+        while (!this.isDone()) {
+            rings.push(this.parseCoordinatesList());
+            this.skipComma();
+        }
+        this.consume('RPAREN');
         return { type: 'Polygon', coordinates: rings };
     }
     // ── MULTIPOINT ───────────────────────────────────────────────────
@@ -176,7 +191,7 @@ class WKTParser {
         }
         this.advance(); // consume outer (
         const coords = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+        while (!this.isDone()) {
             if (this.peek().type === 'LPAREN') {
                 // 标准写法: MULTIPOINT ((x y), (x y))
                 this.advance(); // consume (
@@ -187,9 +202,7 @@ class WKTParser {
                 // 非标准写法: MULTIPOINT (x y, x y)
                 coords.push(this.parseCoordinates());
             }
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
+            this.skipComma();
         }
         this.consume('RPAREN');
         return { type: 'MultiPoint', coordinates: coords };
@@ -203,11 +216,9 @@ class WKTParser {
         }
         this.advance(); // consume outer (
         const lines = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+        while (!this.isDone()) {
             lines.push(this.parseCoordinatesList());
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
+            this.skipComma();
         }
         this.consume('RPAREN');
         return { type: 'MultiLineString', coordinates: lines };
@@ -219,7 +230,13 @@ class WKTParser {
         if (this.isEmptyGeometry()) {
             return { type: 'MultiPolygon', coordinates: [] };
         }
-        const polys = this.parseCoordinateListListList();
+        this.consume('LPAREN');
+        const polys = [];
+        while (!this.isDone()) {
+            polys.push(this.parseCoordinateListList());
+            this.skipComma();
+        }
+        this.consume('RPAREN');
         return { type: 'MultiPolygon', coordinates: polys };
     }
     // ── GEOMETRYCOLLECTION ───────────────────────────────────────────
@@ -268,11 +285,9 @@ class WKTParser {
     parseCoordinatesList() {
         this.consume('LPAREN');
         const coords = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+        while (!this.isDone()) {
             coords.push(this.parseCoordinates());
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
+            this.skipComma();
         }
         this.consume('RPAREN');
         return coords;
@@ -292,21 +307,6 @@ class WKTParser {
         this.consume('RPAREN');
         return lists;
     }
-    /** 解析多边形列表（MultiPolygon 级别）：( ((...)), ((...)) ) */
-    parseCoordinateListListList() {
-        if (this.peek().type !== 'LPAREN')
-            return [];
-        this.advance(); // consume outer (
-        const lists = [];
-        while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
-            lists.push(this.parseCoordinateListList());
-            if (this.peek().type === 'COMMA') {
-                this.advance();
-            }
-        }
-        this.consume('RPAREN');
-        return lists;
-    }
 }
 /** 将 WKT 字符串解析为 GeoJSON Geometry 对象 */
 function parse(wkt) {

package/dist/index.umd.js

@@ -98,6 +98,15 @@
             }
             return this.advance();
         }
+        skipComma() {
+            if (this.peek().type === 'COMMA') {
+                this.advance();
+            }
+        }
+        isDone() {
+            const t = this.peek();
+            return t.type === 'RPAREN' || t.type === 'EOF';
+        }
         parseGeometry() {
             const token = this.peek();
             if (token.type !== 'WORD') {
@@ -170,7 +179,13 @@
             if (this.isEmptyGeometry()) {
                 return { type: 'Polygon', coordinates: [] };
             }
-            const rings = this.parseCoordinateListList();
+            this.consume('LPAREN');
+            const rings = [];
+            while (!this.isDone()) {
+                rings.push(this.parseCoordinatesList());
+                this.skipComma();
+            }
+            this.consume('RPAREN');
             return { type: 'Polygon', coordinates: rings };
         }
         // ── MULTIPOINT ───────────────────────────────────────────────────
@@ -182,7 +197,7 @@
             }
             this.advance(); // consume outer (
             const coords = [];
-            while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+            while (!this.isDone()) {
                 if (this.peek().type === 'LPAREN') {
                     // 标准写法: MULTIPOINT ((x y), (x y))
                     this.advance(); // consume (
@@ -193,9 +208,7 @@
                     // 非标准写法: MULTIPOINT (x y, x y)
                     coords.push(this.parseCoordinates());
                 }
-                if (this.peek().type === 'COMMA') {
-                    this.advance();
-                }
+                this.skipComma();
             }
             this.consume('RPAREN');
             return { type: 'MultiPoint', coordinates: coords };
@@ -209,11 +222,9 @@
             }
             this.advance(); // consume outer (
             const lines = [];
-            while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+            while (!this.isDone()) {
                 lines.push(this.parseCoordinatesList());
-                if (this.peek().type === 'COMMA') {
-                    this.advance();
-                }
+                this.skipComma();
             }
             this.consume('RPAREN');
             return { type: 'MultiLineString', coordinates: lines };
@@ -225,7 +236,13 @@
             if (this.isEmptyGeometry()) {
                 return { type: 'MultiPolygon', coordinates: [] };
             }
-            const polys = this.parseCoordinateListListList();
+            this.consume('LPAREN');
+            const polys = [];
+            while (!this.isDone()) {
+                polys.push(this.parseCoordinateListList());
+                this.skipComma();
+            }
+            this.consume('RPAREN');
             return { type: 'MultiPolygon', coordinates: polys };
         }
         // ── GEOMETRYCOLLECTION ───────────────────────────────────────────
@@ -274,11 +291,9 @@
         parseCoordinatesList() {
             this.consume('LPAREN');
             const coords = [];
-            while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
+            while (!this.isDone()) {
                 coords.push(this.parseCoordinates());
-                if (this.peek().type === 'COMMA') {
-                    this.advance();
-                }
+                this.skipComma();
             }
             this.consume('RPAREN');
             return coords;
@@ -298,21 +313,6 @@
             this.consume('RPAREN');
             return lists;
         }
-        /** 解析多边形列表（MultiPolygon 级别）：( ((...)), ((...)) ) */
-        parseCoordinateListListList() {
-            if (this.peek().type !== 'LPAREN')
-                return [];
-            this.advance(); // consume outer (
-            const lists = [];
-            while (this.peek().type !== 'RPAREN' && this.peek().type !== 'EOF') {
-                lists.push(this.parseCoordinateListList());
-                if (this.peek().type === 'COMMA') {
-                    this.advance();
-                }
-            }
-            this.consume('RPAREN');
-            return lists;
-        }
     }
     /** 将 WKT 字符串解析为 GeoJSON Geometry 对象 */
     function parse(wkt) {

package/dist/wkt-parser.d.ts

@@ -7,6 +7,8 @@ export declare class WKTParser {
     private advance;
     /** 消费当前 token 并返回，若类型不匹配则抛出错误 */
     private consume;
+    private skipComma;
+    private isDone;
     private parseGeometry;
     private skipDimensionKeyword;
     private isEmptyGeometry;
@@ -26,8 +28,6 @@ export declare class WKTParser {
     private parseCoordinatesList;
     /** 解析环列表（Polygon 级别）：( (...), (...) ) */
     private parseCoordinateListList;
-    /** 解析多边形列表（MultiPolygon 级别）：( ((...)), ((...)) ) */
-    private parseCoordinateListListList;
 }
 /** 将 WKT 字符串解析为 GeoJSON Geometry 对象 */
 export declare function parse(wkt: string): Geometry;

package/package.json

@@ -1,13 +1,23 @@
 {
   "name": "wkt-parse-and-geojson",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
-  "description": "Parse WKT and build GeoJSON, convert between WKT and GeoJSON",
+  "description": "Zero-dependency WKT parser/builder and WKT↔GeoJSON converter",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
+  "browser": "dist/index.umd.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.esm.js",
+      "require": "./dist/index.cjs.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "files": [
-    "dist"
+    "dist",
+    "README.md",
+    "LICENSE"
   ],
   "scripts": {
     "build": "rollup -c",
@@ -19,7 +29,10 @@
     "geojson",
     "geometry",
     "parser",
-    "gis"
+    "builder",
+    "gis",
+    "ogc",
+    "spatial"
   ],
   "author": "",
   "license": "MIT",
@@ -28,8 +41,5 @@
     "rollup": "^4.40.0",
     "tslib": "^2.8.1",
     "typescript": "^5.8.3"
-  },
-  "dependencies": {
-    "wkt-parse-and-geojson": "^1.0.0"
   }
 }