npm - @unvt/charites - Versions diffs - 2.0.3 → 2.1.1 - Mend

@unvt/charites 2.0.3 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

package/dist/cli/serve.js +18 -0
package/dist/commands/serve.js +28 -22
package/dist/lib/validate-style.js +2 -2
package/dist/lib/yaml-writer.js +3 -0
package/dist/types/index.js +3 -3
package/dist/types/metadatajson.js +0 -1
package/dist/types/tilejson.js +0 -1
package/dist/types/vector_layers.js +0 -1
package/docs/source/index.rst +1 -1
package/docs/source/usage/commandline_interface.rst +8 -2
package/docs/source/usage/example2.rst +8 -0
package/docs/source/usage/img/example02-019.png +0 -0
package/package.json +37 -29
package/provider/index.html +1 -12
package/provider/package.json +5 -0
package/provider/site-env.d.ts +1 -0
package/provider/{app.css → src/app.css} +1 -1
package/provider/src/main.ts +148 -0
package/src/cli/serve.ts +19 -0
package/src/commands/serve.ts +34 -27
package/src/lib/tileinfo-importer/base-importer.ts +1 -1
package/src/lib/validate-style.ts +3 -2
package/src/lib/yaml-writer.ts +6 -3
package/src/types/index.ts +3 -3
package/src/types/tilejson.ts +1 -1
package/tsconfig.json +10 -2
package/dist/lib/defaultValues.js +0 -6
package/provider/app.js +0 -112
package/src/lib/defaultValues.ts +0 -10

package/dist/cli/serve.js CHANGED Viewed

@@ -1,4 +1,7 @@
 import { Command } from 'commander';
+import { createServer } from 'vite';
+import { fileURLToPath } from 'url';
+import path from 'path';
 import { serve } from '../commands/serve.js';
 import { error } from '../lib/error.js';
 const program = new Command();
@@ -9,6 +12,7 @@ program
     .option('-i, --sprite-input [<icon input directory>]', 'directory path of icon source to build icons. The default <icon source> is `icons/`')
     .option('--sdf', 'Allows to use SDF sprite in charites')
     .option('--port [port]', 'Specify custom port')
+    .option('--vite-port [vitePort]', 'Specify custom port for vite server')
     .option('--no-open', "Don't open the preview in the default browser")
     .action(async (source, serveOptions) => {
     const options = program.opts();
@@ -16,11 +20,25 @@ program
     options.spriteInput = serveOptions.spriteInput;
     options.open = serveOptions.open;
     options.sdf = serveOptions.sdf;
+    options.vitePort = serveOptions.vitePort;
     try {
+        await startProviderDevServer(options);
         await serve(source, program.opts());
     }
     catch (e) {
         error(e);
     }
 });
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+async function startProviderDevServer(options) {
+    const config = {
+        root: path.resolve(__dirname, '../../provider'),
+        server: {
+            port: parseInt(options.vitePort ?? '5137'),
+        },
+    };
+    const viteServer = await createServer(config);
+    await viteServer.listen();
+}
 export default program;

package/dist/commands/serve.js CHANGED Viewed

@@ -9,7 +9,6 @@ const WebSocketServer = ws.default.WebSocketServer || ws.WebSocketServer;
 import watch from 'node-watch';
 import { parser } from '../lib/yaml-parser.js';
 import { validateStyle } from '../lib/validate-style.js';
-import { providerDir } from '../lib/defaultValues.js';
 import { buildSprite } from '../lib/build-sprite.js';
 export async function serve(source, options) {
     let port = process.env.PORT || 8080;
@@ -55,12 +54,6 @@ export async function serve(source, options) {
             return;
         }
         switch (url) {
-            case '/':
-                res.statusCode = 200;
-                res.setHeader('Content-Type', 'text/html; charset=UTF-8');
-                const content = fs.readFileSync(path.join(providerDir, 'index.html'), 'utf-8');
-                res.end(content);
-                break;
             case '/style.json':
                 let style;
                 try {
@@ -78,24 +71,37 @@ export async function serve(source, options) {
                 res.setHeader('Cache-Control', 'no-store');
                 res.end(JSON.stringify(style));
                 break;
-            case '/app.css':
-                res.statusCode = 200;
-                res.setHeader('Content-Type', 'text/css; charset=UTF-8');
-                const css = fs.readFileSync(path.join(providerDir, 'app.css'), 'utf-8');
-                res.end(css);
-                break;
-            case `/app.js`:
-                res.statusCode = 200;
-                res.setHeader('Content-Type', 'application/javascript; charset=UTF-8');
-                const app = fs.readFileSync(path.join(providerDir, 'app.js'), 'utf-8');
-                const js = app.replace('___PORT___', `${port}`);
-                res.end(js);
-                break;
-            default:
+            case '/sprite.json':
+            case '/sprite@2x.json':
+            case '/sprite.png':
+            case '/sprite@2x.png':
                 res.statusCode = 404;
                 res.setHeader('Content-Type', 'text/plain; charset=UTF-8');
                 res.end('Not found');
                 break;
+            default:
+                const vitePort = parseInt(options.vitePort || '5137');
+                const proxyReq = http.request({
+                    hostname: 'localhost',
+                    port: vitePort,
+                    path: url,
+                    method: req.method,
+                    headers: req.headers,
+                }, (viteRes) => {
+                    res.writeHead(viteRes.statusCode || 500, viteRes.headers);
+                    viteRes.pipe(res, {
+                        end: true,
+                    });
+                });
+                req.pipe(proxyReq, {
+                    end: true,
+                });
+                proxyReq.on('error', (err) => {
+                    console.error('Error with proxy request:', err);
+                    res.statusCode = 500;
+                    res.end('Bad gateway: failed to proxy to Vite dev server');
+                });
+                break;
         }
     });
     server.listen(port, () => {
@@ -128,7 +134,7 @@ export async function serve(source, options) {
                 // Nothing to do
             }
         });
-        ws.on('close', () => {
+        wss.on('close', () => {
             watcher.close();
         });
     });

package/dist/lib/validate-style.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import maplibreStyleSpec from '@maplibre/maplibre-gl-style-spec';
+import { validateStyleMin, } from '@maplibre/maplibre-gl-style-spec';
 export function validateStyle(style) {
-    const result = maplibreStyleSpec.validateStyleMin(style);
+    const result = validateStyleMin(style);
     const errors = [];
     for (let i = 0; i < result.length; i++) {
         const msg = result[i].message;

package/dist/lib/yaml-writer.js CHANGED Viewed

@@ -27,9 +27,12 @@ class IncFileTag {
 }
 const INC_PATH_TYPE = new YAML.Type('tag:yaml.org,2002:inc/file', {
     kind: 'scalar',
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     resolve: (data) => data,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     construct: (data) => new IncFileTag(data),
     instanceOf: IncFileTag,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     represent: (tag) => tag.value,
 });
 const INC_PATH_OUTPUT_SCHEMA = YAML.DEFAULT_SCHEMA.extend([INC_PATH_TYPE]);

package/dist/types/index.js CHANGED Viewed

@@ -1,3 +1,3 @@
-export * from './tilejson';
-export * from './metadatajson';
-export * from './vector_layers';
+export * from './tilejson.js';
+export * from './metadatajson.js';
+export * from './vector_layers.js';

package/dist/types/metadatajson.js CHANGED Viewed

	@@ -1 +0,0 @@
1	- export {};

package/dist/types/tilejson.js CHANGED Viewed

	@@ -1 +0,0 @@
1	- export {};

package/dist/types/vector_layers.js CHANGED Viewed

	@@ -1 +0,0 @@
1	- export {};

package/docs/source/index.rst CHANGED Viewed

@@ -9,7 +9,7 @@ Charites - Documentation
 :Date:   2024-08-23
 :Copyright: CC-BY-SA
 :Organization: The United Nations Vector Tile Toolkit
-:Version: 2.0.3
+:Version: 2.1.0
 :Abstract: This document contains the complete documentation of Charites, an application to style vector tiles easily
 .. meta::

package/docs/source/usage/commandline_interface.rst CHANGED Viewed

@@ -27,7 +27,7 @@ Checking version
 .. code-block:: bash
     $ charites --version
-    0.3.0
+    2.1.0
 Inititalize `style.yml`
@@ -95,12 +95,18 @@ Realtime editor on browser
                                                  source> is `icons/`
     --sdf                                        Allows to use SDF sprite in charites
     --port [port]                                Specify custom port
+    --vite-port [vitePort]                       Specify custom port for vite server
+    --no-open                                    Don't open the preview in the default browser
     -h, --help                                   display help for command
-Charites has three options for `serve` command.
+Charites has fifth options for `serve` command.
 - ``--sprite-input`` - If you are building icon spritesheets with Charites, you can specify the directory of SVG files to compile here. See the ``build`` command for more information.
 - ``--sdf`` - if this option is used together with ``--sprite-input``, the viewer will generate SDF sprite. If the option is not specified, non SDF sprite will be generated.
 - ``--port`` - Set http server's port number. When not specified, the default is 8080.
+- ``--vite-port`` - Set Vite server's port number. When not specified, the default is 5137.
+- ``--no-open`` - If this option is used, the preview will not be opened in the default browser. This is useful when you want to use the preview in a headless environment.

package/docs/source/usage/example2.rst CHANGED Viewed

@@ -154,6 +154,14 @@ If you repeatedly use the same expression (color, font, etc) for several layers,
    :scale: 75%
    :align: center
+(Tips 6) Use inspect control to view features
+################################################################
+Use maplibre-gl-js inspect control to view all features of the vector sources and allows hovering over features to see their properties.
+.. image:: ./img/example02-019.png
+   :scale: 75%
+   :align: center
 Step 5. Exporting style json from YAML files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Once you have edited your style with YAML files, you can now export it back to json by running the following command.

package/docs/source/usage/img/example02-019.png ADDED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@unvt/charites",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "description": "",
   "bin": {
     "charites": "dist/cli.js"
@@ -14,50 +14,58 @@
     "test:e2e": "npx playwright test",
     "command": "tsx ./src/cli.ts"
   },
+  "workspaces": [
+    "provider"
+  ],
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@maplibre/maplibre-gl-style-spec": "^20.3.1",
-    "@types/geojson": "^7946.0.14",
-    "@types/jsonminify": "^0.4.3",
+    "@maplibre/maplibre-gl-inspect": "^1.7.1",
+    "@maplibre/maplibre-gl-style-spec": "^23.2.2",
     "@unvt/sprite-one": "^0.1.1",
-    "axios": "^1.7.5",
-    "commander": "^12.1.0",
-    "glob": "^11.0.0",
+    "@watergis/maplibre-gl-legend": "^2.0.5",
+    "axios": "^1.9.0",
+    "commander": "^13.1.0",
+    "glob": "^11.0.2",
     "js-yaml": "^4.1.0",
     "jsonminify": "^0.4.2",
+    "maplibre-gl": "^5.4.0",
     "node-watch": "^0.7.4",
-    "open": "^10.1.0",
-    "ws": "^8.18.1"
+    "open": "^10.1.2",
+    "pmtiles": "^4.3.0",
+    "vite": "^6.3.4",
+    "ws": "^8.18.2"
   },
   "devDependencies": {
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.9.1",
-    "@playwright/test": "^1.46.1",
-    "@types/chai": "^4.3.19",
-    "@types/chai-as-promised": "^7.1.8",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.26.0",
+    "@playwright/test": "^1.52.0",
+    "@types/chai": "^5.2.1",
+    "@types/chai-as-promised": "^8.0.2",
     "@types/fs-extra": "^11.0.4",
+    "@types/geojson": "^7946.0.16",
     "@types/js-yaml": "^4.0.9",
+    "@types/jsonminify": "^0.4.3",
     "@types/mapbox__point-geometry": "^0.1.4",
-    "@types/mocha": "^10.0.7",
-    "@types/node": "^22.5.0",
-    "@types/ws": "^8.18.0",
-    "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
-    "chai": "^5.1.1",
-    "chai-as-promised": "^8.0.0",
-    "eslint": "^9.9.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "fs-extra": "^11.2.0",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.15.3",
+    "@types/ws": "^8.18.1",
+    "@typescript-eslint/eslint-plugin": "^8.31.1",
+    "@typescript-eslint/parser": "^8.31.1",
+    "chai": "^5.2.0",
+    "chai-as-promised": "^8.0.1",
+    "eslint": "^9.26.0",
+    "eslint-config-prettier": "^10.1.2",
+    "eslint-plugin-prettier": "^5.2.6",
+    "fs-extra": "^11.3.0",
     "kill-port-process": "^3.2.1",
-    "mocha": "^10.7.3",
+    "mocha": "^11.2.2",
     "node-abort-controller": "^3.1.1",
-    "prettier": "^3.3.3",
+    "prettier": "^3.5.3",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "tsx": "^4.19.3",
-    "typescript": "^5.5.4"
+    "tsx": "^4.19.4",
+    "typescript": "^5.8.3"
   },
   "type": "module"
 }

package/provider/index.html CHANGED Viewed

@@ -1,13 +1,7 @@
 <!DOCTYPE html>
 <html id="charites-default">
   <head>
-    <link rel="stylesheet" href="/app.css" />
-    <link href='https://cdn.jsdelivr.net/npm/maplibre-gl/dist/maplibre-gl.css' rel='stylesheet' />
-    <link href='https://cdn.jsdelivr.net/npm/@watergis/maplibre-gl-legend@2.0.5/dist/maplibre-gl-legend.css' rel='stylesheet' />
     <title>Charites Live Preview</title>
-    <script src='https://cdn.jsdelivr.net/npm/maplibre-gl/dist/maplibre-gl.js'></script>
-    <script src="https://cdn.jsdelivr.net/npm/@watergis/maplibre-gl-legend@2.0.5/dist/maplibre-gl-legend.umd.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/pmtiles@4.3.0/dist/pmtiles.js"></script>
   </head>
   <body>
     <div class="overlay">
@@ -18,11 +12,6 @@
       <label><input type="checkbox" id="showPadding">show Padding</label>
     </div>
     <div id="map"></div>
-    <script type="text/javascript">
-      let protocol = new pmtiles.Protocol()
-        maplibregl.addProtocol('pmtiles', protocol.tile)
-      </script>
-    <script type="text/javascript" src="/shared.js"></script>
-    <script type="text/javascript" src="/app.js"></script>
+    <script type="module" src="./src/main.ts"></script>
   </body>
 </html>

package/provider/package.json ADDED Viewed

@@ -0,0 +1,5 @@
+{
+  "name": "@unvt/provider",
+  "version": "0.0.1",
+  "private": true
+}

package/provider/site-env.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ /// <reference types="vite/client" />

package/provider/{app.css → src/app.css} RENAMED Viewed

@@ -14,4 +14,4 @@ html, body, #map
   margin: 5px;
   z-index: 90;
   background-color: rgba(255, 255, 255, 0.6);
-}
+}

package/provider/src/main.ts ADDED Viewed

@@ -0,0 +1,148 @@
+import {
+  Map,
+  Popup,
+  MapOptions,
+  NavigationControl,
+  addProtocol,
+  IControl,
+} from 'maplibre-gl'
+import 'maplibre-gl/dist/maplibre-gl.css'
+import '@maplibre/maplibre-gl-inspect/dist/maplibre-gl-inspect.css'
+import MaplibreInspect from '@maplibre/maplibre-gl-inspect'
+import { MaplibreLegendControl } from '@watergis/maplibre-gl-legend'
+import '@watergis/maplibre-gl-legend/dist/maplibre-gl-legend.css'
+import { Protocol } from 'pmtiles'
+import './app.css'
+const protocol = new Protocol()
+addProtocol('pmtiles', protocol.tile)
+class Charites {
+  constructor() {}
+  initializeWebSocket = (map: Map) => {
+    const isHttps = window.location.protocol === 'https:'
+    const wsProtocol = isHttps ? 'wss' : 'ws'
+    const socket = new WebSocket(`${wsProtocol}://${window.location.host}`)
+    socket.addEventListener('message', (message) => {
+      const data = JSON.parse(message.data)
+      if (data.event === 'styleUpdate') {
+        console.log('styleUpdate', data)
+        map.setStyle(`//${window.location.host}/style.json`)
+      } else if (data.event === 'spriteUpdate') {
+        map.setStyle(`//${window.location.host}/style.json`, {
+          diff: false,
+        })
+      }
+    })
+  }
+  parseMapStyle = async () => {
+    const mapStyleUrl = `//${window.location.host}/style.json`
+    const mapStyleRes = await fetch(mapStyleUrl)
+    const mapStyleJson = await mapStyleRes.json()
+    // detect center & zoom from map style json
+    let center = mapStyleJson.hasOwnProperty('center')
+      ? mapStyleJson.center
+      : undefined
+    let zoom = mapStyleJson.hasOwnProperty('zoom')
+      ? mapStyleJson.zoom
+      : undefined
+    // detect center & zoom from tile json
+    if (center === undefined || zoom === undefined) {
+      for (const sourceName in mapStyleJson.sources) {
+        if (
+          mapStyleJson.sources[sourceName].type === 'vector' &&
+          mapStyleJson.sources[sourceName].hasOwnProperty('url')
+        ) {
+          const mapTileUrl = mapStyleJson.sources[sourceName].url
+          const mapTileRes = await fetch(mapTileUrl)
+          const mapTileJson = await mapTileRes.json()
+          if (center === undefined) {
+            const bounds = mapTileJson.bounds
+            center = mapTileJson.center
+            if (!center && bounds) {
+              center = [
+                (bounds[0] + bounds[2]) / 2,
+                (bounds[1] + bounds[3]) / 2,
+              ]
+            }
+          }
+          if (zoom === undefined) {
+            zoom = (mapTileJson.minzoom + mapTileJson.maxzoom) / 2
+          }
+        }
+      }
+    }
+    return {
+      style: mapStyleUrl,
+      center,
+      zoom,
+    }
+  }
+  setupDebugCheckbox = (map: Map) => {
+    const properties = [
+      'showTileBoundaries',
+      'showCollisionBoxes',
+      'showPadding',
+    ]
+    for (const property of properties) {
+      const control = document.getElementById(property) as HTMLInputElement
+      const clickHandler = () => {
+        const checked = control.checked
+        map[property] = checked
+      }
+      clickHandler()
+      control.addEventListener('click', clickHandler)
+    }
+  }
+}
+const init = async () => {
+  const charites = new Charites()
+  const { style, center, zoom } = await charites.parseMapStyle()
+  const options: MapOptions = {
+    container: 'map',
+    hash: true,
+    maxPitch: 85,
+    style,
+  }
+  if (center) {
+    options.center = center
+  }
+  if (zoom) {
+    options.zoom = zoom
+  }
+  const map = new Map(options)
+  charites.initializeWebSocket(map)
+  map.addControl(
+    new MaplibreInspect({
+      popup: new Popup({
+        closeButton: false,
+        closeOnClick: false,
+      }),
+    }),
+  )
+  map.addControl(new NavigationControl(), 'top-right')
+  map.addControl(
+    new MaplibreLegendControl(
+      {},
+      {
+        showDefault: true,
+        showCheckbox: true,
+        onlyRendered: true,
+        reverseOrder: true,
+      },
+    ) as unknown as IControl,
+    'bottom-left',
+  )
+  charites.setupDebugCheckbox(map)
+}
+init()

package/src/cli/serve.ts CHANGED Viewed

@@ -1,4 +1,7 @@
 import { Command } from 'commander'
+import { createServer, InlineConfig } from 'vite'
+import { fileURLToPath } from 'url'
+import path from 'path'
 import { serve, serveOptions } from '../commands/serve.js'
 import { error } from '../lib/error.js'
@@ -13,6 +16,7 @@ program
   )
   .option('--sdf', 'Allows to use SDF sprite in charites')
   .option('--port [port]', 'Specify custom port')
+  .option('--vite-port [vitePort]', 'Specify custom port for vite server')
   .option('--no-open', "Don't open the preview in the default browser")
   .action(async (source: string, serveOptions: serveOptions) => {
     const options: serveOptions = program.opts()
@@ -20,11 +24,26 @@ program
     options.spriteInput = serveOptions.spriteInput
     options.open = serveOptions.open
     options.sdf = serveOptions.sdf
+    options.vitePort = serveOptions.vitePort
     try {
+      await startProviderDevServer(options)
       await serve(source, program.opts())
     } catch (e) {
       error(e)
     }
   })
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+async function startProviderDevServer(options: serveOptions) {
+  const config: InlineConfig = {
+    root: path.resolve(__dirname, '../../provider'),
+    server: {
+      port: parseInt(options.vitePort ?? '5137'),
+    },
+  }
+  const viteServer = await createServer(config)
+  await viteServer.listen()
+}
 export default program

package/src/commands/serve.ts CHANGED Viewed

@@ -10,11 +10,11 @@ import watch from 'node-watch'
 import { parser } from '../lib/yaml-parser.js'
 import { validateStyle } from '../lib/validate-style.js'
-import { providerDir } from '../lib/defaultValues.js'
 import { buildSprite } from '../lib/build-sprite.js'
 export interface serveOptions {
   port?: string
+  vitePort?: string
   spriteInput?: string
   open?: boolean
   sdf?: boolean
@@ -73,15 +73,6 @@ export async function serve(source: string, options: serveOptions) {
     }
     switch (url) {
-      case '/':
-        res.statusCode = 200
-        res.setHeader('Content-Type', 'text/html; charset=UTF-8')
-        const content = fs.readFileSync(
-          path.join(providerDir, 'index.html'),
-          'utf-8',
-        )
-        res.end(content)
-        break
       case '/style.json':
         let style
         try {
@@ -100,24 +91,40 @@ export async function serve(source: string, options: serveOptions) {
         res.setHeader('Cache-Control', 'no-store')
         res.end(JSON.stringify(style))
         break
-      case '/app.css':
-        res.statusCode = 200
-        res.setHeader('Content-Type', 'text/css; charset=UTF-8')
-        const css = fs.readFileSync(path.join(providerDir, 'app.css'), 'utf-8')
-        res.end(css)
-        break
-      case `/app.js`:
-        res.statusCode = 200
-        res.setHeader('Content-Type', 'application/javascript; charset=UTF-8')
-        const app = fs.readFileSync(path.join(providerDir, 'app.js'), 'utf-8')
-        const js = app.replace('___PORT___', `${port}`)
-        res.end(js)
-        break
-      default:
+      case '/sprite.json':
+      case '/sprite@2x.json':
+      case '/sprite.png':
+      case '/sprite@2x.png':
         res.statusCode = 404
         res.setHeader('Content-Type', 'text/plain; charset=UTF-8')
         res.end('Not found')
         break
+      default:
+        const vitePort = parseInt(options.vitePort || '5137')
+        const proxyReq = http.request(
+          {
+            hostname: 'localhost',
+            port: vitePort,
+            path: url,
+            method: req.method,
+            headers: req.headers,
+          },
+          (viteRes) => {
+            res.writeHead(viteRes.statusCode || 500, viteRes.headers)
+            viteRes.pipe(res, {
+              end: true,
+            })
+          },
+        )
+        req.pipe(proxyReq, {
+          end: true,
+        })
+        proxyReq.on('error', (err) => {
+          console.error('Error with proxy request:', err)
+          res.statusCode = 500
+          res.end('Bad gateway: failed to proxy to Vite dev server')
+        })
+        break
     }
   })
@@ -131,11 +138,11 @@ export async function serve(source: string, options: serveOptions) {
   const wss = new WebSocketServer({ server })
-  wss.on('connection', (ws) => {
+  wss.on('connection', (ws: WebSocket) => {
     const watcher = watch(
       path.dirname(sourcePath),
       { recursive: true, filter: /\.yml$|\.svg$/i },
-      (event, file) => {
+      (event: string, file: string) => {
         console.log(`${(event || '').toUpperCase()}: ${file}`)
         try {
           if (file?.toLowerCase().endsWith('.yml')) {
@@ -161,7 +168,7 @@ export async function serve(source: string, options: serveOptions) {
         }
       },
     )
-    ws.on('close', () => {
+    wss.on('close', () => {
       watcher.close()
     })
   })

package/src/lib/tileinfo-importer/base-importer.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { VectorLayer } from '../../types'
+import { VectorLayer } from '../../types/vector_layers.js'
 import {
   StyleSpecification,
   SourceSpecification,

package/src/lib/validate-style.ts CHANGED Viewed

@@ -1,9 +1,10 @@
-import maplibreStyleSpec, {
+import {
+  validateStyleMin,
   StyleSpecification,
 } from '@maplibre/maplibre-gl-style-spec'
 export function validateStyle(style: StyleSpecification): void {
-  const result = maplibreStyleSpec.validateStyleMin(style)
+  const result = validateStyleMin(style)
   const errors = []
   for (let i = 0; i < result.length; i++) {

package/src/lib/yaml-writer.ts CHANGED Viewed

@@ -43,10 +43,13 @@ class IncFileTag {
 const INC_PATH_TYPE = new YAML.Type('tag:yaml.org,2002:inc/file', {
   kind: 'scalar',
-  resolve: (data) => data,
-  construct: (data) => new IncFileTag(data),
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  resolve: (data: any) => data,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  construct: (data: any) => new IncFileTag(data),
   instanceOf: IncFileTag,
-  represent: (tag) => (tag as IncFileTag).value,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  represent: (tag: any) => (tag as IncFileTag).value,
 })
 const INC_PATH_OUTPUT_SCHEMA = YAML.DEFAULT_SCHEMA.extend([INC_PATH_TYPE])

package/src/types/index.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-export * from './tilejson'
-export * from './metadatajson'
-export * from './vector_layers'
+export * from './tilejson.js'
+export * from './metadatajson.js'
+export * from './vector_layers.js'

package/src/types/tilejson.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { VectorLayer } from './vector_layers'
+import { VectorLayer } from './vector_layers.js'
 /**
  * Definition of TileJSON v3.0.0

package/tsconfig.json CHANGED Viewed

@@ -13,13 +13,21 @@
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "resolveJsonModule": true,
-    "module": "ESNext",
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
+    "module": "Preserve",
     "moduleResolution": "node",
     "outDir": "./dist",
     "baseUrl": ".",
     "paths": {
       "*": ["node_modules/*", "src/types/*"]
-    }
+    },
+    "types": [
+      "mocha",
+      "chai",
+      "node"
+    ],
+    "typeRoots": ["./node_modules/@types", "./src/types"]
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]

package/dist/lib/defaultValues.js DELETED Viewed

@@ -1,6 +0,0 @@
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
-import path from 'path';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-export const providerDir = path.join(path.dirname(path.dirname(__dirname)), 'provider');

package/provider/app.js DELETED Viewed

@@ -1,112 +0,0 @@
-;(async () => {
-  window._charites = {
-    initializeWebSocket: function (map) {
-      const isHttps = window.location.protocol === 'https:'
-      const wsProtocol = isHttps ? 'wss' : 'ws'
-      const socket = new WebSocket(`${wsProtocol}://${window.location.host}`)
-      socket.addEventListener('message', (message) => {
-        const data = JSON.parse(message.data)
-        if (data.event === 'styleUpdate') {
-          map.setStyle(`//${window.location.host}/style.json`)
-        } else if (data.event === 'spriteUpdate') {
-          map.setStyle(`//${window.location.host}/style.json`, {
-            diff: false,
-          })
-        }
-      })
-    },
-    parseMapStyle: async function () {
-      const mapStyleUrl = `//${window.location.host}/style.json`
-      const mapStyleRes = await fetch(mapStyleUrl)
-      const mapStyleJson = await mapStyleRes.json()
-      // detect center & zoom from map style json
-      let center = mapStyleJson.hasOwnProperty('center')
-        ? mapStyleJson.center
-        : undefined
-      let zoom = mapStyleJson.hasOwnProperty('zoom')
-        ? mapStyleJson.zoom
-        : undefined
-      // detect center & zoom from tile json
-      if (center === undefined || zoom === undefined) {
-        for (const sourceName in mapStyleJson.sources) {
-          if (
-            mapStyleJson.sources[sourceName].type === 'vector' &&
-            mapStyleJson.sources[sourceName].hasOwnProperty('url')
-          ) {
-            const mapTileUrl = mapStyleJson.sources[sourceName].url
-            const mapTileRes = await fetch(mapTileUrl)
-            const mapTileJson = await mapTileRes.json()
-            if (center === undefined) {
-              const bounds = mapTileJson.bounds
-              center = mapTileJson.center
-              if (!center && bounds) {
-                center = [
-                  (bounds[0] + bounds[2]) / 2,
-                  (bounds[1] + bounds[3]) / 2,
-                ]
-              }
-            }
-            if (zoom === undefined) {
-              zoom = (mapTileJson.minzoom + mapTileJson.maxzoom) / 2
-            }
-          }
-        }
-      }
-      return {
-        style: mapStyleUrl,
-        center,
-        zoom,
-      }
-    },
-    setupDebugCheckboxes: function (map) {
-      const properties = [
-        'showTileBoundaries',
-        'showCollisionBoxes',
-        'showPadding',
-      ]
-      for (const property of properties) {
-        const control = document.getElementById(property)
-        const clickHandler = function () {
-          const checked = control.checked
-          map[property] = checked
-        }
-        clickHandler()
-        control.addEventListener('click', clickHandler)
-      }
-    },
-  }
-  const { style, center, zoom } = await window._charites.parseMapStyle()
-  const options = {
-    container: 'map',
-    hash: true,
-    maxPitch: 85,
-    style,
-  }
-  if (center) options.center = center
-  if (zoom) options.zoom = zoom
-  const map = new maplibregl.Map(options)
-  window._charites.initializeWebSocket(map)
-  map.addControl(new maplibregl.NavigationControl(), 'top-right')
-  map.addControl(
-    new MaplibreLegendControl.MaplibreLegendControl(
-      {},
-      {
-        showDefault: true,
-        showCheckbox: true,
-        onlyRendered: true,
-        reverseOrder: true,
-      },
-    ),
-    'bottom-left',
-  )
-  window._charites.setupDebugCheckboxes(map)
-})()

package/src/lib/defaultValues.ts DELETED Viewed

@@ -1,10 +0,0 @@
-import { fileURLToPath } from 'url'
-import { dirname } from 'path'
-import path from 'path'
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-export const providerDir = path.join(
-  path.dirname(path.dirname(__dirname)),
-  'provider',
-)