@im-nobsidian/core 0.1.1 → 0.1.2

package/dist/index.d.ts

@@ -542,8 +542,14 @@ declare class NotionBlockBuilder {
 }
 
 type NotionPropertyValue = Record<string, unknown>;
+interface WikilinkResolver$1 {
+    resolve(title: string): string | null;
+    resolvePageId(pageId: string): string | null;
+}
 declare class PropertyMapper {
     private schema;
+    private wikilinkResolver;
+    setWikilinkResolver(resolver: WikilinkResolver$1): void;
     loadSchema(properties: Record<string, {
         id: string;
         type: string;
@@ -698,6 +704,8 @@ declare class BlockConverter {
     private registerTocTransformer;
     private registerBreadcrumbTransformer;
     private registerLinkPreviewTransformer;
+    private registerPdfTransformer;
+    private registerEmbedTransformer;
     private registerCalloutTransformer;
     markdownToNotionBlocks(markdown: string): unknown[];
     private toggleContents;

package/dist/index.js

@@ -453,8 +453,13 @@ var StateDB = class _StateDB {
 
 // src/notion/property-mapper.ts
 var DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2})?/;
+var WIKILINK_REGEX = /^\[\[(.+?)(?:\|.+?)?\]\]$/;
 var PropertyMapper = class {
   schema = /* @__PURE__ */ new Map();
+  wikilinkResolver = null;
+  setWikilinkResolver(resolver) {
+    this.wikilinkResolver = resolver;
+  }
   loadSchema(properties) {
     this.schema.clear();
     for (const [name, prop] of Object.entries(properties)) {
@@ -506,9 +511,13 @@ var PropertyMapper = class {
       case "checkbox":
         return { checkbox: Boolean(value) };
       case "date": {
+        if (typeof value === "object" && value !== null && "start" in value) {
+          const obj = value;
+          return { date: { start: obj.start, end: obj.end ?? null } };
+        }
         const dateStr = String(value);
         if (DATE_REGEX.test(dateStr)) {
-          return { date: { start: dateStr } };
+          return { date: { start: dateStr, end: null } };
         }
         return null;
       }
@@ -520,6 +529,45 @@ var PropertyMapper = class {
         return { phone_number: String(value) };
       case "status":
         return { status: { name: String(value) } };
+      case "relation": {
+        const items = Array.isArray(value) ? value : [value];
+        const ids = [];
+        for (const item of items) {
+          const str = String(item);
+          const match = str.match(WIKILINK_REGEX);
+          if (match?.[1] && this.wikilinkResolver) {
+            const pageId = this.wikilinkResolver.resolve(match[1]);
+            if (pageId) ids.push({ id: pageId });
+          } else if (str.match(/^[0-9a-f-]{32,36}$/)) {
+            ids.push({ id: str });
+          }
+        }
+        return ids.length > 0 ? { relation: ids } : null;
+      }
+      case "people": {
+        const users = Array.isArray(value) ? value : [value];
+        const peopleArr = users.map((u) => {
+          const s = String(u);
+          if (s.match(/^[0-9a-f-]{32,36}$/)) return { object: "user", id: s };
+          return null;
+        }).filter(Boolean);
+        return peopleArr.length > 0 ? { people: peopleArr } : null;
+      }
+      case "files": {
+        const fileList = Array.isArray(value) ? value : [value];
+        const filesArr = fileList.map((f) => {
+          if (typeof f === "object" && f !== null && "url" in f) {
+            const obj = f;
+            return { type: "external", name: obj.name ?? "file", external: { url: obj.url } };
+          }
+          return {
+            type: "external",
+            name: String(f),
+            external: { url: String(f) }
+          };
+        });
+        return { files: filesArr };
+      }
       default:
         return { rich_text: [{ text: { content: String(value) } }] };
     }
@@ -538,7 +586,7 @@ var PropertyMapper = class {
     }
     if (typeof value === "string") {
       if (DATE_REGEX.test(value)) {
-        return { date: { start: value } };
+        return { date: { start: value, end: null } };
       }
       if (value.startsWith("http://") || value.startsWith("https://")) {
         return { url: value };
@@ -565,8 +613,12 @@ var PropertyMapper = class {
       }
       case "checkbox":
         return prop.checkbox;
-      case "date":
-        return prop.date ?? null;
+      case "date": {
+        const dateObj = prop.date;
+        if (!dateObj) return null;
+        if (dateObj.end) return { start: dateObj.start, end: dateObj.end };
+        return dateObj.start;
+      }
       case "url":
         return prop.url;
       case "email":
@@ -599,7 +651,14 @@ var PropertyMapper = class {
       }
       case "relation": {
         const rel = prop.relation;
-        return rel?.map((r) => r.id) ?? [];
+        if (!rel || rel.length === 0) return [];
+        return rel.map((r) => {
+          if (this.wikilinkResolver) {
+            const title = this.wikilinkResolver.resolvePageId(r.id);
+            if (title) return `[[${title}]]`;
+          }
+          return r.id;
+        });
       }
       case "rollup": {
         const rollup = prop.rollup;
@@ -1398,7 +1457,7 @@ var FrontmatterExtractor = class {
 };
 
 // src/converter/pre-processors/wikilink.ts
-var WIKILINK_REGEX = /(?<!!)\[\[([^\]|]+)(?:\|([^\]]+))?\]\]/g;
+var WIKILINK_REGEX2 = /(?<!!)\[\[([^\]|]+)(?:\|([^\]]+))?\]\]/g;
 var WikilinkResolver = class {
   constructor(resolve) {
     this.resolve = resolve;
@@ -1412,7 +1471,7 @@ var WikilinkResolver = class {
     }
     const preserveMarkers = input.metadata.preserveMarkers ? [...input.metadata.preserveMarkers] : [];
     const resolved = input.content.replace(
-      WIKILINK_REGEX,
+      WIKILINK_REGEX2,
       (_match, target, display) => {
         const label = display ?? target;
         if (this.resolve) {
@@ -1784,13 +1843,45 @@ var FrontmatterGenerator = class {
     if (!properties || Object.keys(properties).length === 0) {
       return { content: input.content, metadata: input.metadata };
     }
-    const content = matter.stringify(input.content, properties);
+    const normalized = normalizeProperties(properties);
+    const content = matter.stringify(input.content, normalized);
     return {
       content,
       metadata: input.metadata
     };
   }
 };
+function normalizeProperties(props) {
+  const result = {};
+  for (const [key, value] of Object.entries(props)) {
+    result[key] = normalizeValue(value);
+  }
+  return result;
+}
+function normalizeValue(value) {
+  if (typeof value === "string") {
+    return normalizeDate(value);
+  }
+  if (typeof value === "object" && value !== null && "start" in value) {
+    const dateObj = value;
+    const normalized = {
+      start: normalizeDate(dateObj.start),
+      ...dateObj.end ? { end: normalizeDate(dateObj.end) } : {}
+    };
+    return normalized;
+  }
+  return value;
+}
+function normalizeDate(dateStr) {
+  if (typeof dateStr !== "string") return dateStr;
+  if (dateStr.match(/T00:00:00\.000[Z+]/)) {
+    return dateStr.split("T")[0] ?? dateStr;
+  }
+  if (dateStr.match(/T00:00:00[Z+]/)) {
+    return dateStr.split("T")[0] ?? dateStr;
+  }
+  return dateStr;
+}
 
 // src/converter/post-processors/local-image-restorer.ts
 var LOCAL_IMAGE_MARKER_REGEX = />\s*📎\s*[^\n]*\n>\s*%%\s*im-nobsidian:local-image:([^\s]+)\s*%%/g;
@@ -2029,6 +2120,8 @@ var BlockConverter = class {
     this.registerTocTransformer();
     this.registerBreadcrumbTransformer();
     this.registerLinkPreviewTransformer();
+    this.registerPdfTransformer();
+    this.registerEmbedTransformer();
     this.registerCalloutTransformer();
     this.registerToggleHeadingTransformers();
   }
@@ -2201,6 +2294,24 @@ ${COLUMN_LIST_END}`;
       return `[${url}](${url})`;
     });
   }
+  registerPdfTransformer() {
+    if (!this.n2m) return;
+    this.n2m.setCustomTransformer("pdf", async (block) => {
+      const b = block;
+      const url = b.pdf?.type === "file" ? b.pdf.file?.url ?? "" : b.pdf?.external?.url ?? "";
+      const caption = b.pdf?.caption ? richTextToMarkdown(b.pdf.caption) : "";
+      return `[\u{1F4C4} ${caption || "PDF"}](${url})`;
+    });
+  }
+  registerEmbedTransformer() {
+    if (!this.n2m) return;
+    this.n2m.setCustomTransformer("embed", async (block) => {
+      const b = block;
+      const url = b.embed?.url ?? "";
+      const caption = b.embed?.caption ? richTextToMarkdown(b.embed.caption) : "";
+      return `[${caption || url}](${url})`;
+    });
+  }
   registerCalloutTransformer() {
     if (!this.n2m) return;
     const n2m = this.n2m;
@@ -3003,6 +3114,10 @@ var SyncOrchestrator = class {
     this.blockConverter = new BlockConverter();
     this.imageHandler = new ImageHandler(vaultFs, config.paths.attachments, notionClient);
     this.propertyMapper = new PropertyMapper();
+    this.propertyMapper.setWikilinkResolver({
+      resolve: (title) => stateDb.resolveWikilink(title)?.notionPageId ?? null,
+      resolvePageId: (pageId) => stateDb.resolvePageId(pageId)?.title ?? null
+    });
     this.blockConverter.initNotionToMd(this.notionClient.getInternalClient());
   }
   config;