From 92cb34b719b481faf417760f307241e8f6d777a9 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Fri, 2 Jul 2021 22:59:56 +0200 Subject: viewer: types normalization - tag.d.ts GitHub: closes #301 --- viewer/src/services/indexfactory.ts | 29 +++++++++++++++-------------- viewer/src/services/indexsearch.ts | 13 +++++++------ 2 files changed, 22 insertions(+), 20 deletions(-) (limited to 'viewer/src/services') diff --git a/viewer/src/services/indexfactory.ts b/viewer/src/services/indexfactory.ts index 0c5fdc5..691a765 100644 --- a/viewer/src/services/indexfactory.ts +++ b/viewer/src/services/indexfactory.ts @@ -20,17 +20,18 @@ import { Item, RawTag } from "@/@types/gallery"; import { ItemType } from "@/@types/ItemType"; import { Operation } from "@/@types/Operation"; +import { TagCategory, TagIndex, TagNode, TagSearch } from "@/@types/tag"; import Navigation from "@/services/navigation"; export default class IndexFactory { - public static generateTags(root: Item | null): Tag.Index { - const tagsIndex: Tag.Index = {}; + public static generateTags(root: Item | null): TagIndex { + const tagsIndex: TagIndex = {}; if (root) IndexFactory.pushTagsForItem(tagsIndex, root); return tagsIndex; } // Pushes all tags for a root item (and its children) to the index - private static pushTagsForItem(tagsIndex: Tag.Index, item: Item): void { + private static pushTagsForItem(tagsIndex: TagIndex, item: Item): void { if (item.properties.type === ItemType.DIRECTORY) { item.properties.items.forEach(item => this.pushTagsForItem(tagsIndex, item)); return; // Directories are not indexed @@ -50,7 +51,7 @@ export default class IndexFactory { } } - private static pushPartToIndex(index: Tag.Node, part: string, item: Item, rootPart: boolean): Tag.Node { + private static pushPartToIndex(index: TagNode, part: string, item: Item, rootPart: boolean): TagNode { if (!index) index = { tag: part, @@ -69,8 +70,8 @@ export default class IndexFactory { // --- - public static searchTags(tagsIndex: Tag.Index, filter: string, strict: boolean): Tag.Search[] { - let search: Tag.Search[] = []; + public static searchTags(tagsIndex: TagIndex, filter: string, strict: boolean): TagSearch[] { + let search: TagSearch[] = []; if (tagsIndex && filter) { const operation = IndexFactory.extractOperation(filter); if (operation !== Operation.INTERSECTION) filter = filter.slice(1); @@ -96,12 +97,12 @@ export default class IndexFactory { } private static searchTagsFromFilterWithCategory( - tagsIndex: Tag.Index, + tagsIndex: TagIndex, operation: Operation, category: string, disambiguation: string, strict: boolean - ): Tag.Search[] { + ): TagSearch[] { category = Navigation.normalize(category); disambiguation = Navigation.normalize(disambiguation); return Object.values(tagsIndex) @@ -114,28 +115,28 @@ export default class IndexFactory { } private static searchTagsFromFilter( - tagsIndex: Tag.Index, + tagsIndex: TagIndex, operation: Operation, filter: string, strict: boolean - ): Tag.Search[] { + ): TagSearch[] { filter = Navigation.normalize(filter); return Object.values(tagsIndex) .filter(node => IndexFactory.matches(node, filter, strict)) .map(node => ({ ...node, operation, display: `${operation}${node.tag}` })); } - private static matches(node: Tag.Node, filter: string, strict: boolean): boolean { + private static matches(node: TagNode, filter: string, strict: boolean): boolean { if (strict) return node.tagfiltered === filter; return node.tagfiltered.includes(filter); } // --- - public static generateCategories(tagsIndex: Tag.Index, categoryTags?: RawTag[]): Tag.Category[] { + public static generateCategories(tagsIndex: TagIndex, categoryTags?: RawTag[]): TagCategory[] { if (!categoryTags?.length) return [{ tag: "", index: tagsIndex }]; - const tagsCategories: Tag.Category[] = []; + const tagsCategories: TagCategory[] = []; const tagsRemaining = new Map(Object.entries(tagsIndex)); categoryTags .map(tag => ({ tag, index: tagsIndex[tag]?.children })) @@ -150,7 +151,7 @@ export default class IndexFactory { return tagsCategories; } - private static isDiscriminantTagOnly(tags: RawTag[], node: Tag.Node): boolean { + private static isDiscriminantTagOnly(tags: RawTag[], node: TagNode): boolean { return !tags.includes(node.tag) || !node.childPart; } } diff --git a/viewer/src/services/indexsearch.ts b/viewer/src/services/indexsearch.ts index eda1b27..57bd03c 100644 --- a/viewer/src/services/indexsearch.ts +++ b/viewer/src/services/indexsearch.ts @@ -19,25 +19,26 @@ import { Item } from "@/@types/gallery"; import { Operation } from "@/@types/Operation"; +import { TagSearch, TagSearchByOperation } from "@/@types/tag"; export default class IndexSearch { // Results of the search (by tags) - public static search(searchTags: Tag.Search[]): Item[] { + public static search(searchTags: TagSearch[]): Item[] { const byOperation = this.extractTagsByOperation(searchTags); const intersection = this.extractIntersection(byOperation); const substraction = this.extractSubstraction(byOperation); return this.aggregateAll(byOperation, intersection, substraction); } - private static extractTagsByOperation(searchTags: Tag.Search[]): Tag.SearchByOperation { - const byOperation: Tag.SearchByOperation = {}; + private static extractTagsByOperation(searchTags: TagSearch[]): TagSearchByOperation { + const byOperation: TagSearchByOperation = {}; Object.values(Operation).forEach( operation => (byOperation[operation] = searchTags.filter(tag => tag.operation === operation)) ); return byOperation; } - private static extractIntersection(byOperation: Tag.SearchByOperation): Set { + private static extractIntersection(byOperation: TagSearchByOperation): Set { const intersection = new Set(); if (byOperation[Operation.INTERSECTION].length > 0) { byOperation[Operation.INTERSECTION] @@ -49,7 +50,7 @@ export default class IndexSearch { return intersection; } - private static extractSubstraction(byOperation: Tag.SearchByOperation): Set { + private static extractSubstraction(byOperation: TagSearchByOperation): Set { const substraction = new Set(); if (byOperation[Operation.SUBSTRACTION].length > 0) { byOperation[Operation.SUBSTRACTION].flatMap(tag => tag.items).forEach(item => substraction.add(item)); @@ -58,7 +59,7 @@ export default class IndexSearch { } private static aggregateAll( - byOperation: Tag.SearchByOperation, + byOperation: TagSearchByOperation, intersection: Set, substraction: Set ): Item[] { -- cgit v1.2.3