@d3-maps/core 0.2.0 → 0.3.0

package/dist/index.css

@@ -2,6 +2,7 @@
   height: 100%;
   width: auto;
   max-width: 100%;
+  stroke-width: 0.5
 }
 .d3-map-zoom path {
   vector-effect: non-scaling-stroke;

package/dist/index.d.ts

@@ -1,8 +1,55 @@
-import { GeoPath, GeoProjection } from "d3-geo";
+import { ExtendedFeature, ExtendedFeatureCollection, GeoGeometryObjects, GeoPath, GeoPermissibleObjects, GeoProjection } from "d3-geo";
+import { mesh } from "topojson-client";
 import { D3ZoomEvent, D3ZoomEvent as D3ZoomEvent$1, ZoomBehavior, ZoomBehavior as ZoomBehavior$1, ZoomTransform, ZoomTransform as ZoomTransform$1 } from "d3-zoom";
 
+//#region src/lib/mapObject.d.ts
+type MapObject = GeoGeometryObjects | ExtendedFeature;
+type MapObjectFocusEventType = 'focus' | 'blur';
+type MapObjectMouseEventType = 'mouseenter' | 'mouseleave' | 'mousedown' | 'mouseup';
+type MapObjectEventType = MapObjectFocusEventType | MapObjectMouseEventType;
+type MapObjectEvent<E> = E extends MapObjectFocusEventType ? FocusEvent : MouseEvent;
+/**
+ * Supported interaction states for map objects.
+ */
+declare const mapObjectState: readonly ["default", "hover", "active"];
+type MapObjectState = typeof mapObjectState[number];
+type MapObjectStyles<TStyle> = Partial<Record<MapObjectState, TStyle>>;
+/**
+ * Maps DOM event names to interaction state updates.
+ */
+declare function getObjectStateUpdate(event: MapObjectEventType): MapObjectState;
+/**
+ * Resolves a style value for the current state (falls back to `default`).
+ */
+declare function resolveObjectStyle<TStyle>(state: MapObjectState, styles?: MapObjectStyles<TStyle>): TStyle | undefined;
+//#endregion
+//#region src/lib/feature.d.ts
+/**
+ * A GeoJSON Feature used by d3-maps.
+ *
+ * This type allows extra top-level fields to be attached in `dataTransformer` (e.g. choropleth colors).
+ */
+type MapFeature = (ExtendedFeature & Record<string, unknown>) | ExtendedFeature;
+/**
+ * Shared props contract for a single rendered feature.
+ */
+interface MapFeatureProps<TStyle = unknown> {
+  data: MapFeature;
+  styles?: MapObjectStyles<TStyle>;
+  fill?: string;
+  stroke?: string;
+}
+/**
+ * Resolves a stable key for a feature.
+ *
+ * Checks:
+ * 1) `feature[idKey]`
+ * 2) `feature.properties[idKey]`
+ * 3) fallback to the list index
+ */
+declare function getFeatureKey(feature: MapFeature, idKey: string | undefined, index: number): string | number;
+//#endregion
 //#region ../../node_modules/.pnpm/@types+geojson@7946.0.16/node_modules/@types/geojson/index.d.ts
-
 /**
  * The valid values for the "type" property of GeoJSON geometry objects.
  * https://tools.ietf.org/html/rfc7946#section-1.4
@@ -183,53 +230,6 @@ interface FeatureCollection<G extends Geometry | null = Geometry, P$1 = GeoJsonP
   features: Array<Feature<G, P$1>>;
 }
 //#endregion
-//#region src/lib/mapObject.d.ts
-type MapObject = Point$1 | Feature;
-type MapObjectFocusEventType = 'focus' | 'blur';
-type MapObjectMouseEventType = 'mouseenter' | 'mouseleave' | 'mousedown' | 'mouseup';
-type MapObjectEventType = MapObjectFocusEventType | MapObjectMouseEventType;
-type MapObjectEvent<E> = E extends MapObjectFocusEventType ? FocusEvent : MouseEvent;
-/**
- * Supported interaction states for map objects.
- */
-declare const mapObjectState: readonly ["default", "hover", "active"];
-type MapObjectState = typeof mapObjectState[number];
-type MapObjectStyles<TStyle> = Partial<Record<MapObjectState, TStyle>>;
-/**
- * Maps DOM event names to interaction state updates.
- */
-declare function getObjectStateUpdate(event: MapObjectEventType): MapObjectState;
-/**
- * Resolves a style value for the current state (falls back to `default`).
- */
-declare function resolveObjectStyle<TStyle>(state: MapObjectState, styles?: MapObjectStyles<TStyle>): TStyle | undefined;
-//#endregion
-//#region src/lib/feature.d.ts
-/**
- * A GeoJSON Feature used by d3-maps.
- *
- * This type allows extra top-level fields to be attached in `dataTransformer` (e.g. choropleth colors).
- */
-type MapFeature = (Feature & Record<string, unknown>) | Feature;
-/**
- * Shared props contract for a single rendered feature.
- */
-interface MapFeatureProps<TStyle = unknown> {
-  data: MapFeature;
-  styles?: MapObjectStyles<TStyle>;
-  fill?: string;
-  stroke?: string;
-}
-/**
- * Resolves a stable key for a feature.
- *
- * Checks:
- * 1) `feature[idKey]`
- * 2) `feature.properties[idKey]`
- * 3) fallback to the list index
- */
-declare function getFeatureKey(feature: MapFeature, idKey: string | undefined, index: number): string | number;
-//#endregion
 //#region ../../node_modules/.pnpm/@types+topojson-specification@1.0.5/node_modules/@types/topojson-specification/index.d.ts
 // ---------------------------------------------------------------
 // TopoJSON Format Specification
@@ -316,19 +316,120 @@ interface NullObject extends GeometryObjectA {
   type: null;
 }
 //#endregion
+//#region src/lib/utils.d.ts
+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 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 makeTransform(x: number, y: number, k?: number): string;
+type AnyFn = (...args: any) => any;
+/**
+ * Extracts a union of parameter tuples from a (possibly overloaded) function type.
+ *
+ * TypeScript's built-in `Parameters<F>` only captures the *last* overload, which breaks typing
+ * for overloaded getter/setter APIs (common in d3), where the setter overload might not be last.
+ *
+ * Notes:
+ * - This helper supports up to 5 overload signatures (adjust if needed).
+ * - Getter overloads like `(): T` are filtered out later via `Exclude<..., []>` when we build
+ *   setter-only config types.
+ */
+type OverloadedArgs<F> = F extends {
+  (...a: infer A1): any;
+  (...a: infer A2): any;
+  (...a: infer A3): any;
+  (...a: infer A4): any;
+  (...a: infer A5): any;
+} ? A1 | A2 | A3 | A4 | A5 : F extends {
+  (...a: infer A1): any;
+  (...a: infer A2): any;
+  (...a: infer A3): any;
+  (...a: infer A4): any;
+} ? A1 | A2 | A3 | A4 : F extends {
+  (...a: infer A1): any;
+  (...a: infer A2): any;
+  (...a: infer A3): any;
+} ? A1 | A2 | A3 : F extends {
+  (...a: infer A1): any;
+  (...a: infer A2): any;
+} ? A1 | A2 : F extends ((...a: infer A1) => any) ? A1 : never;
+/**
+ * Removes 0-arg overloads (getters), leaving only setter-style overload argument tuples.
+ */
+type SetterArgs<F> = Exclude<OverloadedArgs<F>, []>;
+/**
+ * True if the function has at least one overload that accepts arguments (i.e. a setter overload).
+ */
+type HasArgs<F> = [SetterArgs<F>] extends [never] ? false : true;
+type OwnKeys<T> = T extends AnyFn ? Exclude<keyof T, keyof CallableFunction> : keyof T;
+/**
+ * Converts method parameters to modifiers values
+ * - single non-array arg: `arg` | `[arg]`
+ * - multiple args/single array wrapped with array
+ */
+type ModifierArgs<P$1 extends unknown[]> = P$1 extends [infer Only] ? Only extends readonly unknown[] ? [Only] : Only | [Only] : P$1;
+/**
+ * Maps methods with args to modifiers
+ *
+ * @example
+ * type X = {
+ *   a: string;  // not a function - will be ignored
+ *   b(): void;  // has no arguments - will be ignored
+ *   c(x: number): void;
+ *   d(x: number, y: string): void;
+ *   e(xs: string[]): void;
+ * }
+ *
+ * type R = MethodsToModifiers<X>
+ * {
+ *   c: number | [number];
+ *   d: [number, string];
+ *   e: [string[]]; // forced wrapper (arg is array)
+ * }
+ */
+type MethodsToModifiers<T extends object> = { [K in OwnKeys<T> as Extract<T[K], AnyFn> extends never ? never : HasArgs<Extract<T[K], AnyFn>> extends true ? K : never]?: ModifierArgs<Extract<SetterArgs<Extract<T[K], AnyFn>>, unknown[]>> };
+/**
+ * Invokes `target` methods with arguments from `modifiers`.
+ *
+ * modifiers: `{ [methodName]: args[] | arg }`
+ *
+ * @example
+ * class X {
+ *  a(x: number) {}
+ *  b(x: number, y: string) {}
+ *  c(x: string[]) {}
+ *  d() {}
+ *  e = 'foo'
+ * }
+ *
+ * applyModifiers(new X(), {
+ *  a: 1, // ok (single arg as-is)
+ *  a: [1], // ok (single arg wrapped)
+ *  b: [1, 'foo'], // ok (tuple for 2 args)
+ *  c: [['foo', 'bar']], // ok (array-arg must be wrapped)
+ *  c: ['foo', 'bar'],  // error (single array-arg must be wrapped into array)
+ *  d: [], // error (d has no args, excluded)
+ *  e: 'foo' // error (e is not a function, excluded)
+ * })
+ */
+declare function applyModifiers<T extends object>(target: T, modifiers?: MethodsToModifiers<T>): void;
+//#endregion
 //#region src/lib/map.d.ts
-type MapData = FeatureCollection | Topology;
+type MapMesh = ReturnType<typeof mesh>;
+type MapData = ExtendedFeatureCollection | Topology;
 type DataTransformer = (features: MapFeature[]) => MapFeature[];
 /**
- * Configuration for a d3-geo projection.
+ * Extra projection method calls to apply before rendering.
  *
- * d3-maps applies these options (if provided) before fitting the geometry to the map size.
+ * Use projection method names as keys and method arguments as values.
+ * Example: `{ center: [[0, 20]], rotate: [[0, 0, 0]], scale: 160 }`
+ *
+ * @see https://d3js.org/d3-geo/projection
  */
-interface ProjectionConfig {
-  center?: [number, number];
-  rotate?: [number, number, number];
-  scale?: number;
-}
+interface ProjectionConfig extends Omit<MethodsToModifiers<GeoProjection>, 'invert' | 'stream'> {}
 /**
  * Input configuration for creating a map context.
  *
@@ -344,6 +445,9 @@ interface MapConfig {
    * Example: `geoEqualEarth`.
    */
   projection?: () => GeoProjection;
+  /**
+   * Projection method arguments passed to the created projection
+   */
   projectionConfig?: ProjectionConfig;
   /**
    * TopoJSON or GeoJSON input.
@@ -366,9 +470,9 @@ interface MapContext {
   height: number;
   projection?: GeoProjection;
   features: MapFeature[];
-  mesh?: MultiLineString$1;
+  mesh?: MapMesh;
   path: GeoPath;
-  renderPath: (feature: Feature) => ReturnType<GeoPath>;
+  renderPath: (feature: MapFeature) => ReturnType<GeoPath>;
   renderMesh: () => ReturnType<GeoPath>;
 }
 /**
@@ -385,7 +489,7 @@ declare function makeProjection({
   height: number;
   config?: ProjectionConfig;
   projection: () => GeoProjection;
-  geoJson?: FeatureCollection;
+  geoJson?: GeoPermissibleObjects;
 }): GeoProjection;
 /**
  * Normalizes input map data to GeoJSON features.
@@ -393,12 +497,12 @@ declare function makeProjection({
  * - TopoJSON is converted via `topojson-client`.
  * - If provided, `dataTransformer` is applied to the feature array.
  */
-declare function makeFeatures(geoData: MapData, dataTransformer?: DataTransformer): [features: MapFeature[], geoJson: FeatureCollection];
+declare function makeFeatures(geoData: MapData, dataTransformer?: DataTransformer): [features: MapFeature[], geoJson: ExtendedFeatureCollection];
 declare const makePathFn: (mapProjection: GeoProjection) => GeoPath;
 /**
  * Returns a TopoJSON mesh when topology data is provided.
  */
-declare function makeMesh(geoData: MapData): MultiLineString$1 | undefined;
+declare function makeMesh(geoData: MapData): MapMesh | undefined;
 /**
  * Creates a full {@link MapContext} from a {@link MapConfig}.
  */
@@ -433,40 +537,24 @@ interface MapMarkerProps<TStyle = unknown> {
  */
 declare function getMarkerTransform(context: MapContext | undefined, coordinates: MapMarkerCoordinates, fallback?: string): string;
 //#endregion
-//#region src/lib/utils.d.ts
-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 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 function makeTransform(x: number, y: number, k?: number): string;
-//#endregion
 //#region src/lib/zoom.d.ts
 type Extent = [[number, number], [number, number]];
-interface ZoomConfigOptions {
-  minZoom?: number;
-  maxZoom?: number;
-  translateExtent?: Extent;
-}
-interface ZoomConfig {
-  scaleExtent: [number, number];
-  translateExtent: Extent;
-}
-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>;
-type ZoomModifiers<TElement extends Element = SVGSVGElement, TDatum = unknown> = Partial<{ [K in ZoomBehaviorMethodName<TElement, TDatum>]: ZoomModifierValue<TElement, TDatum, K> }>;
-interface ZoomProps<TElement extends Element = SVGSVGElement, TDatum = unknown> {
+interface DefaultZoomBehavior extends ZoomBehavior$1<SVGSVGElement, unknown> {}
+/**
+ * Extra zoom method calls to apply before rendering.
+ *
+ * Use zoom method names as keys and method arguments as values.
+ * Example: `{ scaleExtent: [[2, 9]], translateExtent: [[[0, 0], [10, 10]]] }`
+ *
+ * @see https://d3js.org/d3-zoom
+ */
+interface ZoomModifiers extends MethodsToModifiers<DefaultZoomBehavior> {}
+interface ZoomProps {
   center?: [number, number];
   zoom?: number;
   minZoom?: number;
   maxZoom?: number;
-  translateExtent?: Extent;
-  modifiers?: ZoomModifiers<TElement, TDatum>;
+  config?: ZoomModifiers;
 }
 interface ZoomEvent extends D3ZoomEvent$1<SVGSVGElement, unknown> {}
 interface ZoomEvents {
@@ -474,7 +562,7 @@ interface ZoomEvents {
   onZoom?: (event: ZoomEvent) => void;
   onZoomEnd?: (event: ZoomEvent) => void;
 }
-interface ZoomBehaviorOptions<TElement extends Element = SVGSVGElement, TDatum = unknown> extends ZoomProps<TElement, TDatum>, ZoomEvents {}
+interface ZoomBehaviorOptions extends ZoomProps, ZoomEvents {}
 type ZoomScaleSource = number | ZoomTransform$1 | {
   transform: ZoomTransform$1;
 };
@@ -484,24 +572,20 @@ declare const ZOOM_DEFAULTS: {
   zoom: number;
   minZoom: number;
   maxZoom: number;
-  extent: Extent;
 };
 interface ApplyZoomOptions {
   element: ZoomTargetElement | null | undefined;
-  behavior: ZoomBehavior$1<SVGSVGElement, unknown>;
+  behavior: DefaultZoomBehavior;
   center?: [number, number];
   zoom?: number;
 }
 interface SetupZoomOptions extends ApplyZoomOptions {}
-declare function getDefaultTranslateExtent(context?: MapContext): Extent;
-declare function createZoomTransform(center: [number, number], zoomLevel: number): ZoomTransform$1;
-declare function createZoomConfig(options: ZoomConfigOptions): ZoomConfig;
-declare function createZoomBehavior<TElement extends Element = SVGSVGElement, TDatum = unknown>(context?: MapContext, options?: ZoomBehaviorOptions<TElement, TDatum>): ZoomBehavior$1<TElement, TDatum>;
-declare function attachZoomBehavior(element: ZoomTargetElement | null | undefined, behavior: ZoomBehavior$1<SVGSVGElement, unknown>): void;
-declare function applyZoomBehaviorTransform(element: ZoomTargetElement | null | undefined, behavior: ZoomBehavior$1<SVGSVGElement, unknown>, transform: ZoomTransform$1): void;
+declare function createZoomBehavior(context?: MapContext, options?: ZoomBehaviorOptions): DefaultZoomBehavior;
+declare function attachZoomBehavior(element: ZoomTargetElement | null | undefined, behavior: DefaultZoomBehavior): void;
+declare function applyZoomBehaviorTransform(element: ZoomTargetElement | null | undefined, behavior: DefaultZoomBehavior, transform: ZoomTransform$1): void;
 declare function applyZoomTransform(options: ApplyZoomOptions): void;
 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, 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 };
+export { AnyFn, ApplyZoomOptions, type D3ZoomEvent, DataTransformer, DefaultZoomBehavior, Extent, HasArgs, MapConfig, MapContext, MapData, MapFeature, MapFeatureProps, MapMarkerCoordinates, MapMarkerProps, MapMesh, MapObject, MapObjectEvent, MapObjectEventType, MapObjectFocusEventType, MapObjectMouseEventType, MapObjectState, MapObjectStyles, MethodsToModifiers, ModifierArgs, OverloadedArgs, OwnKeys, ProjectionConfig, SetterArgs, SetupZoomOptions, ZOOM_DEFAULTS, type ZoomBehavior, ZoomBehaviorOptions, ZoomEvent, ZoomEvents, ZoomModifiers, ZoomProps, ZoomScaleSource, ZoomTargetElement, type ZoomTransform, applyModifiers, applyZoomBehaviorTransform, applyZoomTransform, attachZoomBehavior, createZoomBehavior, 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);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);
+(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}function f(e,t,n){return`translate(${e}, ${t}) scale(${n??1})`}function p(e,t){if(t)for(let n of Object.keys(t)){let r=t[n];if(!o(r))continue;let i=e[n];if(!u(i))continue;let a=Array.isArray(r)?r:[r];i.apply(e,a)}}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();return i?n?.fitSize||a.fitSize([e,t],i):n?.translate||a.translate([e/2,t/2]),p(a,n),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?f(...i):n}let E={center:[0,0],zoom:1,minZoom:1,maxZoom:8};function D(e,t={}){let n=(0,i.zoom)(),r=t.minZoom??E.minZoom,a=t.maxZoom??E.maxZoom,o=[[0,0],[e?.width??0,e?.height??0]];return n.scaleExtent([r,a]).translateExtent(o),t.onZoomStart&&n.on(`start`,t.onZoomStart),t.onZoom&&n.on(`zoom`,t.onZoom),t.onZoomEnd&&n.on(`end`,t.onZoomEnd),p(n,t.config),n}function O(e,t){let n=F(e);n&&(0,r.select)(n).call(t)}function k(e,t,n){let i=F(e);i&&(0,r.select)(i).call(t.transform,n)}function A(e){let t=e.center??E.center,n=e.zoom??E.zoom;k(e.element,e.behavior,i.zoomIdentity.translate(...t).scale(n))}function j(e){O(e.element,e.behavior),A(e)}function M(e){return c(e)?e:P(e)?e.k:e?.transform?.k??1}function N(e,t=1){let n=M(e);return!c(n)||n===0?t:1/n}function P(e){return!!(e&&c(e.k)&&c(e.x)&&c(e.y))}function F(e){return e?e instanceof SVGSVGElement?e:e.closest(`svg`):null}e.ZOOM_DEFAULTS=E,e.applyModifiers=p,e.applyZoomBehaviorTransform=k,e.applyZoomTransform=A,e.attachZoomBehavior=O,e.createZoomBehavior=D,e.getFeatureKey=m,e.getInverseZoomScale=N,e.getMarkerTransform=T,e.getObjectStateUpdate=C,e.getTopoObject=x,e.getZoomScale=M,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=f,e.mapObjectState=S,e.resolveObjectStyle=w,e.setupZoom=j})(this.D3Maps=this.D3Maps||{},d3,topojson,d3,d3);

package/dist/index.js

@@ -23,12 +23,44 @@ function isPlainObject(value) {
 	const prototype = Object.getPrototypeOf(value);
 	return prototype === null || prototype === Object.prototype;
 }
-async function get(url) {
-	return (await fetch(url)).json();
-}
 function makeTransform(x, y, k) {
 	return `translate(${x}, ${y}) scale(${k ?? 1})`;
 }
+/**
+* Invokes `target` methods with arguments from `modifiers`.
+*
+* modifiers: `{ [methodName]: args[] | arg }`
+*
+* @example
+* class X {
+*  a(x: number) {}
+*  b(x: number, y: string) {}
+*  c(x: string[]) {}
+*  d() {}
+*  e = 'foo'
+* }
+*
+* applyModifiers(new X(), {
+*  a: 1, // ok (single arg as-is)
+*  a: [1], // ok (single arg wrapped)
+*  b: [1, 'foo'], // ok (tuple for 2 args)
+*  c: [['foo', 'bar']], // ok (array-arg must be wrapped)
+*  c: ['foo', 'bar'],  // error (single array-arg must be wrapped into array)
+*  d: [], // error (d has no args, excluded)
+*  e: 'foo' // error (e is not a function, excluded)
+* })
+*/
+function applyModifiers(target, modifiers) {
+	if (!modifiers) return;
+	for (const methodName of Object.keys(modifiers)) {
+		const methodArgs = modifiers[methodName];
+		if (!isDefined(methodArgs)) continue;
+		const fn = target[methodName];
+		if (!isFunction(fn)) continue;
+		const normalizedArgs = Array.isArray(methodArgs) ? methodArgs : [methodArgs];
+		fn.apply(target, normalizedArgs);
+	}
+}
 
 //#endregion
 //#region src/lib/feature.ts
@@ -55,21 +87,10 @@ function getFeatureKey(feature$1, idKey = "id", index) {
 */
 function makeProjection({ width, height, config, projection, geoJson }) {
 	const mapProjection = projection();
-	if (config?.center) {
-		const [cx, cy] = config.center;
-		if (isNumber(cx) && isNumber(cy)) mapProjection.center([cx, cy]);
-	}
-	if (config?.rotate) {
-		const [rx, ry, rz] = config.rotate;
-		if (isNumber(rx) && isNumber(ry)) mapProjection.rotate([
-			rx,
-			ry,
-			isNumber(rz) ? rz : 0
-		]);
-	}
-	if (config && isNumber(config.scale)) mapProjection.scale(config.scale);
-	if (geoJson) mapProjection.fitSize([width, height], geoJson);
-	else mapProjection.translate([width / 2, height / 2]);
+	if (!geoJson) {
+		if (!config?.translate) mapProjection.translate([width / 2, height / 2]);
+	} else if (!config?.fitSize) mapProjection.fitSize([width, height], geoJson);
+	applyModifiers(mapProjection, config);
 	return mapProjection;
 }
 /**
@@ -186,33 +207,18 @@ const ZOOM_DEFAULTS = {
 	center: [0, 0],
 	zoom: 1,
 	minZoom: 1,
-	maxZoom: 8,
-	extent: [[0, 0], [0, 0]]
+	maxZoom: 8
 };
-function getDefaultTranslateExtent(context) {
-	return [[0, 0], [context?.width ?? 0, context?.height ?? 0]];
-}
-function createZoomTransform(center, zoomLevel) {
-	return zoomIdentity.translate(...center).scale(zoomLevel);
-}
-function createZoomConfig(options) {
-	return {
-		scaleExtent: [options.minZoom ?? ZOOM_DEFAULTS.minZoom, options.maxZoom ?? ZOOM_DEFAULTS.maxZoom],
-		translateExtent: options.translateExtent ?? ZOOM_DEFAULTS.extent
-	};
-}
 function createZoomBehavior(context, options = {}) {
 	const behavior = zoom();
-	const config = createZoomConfig({
-		minZoom: options.minZoom,
-		maxZoom: options.maxZoom,
-		translateExtent: options.translateExtent ?? getDefaultTranslateExtent(context)
-	});
-	behavior.scaleExtent(config.scaleExtent).translateExtent(config.translateExtent);
+	const minZoom = options.minZoom ?? ZOOM_DEFAULTS.minZoom;
+	const maxZoom = options.maxZoom ?? ZOOM_DEFAULTS.maxZoom;
+	const translateExtent = [[0, 0], [context?.width ?? 0, context?.height ?? 0]];
+	behavior.scaleExtent([minZoom, maxZoom]).translateExtent(translateExtent);
 	if (options.onZoomStart) behavior.on("start", options.onZoomStart);
 	if (options.onZoom) behavior.on("zoom", options.onZoom);
 	if (options.onZoomEnd) behavior.on("end", options.onZoomEnd);
-	applyZoomModifiers(behavior, options.modifiers);
+	applyModifiers(behavior, options.config);
 	return behavior;
 }
 function attachZoomBehavior(element, behavior) {
@@ -228,7 +234,7 @@ function applyZoomBehaviorTransform(element, behavior, transform) {
 function applyZoomTransform(options) {
 	const center = options.center ?? ZOOM_DEFAULTS.center;
 	const zoom$1 = options.zoom ?? ZOOM_DEFAULTS.zoom;
-	applyZoomBehaviorTransform(options.element, options.behavior, createZoomTransform(center, zoom$1));
+	applyZoomBehaviorTransform(options.element, options.behavior, zoomIdentity.translate(...center).scale(zoom$1));
 }
 function setupZoom(options) {
 	attachZoomBehavior(options.element, options.behavior);
@@ -247,16 +253,6 @@ function getInverseZoomScale(source, fallback = 1) {
 function isZoomTransform(value) {
 	return Boolean(value && isNumber(value.k) && isNumber(value.x) && isNumber(value.y));
 }
-function applyZoomModifiers(behavior, modifiers) {
-	if (!modifiers) return;
-	for (const [methodName, methodArgs] of Object.entries(modifiers)) {
-		if (!methodName || methodArgs === void 0) continue;
-		const modifier = behavior[methodName];
-		if (typeof modifier !== "function") continue;
-		const normalizedArgs = Array.isArray(methodArgs) ? methodArgs : [methodArgs];
-		modifier.apply(behavior, normalizedArgs);
-	}
-}
 function getSvgElement(element) {
 	if (!element) return null;
 	if (element instanceof SVGSVGElement) return element;
@@ -264,4 +260,4 @@ function getSvgElement(element) {
 }
 
 //#endregion
-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 };
+export { ZOOM_DEFAULTS, applyModifiers, applyZoomBehaviorTransform, applyZoomTransform, attachZoomBehavior, createZoomBehavior, 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",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "private": false,
   "description": "Framework-agnostic core utilities for building reactive D3 maps",
   "author": "Georgii Bukharov <souljorje@gmail.com>",
@@ -52,6 +52,7 @@
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
+    "typecheck:test": "tsc -p tsconfig.test.json --noEmit",
     "build": "pnpm run typecheck && tsdown",
     "dev": "tsdown --watch",
     "test": "vitest run",