@mapcreator/api 5.1.0 → 5.2.0

package/src/README.md

@@ -1,126 +1,126 @@
-### Used type system
-
-We use type declarations for both the data coming over the wire and the data used by the application. In general, these types differ only in the presence of additional fields in the data arriving over the network (like `created_at`), and used naming convention. Data over the network uses the so-called snake case.
-
-All in all, we can use TypeScript's native mechanisms to convert one type to another and fully define just one type:
-
-```typescript
-import type { CamelCasedProperties } from 'type-fest';
-
-type ApiType =
-  | ({
-      data: {
-        prop: unknown;
-      } & ApiCommonData;
-    } & Omit<ApiSuccess, 'data'>)
-  | ApiError;
-
-type AppType = CamelCasedProperties<Omit<Exclude<ApiType, ApiError>['data'], keyof ApiCommonData>>;
-```
-
-or in reverse order:
-
-```typescript
-import type { SnakeCasedProperties } from 'type-fest';
-
-type AppType = {
-  prop: unknown;
-};
-
-type ApiType =
-  | ({
-      data: SnakeCasedProperties<AppType> & ApiCommonData;
-    } & Omit<ApiSuccess, 'data'>)
-  | ApiError;
-```
-
-But the decision was made not to do this, since it may be more difficult for the developer to make the conversion in their head than to see it in front of their eyes.
-
-### Using a `request()`
-
-The function has the following signature:
-
-```typescript
-async function request<I extends ApiCommon, O extends Record<string, unknown> | string>(
-  path: string,
-  body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null,
-  extraHeaders?: Record<string, string> | null,
-  extraOptions?: ExtraOptions<I, O>,
-): Promise<O | O[]> { /* ... */ }
-```
-
-Let's take it step by step.
-
-`I extends ApiCommon` - represents the type of data we receive over the network.
-
-`O extends Record<string, unknown> | string` - represents the data type that will be used in the application.
-
-Ideally you should describe and convey both types. This will help to check the data types in the arguments passed.
-See current data types for an example.
-
-`path: string` - the path to the resource, must include the API version, but must not include the schema or authority.
-Example: `/v1/jobs/12345`
-
-`body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null` - any meaningful body type. In general,
-the presence of an JSON object is assumed (or the absence of one for methods that only request data), but you can
-also pass `Blob`, `FormData`, `URLSearchParams` or just `ArrayBuffer`. The required content type will be added to
-the headers automatically.
-
-`extraHeaders?: Record<string, string> | null` - the object with additional headers.
-
-`extraOptions?: ExtraOptions<I, O>` - where `ExtraOptions<I, O>` is defined like this:
-
-```typescript
-interface ExtraOptions<I extends ApiCommon, O extends Record<string, unknown> | string> {
-  method?: 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-  revivers?: O extends Record<string, unknown> ? Revivers<I, O> : never;
-  sendNull?: boolean;
-  withMeta?: boolean;
-}
-```
-
-Most fields are self-explanatory.
-
-`sendNull` can be used if you really want to pass `null` as body content.
-
-`revivers` is used to specify an object that can modify the behavior of the internal handler of data coming over
-the network. Let's take a closer look at this moment.
-
-#### Revivers
-
-By default, the `request()` function does the following things with data coming over the network:
-
-- It removes `created_at`, `updated_at`, `deleted_at` fields from the output objects.
-- It preserves all the remaining fields but converts their names into camelCase.
-
-When passing an object with revivers you can a couple of things:
-
-- You can list the fields that you want **to exclude** from the result object. To do this, the field must be assigned an
-`undefined` value.
-- You can **add** new fields or **modify** the type of existing ones. To do this, you need to pass a function as a field
-value, which will receive the original object as input.
-
-Example:
-
-```typescript
-const jobRevivers: Revivers<ApiJob, Job> = {
-  user_id: undefined,
-  description: undefined,
-  share_token: undefined,
-  autosave_preview_path: undefined,
-  job_folder_id: undefined,
-
-  jobTypeId: () => 9,
-  createdAt: (data: ApiJobData) => data.created_at as string,
-  previewPath: (data: ApiJobData) => data.autosave_preview_path ?? undefined,
-};
-```
-
-`user_id`, `description`, `share_token`, `autosave_preview_path`, `job_folder_id` fields will be excluded from the
-result object.
-
-`jobTypeId` will be always **9**.
-
-`createdAt` will be returned (please note that that field is excluded by default)
-
-`previewPath` - some actions will be performed with the source data.
+### Used type system
+
+We use type declarations for both the data coming over the wire and the data used by the application. In general, these types differ only in the presence of additional fields in the data arriving over the network (like `created_at`), and used naming convention. Data over the network uses the so-called snake case.
+
+All in all, we can use TypeScript's native mechanisms to convert one type to another and fully define just one type:
+
+```typescript
+import type { CamelCasedProperties } from 'type-fest';
+
+type ApiType =
+  | ({
+      data: {
+        prop: unknown;
+      } & ApiCommonData;
+    } & Omit<ApiSuccess, 'data'>)
+  | ApiError;
+
+type AppType = CamelCasedProperties<Omit<Exclude<ApiType, ApiError>['data'], keyof ApiCommonData>>;
+```
+
+or in reverse order:
+
+```typescript
+import type { SnakeCasedProperties } from 'type-fest';
+
+type AppType = {
+  prop: unknown;
+};
+
+type ApiType =
+  | ({
+      data: SnakeCasedProperties<AppType> & ApiCommonData;
+    } & Omit<ApiSuccess, 'data'>)
+  | ApiError;
+```
+
+But the decision was made not to do this, since it may be more difficult for the developer to make the conversion in their head than to see it in front of their eyes.
+
+### Using a `request()`
+
+The function has the following signature:
+
+```typescript
+async function request<I extends ApiCommon, O extends Record<string, unknown> | string>(
+  path: string,
+  body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null,
+  extraHeaders?: Record<string, string> | null,
+  extraOptions?: ExtraOptions<I, O>,
+): Promise<O | O[]> { /* ... */ }
+```
+
+Let's take it step by step.
+
+`I extends ApiCommon` - represents the type of data we receive over the network.
+
+`O extends Record<string, unknown> | string` - represents the data type that will be used in the application.
+
+Ideally you should describe and convey both types. This will help to check the data types in the arguments passed.
+See current data types for an example.
+
+`path: string` - the path to the resource, must include the API version, but must not include the schema or authority.
+Example: `/v1/jobs/12345`
+
+`body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null` - any meaningful body type. In general,
+the presence of an JSON object is assumed (or the absence of one for methods that only request data), but you can
+also pass `Blob`, `FormData`, `URLSearchParams` or just `ArrayBuffer`. The required content type will be added to
+the headers automatically.
+
+`extraHeaders?: Record<string, string> | null` - the object with additional headers.
+
+`extraOptions?: ExtraOptions<I, O>` - where `ExtraOptions<I, O>` is defined like this:
+
+```typescript
+interface ExtraOptions<I extends ApiCommon, O extends Record<string, unknown> | string> {
+  method?: 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+  revivers?: O extends Record<string, unknown> ? Revivers<I, O> : never;
+  sendNull?: boolean;
+  withMeta?: boolean;
+}
+```
+
+Most fields are self-explanatory.
+
+`sendNull` can be used if you really want to pass `null` as body content.
+
+`revivers` is used to specify an object that can modify the behavior of the internal handler of data coming over
+the network. Let's take a closer look at this moment.
+
+#### Revivers
+
+By default, the `request()` function does the following things with data coming over the network:
+
+- It removes `created_at`, `updated_at`, `deleted_at` fields from the output objects.
+- It preserves all the remaining fields but converts their names into camelCase.
+
+When passing an object with revivers you can a couple of things:
+
+- You can list the fields that you want **to exclude** from the result object. To do this, the field must be assigned an
+`undefined` value.
+- You can **add** new fields or **modify** the type of existing ones. To do this, you need to pass a function as a field
+value, which will receive the original object as input.
+
+Example:
+
+```typescript
+const jobRevivers: Revivers<ApiJob, Job> = {
+  user_id: undefined,
+  description: undefined,
+  share_token: undefined,
+  autosave_preview_path: undefined,
+  job_folder_id: undefined,
+
+  jobTypeId: () => 9,
+  createdAt: (data: ApiJobData) => data.created_at as string,
+  previewPath: (data: ApiJobData) => data.autosave_preview_path ?? undefined,
+};
+```
+
+`user_id`, `description`, `share_token`, `autosave_preview_path`, `job_folder_id` fields will be excluded from the
+result object.
+
+`jobTypeId` will be always **9**.
+
+`createdAt` will be returned (please note that that field is excluded by default)
+
+`previewPath` - some actions will be performed with the source data.

package/src/api/choropleth.ts

@@ -10,6 +10,8 @@ export const boundingBoxRevivers: Revivers<
   boundingBox: (data: { bounding_box: string }) => JSON.parse(data.bounding_box) as Polygon,
 };
 
+export type SAGALanguage = 'en' | 'da' | 'nl' | 'fi' | 'fr' | 'de' | 'it' | 'no' | 'pl' | 'pt' | 'es' | 'sv' | 'ja' | 'zh' | 'ru' | 'uk' | 'lv' | 'kk' | '';
+
 export type ApiSearchPoint = {
   lat: number;
   lng: number;
@@ -30,12 +32,10 @@ type SingleOrGroupedAreaBase = {
   boundingBox: Polygon;
 };
 
-// TODO don't export this once search on click is out
 export type GroupedArea = SingleOrGroupedAreaBase & {
   isGroup: true;
 };
 
-// TODO don't export this once search on click is out
 export type SingleArea = SingleOrGroupedAreaBase & {
   isGroup: false;
   properties: Record<string, string>;
@@ -44,70 +44,100 @@ export type SingleArea = SingleOrGroupedAreaBase & {
   featureId: number;
 };
 
-export type SingleOrGroupedArea = {
-  id: number;
-  title: string;
-  subtitle: string;
-  svgPreview: string;
-  boundingBox: Polygon;
-  isGroup: boolean;
-  properties: Record<string, string> | null;
-  vectorSource: string | null;
-  sourceLayer: string | null;
-  featureId: number | null;
-};
+type ApiSingleArea = {
+  data: {
+    id: number;
+    title: string;
+    subtitle: string;
+    svg_preview: string;
+    bounding_box: string;
+    is_group: false;
+    properties: string;
+    vector_source: string;
+    source_layer: string;
+    feature_id: number;
+  };
+} & Omit<ApiSuccess, 'data'> | ApiError;
+
+export type ApiSingleAreaData = Flatten<Exclude<ApiSingleArea, ApiError>['data']>;
+
+export type ApiSingleAreaArray = {
+  data: ApiSingleAreaData[];
+} & Omit<ApiSuccess, 'data'> | ApiError;
 
-export type ApiSingleOrGroupedArea = {
+type ApiGroupedArea = {
   data: {
     id: number;
     title: string;
     subtitle: string;
     svg_preview: string;
     bounding_box: string;
-    is_group: boolean;
-    properties: string | null;
-    vector_source: string | null;
-    source_layer: string | null;
-    feature_id: number | null;
+    is_group: true;
+    properties: null;
+    vector_source: null;
+    source_layer: null;
+    feature_id: null;
   };
 } & Omit<ApiSuccess, 'data'> | ApiError;
 
-export type ApiSingleOrGroupedAreaData = Flatten<Exclude<ApiSingleOrGroupedArea, ApiError>['data']>;
+export type ApiGroupedAreaData = Flatten<Exclude<ApiGroupedArea, ApiError>['data']>;
+
+export type ApiGroupedAreaArray = {
+  data: ApiGroupedAreaData[];
+} & Omit<ApiSuccess, 'data'> | ApiError;
+
+export const singleAreaRevivers: Revivers<ApiSingleArea, SingleArea> = {
+  ...boundingBoxRevivers,
+  properties: (data: ApiSingleAreaData) =>
+    JSON.parse(data.properties) as Record<string, string>,
+};
 
-export const singleOrGroupedAreaRevivers: Revivers<ApiSingleOrGroupedArea, SingleOrGroupedArea> = {
+export const groupedAreaRevivers: Revivers<ApiGroupedArea, GroupedArea> = {
   ...boundingBoxRevivers,
-  properties: (data: ApiSingleOrGroupedAreaData) =>
-    (data.properties != null ? JSON.parse(data.properties) as Record<string, string> : null),
 };
 
-/**
- * TODO When SAGA search on click is implemented, remove mode and make searchBounds required
- */
-export async function searchSingleOrGroupedAreas(
-  language: string,
+export async function searchSingleAreas(
+  language: SAGALanguage,
   search: RequireAtLeastOne<{
-    searchBounds?: ApiSearchBounds;
+    searchBounds: ApiSearchBounds;
     query?: string;
     searchPoint?: ApiSearchPoint;
   }>,
-  mode: 'polygon' | 'group' | 'both' = 'both',
-): Promise<SingleOrGroupedArea[]> {
+): Promise<SingleArea[]> {
   const pathname = '/v1/choropleth/polygons/search';
   const query = getSearchParams({
     language,
     ...search.searchBounds,
     ...(search.query && { query: search.query }),
     ...(search.searchPoint && { point: search.searchPoint }),
-    mode,
+    mode: 'polygon',
   });
   const path = `${pathname}?${query}`;
-  const options = { revivers: singleOrGroupedAreaRevivers };
+  const options = { revivers: singleAreaRevivers };
 
-  type ApiSingleOrGroupedAreaArray = {
-    data: ApiSingleOrGroupedAreaData[];
-  } & Omit<ApiSuccess, 'data'> | ApiError;
+  return request<ApiSingleAreaArray, SingleArea>(path, null, null, options);
+}
+
+export async function searchGroupedAreas(
+  language: SAGALanguage,
+  search: RequireAtLeastOne<{
+    searchBounds: ApiSearchBounds;
+    query?: string;
+    searchPoint?: ApiSearchPoint;
+  }>,
+): Promise<GroupedArea[]> {
+  const pathname = '/v1/choropleth/polygons/search';
+  const query = getSearchParams({
+    language,
+    ...search.searchBounds,
+    ...(search.query && { query: search.query }),
+    ...(search.searchPoint && { point: search.searchPoint }),
+    mode: 'group',
+  });
+  const path = `${pathname}?${query}`;
+  const options = { revivers: groupedAreaRevivers };
 
-  return request<ApiSingleOrGroupedAreaArray, SingleOrGroupedArea>(path, null, null, options);
+  return request<ApiGroupedAreaArray, GroupedArea>(path, null, null, options);
 }
 
 export type GroupedAreaChild = {
@@ -139,7 +169,7 @@ export const groupedAreaChildRevivers: Revivers<ApiGroupedAreaChild, GroupedArea
   properties: (data: ApiGroupedAreaChildData) => JSON.parse(data.properties) as Record<string, string>,
 };
 
-export async function groupedAreaChildren(groupId: number, language: string): Promise<GroupedAreaChild[]> {
+export async function groupedAreaChildren(groupId: number, language: SAGALanguage): Promise<GroupedAreaChild[]> {
   const pathname = `/v1/choropleth/groups/${groupId}/children-optimized`;
   const query = getSearchParams({ language });
   const path = `${pathname}?${query}`;
@@ -178,7 +208,7 @@ export type ApiMatchedGroupData = Flatten<Exclude<ApiMatchedGroup, ApiError>['da
 
 export async function getGroupsByDataSample(
   sample: Record<string, string[]>,
-  language: string,
+  language: SAGALanguage,
   rowCount: number,
 ): Promise<MatchedGroup[]> {
   const path = `/v1/choropleth/groups/sample`;
@@ -215,7 +245,7 @@ export async function getBoundPolygons(
   groupId: number,
   property: string,
   data: string[],
-  language: string,
+  language: SAGALanguage,
 ): Promise<BoundPolygon[]> {
   const path = `/v1/choropleth/groups/bind`;
   const body = { group_id: groupId, property, data, language };

package/src/api/resources.ts

@@ -6,19 +6,18 @@ import { type ApiDimensionData, type Dimension, dimensionRevivers } from './dime
 import { type ApiFeatureData, type Feature, featureRevivers } from './feature.js';
 import { type ApiJobTypeData, type JobType, jobTypeRevivers } from './jobType.js';
 import { type ApiMessageData, type Message, messageRevivers } from './message.js';
-import { type ApiSvg, type ApiSvgData, type Svg, svgRevivers } from './svg.js';
 import { type ApiSvgSetData, type SvgSet, svgSetRevivers } from './svgSet.js';
 import { type ApiLayerData, type Layer, layerRevivers } from './layer.js';
 import { type ApiColorData, type Color, colorRevivers } from './color.js';
 import { type ApiUserData, type User, userRevivers } from './user.js';
 import { type ApiFontData, type Font, fontRevivers } from './font.js';
+import { type ApiSvgData, type Svg, svgRevivers } from './svg.js';
 import type { CamelCasedProperties } from 'type-fest';
 import {
   type ApiCommon,
   type ApiCommonData,
   type ApiError,
   type ApiSuccess,
-  type Revivers,
   getContext,
   myUser,
   processData,
@@ -112,11 +111,6 @@ export async function loadResources(): Promise<Resources> {
 
   allMessages.sort((m1, m2) => m2.date.localeCompare(m1.date));
 
-  const mcSvgRevivers: Revivers<ApiSvg, Svg> = {
-    ...svgRevivers,
-    name: (data: ApiSvgData) => `mc-image-${data.name}`,
-  };
-
   return {
     // @ts-expect-error TS2345
     user: processData.call(getContext(userRevivers), user) as User,
@@ -127,7 +121,7 @@ export async function loadResources(): Promise<Resources> {
       feature => feature.name,
     ) as CustomFeature[],
     colors: raw.colors.map(processData, getContext(colorRevivers)) as Color[],
-    svgs: raw.svgs.map(processData, getContext(mcSvgRevivers)) as Svg[],
+    svgs: raw.svgs.map(processData, getContext(svgRevivers)) as Svg[],
     dimensions: raw.dimensions.map(processData, getContext(dimensionRevivers)) as Dimension[],
     dimensionSets: raw.dimensionSets.map(processData, getContext(dimensionSetRevivers)) as DimensionSet[],
     mapstyleSets: raw.mapstyleSets.map(processData, getContext(mapstyleSetRevivers)) as MapstyleSet[],