@basemaps/lambda-tiler 8.13.1 → 8.13.3

package/src/cli/render.tile.ts

@@ -1,10 +1,14 @@
-import { ConfigImagery, ConfigProviderMemory, ConfigTileSetRaster } from '@basemaps/config';
+import { extname } from 'path';
+
+import type { ConfigImagery, ConfigTileSetRaster } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { initConfigFromUrls } from '@basemaps/config-loader';
-import { Tile, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
+import type { Tile, TileMatrixSet } from '@basemaps/geo';
+import { TileMatrixSets } from '@basemaps/geo';
 import { fsa, FsaLocalCache, LogConfig, setDefaultConfig } from '@basemaps/shared';
-import { LambdaHttpRequest, LambdaUrlRequest, UrlEvent } from '@linzjs/lambda';
-import { Context } from 'aws-lambda';
-import { extname } from 'path';
+import type { LambdaHttpRequest, UrlEvent } from '@linzjs/lambda';
+import { LambdaUrlRequest } from '@linzjs/lambda';
+import type { Context } from 'aws-lambda';
 
 import { TileXyzRaster } from '../routes/tile.xyz.raster.js';
 

package/src/index.ts

@@ -1,5 +1,6 @@
 import { FsaCache, FsaLog, LogConfig, LogStorage } from '@basemaps/shared';
-import { LambdaHttpRequest, LambdaHttpResponse, lf } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaHttpResponse, lf } from '@linzjs/lambda';
 
 import { tileAttributionGet } from './routes/attribution.js';
 import { configImageryGet, configTileSetGet } from './routes/config.js';

package/src/routes/__tests__/attribution.test.ts

@@ -3,9 +3,10 @@ import { afterEach, beforeEach, describe, it } from 'node:test';
 
 import { Attribution } from '@basemaps/attribution';
 import { ConfigProviderMemory } from '@basemaps/config';
-import { AttributionStac, GoogleTms, Nztm2000QuadTms, Projection } from '@basemaps/geo';
+import type { AttributionStac } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms, Projection } from '@basemaps/geo';
 import { LogConfig } from '@basemaps/shared';
-import { BBox } from '@linzjs/geojson';
+import type { BBox } from '@linzjs/geojson';
 import { HttpHeader } from '@linzjs/lambda';
 import sinon from 'sinon';
 

package/src/routes/__tests__/export.test.ts

@@ -1,8 +1,8 @@
+import assert from 'assert';
 import { afterEach, beforeEach, describe, it } from 'node:test';
 
 import { ConfigProviderMemory } from '@basemaps/config';
 import { fsa, FsMemory, LogConfig, s3Config } from '@basemaps/shared';
-import assert from 'assert';
 
 import { FakeData } from '../../__tests__/config.data.js';
 import { Api, mockUrlRequest } from '../../__tests__/xyz.util.js';

package/src/routes/__tests__/fonts.test.ts

@@ -1,7 +1,8 @@
 import assert from 'node:assert';
 import { afterEach, beforeEach, describe, it } from 'node:test';
 
-import { base58, BaseConfig, ConfigProviderMemory } from '@basemaps/config';
+import type { BaseConfig } from '@basemaps/config';
+import { base58, ConfigProviderMemory } from '@basemaps/config';
 import { setDefaultConfig } from '@basemaps/shared';
 import { fsa, FsMemory } from '@chunkd/fs';
 

package/src/routes/__tests__/health.test.ts

@@ -3,13 +3,14 @@ import { afterEach, before, beforeEach, describe, it } from 'node:test';
 
 import { ConfigProviderMemory } from '@basemaps/config';
 import { LambdaHttpResponse } from '@linzjs/lambda';
-import { VectorTile, VectorTileFeature, VectorTileLayer } from '@mapbox/vector-tile';
+import type { VectorTile, VectorTileFeature, VectorTileLayer } from '@mapbox/vector-tile';
 import sinon from 'sinon';
 
 import { FakeData } from '../../__tests__/config.data.js';
 import { mockRequest } from '../../__tests__/xyz.util.js';
 import { ConfigLoader } from '../../util/config.loader.js';
-import { getTestBuffer, healthGet, TestFeature, TestTiles, VectorTileProvider } from '../health.js';
+import type { TestFeature } from '../health.js';
+import { getTestBuffer, healthGet, TestTiles, VectorTileProvider } from '../health.js';
 import { TileXyzRaster } from '../tile.xyz.raster.js';
 import { tileXyzVector } from '../tile.xyz.vector.js';
 

package/src/routes/__tests__/preview.index.test.ts

@@ -4,12 +4,14 @@ import { afterEach, beforeEach, describe, it } from 'node:test';
 import { ConfigProviderMemory, DefaultColorRampOutput, DefaultTerrainRgbOutput } from '@basemaps/config';
 import { LocationUrl } from '@basemaps/geo';
 import { Env, fsa, FsMemory, LogConfig, V } from '@basemaps/shared';
-import { LambdaAlbRequest, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-import { ALBEvent, ALBEventRequestContext, Context } from 'aws-lambda';
+import type { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import { LambdaAlbRequest } from '@linzjs/lambda';
+import type { ALBEvent, ALBEventRequestContext, Context } from 'aws-lambda';
 
 import { FakeData } from '../../__tests__/config.data.js';
 import { CachedConfig } from '../../util/config.cache.js';
-import { loadAndServeIndexHtml, PreviewIndexGet, previewIndexGet } from '../preview.index.js';
+import type { PreviewIndexGet } from '../preview.index.js';
+import { loadAndServeIndexHtml, previewIndexGet } from '../preview.index.js';
 
 describe('/@*', () => {
   // o.specTimeout(1000);

package/src/routes/__tests__/sprites.test.ts

@@ -1,10 +1,10 @@
 import assert from 'node:assert';
 import { afterEach, before, beforeEach, describe, it } from 'node:test';
+import { gunzipSync, gzipSync } from 'zlib';
 
 import { ConfigProviderMemory } from '@basemaps/config';
 import { fsa, FsMemory } from '@chunkd/fs';
 import { createSandbox } from 'sinon';
-import { gunzipSync, gzipSync } from 'zlib';
 
 import { mockRequest } from '../../__tests__/xyz.util.js';
 import { handler } from '../../index.js';
@@ -57,12 +57,10 @@ describe('/v1/sprites', () => {
   });
 
   it('should detect gziped files and set content-encoding', async () => {
-    await Promise.all([
-      fsa.write(
-        new URL('fake-s3://assets/sprites/topographic.json'),
-        gzipSync(Buffer.from(JSON.stringify({ test: true }))),
-      ),
-    ]);
+    await fsa.write(
+      new URL('fake-s3://assets/sprites/topographic.json'),
+      gzipSync(Buffer.from(JSON.stringify({ test: true }))),
+    );
     const res = await handler.router.handle(mockRequest('/v1/sprites/topographic.json'));
     assert.equal(res.status, 200);
     assert.equal(res.header('content-type'), 'application/json');

package/src/routes/__tests__/tile.json.test.ts

@@ -142,7 +142,7 @@ describe('/v1/tiles/:tileSet/:tileMatrix/tile.json', () => {
 
     const cfgBundle = new ConfigProviderMemory();
     cfgBundle.put(fakeTileSet);
-    memoryFs.write(new URL('memory://linz-basemaps/bar.json'), JSON.stringify(cfgBundle.toJson()));
+    await memoryFs.write(new URL('memory://linz-basemaps/bar.json'), JSON.stringify(cfgBundle.toJson()));
 
     const configLocation = base58.encode(Buffer.from('memory://linz-basemaps/bar.json'));
     const request = mockUrlRequest('/v1/tiles/🦄 🌈/NZTM2000Quad/tile.json', `?config=${configLocation}`, Api.header);

package/src/routes/__tests__/tile.style.json.attribution.test.ts

@@ -2,8 +2,9 @@ import assert, { strictEqual } from 'node:assert';
 import { afterEach, before, describe, it } from 'node:test';
 
 import { copyright, createLicensorAttribution } from '@basemaps/attribution/build/utils.js';
-import { ConfigProviderMemory, StyleJson } from '@basemaps/config';
-import { StacProvider } from '@basemaps/geo';
+import type { StyleJson } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
+import type { StacProvider } from '@basemaps/geo';
 import { Env } from '@basemaps/shared';
 
 import { FakeData, Imagery3857 } from '../../__tests__/config.data.js';

package/src/routes/__tests__/tile.style.json.test.ts

@@ -1,8 +1,10 @@
 import assert from 'node:assert';
 import { afterEach, before, beforeEach, describe, it } from 'node:test';
 
-import { ConfigProviderMemory, SourceRaster, StyleJson } from '@basemaps/config';
-import { DefaultExaggeration, Terrain } from '@basemaps/config/build/config/vector.style.js';
+import type { SourceRaster, StyleJson } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
+import type { Terrain } from '@basemaps/config/build/config/vector.style.js';
+import { DefaultExaggeration } from '@basemaps/config/build/config/vector.style.js';
 import { Nztm2000QuadTms } from '@basemaps/geo';
 import { Env } from '@basemaps/shared';
 import { createSandbox } from 'sinon';
@@ -279,9 +281,6 @@ describe('/v1/styles', () => {
     assert.equal(res.status, 200, res.statusDescription);
 
     const body = JSON.parse(Buffer.from(res.body, 'base64').toString()) as StyleJson;
-    body.sources['basemaps-aerial'];
-    body.sources['basemaps-aerial'];
-    body.sources['basemaps-aerial'];
     const aerialSource = body.sources['basemaps-aerial'] as unknown as SourceRaster;
 
     assert.deepEqual(aerialSource.type, 'raster');

package/src/routes/__tests__/wmts.test.ts

@@ -1,7 +1,8 @@
 import assert from 'node:assert';
 import { afterEach, beforeEach, describe, it } from 'node:test';
 
-import { ConfigProviderMemory, ConfigTileSetRaster } from '@basemaps/config';
+import type { ConfigTileSetRaster } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { Env } from '@basemaps/shared';
 
 import {

package/src/routes/attribution.ts

@@ -1,22 +1,21 @@
 import { createLicensorAttribution } from '@basemaps/attribution/build/utils.js';
-import { BasemapsConfigProvider, ConfigProvider, ConfigTileSet, getAllImagery, TileSetType } from '@basemaps/config';
-import {
+import type { BasemapsConfigProvider, ConfigProvider, ConfigTileSet } from '@basemaps/config';
+import { getAllImagery, TileSetType } from '@basemaps/config';
+import type {
   AttributionCollection,
   AttributionItem,
   AttributionStac,
-  Bounds,
   Epsg,
-  GoogleTms,
   NamedBounds,
-  Projection,
-  Stac,
   StacExtent,
   StacProvider,
-  TileMatrixSet,
 } from '@basemaps/geo';
+import { Bounds, GoogleTms, Projection, Stac, TileMatrixSet } from '@basemaps/geo';
 import { extractYearRangeFromName, extractYearRangeFromTitle } from '@basemaps/shared';
-import { BBox, MultiPolygon, multiPolygonToWgs84, Pair, union, Wgs84 } from '@linzjs/geojson';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { BBox, MultiPolygon, Pair } from '@linzjs/geojson';
+import { multiPolygonToWgs84, union, Wgs84 } from '@linzjs/geojson';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';

package/src/routes/config.ts

@@ -1,6 +1,7 @@
 import { standardizeLayerName } from '@basemaps/config';
 import { GoogleTms, TileMatrixSets } from '@basemaps/geo';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';

package/src/routes/export.tileset.ts

@@ -1,6 +1,7 @@
 import { signS3Get } from '@basemaps/shared';
 import { fsa } from '@chunkd/fs';
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { NotFound } from '../util/response.js';

package/src/routes/fonts.ts

@@ -1,4 +1,4 @@
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { assetProvider } from '../util/assets.provider.js';
 

package/src/routes/health.ts

@@ -1,17 +1,19 @@
 import * as fs from 'node:fs';
+import { gunzipSync } from 'zlib';
 
-import { ConfigTileSetRaster, ConfigTileSetVector, TileSetType } from '@basemaps/config';
+import type { ConfigTileSetRaster, ConfigTileSetVector } from '@basemaps/config';
+import { TileSetType } from '@basemaps/config';
 import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import { VectorTile } from '@mapbox/vector-tile';
 import Protobuf from 'pbf';
 import PixelMatch from 'pixelmatch';
 import Sharp from 'sharp';
-import { gunzipSync } from 'zlib';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { isGzip } from '../util/cotar.serve.js';
-import { TileXyz } from '../util/validate.js';
+import type { TileXyz } from '../util/validate.js';
 import { TileXyzRaster } from './tile.xyz.raster.js';
 import { tileXyzVector } from './tile.xyz.vector.js';
 

package/src/routes/imagery.ts

@@ -1,8 +1,10 @@
-import { fsa } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import { promisify } from 'util';
 import { gzip } from 'zlib';
 
+import { fsa } from '@basemaps/shared';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
+
 import { ConfigLoader } from '../util/config.loader.js';
 import { isGzip } from '../util/cotar.serve.js';
 import { Etag } from '../util/etag.js';

package/src/routes/link.ts

@@ -1,7 +1,8 @@
 import { TileSetType } from '@basemaps/config';
 import { Epsg } from '@basemaps/geo';
 import { getPreviewUrl } from '@basemaps/shared';
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 

package/src/routes/preview.index.ts

@@ -2,9 +2,11 @@ import { promisify } from 'node:util';
 import { gunzip } from 'node:zlib';
 
 import { TileSetType } from '@basemaps/config';
-import { GoogleTms, LocationUrl, LonLatZoom, TileMatrixSets } from '@basemaps/geo';
+import type { LonLatZoom } from '@basemaps/geo';
+import { GoogleTms, LocationUrl, TileMatrixSets } from '@basemaps/geo';
 import { Env, fsa, getPreviewQuery } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { isGzip } from '../util/cotar.serve.js';

package/src/routes/preview.ts

@@ -1,8 +1,12 @@
-import { ConfigTileSetRaster, ConfigTileSetRasterOutput, TileSetType } from '@basemaps/config';
-import { Bounds, LatLon, Projection, TileMatrixSet } from '@basemaps/geo';
-import { CompositionTiff, TileMakerContext, Tiler } from '@basemaps/tiler';
+import type { ConfigTileSetRaster, ConfigTileSetRasterOutput } from '@basemaps/config';
+import { TileSetType } from '@basemaps/config';
+import type { LatLon, TileMatrixSet } from '@basemaps/geo';
+import { Bounds, Projection } from '@basemaps/geo';
+import type { CompositionTiff, TileMakerContext } from '@basemaps/tiler';
+import { Tiler } from '@basemaps/tiler';
 import { TileMakerSharp } from '@basemaps/tiler-sharp';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import sharp from 'sharp';
 
 import { ConfigLoader } from '../util/config.loader.js';
@@ -176,7 +180,7 @@ export async function renderPreview(req: LambdaHttpRequest, ctx: PreviewRenderCo
 
   const shortLocation = [ctx.location.lon.toFixed(7), ctx.location.lat.toFixed(7)].join('_');
   const suggestedFileName = `preview_${ctx.tileSet.name}_z${ctx.z}_${shortLocation}-${ctx.output.name}.${tileContext.format}`;
-  response.header('Content-Disposition', `inline; filename=\"${suggestedFileName}\"`);
+  response.header('Content-Disposition', `inline; filename="${suggestedFileName}"`);
 
   return response;
 }

package/src/routes/sprites.ts

@@ -1,6 +1,7 @@
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import path from 'path';
 
+import type { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+
 import { assetProvider } from '../util/assets.provider.js';
 import { NotFound } from '../util/response.js';
 

package/src/routes/tile.json.ts

@@ -1,7 +1,10 @@
-import { ConfigTileSet, TileSetType } from '@basemaps/config';
-import { GoogleTms, OutputFormat, TileJson, TileMatrixSet } from '@basemaps/geo';
+import type { ConfigTileSet } from '@basemaps/config';
+import { TileSetType } from '@basemaps/config';
+import type { OutputFormat, TileJson } from '@basemaps/geo';
+import { GoogleTms, TileMatrixSet } from '@basemaps/geo';
 import { Env, toQueryString } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { NotFound } from '../util/response.js';

package/src/routes/tile.style.json.ts

@@ -1,18 +1,13 @@
-import {
-  BasemapsConfigProvider,
-  ConfigId,
-  ConfigPrefix,
-  ConfigTileSetRaster,
-  Layer,
-  Sources,
-  StyleJson,
-  TileSetType,
-} from '@basemaps/config';
+import { URL } from 'url';
+
+import type { BasemapsConfigProvider, ConfigTileSetRaster, Layer, Sources, StyleJson } from '@basemaps/config';
+import { ConfigId, ConfigPrefix, TileSetType } from '@basemaps/config';
 import { DefaultExaggeration } from '@basemaps/config/build/config/vector.style.js';
-import { GoogleTms, Nztm2000QuadTms, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
+import type { TileMatrixSet } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms, TileMatrixSets } from '@basemaps/geo';
 import { Env, toQueryString } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-import { URL } from 'url';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';

package/src/routes/tile.wmts.ts

@@ -1,8 +1,11 @@
+import { createHash } from 'crypto';
+
 import { getAllImagery, TileSetType } from '@basemaps/config';
-import { GoogleTms, Nztm2000QuadTms, TileMatrixSet } from '@basemaps/geo';
+import type { TileMatrixSet } from '@basemaps/geo';
+import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
 import { Env } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
-import { createHash } from 'crypto';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';

package/src/routes/tile.xyz.raster.ts

@@ -1,16 +1,20 @@
-import { ConfigTileSetRaster, getAllImagery } from '@basemaps/config';
+import type { ConfigTileSetRaster } from '@basemaps/config';
+import { getAllImagery } from '@basemaps/config';
 import { Bounds, Epsg, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
-import { Cotar, Env, stringToUrlFolder, Tiff } from '@basemaps/shared';
+import type { Cotar } from '@basemaps/shared';
+import { Env, stringToUrlFolder, Tiff } from '@basemaps/shared';
 import { Tiler } from '@basemaps/tiler';
 import { TileMakerSharp } from '@basemaps/tiler-sharp';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 import pLimit from 'p-limit';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { Etag } from '../util/etag.js';
 import { NotModified } from '../util/response.js';
 import { CoSources } from '../util/source.cache.js';
-import { TileXyz, Validate } from '../util/validate.js';
+import type { TileXyz } from '../util/validate.js';
+import { Validate } from '../util/validate.js';
 
 const LoadingQueue = pLimit(Env.getNumber(Env.TiffConcurrency, 25));
 

package/src/routes/tile.xyz.ts

@@ -1,5 +1,6 @@
 import { TileSetType } from '@basemaps/config';
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 import { NotFound } from '../util/response.js';

package/src/routes/tile.xyz.vector.ts

@@ -1,12 +1,13 @@
-import { ConfigTileSetVector } from '@basemaps/config';
+import type { ConfigTileSetVector } from '@basemaps/config';
 import { fsa } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { isGzip } from '../util/cotar.serve.js';
 import { Etag } from '../util/etag.js';
 import { NoContent, NotFound, NotModified } from '../util/response.js';
 import { CoSources } from '../util/source.cache.js';
-import { TileXyz } from '../util/validate.js';
+import type { TileXyz } from '../util/validate.js';
 
 export const tileXyzVector = {
   /** Serve a MVT vector tile */

package/src/routes/version.ts

@@ -1,5 +1,7 @@
-import { BasemapsConfigProvider, ConfigProviderMemory } from '@basemaps/config';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { BasemapsConfigProvider } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from '../util/config.loader.js';
 

package/src/util/__test__/nztm.style.test.ts

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 
-import { StyleJson } from '@basemaps/config';
+import type { StyleJson } from '@basemaps/config';
 import { GoogleTms, Nztm2000QuadTms } from '@basemaps/geo';
 
 import { setStyleTerrain } from '../../routes/tile.style.json.js';

package/src/util/assets.provider.ts

@@ -1,5 +1,6 @@
 import { fsa } from '@basemaps/shared';
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { ConfigLoader } from './config.loader.js';
 import { isGzip } from './cotar.serve.js';

package/src/util/config.cache.ts

@@ -1,6 +1,7 @@
-import { ConfigBundled, ConfigProviderMemory } from '@basemaps/config';
+import type { ConfigBundled } from '@basemaps/config';
+import { ConfigProviderMemory } from '@basemaps/config';
 import { fsa } from '@basemaps/shared';
-import { FsError } from '@chunkd/fs';
+import type { FsError } from '@chunkd/fs';
 
 import { SwappingLru } from './swapping.lru.js';
 

package/src/util/config.loader.ts

@@ -1,7 +1,8 @@
-import { base58, BasemapsConfigProvider, isBase58 } from '@basemaps/config';
+import type { BasemapsConfigProvider } from '@basemaps/config';
+import { base58, isBase58 } from '@basemaps/config';
 import { fsa, getDefaultConfig } from '@basemaps/shared';
 import { LambdaHttpResponse } from '@linzjs/lambda';
-import { LambdaHttpRequest } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
 
 import { CachedConfig } from './config.cache.js';
 

package/src/util/cotar.serve.ts

@@ -1,4 +1,5 @@
-import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader, LambdaHttpResponse } from '@linzjs/lambda';
 
 import { Etag } from './etag.js';
 import { NotFound, NotModified } from './response.js';

package/src/util/etag.ts

@@ -1,5 +1,6 @@
 import { sha256base58 } from '@basemaps/config';
-import { HttpHeader, LambdaHttpRequest } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { HttpHeader } from '@linzjs/lambda';
 
 export const Etag = {
   key(obj: unknown): string {

package/src/util/nztm.style.ts

@@ -1,4 +1,4 @@
-import { StyleJson } from '@basemaps/config';
+import type { StyleJson } from '@basemaps/config';
 
 /**
  * limited checking to cast a unknown paint/layout into one with stops

package/src/util/response.ts

@@ -1,4 +1,5 @@
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 
 export const NotFound = (msg: string = 'Not Found'): LambdaHttpResponse => new LambdaHttpResponse(404, msg);
 export const NotModified = (): LambdaHttpResponse => new LambdaHttpResponse(304, 'Not modified');

package/src/util/validate.ts

@@ -1,10 +1,12 @@
-import { ConfigTileSetRaster, ConfigTileSetRasterOutput } from '@basemaps/config';
-import { ImageFormat, LatLon, Projection, TileMatrixSet, TileMatrixSets } from '@basemaps/geo';
-import { Const, Env, isValidApiKey, LogConfig, truncateApiKey } from '@basemaps/shared';
+import type { ConfigTileSetRaster, ConfigTileSetRasterOutput } from '@basemaps/config';
+import type { ImageFormat, LatLon, TileMatrixSet } from '@basemaps/geo';
+import { Projection, TileMatrixSets } from '@basemaps/geo';
+import { Const, Env, isValidApiKey, LogConfig } from '@basemaps/shared';
 import { getImageFormat } from '@basemaps/tiler';
-import { LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
+import type { LambdaHttpRequest } from '@linzjs/lambda';
+import { LambdaHttpResponse } from '@linzjs/lambda';
 
-import { TileXyzGet } from '../routes/tile.xyz.js';
+import type { TileXyzGet } from '../routes/tile.xyz.js';
 
 export interface TileXyz {
   /** Tile XYZ location */
@@ -46,8 +48,7 @@ export const Validate = {
     const valid = isValidApiKey(apiKey);
 
     if (!valid.valid) throw new LambdaHttpResponse(400, 'API Key Invalid: ' + valid.message);
-    // Truncate the API Key so we are not logging the full key
-    req.set('api', truncateApiKey(apiKey));
+    req.set('api', apiKey);
 
     if (this.blockedApiKeys.has(apiKey as string)) {
       throw new LambdaHttpResponse(429, 'Too many requests! Please contact basemaps@linz.govt.nz for a developer key');

package/src/wmts.capability.ts

@@ -1,15 +1,11 @@
-import {
-  ConfigImagery,
-  ConfigLayer,
-  ConfigTileSet,
-  ConfigTileSetRasterOutput,
-  standardizeLayerName,
-  TileSetType,
-} from '@basemaps/config';
-import { BoundingBox, Bounds, GoogleTms, ImageFormat, Projection, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
-import { toQueryString, V, VNodeElement } from '@basemaps/shared';
+import type { ConfigImagery, ConfigLayer, ConfigTileSet, ConfigTileSetRasterOutput } from '@basemaps/config';
+import { standardizeLayerName, TileSetType } from '@basemaps/config';
+import type { BoundingBox, ImageFormat, TileMatrixSet, WmtsProvider } from '@basemaps/geo';
+import { Bounds, GoogleTms, Projection } from '@basemaps/geo';
+import type { VNodeElement } from '@basemaps/shared';
+import { toQueryString, V } from '@basemaps/shared';
 import { ImageFormatOrder } from '@basemaps/tiler';
-import { BBox } from '@linzjs/geojson';
+import type { BBox } from '@linzjs/geojson';
 
 const CapabilitiesAttrs = {
   xmlns: 'http://www.opengis.net/wmts/1.0',