[Do not merge] Push/pull validation candidate b3796a70

apps/obsidian/src/utils/__tests__/noteFileName.test.ts

@@ -0,0 +1,58 @@
+import { describe, expect, it } from "vitest";
+import { noteFileNameFromTitle } from "~/utils/noteFileName";
+
+describe("noteFileNameFromTitle", () => {
+  it("keeps a plain title", () => {
+    expect(noteFileNameFromTitle("CLM - sleep improves memory")).toBe(
+      "CLM - sleep improves memory",
+    );
+  });
+
+  it("unwraps Roam page references in the title", () => {
+    expect(
+      noteFileNameFromTitle(
+        "[[EVD]] - REM sleep aids recall - [[@Smith 2020]]",
+      ),
+    ).toBe("EVD - REM sleep aids recall - @Smith 2020");
+  });
+
+  it("drops the characters Obsidian rejects in file names", () => {
+    expect(noteFileNameFromTitle('a<b>c:d"e/f\\g|h?i*j#k^l[m]n')).toBe(
+      "abcdefghijklmn",
+    );
+  });
+
+  it("drops a stray bracket that is not a page reference", () => {
+    expect(noteFileNameFromTitle("[[unclosed - [tag] - x")).toBe(
+      "unclosed - tag - x",
+    );
+  });
+
+  it("drops a slash rather than making a folder", () => {
+    expect(noteFileNameFromTitle("Projects/Alpha")).toBe("ProjectsAlpha");
+  });
+
+  it("collapses whitespace left behind", () => {
+    expect(noteFileNameFromTitle("  #tag   - x  ")).toBe("tag - x");
+  });
+
+  it("returns an empty string when nothing survives", () => {
+    expect(noteFileNameFromTitle("[[]]")).toBe("");
+    expect(noteFileNameFromTitle("#")).toBe("");
+  });
+
+  it("unwraps nested and adjacent references", () => {
+    expect(noteFileNameFromTitle("[[a [[b]] c]]")).toBe("a b c");
+    expect(noteFileNameFromTitle("[[EVD]][[x]]")).toBe("EVDx");
+  });
+
+  it("does not treat a pipe inside a reference as an alias", () => {
+    expect(noteFileNameFromTitle("[[Page|alias]]")).toBe("Pagealias");
+  });
+
+  it("passes non-ASCII titles through", () => {
+    expect(
+      noteFileNameFromTitle("[[EVD]] - Schlaf verbessert Gedächtnis"),
+    ).toBe("EVD - Schlaf verbessert Gedächtnis");
+  });
+});

apps/obsidian/src/utils/importNodes.ts

@@ -37,6 +37,7 @@ import {
 } from "./importedNodeContent";
 import { decorateTitle } from "@repo/database/lib/decorateTitle";
 import { buildSchemaRid, findLocalNodeTypeMatch } from "./schemaMatching";
+import { noteFileNameFromTitle } from "./noteFileName";
 
 type PublishedNode = {
   source_local_id: string;
@@ -1725,7 +1726,9 @@ const importNodes = async ({
           coreTitle !== undefined && localNodeType
             ? decorateTitle(localNodeType.format, coreTitle)
             : null;
-        const sanitizedFileName = sanitizeFileName(decoratedTitle ?? fileName);
+        const sanitizedFileName =
+          noteFileNameFromTitle(decoratedTitle ?? fileName) ||
+          node.nodeInstanceId;
         let finalFilePath: string;
 
         if (existingFile) {

apps/obsidian/src/utils/noteFileName.ts

@@ -0,0 +1,17 @@
+// Titles arrive from other apps in their own syntax: Roam node titles carry page
+// references ([[EVD]] - x - [[@Smith 2020]]) and tags. Obsidian creates a file with
+// those characters in its name but cannot link to it, so references are unwrapped
+// to keep the page name and the rest of the link characters (#^[]|, the set
+// checkInvalidChars enforces on node type formats) are dropped with the OS set.
+// A slash is dropped rather than made a folder: a Roam namespace and an Obsidian
+// folder are not the same thing. Returns "" when nothing survives; the caller
+// picks the fallback name.
+const PAGE_REFERENCE = /\[\[([^\]]*)\]\]/g;
+const REJECTED_IN_FILE_NAMES = /[<>:"/\\|?*#^[\]]/g;
+
+export const noteFileNameFromTitle = (title: string): string =>
+  title
+    .replace(PAGE_REFERENCE, "$1")
+    .replace(REJECTED_IN_FILE_NAMES, "")
+    .replace(/\s+/g, " ")
+    .trim();

apps/roam/src/components/CreateRelationDialog.tsx

@@ -1,3 +1,4 @@
+import { useRelationSchemaRevision } from "~/utils/relationSchemaChanges";
 import React, { useState, useMemo } from "react";
 import { Dialog, Classes, Label, Button, Callout } from "@blueprintjs/core";
 import renderOverlay from "roamjs-components/util/renderOverlay";
@@ -8,6 +9,7 @@ import getPageTitleByPageUid from "roamjs-components/queries/getPageTitleByPageU
 import getDiscourseRelations, {
   type DiscourseRelation,
 } from "~/utils/getDiscourseRelations";
+import { excludeProvisionalRelationSchemas } from "~/utils/relationSchemaAcceptance";
 import { createReifiedRelation } from "~/utils/createReifiedBlock";
 import { getStoredRelationsEnabled } from "~/utils/storedRelations";
 import findDiscourseNode from "~/utils/findDiscourseNode";
@@ -291,7 +293,7 @@ const prepareRelData = (
 ): RelWithDirection[] => {
   nodeTitle = nodeTitle || getPageTitleByPageUid(targetNodeUid).trim();
   const discourseNodeSchemas = getDiscourseNodes();
-  const relations = getDiscourseRelations();
+  const relations = excludeProvisionalRelationSchemas(getDiscourseRelations());
   const nodeSchema = findDiscourseNode({
     uid: targetNodeUid,
     title: nodeTitle,
@@ -387,6 +389,7 @@ export const renderCreateRelationDialog = (
 export const CreateRelationButton = (
   props: CreateRelationDialogProps & { fill?: boolean },
 ): React.JSX.Element | null => {
+  useRelationSchemaRevision();
   const { fill = false, ...relationProps } = props;
   const storedRelationsEnabled = getStoredRelationsEnabled();
   if (!storedRelationsEnabled) return null;
@@ -405,7 +408,8 @@ export const CreateRelationButton = (
       text="Add relation"
       disabled={extProps === null}
       onClick={() => {
-        renderCreateRelationDialog(extProps);
+        // A schema may have been accepted since this button last rendered.
+        renderCreateRelationDialog(relationProps);
       }}
     />
   );