@im-nobsidian/core 0.1.8 → 0.1.10

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",
@@ -936,6 +940,39 @@ var NotionClient = class _NotionClient {
     }
     return schema;
   }
+  async getDatabaseSchemaFull(databaseId) {
+    const db = await this.fetchDatabaseLegacy(databaseId);
+    const properties = db.properties;
+    if (!properties) return {};
+    const schema = {};
+    for (const [name, prop] of Object.entries(properties)) {
+      const entry = {
+        id: prop.id,
+        type: prop.type
+      };
+      if (prop.type === "select" || prop.type === "multi_select") {
+        const typeData = prop[prop.type];
+        if (typeData?.options) {
+          entry.options = typeData.options.map((o) => ({ name: o.name, color: o.color }));
+        }
+      }
+      if (prop.type === "status") {
+        const statusData = prop.status;
+        if (statusData?.options) {
+          entry.options = statusData.options.map((o) => ({ name: o.name, color: o.color }));
+        }
+        if (statusData?.groups) {
+          entry.groups = statusData.groups.map((g) => ({
+            name: g.name,
+            color: g.color,
+            optionIds: g.option_ids
+          }));
+        }
+      }
+      schema[name] = entry;
+    }
+    return schema;
+  }
   async queryDatabase(databaseId, options) {
     const dsId = await this.getDataSourceId(databaseId);
     const response = await this.withRateLimit(
@@ -3142,14 +3179,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 +3203,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 +3446,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}`);
         }
@@ -3759,6 +3801,168 @@ function sanitizeFileName(name) {
   return sanitized;
 }
 
+// src/view/base-file-generator.ts
+var NOTION_TO_BASES_VIEW = {
+  table: "table",
+  gallery: "cards",
+  list: "list",
+  board: "cards",
+  calendar: null,
+  timeline: null,
+  form: null,
+  chart: null,
+  map: null,
+  dashboard: null
+};
+var BaseFileGenerator = class {
+  generate(options) {
+    const lines = [];
+    lines.push(`# Auto-generated by Im-Nobsidian from Notion DB: ${options.databaseName}`);
+    lines.push(`# Database ID: ${options.databaseId}`);
+    lines.push("");
+    this.writeFilters(lines, options.folderPath);
+    this.writeFormulas(lines, options.viewsConfig.views);
+    this.writePropertyDisplayNames(lines, options.schema);
+    this.writeViews(lines, options.viewsConfig.views, options.schema);
+    return lines.join("\n");
+  }
+  writeFilters(lines, folderPath) {
+    lines.push("filters:");
+    lines.push("  and:");
+    lines.push(`    - file.inFolder("${folderPath}")`);
+    lines.push("");
+  }
+  needsContentCoverFormula(views) {
+    return views.some(
+      (v) => v.type === "gallery" && v.cover && (v.cover.type === "page_content" || v.cover.type === "page_content_first")
+    );
+  }
+  writeFormulas(lines, views) {
+    if (!this.needsContentCoverFormula(views)) return;
+    lines.push("formulas:");
+    lines.push("  coverImage: file.embeds[0]");
+    lines.push("");
+  }
+  writePropertyDisplayNames(lines, schema) {
+    const entries = Object.entries(schema).filter(([, prop]) => prop.type !== "title");
+    if (entries.length === 0) return;
+    lines.push("properties:");
+    for (const [name] of entries) {
+      lines.push(`  ${this.yamlKey(name)}:`);
+      lines.push(`    displayName: ${this.yamlValue(name)}`);
+    }
+    lines.push("");
+  }
+  writeViews(lines, views, schema) {
+    const basesViews = views.map((v) => this.convertView(v, schema)).filter((v) => v !== null);
+    if (basesViews.length === 0) {
+      lines.push("views:");
+      lines.push("  - type: table");
+      lines.push("    name: Table");
+      return;
+    }
+    lines.push("views:");
+    for (const view of basesViews) {
+      lines.push(`  - type: ${view.type}`);
+      lines.push(`    name: ${this.yamlValue(view.name)}`);
+      if (view.order && view.order.length > 0) {
+        lines.push("    order:");
+        for (const col of view.order) {
+          lines.push(`      - ${col}`);
+        }
+      }
+      if (view.sort && view.sort.length > 0) {
+        lines.push("    sort:");
+        for (const s of view.sort) {
+          lines.push(`      - column: ${s.column}`);
+          lines.push(`        direction: ${s.direction}`);
+        }
+      }
+      if (view.groupBy) {
+        lines.push("    groupBy:");
+        lines.push(`      property: ${view.groupBy.property}`);
+        if (view.groupBy.direction) {
+          lines.push(`      direction: ${view.groupBy.direction}`);
+        }
+      }
+      if (view.image) {
+        lines.push(`    image: ${view.image}`);
+      }
+    }
+  }
+  convertView(view, schema) {
+    const basesType = NOTION_TO_BASES_VIEW[view.type];
+    if (!basesType) return null;
+    const result = {
+      type: basesType,
+      name: view.name || view.type
+    };
+    if (view.properties && view.properties.length > 0) {
+      const visible = view.properties.filter((p) => p.visible !== false).map((p) => {
+        const name = p.propertyName ?? this.resolvePropertyName(p.propertyId, schema);
+        return name ? this.toNoteRef(name) : null;
+      }).filter((name) => !!name);
+      if (visible.length > 0) {
+        result.order = ["file.name", ...visible];
+      }
+    }
+    if (view.sorts && view.sorts.length > 0) {
+      result.sort = view.sorts.map((s) => {
+        let column;
+        if (s.property) {
+          const propName = this.resolvePropertyName(s.property, schema) ?? s.property;
+          column = this.toNoteRef(propName);
+        } else if (s.timestamp) {
+          column = s.timestamp === "created_time" ? "file.ctime" : "file.mtime";
+        } else {
+          return null;
+        }
+        return {
+          column,
+          direction: s.direction === "ascending" ? "ASC" : "DESC"
+        };
+      }).filter((s) => s !== null);
+    }
+    if (view.groupBy) {
+      const propName = view.groupBy.propertyName ?? this.resolvePropertyName(view.groupBy.propertyId, schema);
+      if (propName) {
+        result.groupBy = {
+          property: this.toNoteRef(propName),
+          direction: view.groupBy.sort === "ascending" ? "ASC" : view.groupBy.sort === "descending" ? "DESC" : void 0
+        };
+      }
+    }
+    if (view.type === "gallery" && view.cover) {
+      if (view.cover.type === "property" && view.cover.propertyId) {
+        const propName = this.resolvePropertyName(view.cover.propertyId, schema);
+        if (propName) result.image = this.toNoteRef(propName);
+      } else if (view.cover.type === "page_cover") {
+        result.image = "note.cover";
+      } else if (view.cover.type === "page_content" || view.cover.type === "page_content_first") {
+        result.image = "formula.coverImage";
+      }
+    }
+    return result;
+  }
+  toNoteRef(propertyName) {
+    return propertyName;
+  }
+  resolvePropertyName(propertyId, schema) {
+    for (const [name, prop] of Object.entries(schema)) {
+      if (prop.id === propertyId) return name;
+    }
+    return void 0;
+  }
+  yamlKey(key) {
+    if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) return key;
+    return `"${key.replace(/"/g, '\\"')}"`;
+  }
+  yamlValue(value) {
+    if (/^[a-zA-Z0-9_-]+$/.test(value)) return value;
+    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+  }
+};
+
 // src/converter/enhanced-md-converter.ts
 var NOTION_CALLOUT_RE = /^::: callout\n([\s\S]*?)\n:::/gm;
 var NOTION_CALLOUT_TAG_RE = /<callout[^>]*>\n?([\s\S]*?)<\/callout>/g;
@@ -4232,6 +4436,7 @@ var DatabaseSyncer = class {
   pipeline;
   imageHandler;
   propertyMapper = new PropertyMapper();
+  baseFileGenerator = new BaseFileGenerator();
   async pullAll() {
     const databases = this.config.notion.databases;
     if (!databases || databases.length === 0) {
@@ -4286,7 +4491,8 @@ var DatabaseSyncer = class {
     const schema = await this.notionClient.getDatabaseSchema(dbConfig.databaseId);
     this.propertyMapper.loadSchema(schema);
     await this.vaultFs.ensureFolder(dbConfig.localFolder);
-    await this.pullDatabaseViews(dbConfig);
+    const viewsConfig = await this.pullDatabaseViews(dbConfig);
+    await this.generateBaseFile(dbConfig, viewsConfig);
     const pages = await this.notionClient.queryAllDatabasePages(
       dbConfig.databaseId,
       dbConfig.pullFilter
@@ -4323,7 +4529,7 @@ var DatabaseSyncer = class {
         try {
           const existing = await this.vaultFs.readFile(configPath);
           const parsed = JSON.parse(existing);
-          if (parsed[dbConfig.databaseId]) return;
+          if (parsed[dbConfig.databaseId]) return parsed[dbConfig.databaseId];
         } catch {
         }
       }
@@ -4340,8 +4546,33 @@ var DatabaseSyncer = class {
       getLogger().debug(
         `[DB Sync] \uBDF0 \uC124\uC815 ${viewsConfig.views.length}\uAC1C \uC800\uC7A5: ${dbConfig.databaseId}`
       );
+      return viewsConfig;
     } catch (error) {
       getLogger().warn(`[DB Sync] \uBDF0 \uC124\uC815 Pull \uC2E4\uD328 (\uACC4\uC18D \uC9C4\uD589):`, error);
+      return null;
+    }
+  }
+  async generateBaseFile(dbConfig, viewsConfig) {
+    try {
+      const schemaFull = await this.notionClient.getDatabaseSchemaFull(dbConfig.databaseId);
+      const dbName = viewsConfig?.databaseName || await this.notionClient.getDatabaseTitle(dbConfig.databaseId) || dbConfig.localFolder.split("/").pop() || "Database";
+      const baseContent = this.baseFileGenerator.generate({
+        databaseId: dbConfig.databaseId,
+        databaseName: dbName,
+        schema: schemaFull,
+        viewsConfig: viewsConfig ?? {
+          databaseId: dbConfig.databaseId,
+          databaseName: dbName,
+          lastSynced: (/* @__PURE__ */ new Date()).toISOString(),
+          views: [{ id: "default", name: "Table", type: "table" }]
+        },
+        folderPath: dbConfig.localFolder
+      });
+      const basePath = `${dbConfig.localFolder}/${sanitizeFileName(dbName)}.base`;
+      await this.vaultFs.writeFile(basePath, baseContent);
+      getLogger().debug(`[DB Sync] .base \uD30C\uC77C \uC0DD\uC131: ${basePath}`);
+    } catch (error) {
+      getLogger().warn(`[DB Sync] .base \uD30C\uC77C \uC0DD\uC131 \uC2E4\uD328 (\uACC4\uC18D \uC9C4\uD589):`, error);
     }
   }
   async pullDatabasePage(page, dbConfig) {
@@ -4361,7 +4592,7 @@ var DatabaseSyncer = class {
         );
         const localUrlMatch = coverResult.content.match(/!\[cover\]\((.+?)\)/);
         if (localUrlMatch?.[1]) {
-          properties.cover = localUrlMatch[1];
+          properties.cover = `[[${localUrlMatch[1]}]]`;
         } else {
           properties.cover = cover.url;
         }
@@ -4533,7 +4764,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 +4774,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 +4878,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 +5067,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 +5218,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 +5576,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");
@@ -5967,7 +6212,7 @@ var NodeVaultFS = class {
       if (this.isExcluded(relativePath)) continue;
       if (entry.isDirectory()) {
         await this.walkDirNonMd(fullPath, result);
-      } else if (entry.isFile() && !entry.name.endsWith(".md")) {
+      } else if (entry.isFile() && !entry.name.endsWith(".md") && !entry.name.endsWith(".base")) {
         const fileStat = await stat(fullPath);
         result.push({
           path: relativePath,
@@ -6584,6 +6829,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 +7093,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 { BaseFileGenerator, 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