@im-nobsidian/core 0.1.8 → 0.1.9

package/dist/index.d.ts

@@ -285,18 +285,21 @@ interface PushOptions {
     readonly force?: boolean;
     readonly dryRun?: boolean;
     readonly onProgress?: ProgressCallback;
+    readonly signal?: AbortSignal;
 }
 interface PullOptions {
     readonly paths?: string[];
     readonly force?: boolean;
     readonly dryRun?: boolean;
     readonly onProgress?: ProgressCallback;
+    readonly signal?: AbortSignal;
 }
 interface SyncOptions {
     readonly paths?: string[];
     readonly force?: boolean;
     readonly dryRun?: boolean;
     readonly onProgress?: ProgressCallback;
+    readonly signal?: AbortSignal;
 }
 interface PushResult {
     readonly created: number;
@@ -463,7 +466,35 @@ declare class ConfigManager {
     isInitialized(): Promise<boolean>;
 }
 
-declare class StateDB {
+interface IStateDB {
+    close(): void;
+    getByPath(path: string): SyncRecord | null;
+    getByNotionId(pageId: string): SyncRecord | null;
+    getByStatus(status: SyncStatus): SyncRecord[];
+    getAll(): SyncRecord[];
+    upsert(record: UpsertSyncRecord): SyncRecord;
+    updateStatus(id: string, status: SyncStatus): void;
+    updateHash(id: string, hash: string, snapshot?: Buffer | Uint8Array | null): void;
+    setNotionLastEdited(id: string, lastEdited: string): void;
+    updateStatCache(id: string, mtime: string, fileSize: number): void;
+    setNotionParentId(id: string, parentId: string): void;
+    delete(id: string): void;
+    resolveWikilink(text: string): WikilinkEntry | null;
+    resolvePageId(pageId: string): WikilinkEntry | null;
+    upsertWikilink(entry: WikilinkEntry): void;
+    getMeta(key: string): string | null;
+    setMeta(key: string, value: string): void;
+    isFileRegistered(localPath: string): boolean;
+    getFileRegistry(localPath: string): FileRegistryEntry | null;
+    getFilesByPageId(notionPageId: string): FileRegistryEntry[];
+    registerFile(entry: RegisterFileInput): void;
+    deleteFileRegistry(localPath: string): void;
+    storePreserveMarkers(path: string, markers: PreserveMarker[]): void;
+    getPreserveMarkers(path: string): PreserveMarker[];
+    transaction<T>(fn: () => T): T;
+}
+
+declare class StateDB implements IStateDB {
     private readonly db;
     private constructor();
     static open(dbPath: string): StateDB;
@@ -534,12 +565,14 @@ interface NotionClientOptions {
     readonly token: string;
     readonly concurrency?: number;
     readonly timeoutMs?: number;
+    readonly fetch?: typeof globalThis.fetch;
 }
 declare class NotionClient {
     private readonly client;
     private readonly sema;
     private readonly token;
     private readonly propertyMapper;
+    private readonly customFetch?;
     constructor(options: NotionClientOptions);
     getInternalClient(): Client;
     getPage(pageId: string): Promise<PageObjectResponse>;
@@ -761,7 +794,7 @@ interface FileInfo {
 }
 declare class ChangeDetector {
     private readonly stateDb;
-    constructor(stateDb: StateDB);
+    constructor(stateDb: IStateDB);
     detectLocalChangesFast(stats: FileStatInfo[], readFile: (path: string) => Promise<string>): Promise<LocalChange[]>;
     detectLocalChanges(currentFiles: FileInfo[]): LocalChange[];
     private detectMoves;
@@ -807,7 +840,7 @@ declare class SyncOrchestrator {
     private dbSchemaLoaded;
     private _pullImageCount;
     private _pullFileCount;
-    constructor(config: Config, stateDb: StateDB, notionClient: NotionClient, vaultFs: VaultFS);
+    constructor(config: Config, stateDb: IStateDB, notionClient: NotionClient, vaultFs: VaultFS, customFetch?: typeof globalThis.fetch);
     push(options?: PushOptions): Promise<PushResult>;
     pull(options?: PullOptions): Promise<PullResult>;
     sync(options?: SyncOptions): Promise<SyncResult>;
@@ -892,7 +925,9 @@ declare class ImageHandler {
     private readonly vaultFs;
     private readonly attachmentFolder;
     private readonly notionClient?;
-    constructor(vaultFs: VaultFS, attachmentFolder?: string, notionClient?: NotionClient | undefined);
+    private readonly customFetch?;
+    constructor(vaultFs: VaultFS, attachmentFolder?: string, notionClient?: NotionClient | undefined, customFetch?: typeof globalThis.fetch);
+    private get fetchFn();
     downloadImage(url: string, pageTitle: string): Promise<ImageDownloadResult>;
     downloadAllImages(markdown: string, pageTitle: string): Promise<{
         content: string;
@@ -931,7 +966,7 @@ declare class FileHandler {
     private readonly notionClient;
     private readonly stateDb;
     private readonly sema;
-    constructor(vaultFs: VaultFS, notionClient: NotionClient, stateDb: StateDB);
+    constructor(vaultFs: VaultFS, notionClient: NotionClient, stateDb: IStateDB);
     pushFilesForFolder(folderPageId: string, folderPath: string): Promise<FileUploadResult[]>;
     pushAllFiles(): Promise<FileUploadResult[]>;
     downloadFileBlock(url: string, filename: string, targetFolder: string): Promise<FileDownloadResult>;
@@ -968,7 +1003,7 @@ declare class DatabaseSyncer {
     private readonly pipeline;
     private readonly imageHandler;
     private readonly propertyMapper;
-    constructor(config: Config, stateDb: StateDB, notionClient: NotionClient, vaultFs: VaultFS, pipeline: ConversionPipeline, imageHandler: ImageHandler);
+    constructor(config: Config, stateDb: IStateDB, notionClient: NotionClient, vaultFs: VaultFS, pipeline: ConversionPipeline, imageHandler: ImageHandler);
     pullAll(): Promise<DatabaseSyncResult>;
     pushAll(): Promise<DatabaseSyncResult>;
     pullDatabase(dbConfig: DatabaseSyncConfig): Promise<DatabaseSyncResult>;
@@ -1146,7 +1181,7 @@ interface ResolutionResult {
 declare class ConflictResolver {
     private readonly stateDb;
     private readonly vaultFs;
-    constructor(stateDb: StateDB, vaultFs: VaultFS);
+    constructor(stateDb: IStateDB, vaultFs: VaultFS);
     resolve(conflict: Conflict, choice: ResolutionChoice): Promise<ResolutionResult>;
     resolveByStrategy(conflict: Conflict, strategy: ConflictStrategy): Promise<ResolutionResult>;
     resolveAll(conflicts: Conflict[], strategy: ConflictStrategy): Promise<ResolutionResult[]>;
@@ -1318,6 +1353,13 @@ declare function getVisibleProperties(viewConfig: ViewConfig): Array<{
     name: string;
     width?: number;
 }>;
+interface FilterCondition {
+    property: string;
+    operator: "equals" | "contains" | "startsWith" | "isEmpty" | "isNotEmpty" | "gt" | "lt" | "between";
+    value?: string | number | boolean;
+    valueTo?: string | number;
+}
+declare function filterEntries(entries: DBEntry[], searchQuery?: string, filters?: FilterCondition[]): DBEntry[];
 
 declare function getNotionColor(color: NotionColor | string): string;
 declare function getNotionBgColor(color: NotionColor | string): string;
@@ -1346,4 +1388,4 @@ interface PipelineOptions {
 }
 declare function createDefaultPipeline(options?: PipelineOptions): ConversionPipeline;
 
-export { BlockConverter, type CalendarEntry, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, type Config, ConfigManager, ConfigSchema, type Conflict, ConflictResolver, type ConflictStrategy, type ConversionContext, type ConversionPath, ConversionPipeline, type ConversionResult, type CoverConfig, type DBEntry, DEFAULT_CONFIG, type DatabaseSyncConfig, type DatabaseSyncResult, DatabaseSyncer, type DatabaseViewsConfig, EmbedResolver, EntryEditor, type FailedOperation, type FileDownloadResult, FileHandler, type FileInfo, type FileStatInfo, type FileSystemEntry, type FileType, type FileUploadResult, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, type GroupByConfig, type GroupedEntries, HtmlAnnotationStripper, type ImageDownloadResult, ImageHandler, type ImageReference, InlineDBParser, type LocalChange, LocalImageRestorer, type Logger, type MappingResult, type MappingType, MathNormalizer, MentionToWikilink, type MergeConflictRegion, type MergeResult, NodeVaultFS, type NonMdFileInfo, type NotionBlock, NotionBlockBuilder, NotionClient, type NotionClientOptions, type NotionColor, type NotionPageNode, type NotionRichText, type RichTextItem as NotionRichTextItem, type OperationType, type PageCover, type PageCreationPlan, type PageIcon, type PathFilterConfig, type PreserveMarker, PreserveMarkerCollector, PreserveMarkerInjector, type Processor, type ProcessorInput, type ProcessorMetadata, type ProcessorOutput, type ProgressCallback, type ProgressItem, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, type PropertyOption, type PropertySchema, type PropertyValue, type PullOptions, type PullResult, type PushOptions, type PushResult, type RemoteChange, type ResolutionChoice, type ResolutionResult, type RichTextSegment, StateDB, type StatusResult, type SyncDirection, type SyncOptions, SyncOrchestrator, type SyncRecord, type SyncResult, type SyncStatus, TreeMapper, UnsupportedBlockStripper, type UpsertSyncRecord, type VaultFS, type ViewConfig, ViewDataProvider, type ViewPropertyConfig, type ViewRenderData, type ViewType, type WatchSyncOptions, WatchSyncService, type WikilinkEntry, WikilinkResolver, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, threeWayMerge };
+export { BlockConverter, type CalendarEntry, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, type Config, ConfigManager, ConfigSchema, type Conflict, ConflictResolver, type ConflictStrategy, type ConversionContext, type ConversionPath, ConversionPipeline, type ConversionResult, type CoverConfig, type DBEntry, DEFAULT_CONFIG, type DatabaseSyncConfig, type DatabaseSyncResult, DatabaseSyncer, type DatabaseViewsConfig, EmbedResolver, EntryEditor, type FailedOperation, type FileDownloadResult, FileHandler, type FileInfo, type FileRegistryEntry, type FileStatInfo, type FileSystemEntry, type FileType, type FileUploadResult, FileWatcher, type FilterCondition, FrontmatterExtractor, FrontmatterGenerator, type GroupByConfig, type GroupedEntries, HtmlAnnotationStripper, type IStateDB, type ImageDownloadResult, ImageHandler, type ImageReference, InlineDBParser, type LocalChange, LocalImageRestorer, type Logger, type MappingResult, type MappingType, MathNormalizer, MentionToWikilink, type MergeConflictRegion, type MergeResult, NodeVaultFS, type NonMdFileInfo, type NotionBlock, NotionBlockBuilder, NotionClient, type NotionClientOptions, type NotionColor, type NotionPageNode, type NotionRichText, type RichTextItem as NotionRichTextItem, type OperationType, type PageCover, type PageCreationPlan, type PageIcon, type PathFilterConfig, type PreserveMarker, PreserveMarkerCollector, PreserveMarkerInjector, type Processor, type ProcessorInput, type ProcessorMetadata, type ProcessorOutput, type ProgressCallback, type ProgressItem, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, type PropertyOption, type PropertySchema, type PropertyValue, type PullOptions, type PullResult, type PushOptions, type PushResult, type RegisterFileInput, type RemoteChange, type ResolutionChoice, type ResolutionResult, type RichTextSegment, StateDB, type StatusResult, type SyncDirection, type SyncOptions, SyncOrchestrator, type SyncRecord, type SyncResult, type SyncStatus, TreeMapper, UnsupportedBlockStripper, type UpsertSyncRecord, type VaultFS, type ViewConfig, ViewDataProvider, type ViewPropertyConfig, type ViewRenderData, type ViewType, type WatchSyncOptions, WatchSyncService, type WikilinkEntry, WikilinkResolver, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, threeWayMerge };

package/dist/index.js

@@ -810,13 +810,16 @@ var NotionClient = class _NotionClient {
   sema;
   token;
   propertyMapper = new PropertyMapper();
+  customFetch;
   constructor(options) {
     this.client = new Client({
       auth: options.token,
       timeoutMs: options.timeoutMs ?? 3e4,
-      logLevel: LogLevel.ERROR
+      logLevel: LogLevel.ERROR,
+      ...options.fetch ? { fetch: options.fetch } : {}
     });
     this.token = options.token;
+    this.customFetch = options.fetch;
     this.sema = new Sema(options.concurrency ?? 3);
   }
   getInternalClient() {
@@ -909,7 +912,8 @@ var NotionClient = class _NotionClient {
     const cleanId = databaseId.replace(/-/g, "");
     const formatted = `${cleanId.slice(0, 8)}-${cleanId.slice(8, 12)}-${cleanId.slice(12, 16)}-${cleanId.slice(16, 20)}-${cleanId.slice(20)}`;
     const resp = await this.withRateLimit(async () => {
-      const r = await fetch(`https://api.notion.com/v1/databases/${formatted}`, {
+      const doFetch = this.customFetch ?? globalThis.fetch;
+      const r = await doFetch(`https://api.notion.com/v1/databases/${formatted}`, {
         headers: {
           Authorization: `Bearer ${this.token}`,
           "Notion-Version": "2022-06-28",
@@ -3142,14 +3146,19 @@ var EXTENSION_TO_MIME = {
   ".tiff": "image/tiff"
 };
 var ImageHandler = class {
-  constructor(vaultFs, attachmentFolder = "attachments", notionClient) {
+  constructor(vaultFs, attachmentFolder = "attachments", notionClient, customFetch) {
     this.vaultFs = vaultFs;
     this.attachmentFolder = attachmentFolder;
     this.notionClient = notionClient;
+    this.customFetch = customFetch;
   }
   vaultFs;
   attachmentFolder;
   notionClient;
+  customFetch;
+  get fetchFn() {
+    return this.customFetch ?? globalThis.fetch;
+  }
   async downloadImage(url, pageTitle) {
     const maxRetries = 3;
     let lastError = null;
@@ -3161,7 +3170,7 @@ var ImageHandler = class {
             `[Im-Nobsidian] \uC774\uBBF8\uC9C0 \uB2E4\uC6B4\uB85C\uB4DC \uC7AC\uC2DC\uB3C4 (${attempt + 1}/${maxRetries}): ${pageTitle}`
           );
         }
-        const response = await fetch(url);
+        const response = await this.fetchFn(url);
         if (!response.ok) {
           throw new Error(`\uC774\uBBF8\uC9C0 \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${response.status} ${response.statusText}`);
         }
@@ -3404,7 +3413,7 @@ var ImageHandler = class {
             `[Im-Nobsidian] \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC7AC\uC2DC\uB3C4 (${attempt + 1}/${maxRetries}): ${caption}`
           );
         }
-        const response = await fetch(url);
+        const response = await this.fetchFn(url);
         if (!response.ok) {
           throw new Error(`\uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${response.status} ${response.statusText}`);
         }
@@ -4533,7 +4542,7 @@ function extractTitleFromPath(filePath) {
 
 // src/sync/orchestrator.ts
 var SyncOrchestrator = class {
-  constructor(config, stateDb, notionClient, vaultFs) {
+  constructor(config, stateDb, notionClient, vaultFs, customFetch) {
     this.config = config;
     this.stateDb = stateDb;
     this.notionClient = notionClient;
@@ -4543,7 +4552,12 @@ var SyncOrchestrator = class {
       wikilinkResolver: (text) => stateDb.resolveWikilink(text)
     });
     this.blockConverter = new BlockConverter();
-    this.imageHandler = new ImageHandler(vaultFs, config.paths.attachments, notionClient);
+    this.imageHandler = new ImageHandler(
+      vaultFs,
+      config.paths.attachments,
+      notionClient,
+      customFetch
+    );
     this.fileHandler = new FileHandler(vaultFs, notionClient, stateDb);
     this.propertyMapper = new PropertyMapper();
     this.databaseSyncer = new DatabaseSyncer(
@@ -4642,6 +4656,7 @@ var SyncOrchestrator = class {
     const tasks = filtered.map((change) => async () => {
       await sema.acquire();
       try {
+        if (options?.signal?.aborted) return;
         const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
         options?.onProgress?.(++completed, total, { path: change.path, operation: op });
         switch (change.type) {
@@ -4830,6 +4845,7 @@ var SyncOrchestrator = class {
     const tasks = filtered.map((change) => async () => {
       await sema.acquire();
       try {
+        if (options?.signal?.aborted) return;
         let resultPath;
         switch (change.type) {
           case "created": {
@@ -4980,9 +4996,9 @@ var SyncOrchestrator = class {
   async status() {
     const files = await this.vaultFs.listMarkdownFiles();
     const localChanges = this.changeDetector.detectLocalChanges(files);
-    const remoteChanges = await this.detectRemoteChanges();
-    const conflictRecords = this.stateDb.getByStatus("conflict");
     const lastSyncAt = this.stateDb.getMeta("last_sync_at");
+    const remoteChanges = lastSyncAt ? await this.detectRemoteChangesIncremental(lastSyncAt) : await this.detectRemoteChanges();
+    const conflictRecords = this.stateDb.getByStatus("conflict");
     const conflicts = await this.buildConflictsFromRecords(
       conflictRecords,
       localChanges,
@@ -5338,7 +5354,14 @@ var SyncOrchestrator = class {
     const record = this.stateDb.getByPath(path);
     if (!record?.notionPageId) return;
     if (this.config.sync.deleteSync) {
-      await this.notionClient.archivePage(record.notionPageId);
+      try {
+        await this.notionClient.archivePage(record.notionPageId);
+      } catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes("archived ancestor")) ; else {
+          throw error;
+        }
+      }
       this.stateDb.delete(record.id);
     } else {
       this.stateDb.updateStatus(record.id, "pending");
@@ -6584,6 +6607,59 @@ function extractGroupName(val) {
   if (typeof val === "object" && "start" in val) return val.start;
   return null;
 }
+function filterEntries(entries, searchQuery, filters) {
+  let result = entries;
+  if (searchQuery && searchQuery.trim()) {
+    const q = searchQuery.trim().toLowerCase();
+    result = result.filter((entry) => {
+      if (entry.title.toLowerCase().includes(q)) return true;
+      return Object.values(entry.properties).some((val) => {
+        if (val === null || val === void 0) return false;
+        if (typeof val === "string") return val.toLowerCase().includes(q);
+        if (Array.isArray(val)) return val.some((v) => v.toLowerCase().includes(q));
+        if (typeof val === "object" && "start" in val) return val.start.includes(q);
+        return String(val).toLowerCase().includes(q);
+      });
+    });
+  }
+  if (filters && filters.length > 0) {
+    for (const filter of filters) {
+      result = result.filter((entry) => matchFilter(entry, filter));
+    }
+  }
+  return result;
+}
+function matchFilter(entry, filter) {
+  const val = filter.property === "title" ? entry.title : entry.properties[filter.property] ?? null;
+  switch (filter.operator) {
+    case "isEmpty":
+      return val === null || val === void 0 || val === "" || Array.isArray(val) && val.length === 0;
+    case "isNotEmpty":
+      return val !== null && val !== void 0 && val !== "" && !(Array.isArray(val) && val.length === 0);
+    case "equals":
+      if (typeof val === "boolean") return val === filter.value;
+      return String(val ?? "") === String(filter.value ?? "");
+    case "contains": {
+      const needle = String(filter.value ?? "").toLowerCase();
+      if (typeof val === "string") return val.toLowerCase().includes(needle);
+      if (Array.isArray(val)) return val.some((v) => v.toLowerCase().includes(needle));
+      return String(val ?? "").toLowerCase().includes(needle);
+    }
+    case "startsWith":
+      return String(val ?? "").startsWith(String(filter.value ?? ""));
+    case "gt":
+      return typeof val === "number" && typeof filter.value === "number" && val > filter.value;
+    case "lt":
+      return typeof val === "number" && typeof filter.value === "number" && val < filter.value;
+    case "between": {
+      if (typeof val !== "number" || typeof filter.value !== "number" || typeof filter.valueTo !== "number")
+        return false;
+      return val >= filter.value && val <= filter.valueTo;
+    }
+    default:
+      return true;
+  }
+}
 function parseDate(value) {
   const match = /^(\d{4}-\d{2}-\d{2})/.exec(value);
   return match?.[1] ?? null;
@@ -6795,6 +6871,6 @@ ${lines.join("\n")}
 }`;
 }
 
-export { BlockConverter, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConversionPipeline, DEFAULT_CONFIG, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, HtmlAnnotationStripper, ImageHandler, InlineDBParser, LocalImageRestorer, MathNormalizer, MentionToWikilink, NodeVaultFS, NotionBlockBuilder, NotionClient, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, StateDB, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WatchSyncService, WikilinkResolver, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, threeWayMerge };
+export { BlockConverter, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConversionPipeline, DEFAULT_CONFIG, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, HtmlAnnotationStripper, ImageHandler, InlineDBParser, LocalImageRestorer, MathNormalizer, MentionToWikilink, NodeVaultFS, NotionBlockBuilder, NotionClient, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, StateDB, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WatchSyncService, WikilinkResolver, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, threeWayMerge };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map