@im-nobsidian/core 0.9.1 → 0.10.0

package/dist/index.d.ts

@@ -511,6 +511,20 @@ interface PullResult {
     readonly linkCount: number;
     /** 원격을 얼마나 훑었나. 원격을 보지 않은 실행(받기 방향이 아님 · 취소)에는 없다. */
     readonly remoteScan?: RemoteScanInfo;
+    /** Notion 에서 옮긴 페이지를 볼트에서 옮긴 것(ADR-039) — dry-run 은 옮길 것. 없으면 옮긴 것이 없다. */
+    readonly moved?: readonly RemoteMove[];
+    /** Notion 에서 옮겼지만 볼트에서 옮기지 않은 것과 그 까닭. */
+    readonly moveSkipped?: readonly RemoteMoveSkip[];
+}
+/** Notion 에서 옮긴 페이지를 볼트에서 옮긴 것 하나 — 노트 하나거나 폴더 하나다. */
+interface RemoteMove {
+    readonly from: string;
+    readonly to: string;
+}
+/** 옮기지 않고 둔 것과 그 까닭 — 볼트에서 직접 옮기면 다음 push 가 Notion 을 맞춘다. */
+interface RemoteMoveSkip {
+    readonly path: string;
+    readonly reason: string;
 }
 interface SyncResult {
     readonly push: PushResult;
@@ -848,6 +862,21 @@ declare class StateDB implements IStateDB {
     static open(dbPath: string): StateDB;
     private static openLocked;
     private migrate;
+    /**
+     * `\` 로 이은 경로를 `/` 로 고쳐 적는다 — Windows 에서만 부른다(이슈 #8). 0.9.1 까지의 CLI 는 Windows 에서
+     * 볼트 경로를 `relative()` 그대로(`00 Me\a.md`) 적었다. 이제 목록은 `/` 로 이으므로 그대로 두면 그
+     * 노트들이 「볼트에서 지움」 과 「새 노트」 로 보인다.
+     *
+     * 같은 노트가 이미 `/` 경로로도 추적되고 있으면(pull 이 `/` 로 적은 노트를 `\` 목록이 새 노트로 보고 또
+     * 올렸다) `\` 쪽 기록을 버린다 — 그 기록의 Notion 페이지는 그때 생긴 사본이다. 지우지 않고 추적만 놓는다.
+     * Linux · macOS 에서는 `\` 가 파일 이름의 글자일 수 있어 부르지 않는다.
+     *
+     * @returns 고쳐 적은 경로 수와 버린 사본 기록 수
+     */
+    normalizePathSeparators(): {
+        readonly renamed: number;
+        readonly dropped: number;
+    };
     private getSchemaVersion;
     /** 닫고 잠금을 푼다 — 닫는 사이 다른 곳이 열지 않게 닫은 뒤에 푼다. */
     close(): void;
@@ -2075,7 +2104,12 @@ interface LocalScan {
 }
 declare class ChangeDetector {
     private readonly stateDb;
-    constructor(stateDb: IStateDB);
+    private readonly excludes;
+    /**
+     * @param excludes 설정이 동기화에서 뺀 경로(이슈 #8) — 목록에 없어도 지운 것이 아니다. 예전에는 뺀 폴더의
+     *   추적 노트를 「삭제」 로 보고, deleteSync 면 Notion 페이지를 지울 수 있었다.
+     */
+    constructor(stateDb: IStateDB, excludes?: (path: string) => boolean);
     detectLocalChangesFast(stats: FileStatInfo[], readFile: (path: string) => Promise<string>, options?: LocalScanOptions): Promise<LocalChange[]>;
     detectLocalChanges(currentFiles: FileInfo[], options?: LocalScanOptions): LocalChange[];
     /** 파일 크기 · 수정 시각이 지난 동기화와 같으면 내용을 읽지 않는다. */
@@ -2113,6 +2147,14 @@ interface VaultFS {
      * 이 볼트(연결)가 맡은 경로인가 — 볼트 안의 다른 연결 폴더(ADR-038)는 false. 없으면 전부 맡는다.
      */
     ownsPath?(path: string): boolean;
+    /** 이 폴더 안에 다른 연결 폴더가 있나 — 폴더를 통째로 옮기기 전에 묻는다. 없으면 없다. */
+    holdsOtherConnection?(folder: string): boolean;
+    /**
+     * 설정(`paths.include` · `paths.exclude`)이나 `.im-nobsidian-ignore` 가 동기화에서 뺀 경로인가 (이슈 #8).
+     * 뺀 노트는 목록에 없다 — 추적하던 노트라도 「볼트에서 지움」 으로 보지 않고, pull 이 받거나 되살리지도
+     * 않는다. `folder` 면 제외 패턴만 본다(포함 패턴은 안의 파일이 정한다). 없으면 아무것도 빼지 않는다.
+     */
+    excludesPath?(path: string, kind?: "file" | "folder"): boolean;
 }
 
 type ResolutionChoice = "local" | "remote" | "merge" | "duplicate";
@@ -2429,6 +2471,7 @@ declare class SyncOrchestrator {
     private readonly placement;
     private readonly databaseCreator;
     private readonly planner;
+    private readonly remoteMoves;
     private readonly detector;
     private readonly drift;
     private readonly discovery;
@@ -2457,6 +2500,8 @@ declare class SyncOrchestrator {
     /** 볼트의 노트가 마지막으로 올린 내용 그대로인가 — 읽지 못하면(지움 · 옮김) 아니다. */
     private unchangedSincePush;
     pull(options?: PullOptions): Promise<PullResult>;
+    /** 감지가 본, Notion 에서 옮긴 페이지를 볼트에서 옮긴다 — 경로를 좁힌 pull 은 그 범위의 것만. */
+    private followRemoteMoves;
     private executePull;
     sync(options?: SyncOptions): Promise<SyncResult>;
     private executeSync;
@@ -2549,9 +2594,9 @@ interface PathFilterConfig {
 }
 declare class NodeVaultFS implements VaultFS {
     private readonly rootPath;
-    private readonly includePatterns;
-    private readonly excludePatterns;
+    private readonly filter;
     constructor(rootPath: string, pathConfig?: PathFilterConfig);
+    excludesPath(path: string, kind?: "file" | "folder"): boolean;
     private loadImNobsidianIgnore;
     readFile(path: string): Promise<string>;
     readBinary(path: string): Promise<Buffer>;
@@ -2565,8 +2610,8 @@ declare class NodeVaultFS implements VaultFS {
     listMarkdownFileStats(): Promise<FileStatInfo[]>;
     getFileStat(path: string): Promise<FileStatInfo | null>;
     listNonMarkdownFiles(): Promise<NonMdFileInfo[]>;
-    private matchesPattern;
-    private isExcluded;
+    /** 볼트 경로 — Windows 의 `relative()` 는 `\` 로 잇는다. 상태 DB · 패턴 · Notion 경로는 모두 `/` 다. */
+    private vaultPath;
     private walkDirNonMd;
     private walkDirStats;
     private walkDir;
@@ -3942,6 +3987,36 @@ declare function matchesPathScope(path: string, scope: string): boolean;
 /** 범위 목록 중 하나라도 걸리면 true. 목록이 비어 있으면(범위 미지정) 항상 true. */
 declare function inAnyPathScope(path: string, scopes: readonly string[] | undefined): boolean;
 
+/**
+ * 설정 `paths.include` · `paths.exclude` 와 `.im-nobsidian-ignore` 의 경로 패턴 (이슈 #8).
+ *
+ * 볼트 경로는 늘 `/` 로 잇는다({@link toVaultPath}). 예전 판정은 세 가지가 틀렸다.
+ *   1. Windows 의 `relative()` 가 준 `00 Me\a.md` 를 `/` 로만 견줘 어느 패턴에도 맞지 않았다
+ *   2. 포함 패턴을 폴더에도 대어 `00 Me/**\/*.md` 면 폴더 `00 Me` 가 빠지고 안을 걷지 않았다
+ *   3. `**\/` 가 폴더 0 단계를 받지 않았고(`a/**\/*.md` ↛ `a/x.md`) 정규식 글자를 이스케이프하지 않았다
+ *
+ * 규칙
+ *   - 글롭 없는 패턴은 그 경로이거나 그 폴더 안이다 — `Private` ↔ `Private/a.md`
+ *   - `/` 없는 글롭은 경로 조각 어느 것에나 댄다 — `*.pdf` ↔ `a/b/x.pdf`, `draft-*` ↔ `x/draft-1/a.md`
+ *   - `/` 있는 글롭은 볼트 맨 위부터 댄다. `*` · `?` 는 조각 안, `**` 는 조각을 넘는다
+ *   - 패턴에 맞는 폴더의 안은 모두 맞는다 — 걷기가 그 폴더에서 멈추는 것과 같다
+ *   - 패턴의 `\` 는 `/` 로, 앞의 `./` · `/` 와 끝의 `/` 는 뗀다
+ */
+declare class PathFilter {
+    private readonly include;
+    private readonly exclude;
+    constructor(include: readonly string[], exclude: readonly string[]);
+    /** 동기화하지 않는 노트 · 첨부 — 포함 패턴 어느 것에도 맞지 않거나 제외 패턴에 맞는다. */
+    excludesFile(path: string): boolean;
+    /**
+     * 걷지 않을 폴더 — 제외 패턴만 본다. 포함 패턴은 안의 파일이 정한다: `00 Me/**\/*.md` 는 폴더
+     * `00 Me` 에 맞지 않지만 그 안의 노트에 맞는다.
+     */
+    excludesFolder(path: string): boolean;
+}
+/** 운영체제 구분자로 이은 상대 경로 → 볼트 경로(`/`). `relative()` 의 결과에 쓴다. */
+declare function toVaultPath(relativePath: string, separator: string): string;
+
 /** 줄 비교의 한 줄. 번호는 1부터 — 더한 줄은 옛 번호가, 지운 줄은 새 번호가 없다. */
 interface DiffLine {
     readonly kind: "same" | "added" | "removed";
@@ -4045,6 +4120,8 @@ declare class ScopedVaultFS implements VaultFS {
      */
     constructor(base: VaultFS, folder: string, connections: readonly string[]);
     ownsPath(path: string): boolean;
+    holdsOtherConnection(folder: string): boolean;
+    excludesPath(path: string, kind?: "file" | "folder"): boolean;
     /** 이 연결의 경로 → 볼트 경로. */
     private toBase;
     /** 볼트 경로 → 이 연결의 경로. 이 연결이 맡지 않으면 null. */
@@ -4226,4 +4303,4 @@ declare function readColumnLayout(lines: readonly string[]): (ColumnPlace | unde
 /** 열 이름표 — `열 2/3 · 50%`. 비율이 없으면 `열 2/3`. */
 declare function columnLabel(place: ColumnPlace): string;
 
-export { BaseFileGenerator, type BaseFileOptions, type BasePropertyOption, type BasePropertySchema, type BaseStatusGroup, type BaseSyncOptions, type BasesFilterNode, type BasesViewMapping, type BasesViewType, BlankLineCollapser, type BookmarkTarget, CONFIG_FILE, type CalendarEntry, type CalloutDesign, CalloutRestorer, CalloutTransformer, ChangeDetector, type ChangeDiff, ColorAnnotator, type ColumnPlace, type CompletenessFailure, type CompletenessLocalSource, type CompletenessOptions, type CompletenessRemoteSource, type CompletenessReport, type Config, ConfigManager, ConfigSchema, type Conflict, ConflictResolver, type ConflictStrategy, ConnectionBoundaryError, ConnectionScopeError, type ConversionContext, type ConversionPath, ConversionPipeline, type ConversionResult, type CoverConfig, type DBEntry, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, type DatabaseCompleteness, type DatabaseSyncConfig, type DatabaseSyncResult, DatabaseSyncer, type DatabaseViewsConfig, type DeferredCode, type DegradeNote, type DesignColor, type DesignLine, type DesignSegment, type DiffHunk, type DiffLine, EmbedResolver, EntryEditor, type FailedOperation, type FidelityClassification, type FidelityContext, type FidelityDefect, type FidelityDefectForm, type FidelitySummary, type FileDownloadResult, FileHandler, type FileInfo, type FileRegistryEntry, type FileStatInfo, type FileSystemEntry, type FileType, type FileUploadResult, FileWatcher, type FilterCondition, type FolderDatabaseReport, type FolderMoveChange, FrontmatterExtractor, FrontmatterGenerator, type FullScanReason, GITIGNORE_ENTRY, type GatedOperation, type GroupByConfig, type GroupedEntries, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, type IStateDB, type ImageDownloadResult, ImageHandler, type ImageReference, type InferredProperty, InlineAnnotationPreserver, InlineDBParser, type InlineStyle, type LineDiffOptions, type LineRange, type LocalChange, LocalImageRestorer, type LocalMoveAdoption, type LocalScan, type LocalScanOptions, type Logger, MARKER_BRAND, type MappingResult, type MappingType, MathNormalizer, MentionToWikilink, type MergeConflictRegion, type MergeResult, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, type NonMdFileInfo, type NotionBlock, NotionBlockBuilder, NotionClient, type NotionClientOptions, type NotionColor, type NotionPageNode, type NotionRichText, type RichTextItem as NotionRichTextItem, type NotionSidecar, OBSIDIAN_CONFIG_DIR, type OperationType, type PageCompletenessRemoteSource, type PageCompletenessReport, type PageCover, type PageCreationPlan, type PageIcon, type PathFilterConfig, type PendingOperation, PendingWalError, type PlannedRow, 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, RENDER_LINE_RULES, type RecordPendingInput, type RegisterFileInput, type RemoteChange, type RemoteObservation, type RemoteScanInfo, type RenameHints, type RenameKind, type RenderFinding, type RenderLineRule, type ResolutionChoice, type ResolutionResult, type RichTextSegment, type RowProgress, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, type SidecarProperty, type SidecarView, StateDB, StateDbLockedError, type StateDbMigration, type StateDbTool, StateDbUnavailableError, StateLock, type StateLockClaim, type StateLockOwner, type StatusOptions, type StatusResult, type StyledRange, SyncBusyError, type SyncDirection, type SyncOptions, SyncOrchestrator, type SyncRecord, type SyncResult, type SyncStatus, type TableLineDesign, type TranslationResult, TreeMapper, UnsupportedBlockStripper, type UpsertSyncRecord, type VaultCompletenessReport, type VaultFS, type ViewConfig, ViewDataProvider, type ViewPropertyConfig, type ViewRenderData, type ViewType, WIKILINK_LOOKUPS, type WatchSyncOptions, type WatchSyncScope, WatchSyncService, type WikilinkEntry, type WikilinkLookup, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
+export { BaseFileGenerator, type BaseFileOptions, type BasePropertyOption, type BasePropertySchema, type BaseStatusGroup, type BaseSyncOptions, type BasesFilterNode, type BasesViewMapping, type BasesViewType, BlankLineCollapser, type BookmarkTarget, CONFIG_FILE, type CalendarEntry, type CalloutDesign, CalloutRestorer, CalloutTransformer, ChangeDetector, type ChangeDiff, ColorAnnotator, type ColumnPlace, type CompletenessFailure, type CompletenessLocalSource, type CompletenessOptions, type CompletenessRemoteSource, type CompletenessReport, type Config, ConfigManager, ConfigSchema, type Conflict, ConflictResolver, type ConflictStrategy, ConnectionBoundaryError, ConnectionScopeError, type ConversionContext, type ConversionPath, ConversionPipeline, type ConversionResult, type CoverConfig, type DBEntry, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, type DatabaseCompleteness, type DatabaseSyncConfig, type DatabaseSyncResult, DatabaseSyncer, type DatabaseViewsConfig, type DeferredCode, type DegradeNote, type DesignColor, type DesignLine, type DesignSegment, type DiffHunk, type DiffLine, EmbedResolver, EntryEditor, type FailedOperation, type FidelityClassification, type FidelityContext, type FidelityDefect, type FidelityDefectForm, type FidelitySummary, type FileDownloadResult, FileHandler, type FileInfo, type FileRegistryEntry, type FileStatInfo, type FileSystemEntry, type FileType, type FileUploadResult, FileWatcher, type FilterCondition, type FolderDatabaseReport, type FolderMoveChange, FrontmatterExtractor, FrontmatterGenerator, type FullScanReason, GITIGNORE_ENTRY, type GatedOperation, type GroupByConfig, type GroupedEntries, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, type IStateDB, type ImageDownloadResult, ImageHandler, type ImageReference, type InferredProperty, InlineAnnotationPreserver, InlineDBParser, type InlineStyle, type LineDiffOptions, type LineRange, type LocalChange, LocalImageRestorer, type LocalMoveAdoption, type LocalScan, type LocalScanOptions, type Logger, MARKER_BRAND, type MappingResult, type MappingType, MathNormalizer, MentionToWikilink, type MergeConflictRegion, type MergeResult, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, type NonMdFileInfo, type NotionBlock, NotionBlockBuilder, NotionClient, type NotionClientOptions, type NotionColor, type NotionPageNode, type NotionRichText, type RichTextItem as NotionRichTextItem, type NotionSidecar, OBSIDIAN_CONFIG_DIR, type OperationType, type PageCompletenessRemoteSource, type PageCompletenessReport, type PageCover, type PageCreationPlan, type PageIcon, PathFilter, type PathFilterConfig, type PendingOperation, PendingWalError, type PlannedRow, 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, RENDER_LINE_RULES, type RecordPendingInput, type RegisterFileInput, type RemoteChange, type RemoteMove, type RemoteMoveSkip, type RemoteObservation, type RemoteScanInfo, type RenameHints, type RenameKind, type RenderFinding, type RenderLineRule, type ResolutionChoice, type ResolutionResult, type RichTextSegment, type RowProgress, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, type SidecarProperty, type SidecarView, StateDB, StateDbLockedError, type StateDbMigration, type StateDbTool, StateDbUnavailableError, StateLock, type StateLockClaim, type StateLockOwner, type StatusOptions, type StatusResult, type StyledRange, SyncBusyError, type SyncDirection, type SyncOptions, SyncOrchestrator, type SyncRecord, type SyncResult, type SyncStatus, type TableLineDesign, type TranslationResult, TreeMapper, UnsupportedBlockStripper, type UpsertSyncRecord, type VaultCompletenessReport, type VaultFS, type ViewConfig, ViewDataProvider, type ViewPropertyConfig, type ViewRenderData, type ViewType, WIKILINK_LOOKUPS, type WatchSyncOptions, type WatchSyncScope, WatchSyncService, type WikilinkEntry, type WikilinkLookup, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };