@omerlo/omerlo-webkit 0.0.24 → 0.0.25

package/dist/omerlo/index.d.ts

@@ -26,6 +26,7 @@ export declare const useReader: (f: typeof fetch) => {
     listMenus: (params?: Partial<import("./reader/utils/api").PagingParams>) => Promise<import("./reader/utils/api").ApiResponse<import("./reader").MenuSummary[]>>;
     getMedia: () => Promise<import("./reader/utils/api").ApiResponse<import("./reader").Media>>;
     getMediaSection: (id: string) => Promise<import("./reader/utils/api").ApiResponse<import("./reader").MediaSection>>;
+    getMediaBlock: (id: string) => Promise<import("./reader/utils/api").ApiResponse<import("./reader").MediaBlock>>;
     getContent: (id: string) => Promise<import("./reader/utils/api").ApiResponse<import("./reader").Content>>;
     listContents: (params?: Partial<import("./reader/utils/api").PagingParams>) => Promise<import("./reader/utils/api").ApiResponse<import("./reader").ContentSummary[]>>;
     listCategories: (params?: Partial<import("./reader/utils/api").PagingParams>) => Promise<import("./reader/utils/api").ApiResponse<import("./reader").Category[]>>;

package/dist/omerlo/reader/endpoints/media.d.ts

@@ -2,12 +2,15 @@ import type { ApiAssocs } from '../utils/api';
 import type { ApiData } from '../utils/api';
 import type { LocalesMetadata } from '../utils/response';
 import { type Visual } from './visuals';
+import type { ContentSummary } from './contents';
 export declare const mediaFetchers: (f: typeof fetch) => {
     getMedia: () => Promise<import("../utils/api").ApiResponse<Media>>;
     getMediaSection: (id: string) => Promise<import("../utils/api").ApiResponse<MediaSection>>;
+    getMediaBlock: (id: string) => Promise<import("../utils/api").ApiResponse<MediaBlock>>;
 };
 export declare function getMedia(f: typeof fetch): () => Promise<import("../utils/api").ApiResponse<Media>>;
 export declare function getMediaSection(f: typeof fetch): (id: string) => Promise<import("../utils/api").ApiResponse<MediaSection>>;
+export declare function getMediaBlock(f: typeof fetch): (id: string) => Promise<import("../utils/api").ApiResponse<MediaBlock>>;
 export interface Media {
     id: string;
     displayName: string | null;
@@ -17,7 +20,7 @@ export interface Media {
     name: string;
     key: string;
     contact: MediaContact | null;
-    sections: MediaSectionSummary[];
+    sections: MediaSectionHierarchy[];
     metadata: Record<string, string>;
     updatedAt: Date;
 }
@@ -45,32 +48,43 @@ export interface MediaSectionSummary {
     color: string;
     updatedAt: Date;
 }
+export interface MediaSectionHierarchy extends MediaSectionSummary {
+    sections: MediaSectionSummary[];
+}
 export interface MediaSection extends MediaSectionSummary {
     description: string | null;
-    parentId: string | null;
     advertisingKey: string | null;
+    sections: MediaSectionSummary[];
     blocks: MediaBlockSummary[];
 }
 export interface MediaBlockConfigurationSummary {
-    id: string;
-    blockType: 'content' | 'distribution' | 'html' | 'media' | 'most_popular' | 'section';
-    name: string;
+    type: 'content' | 'distribution' | 'html' | 'media' | 'most_popular' | 'section';
     key: string;
 }
 export interface MediaBlockSummary {
     id: string;
-    configuration: MediaBlockConfigurationSummary;
-    name: string;
+}
+export interface MediaBlock extends MediaBlockSummary {
+    name: string | null;
     description: string | null;
-    html: string | null;
     visual: Visual | null;
+    html: string | null;
+    metadata: {
+        [key: string]: string;
+    };
     meta: {
         locales: LocalesMetadata;
     };
     textColor: string | null;
-    backgroundColor: string | null;
-    backgroundSVG: string | null;
+    backgroundColor: '#f4f4f4';
+    backgroundSvg: null;
+    configuration: MediaBlockConfigurationSummary;
+    entries: MediaBlockEntry[];
     updatedAt: Date;
 }
+export interface MediaBlockEntry {
+    contents: ContentSummary[];
+    section: MediaSectionSummary | null;
+}
 export declare function parseMedia(data: ApiData, assocs: ApiAssocs): Media;
 export declare function parseMediaBlockConfiguration(data: ApiData): MediaBlockConfigurationSummary;

package/dist/omerlo/reader/endpoints/media.js

@@ -1,23 +1,31 @@
-import { request, requestPublisher } from '../utils/request';
+import { requestPublisher } from '../utils/request';
 import { parseVisual } from './visuals';
 import { buildMeta } from '../utils/parseHelpers';
-import { getAssoc } from '../utils/assocs';
+import { getAssocs } from '../utils/assocs';
 export const mediaFetchers = (f) => {
     return {
         getMedia: getMedia(f),
-        getMediaSection: getMediaSection(f)
+        getMediaSection: getMediaSection(f),
+        getMediaBlock: getMediaBlock(f)
     };
 };
 export function getMedia(f) {
     return async () => {
         const opts = { parser: parseMedia };
+        // NOTE the `/` is REALLY important
         return requestPublisher(f, 'media/', opts);
     };
 }
 export function getMediaSection(f) {
     return async (id) => {
         const opts = { parser: parseSection };
-        return request(f, `media/sections/${id}`, opts);
+        return requestPublisher(f, `/sections/${id}`, opts);
+    };
+}
+export function getMediaBlock(f) {
+    return async (id) => {
+        const opts = { parser: parseBlock };
+        return requestPublisher(f, `/blocks/${id}`, opts);
     };
 }
 export function parseMedia(data, assocs) {
@@ -30,7 +38,7 @@ export function parseMedia(data, assocs) {
         key: data.key,
         contact,
         metadata: data.metadata,
-        sections: data.sections.map((section, assocs) => parseSectionSummary(section, assocs)),
+        sections: data.sections.map((section, assocs) => parseSectionHierarchy(section, assocs)),
         updatedAt: data.updated_at
     };
 }
@@ -50,7 +58,6 @@ function parseMediaContact(data, _assocs) {
 function parseSection(data, assocs) {
     return {
         id: data.id,
-        parentId: data.parent_id,
         name: data.localized.name,
         description: data.localized.description,
         slug: data.localized.slug,
@@ -58,41 +65,62 @@ function parseSection(data, assocs) {
         meta: buildMeta(data.localized.locale),
         color: data.color,
         advertisingKey: data.advertising_key,
+        sections: data.sections.map((section) => parseSectionSummary(section, assocs)),
         blocks: data.blocks.map((block, assocs) => parseBlockSummary(block, assocs)),
         updatedAt: data.updated_at
     };
 }
-function parseSectionSummary(section, assocs) {
+function parseSectionSummary(data, assocs) {
+    return {
+        id: data.id,
+        color: data.color,
+        meta: buildMeta(data.localized.locale),
+        name: data.localized.name,
+        slug: data.localized.slug,
+        visual: parseVisual(data.visual, assocs),
+        updatedAt: data.updated_at
+    };
+}
+function parseSectionHierarchy(data, assocs) {
     return {
-        id: section.id,
-        color: section.color,
-        meta: buildMeta(section.localized.locale),
-        name: section.localized.name,
-        slug: section.localized.slug,
-        visual: parseVisual(section.visual, assocs),
-        updatedAt: section.updated_at
+        ...parseSectionSummary(data, assocs),
+        sections: data.sections.map((section) => parseSectionHierarchy(section, assocs))
     };
 }
 export function parseMediaBlockConfiguration(data) {
     return {
-        id: data.id,
-        blockType: data.block_type,
-        name: data.name,
+        type: data.block_type,
         key: data.key
     };
 }
-function parseBlockSummary(data, assocs) {
+function parseBlockSummary(data, _assocs) {
     return {
-        id: data.localized.id,
-        configuration: getAssoc(assocs, 'media_block_configurations', data.configuration_id),
-        name: data.localized.name,
-        description: data.localized.description,
-        html: data.localized.html,
-        visual: data.localized.visual,
-        meta: buildMeta(data.localized.locale),
-        textColor: data.textColor,
-        backgroundColor: data.backgroundColor,
-        backgroundSVG: data.backgroundSVG,
+        id: data.id
+    };
+}
+function parseBlock(data, assocs) {
+    return {
+        ...parseBlockSummary(data, assocs),
+        name: data.localized?.name,
+        description: data.localized?.description,
+        visual: parseVisual(data.visual, assocs),
+        html: data.localized?.html,
+        metadata: data.metadata,
+        meta: buildMeta(data.localized?.locale),
+        textColor: data.color,
+        backgroundColor: data.background_color,
+        backgroundSvg: data.background_svg,
+        configuration: {
+            type: data.block_type,
+            key: data.configuration_key
+        },
+        entries: data.entries.map((entry) => parseBlockEntry(entry, assocs)),
         updatedAt: data.updatedAt
     };
 }
+function parseBlockEntry(data, assocs) {
+    return {
+        contents: getAssocs(assocs, 'contents', data.content_ids),
+        section: data.section ? parseSectionSummary(data.section, assocs) : null
+    };
+}

package/dist/omerlo/reader/fetchers.d.ts

@@ -26,6 +26,7 @@ export declare const fetchers: (f: typeof fetch) => {
     listMenus: (params?: Partial<import("./utils/api").PagingParams>) => Promise<import("./utils/api").ApiResponse<import("./endpoints/menu").MenuSummary[]>>;
     getMedia: () => Promise<import("./utils/api").ApiResponse<import("./endpoints/media").Media>>;
     getMediaSection: (id: string) => Promise<import("./utils/api").ApiResponse<import("./endpoints/media").MediaSection>>;
+    getMediaBlock: (id: string) => Promise<import("./utils/api").ApiResponse<import("./endpoints/media").MediaBlock>>;
     getContent: (id: string) => Promise<import("./utils/api").ApiResponse<import("./endpoints/contents").Content>>;
     listContents: (params?: Partial<import("./utils/api").PagingParams>) => Promise<import("./utils/api").ApiResponse<import("./endpoints/contents").ContentSummary[]>>;
     listCategories: (params?: Partial<import("./utils/api").PagingParams>) => Promise<import("./utils/api").ApiResponse<import("./endpoints/categories").Category[]>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omerlo/omerlo-webkit",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && npm run package",