fontastic 1.0.0 → 1.0.1

package/app/database/repository/Store.repository.ts

@@ -1,6 +1,7 @@
 import { Brackets, Equal } from 'typeorm';
 import { Store } from '../entity';
 import { searchDbColumns } from '../../config';
+import type { SmartCollectionRule } from '../../types';
 
 export const StoreRepository = {
   async search(options: any) {
@@ -330,6 +331,111 @@ export const StoreRepository = {
       .catch((err: any) => console.log('insert-error', err));
   },
 
+  async evaluateSmartRules(rules: SmartCollectionRule[], matchType: string, options: any = {}) {
+    const db = this.createQueryBuilder();
+
+    const textFields = [
+      'file_name',
+      'file_path',
+      'compatible_full_name',
+      'copyright',
+      'description',
+      'designer',
+      'designer_url',
+      'font_family',
+      'font_subfamily',
+      'full_name',
+      'license',
+      'license_url',
+      'manufacturer',
+      'manufacturer_url',
+      'post_script_name',
+      'preferred_family',
+      'preferred_sub_family',
+      'sample_text',
+      'trademark',
+      'unique_id',
+      'version',
+    ];
+    const booleanFields = ['favorite', 'system', 'installable', 'temporary'];
+    const numericFields = ['file_size'];
+    const dateFields = ['created'];
+
+    if (rules.length > 0) {
+      const conditions: ((qb: any) => void)[] = rules.map((rule, idx) => {
+        const field = `store.${rule.field}`;
+        const paramName = `p${idx}`;
+
+        return (qb: any) => {
+          if (textFields.includes(rule.field)) {
+            const val = String(rule.value).toLowerCase();
+            switch (rule.operator) {
+              case 'contains':
+                qb.where(`LOWER(${field}) LIKE :${paramName}`, { [paramName]: `%${val}%` });
+                break;
+              case 'equals':
+                qb.where(`LOWER(${field}) = :${paramName}`, { [paramName]: val });
+                break;
+              case 'starts_with':
+                qb.where(`LOWER(${field}) LIKE :${paramName}`, { [paramName]: `${val}%` });
+                break;
+              case 'ends_with':
+                qb.where(`LOWER(${field}) LIKE :${paramName}`, { [paramName]: `%${val}` });
+                break;
+              default:
+                qb.where(`LOWER(${field}) LIKE :${paramName}`, { [paramName]: `%${val}%` });
+            }
+          } else if (rule.field === 'file_type') {
+            qb.where(`${field} = :${paramName}`, { [paramName]: rule.value });
+          } else if (booleanFields.includes(rule.field)) {
+            const boolVal = rule.operator === 'is_not' ? 0 : 1;
+            qb.where(`${field} = :${paramName}`, { [paramName]: boolVal });
+          } else if (numericFields.includes(rule.field)) {
+            if (rule.operator === 'greater_than') {
+              qb.where(`${field} > :${paramName}`, { [paramName]: rule.value });
+            } else if (rule.operator === 'less_than') {
+              qb.where(`${field} < :${paramName}`, { [paramName]: rule.value });
+            } else {
+              qb.where(`${field} = :${paramName}`, { [paramName]: rule.value });
+            }
+          } else if (dateFields.includes(rule.field)) {
+            if (rule.operator === 'greater_than') {
+              qb.where(`${field} >= :${paramName}`, { [paramName]: rule.value });
+            } else if (rule.operator === 'less_than') {
+              qb.where(`${field} <= :${paramName}`, { [paramName]: rule.value });
+            } else {
+              qb.where(`${field} = :${paramName}`, { [paramName]: rule.value });
+            }
+          }
+        };
+      });
+
+      const joiner = matchType === 'OR' ? 'orWhere' : 'andWhere';
+      conditions.forEach((condition, i) => {
+        if (i === 0) {
+          db.where(new Brackets(condition));
+        } else {
+          db[joiner](new Brackets(condition));
+        }
+      });
+    }
+
+    if (options.take) {
+      db.limit(options.take);
+    }
+
+    if (options.skip) {
+      db.offset(options.skip);
+    }
+
+    if (options.order && options.order.column) {
+      const direction = options.order.direction === 'DESC' ? 'DESC' : 'ASC';
+      db.orderBy(`store.${options.order.column}`, direction);
+    }
+
+    return await db.getManyAndCount();
+  },
+
   async fetchSystemStats() {
     const rowCount = await this.createQueryBuilder().select('COUNT(*)', 'total').getRawOne();
 

package/app/database/repository/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Collection.repository"), exports);
+__exportStar(require("./SmartCollection.repository"), exports);
 __exportStar(require("./Store.repository"), exports);
 __exportStar(require("./Logger.repository"), exports);
 //# sourceMappingURL=index.js.map

package/app/database/repository/index.ts

@@ -1,3 +1,4 @@
 export * from './Collection.repository';
+export * from './SmartCollection.repository';
 export * from './Store.repository';
-export * from './Logger.repository';
+export * from './Logger.repository';

package/app/enums/ChannelType.js

@@ -58,6 +58,11 @@ var ChannelType;
     ChannelType["IPC_LOGGER_DELETE"] = "IPC_LOGGER_DELETE";
     ChannelType["IPC_LOGGER_QUERY"] = "IPC_LOGGER_QUERY";
     ChannelType["IPC_LOGGER_TRUNCATE"] = "IPC_LOGGER_TRUNCATE";
+    ChannelType["IPC_SMART_COLLECTION_FIND"] = "IPC_SMART_COLLECTION_FIND";
+    ChannelType["IPC_SMART_COLLECTION_CREATE"] = "IPC_SMART_COLLECTION_CREATE";
+    ChannelType["IPC_SMART_COLLECTION_UPDATE"] = "IPC_SMART_COLLECTION_UPDATE";
+    ChannelType["IPC_SMART_COLLECTION_DELETE"] = "IPC_SMART_COLLECTION_DELETE";
+    ChannelType["IPC_SMART_COLLECTION_EVALUATE"] = "IPC_SMART_COLLECTION_EVALUATE";
     ChannelType["IPC_TOGGLE_PANEL"] = "IPC_TOGGLE_PANEL";
 })(ChannelType || (exports.ChannelType = ChannelType = {}));
 //# sourceMappingURL=ChannelType.js.map

package/app/enums/ChannelType.ts

@@ -63,5 +63,11 @@ export enum ChannelType {
   IPC_LOGGER_QUERY = 'IPC_LOGGER_QUERY',
   IPC_LOGGER_TRUNCATE = 'IPC_LOGGER_TRUNCATE',
 
+  IPC_SMART_COLLECTION_FIND = 'IPC_SMART_COLLECTION_FIND',
+  IPC_SMART_COLLECTION_CREATE = 'IPC_SMART_COLLECTION_CREATE',
+  IPC_SMART_COLLECTION_UPDATE = 'IPC_SMART_COLLECTION_UPDATE',
+  IPC_SMART_COLLECTION_DELETE = 'IPC_SMART_COLLECTION_DELETE',
+  IPC_SMART_COLLECTION_EVALUATE = 'IPC_SMART_COLLECTION_EVALUATE',
+
   IPC_TOGGLE_PANEL = 'IPC_TOGGLE_PANEL',
 }

package/app/enums/StorageType.js

@@ -16,5 +16,6 @@ var StorageType;
     StorageType["LayoutPreview"] = "layout.preview";
     StorageType["LayoutTheme"] = "layout.theme";
     StorageType["AiKeys"] = "ai.keys";
+    StorageType["NavigationExpanded"] = "navigation.expanded";
 })(StorageType || (exports.StorageType = StorageType = {}));
 //# sourceMappingURL=StorageType.js.map

package/app/enums/StorageType.ts

@@ -12,4 +12,5 @@ export enum StorageType {
   LayoutPreview = 'layout.preview',
   LayoutTheme = 'layout.theme',
   AiKeys = 'ai.keys',
+  NavigationExpanded = 'navigation.expanded',
 }

package/app/package.json

@@ -5,7 +5,7 @@
     "name": "Tom Shaw",
     "email": ""
   },
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "main.js",
   "private": true,
   "dependencies": {

package/app/types/FontMetrics.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FontMetrics.js.map

package/app/types/SmartCollection.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=SmartCollection.js.map

package/app/types/SmartCollection.ts

@@ -0,0 +1,5 @@
+export interface SmartCollectionRule {
+  field: string;
+  operator: string;
+  value: string | number;
+}

package/app/types/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AppAlert"), exports);
+__exportStar(require("./FontMetrics"), exports);
 __exportStar(require("./AuthUser"), exports);
 __exportStar(require("./Breadcrumb"), exports);
 __exportStar(require("./QueryOptions"), exports);
@@ -22,4 +23,5 @@ __exportStar(require("./SystemTheme"), exports);
 __exportStar(require("./SystemStats"), exports);
 __exportStar(require("./SystemConfig"), exports);
 __exportStar(require("./ImportOptions"), exports);
+__exportStar(require("./SmartCollection"), exports);
 //# sourceMappingURL=index.js.map

package/app/types/index.ts

@@ -7,3 +7,4 @@ export * from './SystemTheme';
 export * from './SystemStats';
 export * from './SystemConfig';
 export * from './ImportOptions';
+export * from './SmartCollection';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontastic",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A gorgeous multi-platform font management application.",
   "homepage": "https://github.com/tomshaw/fontastic",
   "private": false,

package/src/app/core/services/database/database.service.ts

@@ -7,6 +7,7 @@ import type { Collection } from '@main/database/entity/Collection.schema';
 import type { Logger } from '@main/database/entity/Logger.schema';
 import type { Store, StoreManyAndCountType } from '@main/database/entity/Store.schema';
 import type { FontMetrics, SystemStats } from '@main/types';
+import type { SmartCollection } from '@main/database/entity/SmartCollection.schema';
 
 @Injectable({
   providedIn: 'root',
@@ -18,6 +19,8 @@ export class DatabaseService {
 
   // Reactive state
   readonly collections = signal<Collection[]>([]);
+  readonly smartCollections = signal<SmartCollection[]>([]);
+  readonly activeSmartCollectionId = signal<number | null>(null);
   readonly parentId = signal<number | null>(null);
   readonly collectionId = signal<number | null>(null);
   readonly stores = signal<Store[]>([]);
@@ -56,6 +59,7 @@ export class DatabaseService {
     this.collectionId.set(parentId);
     this.activeFilter.set(null);
     this.activeSearchWhere.set(null);
+    this.activeSmartCollectionId.set(null);
     this.currentPage.set(1);
   }
 
@@ -64,6 +68,7 @@ export class DatabaseService {
     this.collectionId.set(child.id);
     this.activeFilter.set(null);
     this.activeSearchWhere.set(null);
+    this.activeSmartCollectionId.set(null);
     this.currentPage.set(1);
   }
 
@@ -78,11 +83,22 @@ export class DatabaseService {
     return current.id;
   }
 
+  selectSmartCollection(id: number) {
+    this.parentId.set(null);
+    this.collectionId.set(null);
+    this.activeFilter.set(null);
+    this.activeSearchWhere.set(null);
+    this.activeSmartCollectionId.set(id);
+    this.currentPage.set(1);
+    this.fetchCurrentPage();
+  }
+
   selectFilter(filter: string) {
     this.parentId.set(null);
     this.collectionId.set(null);
     this.activeFilter.set(filter);
     this.activeSearchWhere.set(null);
+    this.activeSmartCollectionId.set(null);
     this.currentPage.set(1);
 
     const whereMap: Record<string, { key: string; value: number }[]> = {
@@ -122,6 +138,12 @@ export class DatabaseService {
     const skip = (this.currentPage() - 1) * this.pageSize();
     const take = this.pageSize();
 
+    const smartCollectionId = this.activeSmartCollectionId();
+    if (smartCollectionId) {
+      this.smartCollectionEvaluate(smartCollectionId, { skip, take });
+      return;
+    }
+
     const searchWhere = this.activeSearchWhere();
     if (searchWhere) {
       const searchOrder = this.activeSearchOrder();
@@ -150,13 +172,15 @@ export class DatabaseService {
 
   constructor() {
     this.electron.ready.then(async () => {
-      const [collections, savedCollectionId, savedStoreId] = await Promise.all([
+      const [collections, smartCollections, savedCollectionId, savedStoreId] = await Promise.all([
         this.message.collectionFetch({}),
+        this.message.smartCollectionFind(),
         this.message.get(StorageType.CollectionId, null),
         this.message.get(StorageType.StoreId, null),
       ]);
 
       this.collections.set(collections);
+      this.smartCollections.set(smartCollections);
       console.log('System Boot:', collections);
 
       if (savedCollectionId) {
@@ -294,6 +318,50 @@ export class DatabaseService {
     );
   }
 
+  // Smart Collection
+
+  smartCollectionCreate(args: any): Promise<SmartCollection[]> {
+    return this.track(
+      this.message.smartCollectionCreate(args).then((result) => {
+        this.smartCollections.set(result);
+        return result;
+      }),
+    );
+  }
+
+  smartCollectionUpdate(id: number, data: any): Promise<SmartCollection[]> {
+    return this.track(
+      this.message.smartCollectionUpdate(id, data).then((result) => {
+        this.smartCollections.set(result);
+        return result;
+      }),
+    );
+  }
+
+  smartCollectionDelete(id: number): Promise<SmartCollection[]> {
+    return this.track(
+      this.message.smartCollectionDelete(id).then((result) => {
+        this.smartCollections.set(result);
+        if (this.activeSmartCollectionId() === id) {
+          this.activeSmartCollectionId.set(null);
+          this.stores.set([]);
+          this.storeCount.set(0);
+        }
+        return result;
+      }),
+    );
+  }
+
+  smartCollectionEvaluate(id: number, options: any): Promise<StoreManyAndCountType> {
+    return this.track(
+      this.message.smartCollectionEvaluate(id, options).then((result) => {
+        this.stores.set(result[0] as Store[]);
+        this.storeCount.set(result[1] as number);
+        return result;
+      }),
+    );
+  }
+
   // Store
 
   storeFind(args: any): Promise<Store[]> {
@@ -336,6 +404,7 @@ export class DatabaseService {
     this.activeFilter.set(null);
     this.activeSearchWhere.set(where);
     this.activeSearchOrder.set(order ?? null);
+    this.activeSmartCollectionId.set(null);
     this.currentPage.set(1);
     this.fetchCurrentPage();
   }

package/src/app/core/services/message/message.service.ts

@@ -5,6 +5,7 @@ import type { Logger } from '@main/database/entity/Logger.schema';
 import type { Store, StoreManyAndCountType } from '@main/database/entity/Store.schema';
 import { ChannelType } from '@main/enums';
 import type { FontMetrics, SystemConfig, SystemStats } from '@main/types';
+import type { SmartCollection } from '@main/database/entity/SmartCollection.schema';
 
 @Injectable({
   providedIn: 'root',
@@ -213,6 +214,28 @@ export class MessageService {
     return this.invoke<Collection[]>(ChannelType.IPC_COLLECTION_MOVE, { collectionId, newParentId, newIndex });
   }
 
+  // Smart Collection
+
+  smartCollectionFind(): Promise<SmartCollection[]> {
+    return this.invoke<SmartCollection[]>(ChannelType.IPC_SMART_COLLECTION_FIND);
+  }
+
+  smartCollectionCreate(args: any): Promise<SmartCollection[]> {
+    return this.invoke<SmartCollection[]>(ChannelType.IPC_SMART_COLLECTION_CREATE, args);
+  }
+
+  smartCollectionUpdate(id: number, data: any): Promise<SmartCollection[]> {
+    return this.invoke<SmartCollection[]>(ChannelType.IPC_SMART_COLLECTION_UPDATE, { id, data });
+  }
+
+  smartCollectionDelete(id: number): Promise<SmartCollection[]> {
+    return this.invoke<SmartCollection[]>(ChannelType.IPC_SMART_COLLECTION_DELETE, { id });
+  }
+
+  smartCollectionEvaluate(id: number, options: any): Promise<StoreManyAndCountType> {
+    return this.invoke<StoreManyAndCountType>(ChannelType.IPC_SMART_COLLECTION_EVALUATE, { id, ...options });
+  }
+
   // Store
 
   storeFind(args: any): Promise<Store[]> {

package/src/app/core/services/presentation/presentation.service.ts

@@ -41,6 +41,7 @@ export class PresentationService {
       this.loadThemeSettings();
       this.loadLayoutSettings();
       this.loadPreviewSettings();
+      this.loadNavigationExpandedSettings();
       this.listenForMenuToggle();
 
       let themeInitialized = false;
@@ -70,6 +71,15 @@ export class PresentationService {
         panelInitialized = true;
       });
 
+      let navExpandedInitialized = false;
+      effect(() => {
+        const ids = this.navigationExpandedIds();
+        if (navExpandedInitialized) {
+          untracked(() => this.messageService.set(StorageType.NavigationExpanded, ids));
+        }
+        navExpandedInitialized = true;
+      });
+
       let previewInitialized = false;
       effect(() => {
         const settings: LayoutPreviewType = {
@@ -120,6 +130,8 @@ export class PresentationService {
   readonly letterSpacing = signal(0);
   readonly wordSpacing = signal(0);
 
+  readonly navigationExpandedIds = signal<number[]>([]);
+
   readonly gridEnabled = signal(true);
   readonly toolbarEnabled = signal(true);
   readonly previewEnabled = signal(true);
@@ -191,6 +203,41 @@ export class PresentationService {
     });
   }
 
+  isNavigationExpanded(id: number): boolean {
+    return this.navigationExpandedIds().includes(id);
+  }
+
+  toggleNavigationExpanded(id: number) {
+    const ids = this.navigationExpandedIds();
+    if (ids.includes(id)) {
+      this.navigationExpandedIds.set(ids.filter((i) => i !== id));
+    } else {
+      this.navigationExpandedIds.set([...ids, id]);
+    }
+  }
+
+  expandNavigationId(id: number) {
+    const ids = this.navigationExpandedIds();
+    if (!ids.includes(id)) {
+      this.navigationExpandedIds.set([...ids, id]);
+    }
+  }
+
+  setAllNavigationExpanded(allIds: number[]) {
+    this.navigationExpandedIds.set(allIds);
+  }
+
+  clearAllNavigationExpanded() {
+    this.navigationExpandedIds.set([]);
+  }
+
+  private async loadNavigationExpandedSettings() {
+    const ids = (await this.messageService.get(StorageType.NavigationExpanded, null)) as number[] | null;
+    if (Array.isArray(ids)) {
+      this.navigationExpandedIds.set(ids);
+    }
+  }
+
   private async loadThemeSettings() {
     const settings = (await this.messageService.get(StorageType.LayoutTheme, null)) as { theme: string } | null;
     if (settings?.theme && PresentationService.themes.includes(settings.theme as (typeof PresentationService.themes)[number])) {

package/src/app/layout/header/header.component.html

@@ -1,4 +1,4 @@
-<header class="grid grid-cols-[220px_1fr_220px] min-[1440px]:grid-cols-[280px_1fr_280px] w-full h-full">
+<header class="grid w-full h-full" [style.grid-template-columns]="'var(--panel-width) 1fr var(--panel-width)'">
   <div class="relative">
     <div class="p-0 h-full flex justify-items-start items-center">
       <a

package/src/app/layout/layout.component.html

@@ -7,7 +7,7 @@
   <div
     class="grid overflow-hidden"
     [style.grid-template-columns]="
-      (presentation.navigationEnabled() ? '280px ' : '') + '1fr' + (presentation.asideEnabled() ? ' 280px' : '')
+      (presentation.navigationEnabled() ? 'var(--panel-width) ' : '') + '1fr' + (presentation.asideEnabled() ? ' var(--panel-width)' : '')
     "
   >
     @if (presentation.navigationEnabled()) {

package/src/app/layout/navigation/navigation.component.html

@@ -4,10 +4,58 @@
       <app-library />
     </app-collapsible-panel>
 
+    <app-collapsible-panel title="Smart Collections">
+      <span
+        panelActions
+        class="material-symbols-outlined cursor-pointer"
+        [style.color]="'var(--text-muted)'"
+        style="
+          font-size: 18px;
+          font-variation-settings:
+            'opsz' 20,
+            'wght' 300;
+        "
+        title="New Smart Collection"
+        (click)="openCreateSmartCollection()"
+        >add</span
+      >
+      <ul class="flex flex-col py-0.5">
+        @for (sc of db.smartCollections(); track sc.id) {
+          <li>
+            <a
+              class="flex items-center px-3 py-1 text-xs font-normal cursor-pointer transition-colors"
+              [style.background-color]="isSmartSelected(sc) ? 'var(--selected-bg)' : 'transparent'"
+              [style.color]="isSmartSelected(sc) ? 'var(--text-primary)' : 'inherit'"
+              (click)="selectSmartCollection(sc)"
+              (dblclick)="editSmartCollection(sc)"
+              (contextmenu)="onSmartContextMenu($event, sc)"
+              (mouseenter)="$any($event.target).style.backgroundColor = isSmartSelected(sc) ? 'var(--selected-bg)' : 'var(--hover-bg)'"
+              (mouseleave)="$any($event.target).style.backgroundColor = isSmartSelected(sc) ? 'var(--selected-bg)' : 'transparent'"
+            >
+              <span
+                class="material-symbols-outlined icon-sm mr-1"
+                [style.color]="'var(--text-muted)'"
+                style="
+                  font-size: 16px;
+                  font-variation-settings:
+                    'opsz' 20,
+                    'wght' 300;
+                "
+                >auto_awesome</span
+              >
+              {{ sc.title }}
+            </a>
+          </li>
+        } @empty {
+          <li class="px-3 py-1 text-xs" [style.color]="'var(--text-muted)'">No smart collections</li>
+        }
+      </ul>
+    </app-collapsible-panel>
+
     <app-collapsible-panel title="Explorer" class="flex-1 min-h-0">
       <span
         panelActions
-        class="material-symbols-outlined cursor-pointer transition-transform duration-200"
+        class="material-symbols-outlined cursor-pointer"
         [style.color]="'var(--text-muted)'"
         style="
           font-size: 18px;
@@ -15,9 +63,9 @@
             'opsz' 20,
             'wght' 300;
         "
-        [title]="allExpanded ? 'Collapse All' : 'Expand All'"
-        (click)="toggleExpandAll($event)"
-        >{{ allExpanded ? 'unfold_less' : 'unfold_more' }}</span
+        title="New Collection"
+        (click)="openCreateRootCollection()"
+        >add</span
       >
       <ul class="flex-1 overflow-auto flex flex-col py-0.5">
         <ng-container *ngTemplateOutlet="subtree; context: { $implicit: tree(), level: 0 }" />
@@ -122,5 +170,23 @@
         (cancelled)="onCollectionCancelled()"
       />
     }
+
+    @if (smartContextMenu) {
+      <app-context-menu
+        [x]="smartContextMenu.x"
+        [y]="smartContextMenu.y"
+        [items]="smartContextMenuItems"
+        (menuSelect)="onSmartContextMenuSelect($event)"
+        (menuClose)="closeSmartContextMenu()"
+      />
+    }
+
+    @if (showRuleBuilder) {
+      <app-rule-builder
+        [smartCollection]="editingSmartCollection"
+        (saved)="onRuleBuilderSaved($event)"
+        (cancelled)="onRuleBuilderCancelled()"
+      />
+    }
   </div>
 </nav>