@d3-maps/core 0.1.1-next.0 → 0.2.0

package/dist/index.d.ts

@@ -366,8 +366,10 @@ interface MapContext {
   height: number;
   projection?: GeoProjection;
   features: MapFeature[];
+  mesh?: MultiLineString$1;
   path: GeoPath;
   renderPath: (feature: Feature) => ReturnType<GeoPath>;
+  renderMesh: () => ReturnType<GeoPath>;
 }
 /**
  * Creates a configured projection and fits it to the provided GeoJSON (if present).
@@ -393,6 +395,10 @@ declare function makeProjection({
  */
 declare function makeFeatures(geoData: MapData, dataTransformer?: DataTransformer): [features: MapFeature[], geoJson: FeatureCollection];
 declare const makePathFn: (mapProjection: GeoProjection) => GeoPath;
+/**
+ * Returns a TopoJSON mesh when topology data is provided.
+ */
+declare function makeMesh(geoData: MapData): MultiLineString$1 | undefined;
 /**
  * Creates a full {@link MapContext} from a {@link MapConfig}.
  */
@@ -409,6 +415,7 @@ declare function makeMapContext({
  * Type guard for TopoJSON topology inputs.
  */
 declare function isTopology(data: MapData): data is Topology;
+declare function getTopoObject(geoData: Topology): GeometryObject;
 //#endregion
 //#region src/lib/marker.d.ts
 type MapMarkerCoordinates = [number, number];
@@ -431,11 +438,11 @@ declare function isString(value: unknown): value is string;
 declare function isDefined<T>(value: T | null | undefined): value is T;
 declare const isNullish: (value: unknown) => value is null | undefined;
 declare const isNumber: (value: unknown) => value is number;
-declare const isStringOrNumber: (value: unknown) => value is string | number;
+declare function isStringOrNumber(value: unknown): value is string | number;
 declare function isFunction(value: unknown): value is (...args: unknown[]) => unknown;
 declare function isPlainObject(value: unknown): value is Record<string, unknown>;
 declare function get<T>(url: string): Promise<T>;
-declare const makeTransform: (x: number, y: number, k?: number) => string;
+declare function makeTransform(x: number, y: number, k?: number): string;
 //#endregion
 //#region src/lib/zoom.d.ts
 type Extent = [[number, number], [number, number]];
@@ -448,8 +455,7 @@ interface ZoomConfig {
   scaleExtent: [number, number];
   translateExtent: Extent;
 }
-type ZoomBehaviorOwnMethodName<TElement extends Element, TDatum> = Exclude<keyof ZoomBehavior$1<TElement, TDatum>, keyof Function>;
-type ZoomBehaviorMethodName<TElement extends Element, TDatum> = Extract<{ [K in ZoomBehaviorOwnMethodName<TElement, TDatum>]: ZoomBehavior$1<TElement, TDatum>[K] extends ((...args: unknown[]) => unknown) ? K : never }[ZoomBehaviorOwnMethodName<TElement, TDatum>], string>;
+type ZoomBehaviorMethodName<TElement extends Element, TDatum> = Extract<{ [K in keyof ZoomBehavior$1<TElement, TDatum>]: ZoomBehavior$1<TElement, TDatum>[K] extends ((...args: unknown[]) => unknown) ? K : never }[keyof ZoomBehavior$1<TElement, TDatum>], string>;
 type ZoomBehaviorMethodArgs<TElement extends Element, TDatum, TMethod extends ZoomBehaviorMethodName<TElement, TDatum>> = ZoomBehavior$1<TElement, TDatum>[TMethod] extends ((...args: infer TArgs) => unknown) ? TArgs : never;
 type ZoomBehaviorSingleArg<TElement extends Element, TDatum, TMethod extends ZoomBehaviorMethodName<TElement, TDatum>> = ZoomBehaviorMethodArgs<TElement, TDatum, TMethod> extends [infer TArg] ? TArg : never;
 type ZoomModifierValue<TElement extends Element, TDatum, TMethod extends ZoomBehaviorMethodName<TElement, TDatum>> = ZoomBehaviorMethodArgs<TElement, TDatum, TMethod> | ZoomBehaviorSingleArg<TElement, TDatum, TMethod>;
@@ -498,4 +504,4 @@ declare function setupZoom(options: SetupZoomOptions): void;
 declare function getZoomScale(source: ZoomScaleSource): number;
 declare function getInverseZoomScale(source: ZoomScaleSource, fallback?: number): number;
 //#endregion
-export { ApplyZoomOptions, type D3ZoomEvent, DataTransformer, Extent, MapConfig, MapContext, MapData, MapFeature, MapFeatureProps, MapMarkerCoordinates, MapMarkerProps, MapObject, MapObjectEvent, MapObjectEventType, MapObjectFocusEventType, MapObjectMouseEventType, MapObjectState, MapObjectStyles, ProjectionConfig, SetupZoomOptions, ZOOM_DEFAULTS, type ZoomBehavior, ZoomBehaviorMethodArgs, ZoomBehaviorMethodName, ZoomBehaviorOptions, ZoomBehaviorOwnMethodName, ZoomBehaviorSingleArg, ZoomConfig, ZoomConfigOptions, ZoomEvent, ZoomEvents, ZoomModifierValue, ZoomModifiers, ZoomProps, ZoomScaleSource, ZoomTargetElement, type ZoomTransform, applyZoomBehaviorTransform, applyZoomTransform, attachZoomBehavior, createZoomBehavior, createZoomConfig, createZoomTransform, get, getDefaultTranslateExtent, getFeatureKey, getInverseZoomScale, getMarkerTransform, getObjectStateUpdate, getZoomScale, isDefined, isFunction, isNullish, isNumber, isPlainObject, isString, isStringOrNumber, isTopology, makeFeatures, makeMapContext, makePathFn, makeProjection, makeTransform, mapObjectState, resolveObjectStyle, setupZoom };
+export { ApplyZoomOptions, type D3ZoomEvent, DataTransformer, Extent, MapConfig, MapContext, MapData, MapFeature, MapFeatureProps, MapMarkerCoordinates, MapMarkerProps, MapObject, MapObjectEvent, MapObjectEventType, MapObjectFocusEventType, MapObjectMouseEventType, MapObjectState, MapObjectStyles, ProjectionConfig, SetupZoomOptions, ZOOM_DEFAULTS, type ZoomBehavior, ZoomBehaviorMethodArgs, ZoomBehaviorMethodName, ZoomBehaviorOptions, ZoomBehaviorSingleArg, ZoomConfig, ZoomConfigOptions, ZoomEvent, ZoomEvents, ZoomModifierValue, ZoomModifiers, ZoomProps, ZoomScaleSource, ZoomTargetElement, type ZoomTransform, applyZoomBehaviorTransform, applyZoomTransform, attachZoomBehavior, createZoomBehavior, createZoomConfig, createZoomTransform, get, getDefaultTranslateExtent, getFeatureKey, getInverseZoomScale, getMarkerTransform, getObjectStateUpdate, getTopoObject, getZoomScale, isDefined, isFunction, isNullish, isNumber, isPlainObject, isString, isStringOrNumber, isTopology, makeFeatures, makeMapContext, makeMesh, makePathFn, makeProjection, makeTransform, mapObjectState, resolveObjectStyle, setupZoom };

package/dist/index.iife.js

@@ -1 +1 @@
-(function(e,t,n,r,i){function a(e){return typeof e==`string`}function o(e){return e!==`undefined`}let s=e=>e==null,c=e=>Number.isFinite(e),l=e=>a(e)||c(e);function u(e){return typeof e==`function`}function d(e){if(Object.prototype.toString.call(e)!==`[object Object]`)return!1;let t=Object.getPrototypeOf(e);return t===null||t===Object.prototype}async function f(e){return(await fetch(e)).json()}let p=(e,t,n)=>`translate(${e}, ${t}) scale(${n??1})`;function m(e,t=`id`,n){let r=e[t];if(l(r))return r;let i=e.properties?.[t];return l(i)?i:n}function h({width:e,height:t,config:n,projection:r,geoJson:i}){let a=r();if(n?.center){let[e,t]=n.center;c(e)&&c(t)&&a.center([e,t])}if(n?.rotate){let[e,t,r]=n.rotate;c(e)&&c(t)&&a.rotate([e,t,c(r)?r:0])}return n&&c(n.scale)&&a.scale(n.scale),i?a.fitSize([e,t],i):a.translate([e/2,t/2]),a}function g(e,t){let r;if(y(e)){let t=Object.keys(e.objects)[0];if(t){let i=e.objects[t],a=(0,n.feature)(e,i);r=a.type===`FeatureCollection`?a:{type:`FeatureCollection`,features:[a]}}else r={type:`FeatureCollection`,features:[]}}else r=e;return[t?t(r.features):r.features,r]}let _=e=>(0,t.geoPath)().projection(e);function v({width:e=600,height:n,aspectRatio:r=16/9,data:i,dataTransformer:a,projection:o=t.geoEqualEarth,projectionConfig:s}){let[c,l]=g(i,a),u=n||e/r,d=h({width:e,height:u,projection:o,config:s,geoJson:l}),f=_(d);return{width:e,height:u,projection:d,features:c,path:f,renderPath:e=>f(e)}}function y(e){return e?.type===`Topology`}let b=[`default`,`hover`,`active`];function x(e){switch(e){case`focus`:case`mouseenter`:case`mouseup`:return`hover`;case`blur`:case`mouseleave`:return`default`;case`mousedown`:return`active`;default:return`default`}}function S(e,t){return t?.[e]??t?.default}function C(e,t,n=`translate(0, 0)`){let r=e?.projection;if(!r)return n;let i=r(t);return i?p(...i):n}let w={center:[0,0],zoom:1,minZoom:1,maxZoom:8,extent:[[0,0],[0,0]]};function T(e){return[[0,0],[e?.width??0,e?.height??0]]}function E(e,t){return i.zoomIdentity.translate(...e).scale(t)}function D(e){return{scaleExtent:[e.minZoom??w.minZoom,e.maxZoom??w.maxZoom],translateExtent:e.translateExtent??w.extent}}function O(e,t={}){let n=(0,i.zoom)(),r=D({minZoom:t.minZoom,maxZoom:t.maxZoom,translateExtent:t.translateExtent??T(e)});return n.scaleExtent(r.scaleExtent).translateExtent(r.translateExtent),t.onZoomStart&&n.on(`start`,t.onZoomStart),t.onZoom&&n.on(`zoom`,t.onZoom),t.onZoomEnd&&n.on(`end`,t.onZoomEnd),I(n,t.modifiers),n}function k(e,t){let n=L(e);n&&(0,r.select)(n).call(t)}function A(e,t,n){let i=L(e);i&&(0,r.select)(i).call(t.transform,n)}function j(e){let t=e.center??w.center,n=e.zoom??w.zoom;A(e.element,e.behavior,E(t,n))}function M(e){k(e.element,e.behavior),j(e)}function N(e){return c(e)?e:F(e)?e.k:e?.transform?.k??1}function P(e,t=1){let n=N(e);return!c(n)||n===0?t:1/n}function F(e){return!!(e&&c(e.k)&&c(e.x)&&c(e.y))}function I(e,t){if(t)for(let[n,r]of Object.entries(t)){if(!n||r===void 0)continue;let t=e[n];if(typeof t!=`function`)continue;let i=Array.isArray(r)?r:[r];t.apply(e,i)}}function L(e){return e?e instanceof SVGSVGElement?e:e.closest(`svg`):null}e.ZOOM_DEFAULTS=w,e.applyZoomBehaviorTransform=A,e.applyZoomTransform=j,e.attachZoomBehavior=k,e.createZoomBehavior=O,e.createZoomConfig=D,e.createZoomTransform=E,e.get=f,e.getDefaultTranslateExtent=T,e.getFeatureKey=m,e.getInverseZoomScale=P,e.getMarkerTransform=C,e.getObjectStateUpdate=x,e.getZoomScale=N,e.isDefined=o,e.isFunction=u,e.isNullish=s,e.isNumber=c,e.isPlainObject=d,e.isString=a,e.isStringOrNumber=l,e.isTopology=y,e.makeFeatures=g,e.makeMapContext=v,e.makePathFn=_,e.makeProjection=h,e.makeTransform=p,e.mapObjectState=b,e.resolveObjectStyle=S,e.setupZoom=M})(this.D3Maps=this.D3Maps||{},d3,topojson,d3,d3);
+(function(e,t,n,r,i){function a(e){return typeof e==`string`}function o(e){return e!==`undefined`}let s=e=>e==null,c=e=>Number.isFinite(e);function l(e){return a(e)||c(e)}function u(e){return typeof e==`function`}function d(e){if(Object.prototype.toString.call(e)!==`[object Object]`)return!1;let t=Object.getPrototypeOf(e);return t===null||t===Object.prototype}async function f(e){return(await fetch(e)).json()}function p(e,t,n){return`translate(${e}, ${t}) scale(${n??1})`}function m(e,t=`id`,n){let r=e[t];if(l(r))return r;let i=e.properties?.[t];return l(i)?i:n}function h({width:e,height:t,config:n,projection:r,geoJson:i}){let a=r();if(n?.center){let[e,t]=n.center;c(e)&&c(t)&&a.center([e,t])}if(n?.rotate){let[e,t,r]=n.rotate;c(e)&&c(t)&&a.rotate([e,t,c(r)?r:0])}return n&&c(n.scale)&&a.scale(n.scale),i?a.fitSize([e,t],i):a.translate([e/2,t/2]),a}function g(e,t){let r;if(b(e)){let t=(0,n.feature)(e,x(e));r=t.type===`FeatureCollection`?t:{type:`FeatureCollection`,features:[t]}}else r=e;return[t?t(r.features):r.features,r]}let _=e=>(0,t.geoPath)().projection(e);function v(e){if(b(e))return(0,n.mesh)(e,x(e))}function y({width:e=600,height:n,aspectRatio:r=16/9,data:i,dataTransformer:a,projection:o=t.geoEqualEarth,projectionConfig:s}){let[c,l]=g(i,a),u=v(i),d=n||e/r,f=h({width:e,height:d,projection:o,config:s,geoJson:l}),p=_(f);return{width:e,height:d,projection:f,features:c,mesh:u,path:p,renderPath:e=>p(e),renderMesh:()=>u?p(u):null}}function b(e){return e?.type===`Topology`}function x(e){let t=Object.keys(e.objects)[0];return e.objects[t]}let S=[`default`,`hover`,`active`];function C(e){switch(e){case`focus`:case`mouseenter`:case`mouseup`:return`hover`;case`blur`:case`mouseleave`:return`default`;case`mousedown`:return`active`;default:return`default`}}function w(e,t){return t?.[e]??t?.default}function T(e,t,n=`translate(0, 0)`){let r=e?.projection;if(!r)return n;let i=r(t);return i?p(...i):n}let E={center:[0,0],zoom:1,minZoom:1,maxZoom:8,extent:[[0,0],[0,0]]};function D(e){return[[0,0],[e?.width??0,e?.height??0]]}function O(e,t){return i.zoomIdentity.translate(...e).scale(t)}function k(e){return{scaleExtent:[e.minZoom??E.minZoom,e.maxZoom??E.maxZoom],translateExtent:e.translateExtent??E.extent}}function A(e,t={}){let n=(0,i.zoom)(),r=k({minZoom:t.minZoom,maxZoom:t.maxZoom,translateExtent:t.translateExtent??D(e)});return n.scaleExtent(r.scaleExtent).translateExtent(r.translateExtent),t.onZoomStart&&n.on(`start`,t.onZoomStart),t.onZoom&&n.on(`zoom`,t.onZoom),t.onZoomEnd&&n.on(`end`,t.onZoomEnd),R(n,t.modifiers),n}function j(e,t){let n=z(e);n&&(0,r.select)(n).call(t)}function M(e,t,n){let i=z(e);i&&(0,r.select)(i).call(t.transform,n)}function N(e){let t=e.center??E.center,n=e.zoom??E.zoom;M(e.element,e.behavior,O(t,n))}function P(e){j(e.element,e.behavior),N(e)}function F(e){return c(e)?e:L(e)?e.k:e?.transform?.k??1}function I(e,t=1){let n=F(e);return!c(n)||n===0?t:1/n}function L(e){return!!(e&&c(e.k)&&c(e.x)&&c(e.y))}function R(e,t){if(t)for(let[n,r]of Object.entries(t)){if(!n||r===void 0)continue;let t=e[n];if(typeof t!=`function`)continue;let i=Array.isArray(r)?r:[r];t.apply(e,i)}}function z(e){return e?e instanceof SVGSVGElement?e:e.closest(`svg`):null}e.ZOOM_DEFAULTS=E,e.applyZoomBehaviorTransform=M,e.applyZoomTransform=N,e.attachZoomBehavior=j,e.createZoomBehavior=A,e.createZoomConfig=k,e.createZoomTransform=O,e.get=f,e.getDefaultTranslateExtent=D,e.getFeatureKey=m,e.getInverseZoomScale=I,e.getMarkerTransform=T,e.getObjectStateUpdate=C,e.getTopoObject=x,e.getZoomScale=F,e.isDefined=o,e.isFunction=u,e.isNullish=s,e.isNumber=c,e.isPlainObject=d,e.isString=a,e.isStringOrNumber=l,e.isTopology=b,e.makeFeatures=g,e.makeMapContext=y,e.makeMesh=v,e.makePathFn=_,e.makeProjection=h,e.makeTransform=p,e.mapObjectState=S,e.resolveObjectStyle=w,e.setupZoom=P})(this.D3Maps=this.D3Maps||{},d3,topojson,d3,d3);

package/dist/index.js

@@ -1,5 +1,5 @@
 import { geoEqualEarth, geoPath } from "d3-geo";
-import { feature } from "topojson-client";
+import { feature, mesh } from "topojson-client";
 import { select } from "d3-selection";
 import { zoom, zoomIdentity } from "d3-zoom";
 
@@ -12,7 +12,9 @@ function isDefined(value) {
 }
 const isNullish = (value) => value == null;
 const isNumber = (value) => Number.isFinite(value);
-const isStringOrNumber = (value) => isString(value) || isNumber(value);
+function isStringOrNumber(value) {
+	return isString(value) || isNumber(value);
+}
 function isFunction(value) {
 	return typeof value === "function";
 }
@@ -24,7 +26,9 @@ function isPlainObject(value) {
 async function get(url) {
 	return (await fetch(url)).json();
 }
-const makeTransform = (x, y, k) => `translate(${x}, ${y}) scale(${k ?? 1})`;
+function makeTransform(x, y, k) {
+	return `translate(${x}, ${y}) scale(${k ?? 1})`;
+}
 
 //#endregion
 //#region src/lib/feature.ts
@@ -77,27 +81,28 @@ function makeProjection({ width, height, config, projection, geoJson }) {
 function makeFeatures(geoData, dataTransformer) {
 	let geoJson;
 	if (isTopology(geoData)) {
-		const objectKey = Object.keys(geoData.objects)[0];
-		if (objectKey) {
-			const topoObject = geoData.objects[objectKey];
-			const normalizedGeoJson = feature(geoData, topoObject);
-			geoJson = normalizedGeoJson.type === "FeatureCollection" ? normalizedGeoJson : {
-				type: "FeatureCollection",
-				features: [normalizedGeoJson]
-			};
-		} else geoJson = {
+		const normalizedGeoJson = feature(geoData, getTopoObject(geoData));
+		geoJson = normalizedGeoJson.type === "FeatureCollection" ? normalizedGeoJson : {
 			type: "FeatureCollection",
-			features: []
+			features: [normalizedGeoJson]
 		};
 	} else geoJson = geoData;
 	return [dataTransformer ? dataTransformer(geoJson.features) : geoJson.features, geoJson];
 }
 const makePathFn = (mapProjection) => geoPath().projection(mapProjection);
 /**
+* Returns a TopoJSON mesh when topology data is provided.
+*/
+function makeMesh(geoData) {
+	if (!isTopology(geoData)) return void 0;
+	return mesh(geoData, getTopoObject(geoData));
+}
+/**
 * Creates a full {@link MapContext} from a {@link MapConfig}.
 */
 function makeMapContext({ width = 600, height: passedHeight, aspectRatio = 16 / 9, data, dataTransformer, projection: providedProjection = geoEqualEarth, projectionConfig }) {
 	const [features, geoJson] = makeFeatures(data, dataTransformer);
+	const mapMesh = makeMesh(data);
 	const height = passedHeight || width / aspectRatio;
 	const projection = makeProjection({
 		width,
@@ -112,8 +117,10 @@ function makeMapContext({ width = 600, height: passedHeight, aspectRatio = 16 /
 		height,
 		projection,
 		features,
+		mesh: mapMesh,
 		path: pathFn,
-		renderPath: (feature$1) => pathFn(feature$1)
+		renderPath: (feature$1) => pathFn(feature$1),
+		renderMesh: () => mapMesh ? pathFn(mapMesh) : null
 	};
 }
 /**
@@ -122,6 +129,10 @@ function makeMapContext({ width = 600, height: passedHeight, aspectRatio = 16 /
 function isTopology(data) {
 	return data?.type === "Topology";
 }
+function getTopoObject(geoData) {
+	const objectKey = Object.keys(geoData.objects)[0];
+	return geoData.objects[objectKey];
+}
 
 //#endregion
 //#region src/lib/mapObject.ts
@@ -253,4 +264,4 @@ function getSvgElement(element) {
 }
 
 //#endregion
-export { ZOOM_DEFAULTS, applyZoomBehaviorTransform, applyZoomTransform, attachZoomBehavior, createZoomBehavior, createZoomConfig, createZoomTransform, get, getDefaultTranslateExtent, getFeatureKey, getInverseZoomScale, getMarkerTransform, getObjectStateUpdate, getZoomScale, isDefined, isFunction, isNullish, isNumber, isPlainObject, isString, isStringOrNumber, isTopology, makeFeatures, makeMapContext, makePathFn, makeProjection, makeTransform, mapObjectState, resolveObjectStyle, setupZoom };
+export { ZOOM_DEFAULTS, applyZoomBehaviorTransform, applyZoomTransform, attachZoomBehavior, createZoomBehavior, createZoomConfig, createZoomTransform, get, getDefaultTranslateExtent, getFeatureKey, getInverseZoomScale, getMarkerTransform, getObjectStateUpdate, getTopoObject, getZoomScale, isDefined, isFunction, isNullish, isNumber, isPlainObject, isString, isStringOrNumber, isTopology, makeFeatures, makeMapContext, makeMesh, makePathFn, makeProjection, makeTransform, mapObjectState, resolveObjectStyle, setupZoom };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@d3-maps/core",
-  "version": "0.1.1-next.0",
   "type": "module",
+  "version": "0.2.0",
   "private": false,
   "description": "Framework-agnostic core utilities for building reactive D3 maps",
   "author": "Georgii Bukharov <souljorje@gmail.com>",
@@ -46,8 +46,8 @@
     "@types/geojson": "^7946.0.16",
     "@types/topojson-client": "^3.1.5",
     "@types/topojson-specification": "^1.0.5",
-    "typescript": "^5.9.3",
     "tsdown": "0.19.0",
+    "typescript": "^5.9.3",
     "vitest": "^4.0.15"
   },
   "scripts": {