@im-nobsidian/core 0.1.6 → 0.1.7

package/dist/index.d.ts

@@ -272,7 +272,11 @@ interface Conflict {
     readonly localContent: string;
     readonly remoteContent: string;
 }
-type ProgressCallback = (current: number, total: number, path: string) => void;
+interface ProgressItem {
+    readonly path: string;
+    readonly operation: "create" | "update" | "delete";
+}
+type ProgressCallback = (current: number, total: number, item: ProgressItem) => void;
 interface PushOptions {
     readonly paths?: string[];
     readonly force?: boolean;
@@ -306,6 +310,9 @@ interface PullResult {
     readonly writtenPaths: string[];
     readonly failed: FailedOperation[];
     readonly duration: number;
+    readonly imageCount: number;
+    readonly fileCount: number;
+    readonly linkCount: number;
 }
 interface SyncResult {
     readonly push: PushResult;
@@ -780,6 +787,8 @@ declare class SyncOrchestrator {
     private readonly databaseSyncer;
     private readonly propertyMapper;
     private dbSchemaLoaded;
+    private _pullImageCount;
+    private _pullFileCount;
     constructor(config: Config, stateDb: StateDB, notionClient: NotionClient, vaultFs: VaultFS);
     push(options?: PushOptions): Promise<PushResult>;
     pull(options?: PullOptions): Promise<PullResult>;
@@ -1306,4 +1315,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 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, 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 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 };

package/dist/index.js

@@ -4443,6 +4443,8 @@ var SyncOrchestrator = class {
   databaseSyncer;
   propertyMapper;
   dbSchemaLoaded = false;
+  _pullImageCount = 0;
+  _pullFileCount = 0;
   async push(options) {
     const startTime = Date.now();
     if (this.config.sync.direction === "pull") {
@@ -4466,6 +4468,12 @@ var SyncOrchestrator = class {
       const dryCreated = filtered.filter((c) => c.type === "created").length;
       const dryUpdated = filtered.filter((c) => c.type === "modified" || c.type === "moved").length;
       const dryDeleted = filtered.filter((c) => c.type === "deleted").length;
+      let dryProgress = 0;
+      const dryTotal = filtered.length;
+      for (const change of filtered) {
+        const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
+        options?.onProgress?.(++dryProgress, dryTotal, { path: change.path, operation: op });
+      }
       return {
         created: dryCreated,
         updated: dryUpdated,
@@ -4500,7 +4508,8 @@ var SyncOrchestrator = class {
     const tasks = filtered.map((change) => async () => {
       await sema.acquire();
       try {
-        options?.onProgress?.(++completed, total, change.path);
+        const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
+        options?.onProgress?.(++completed, total, { path: change.path, operation: op });
         switch (change.type) {
           case "created":
             await this.pushCreate(change.path);
@@ -4604,7 +4613,10 @@ var SyncOrchestrator = class {
       conflicts: [],
       writtenPaths: [],
       failed: [],
-      duration: Date.now() - startTime
+      duration: Date.now() - startTime,
+      imageCount: 0,
+      fileCount: 0,
+      linkCount: 0
     };
     if (this.config.sync.direction === "push") {
       return emptyResult;
@@ -4613,6 +4625,8 @@ var SyncOrchestrator = class {
     let created = 0;
     let updated = 0;
     let deleted = 0;
+    this._pullImageCount = 0;
+    this._pullFileCount = 0;
     const conflicts = [];
     const writtenPaths = [];
     const failed = [];
@@ -4628,6 +4642,14 @@ var SyncOrchestrator = class {
       const dryCreated = filtered.filter((c) => c.type === "created").length;
       const dryUpdated = filtered.filter((c) => c.type === "modified").length;
       const dryDeleted = filtered.filter((c) => c.type === "deleted").length;
+      let dryProgress = 0;
+      const dryTotal = filtered.length;
+      for (const change of filtered) {
+        const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
+        const record = this.stateDb.getByNotionId(change.pageId);
+        const displayPath = record?.obsidianPath ?? change.pageId;
+        options?.onProgress?.(++dryProgress, dryTotal, { path: displayPath, operation: op });
+      }
       return {
         created: dryCreated,
         updated: dryUpdated,
@@ -4635,7 +4657,10 @@ var SyncOrchestrator = class {
         conflicts: [],
         writtenPaths: [],
         failed: [],
-        duration: Date.now() - startTime
+        duration: Date.now() - startTime,
+        imageCount: 0,
+        fileCount: 0,
+        linkCount: 0
       };
     }
     this.stateDb.setMeta("pull_in_progress", "true");
@@ -4645,7 +4670,10 @@ var SyncOrchestrator = class {
     const tasks = filtered.map((change) => async () => {
       await sema.acquire();
       try {
-        options?.onProgress?.(++pullCompleted, pullTotal, change.pageId);
+        const record = this.stateDb.getByNotionId(change.pageId);
+        const displayPath = record?.obsidianPath ?? change.pageId;
+        const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
+        options?.onProgress?.(++pullCompleted, pullTotal, { path: displayPath, operation: op });
         switch (change.type) {
           case "created": {
             const path = await this.pullCreate(change.pageId);
@@ -4782,7 +4810,7 @@ var SyncOrchestrator = class {
       }
     }
     const allSyncedMdPaths = this.stateDb.getAll().filter((r) => r.obsidianPath?.endsWith(".md")).map((r) => r.obsidianPath);
-    await this.resolveNotionLinks(allSyncedMdPaths);
+    const linkCount = await this.resolveNotionLinks(allSyncedMdPaths);
     this.stateDb.setMeta("last_pull_at", (/* @__PURE__ */ new Date()).toISOString());
     this.stateDb.setMeta("last_sync_at", (/* @__PURE__ */ new Date()).toISOString());
     this.stateDb.setMeta("pull_in_progress", "");
@@ -4793,7 +4821,10 @@ var SyncOrchestrator = class {
       conflicts,
       writtenPaths,
       failed,
-      duration: Date.now() - startTime
+      duration: Date.now() - startTime,
+      imageCount: this._pullImageCount,
+      fileCount: this._pullFileCount,
+      linkCount
     };
   }
   async sync(options) {
@@ -4893,6 +4924,7 @@ var SyncOrchestrator = class {
     return allDbs;
   }
   async resolveNotionLinks(paths) {
+    let totalResolved = 0;
     const allRecords = this.stateDb.getAll();
     const idToTitle = /* @__PURE__ */ new Map();
     for (const r of allRecords) {
@@ -4903,7 +4935,7 @@ var SyncOrchestrator = class {
         idToTitle.set(r.notionPageId, title);
       }
     }
-    if (idToTitle.size === 0) return;
+    if (idToTitle.size === 0) return 0;
     for (const filePath of paths) {
       if (!filePath.endsWith(".md")) continue;
       try {
@@ -4912,6 +4944,7 @@ var SyncOrchestrator = class {
         const resolved = content.replace(/\[\[notion:([a-f0-9-]+)\]\]/g, (_match, id) => {
           const title = idToTitle.get(id.replace(/-/g, ""));
           if (title) {
+            totalResolved++;
             changed = true;
             return `[[${title}]]`;
           }
@@ -4923,6 +4956,7 @@ var SyncOrchestrator = class {
           (_match, text, id) => {
             const title = idToTitle.get(id);
             if (title) {
+              totalResolved++;
               changed = true;
               return `[[${title}|${text}]]`;
             }
@@ -4936,6 +4970,7 @@ var SyncOrchestrator = class {
       } catch {
       }
     }
+    return totalResolved;
   }
   async ensureDbSchema() {
     if (this.dbSchemaLoaded || !this.isDatabaseMode) return;
@@ -5171,9 +5206,11 @@ var SyncOrchestrator = class {
     if (this.config.conversion.imageDownload === "immediate") {
       const imageResult = await this.imageHandler.downloadAllImages(markdown, title);
       processedMarkdown = imageResult.content;
+      this._pullImageCount += imageResult.downloads.length;
     }
     const fileResult = await this.imageHandler.downloadAllFiles(processedMarkdown, title);
     processedMarkdown = fileResult.content;
+    this._pullFileCount += fileResult.downloads.length;
     const finalContent = this.pipeline.convertToMarkdown(
       processedMarkdown,
       {
@@ -5229,9 +5266,11 @@ var SyncOrchestrator = class {
     if (this.config.conversion.imageDownload === "immediate") {
       const imageResult = await this.imageHandler.downloadAllImages(markdown, title);
       markdown = imageResult.content;
+      this._pullImageCount += imageResult.downloads.length;
     }
     const fileResult = await this.imageHandler.downloadAllFiles(markdown, title);
     markdown = fileResult.content;
+    this._pullFileCount += fileResult.downloads.length;
     const savedMarkers = this.stateDb.getPreserveMarkers(record.obsidianPath);
     const remoteContent = this.pipeline.convertToMarkdown(
       markdown,