Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/insert-template-command #3

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Feature/insert-template-command #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab11b7e
feat: change mark
udus122 Jun 10, 2024
e791840
feat: add insert template command
udus122 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
import { type Command } from "obsidian";
import { Notice, type Command } from "obsidian";
import { Settings } from "./settings";
// import { serializeDataview } from "./operations";

import type { UnsafeApp } from "./types";
import { Operator } from "./operations";

export function createCommands(app: UnsafeApp, settings: Settings): Command[] {
return [
{
id: "update-dataview-blocks",
id: "dataview-publisher-update-blocks",
name: "Update dataview blocks",
callback: () => {
const operator = new Operator(app);
operator.updateFromSource(settings.source);
},
},
{
id: "update-dataview-blocks-and-publish",
id: "dataview-publisher-update-blocks-and-publish",
name: "Update dataview blocks and publish",
callback: () => {
const operator = new Operator(app);
Expand All @@ -25,5 +24,31 @@ export function createCommands(app: UnsafeApp, settings: Settings): Command[] {
app.commands.executeCommandById("publish:view-changes");
},
},
{
id: "dataview-publisher-insert-block",
name: "Insert dataview publish block",
editorCallback: (editor) => {
const { line, ch } = editor.getCursor();
const lineContent = editor.getLine(line);

try {
editor.replaceRange(
`
%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
\`\`\`
%%
%% DATAVIEW_PUBLISHER: end %%`,
{
line,
ch: lineContent.length,
}
);
editor.setCursor(line, ch);
} catch (e) {
new Notice(e.message);
}
},
},
];
}
50 changes: 25 additions & 25 deletions src/dataview-publisher.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,46 @@ import {
const TEST_TEXT = `
Necessitatibus quisquam veritatis eos dolor hic totam sapiente necessitatibus est. Eaque maxime nisi velit fugiat sint. Non natus nam illo. Dolorum earum esse quod vitae autem.

%% DATAVIEW_PUBLISH: start
%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%
%% DATAVIEW_PUBLISHER: end %%

Necessitatibus quisquam veritatis eos dolor hic totam sapiente necessitatibus est. Eaque maxime nisi velit fugiat sint. Non natus nam illo. Dolorum earum esse quod vitae autem.

Necessitatibus quisquam veritatis eos dolor hic totam sapiente necessitatibus est. Eaque maxime nisi velit fugiat sint. Non natus nam illo. Dolorum earum esse quod vitae autem.

%% DATAVIEW_PUBLISH: start
%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/index
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%
%% DATAVIEW_PUBLISHER: end %%

Necessitatibus quisquam veritatis eos dolor hic totam sapiente necessitatibus est. Eaque maxime nisi velit fugiat sint. Non natus nam illo. Dolorum earum esse quod vitae autem.
`;

const TEST_BLOCK = `%% DATAVIEW_PUBLISH: start
const TEST_BLOCK = `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%`;
%% DATAVIEW_PUBLISHER: end %%`;

describe("operations", () => {
it("parseBlock", () => {
const parsed = parseBlock(TEST_BLOCK);
expect(parsed).toEqual({
content: TEST_BLOCK,
startBlock: `%% DATAVIEW_PUBLISH: start
startBlock: `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
Expand All @@ -55,30 +55,30 @@ FROM #🏷️/dataview-publish
query: "LIST\nFROM #🏷️/dataview-publish",
language: "dataview",
serialized: `DATAVIEWの結果をシリアライズした結果であり、置換対象`,
endBlock: "%% DATAVIEW_PUBLISH: end %%",
endBlock: "%% DATAVIEW_PUBLISHER: end %%",
});
});

it("extractBlock", () => {
const blocks = extractBlock(TEST_TEXT);
expect(blocks.length).toBe(2);
expect(blocks).toEqual([
`%% DATAVIEW_PUBLISH: start
`%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%`,
`%% DATAVIEW_PUBLISH: start
%% DATAVIEW_PUBLISHER: end %%`,
`%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/index
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%`,
%% DATAVIEW_PUBLISHER: end %%`,
]);
});

Expand All @@ -87,69 +87,69 @@ DATAVIEWの結果をシリアライズした結果であり、置換対象
const parsed = blocks.map((block) => parseBlock(block));
expect(parsed).toEqual([
{
content: `%% DATAVIEW_PUBLISH: start
content: `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%`,
%% DATAVIEW_PUBLISHER: end %%`,
language: "dataview",
query: "LIST\nFROM #🏷️/dataview-publish",
serialized: `DATAVIEWの結果をシリアライズした結果であり、置換対象`,
startBlock: `%% DATAVIEW_PUBLISH: start
startBlock: `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
\`\`\`
%%`,
endBlock: "%% DATAVIEW_PUBLISH: end %%",
endBlock: "%% DATAVIEW_PUBLISHER: end %%",
},
{
content: `%% DATAVIEW_PUBLISH: start
content: `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/index
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%`,
%% DATAVIEW_PUBLISHER: end %%`,
language: "dataview",
query: "LIST\nFROM #🏷️/index",
serialized: `DATAVIEWの結果をシリアライズした結果であり、置換対象`,
startBlock: `%% DATAVIEW_PUBLISH: start
startBlock: `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/index
\`\`\`
%%`,
endBlock: "%% DATAVIEW_PUBLISH: end %%",
endBlock: "%% DATAVIEW_PUBLISHER: end %%",
},
]);
});
it("should return the composed block", () => {
const blocks = {
content:
"%% DATAVIEW_PUBLISH: start\n```dataview\nLIST\nFROM #🏷️/dataview-publish \n```\n%%\nDATAVIEWの結果をシリアライズした結果であり、置換対象\n%% DATAVIEW_PUBLISH: end %%",
"%% DATAVIEW_PUBLISHER: start\n```dataview\nLIST\nFROM #🏷️/dataview-publish \n```\n%%\nDATAVIEWの結果をシリアライズした結果であり、置換対象\n%% DATAVIEW_PUBLISHER: end %%",
startBlock:
"%% DATAVIEW_PUBLISH: start\n```dataview\nLIST\nFROM #🏷️/dataview-publish \n```\n%%",
"%% DATAVIEW_PUBLISHER: start\n```dataview\nLIST\nFROM #🏷️/dataview-publish \n```\n%%",
query: "LIST\nFROM #🏷️/dataview-publish",
language: "dataview",
serialized: "DATAVIEWの結果をシリアライズした結果であり、置換対象",
endBlock: "%% DATAVIEW_PUBLISH: end %%",
endBlock: "%% DATAVIEW_PUBLISHER: end %%",
};

const composedBlock = composeBlockContent(blocks);

const expectedBlock = `%% DATAVIEW_PUBLISH: start
const expectedBlock = `%% DATAVIEW_PUBLISHER: start
\`\`\`dataview
LIST
FROM #🏷️/dataview-publish
\`\`\`
%%
DATAVIEWの結果をシリアライズした結果であり、置換対象
%% DATAVIEW_PUBLISH: end %%`;
%% DATAVIEW_PUBLISHER: end %%`;

expect(composedBlock).toEqual(expectedBlock);
});
Expand Down
4 changes: 2 additions & 2 deletions src/dataview-publisher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { executeQueryMarkdown } from "./dataview-utils";
import { BlockInfo, Replacer } from "./types";

const START_BLOCK_REGEX = /\s*%%\s*DATAVIEW_PUBLISH:\s*start\s*[\s\S]*?%%\s*/;
const END_BLOCK_REGEX = /\s*%%\s*DATAVIEW_PUBLISH:\s*end\s*%%\s*/;
const START_BLOCK_REGEX = /\s*%%\s*DATAVIEW_PUBLISHER:\s*start\s*[\s\S]*?%%\s*/;
const END_BLOCK_REGEX = /\s*%%\s*DATAVIEW_PUBLISHER:\s*end\s*%%\s*/;
const BLOCK_REGEX = new RegExp(
START_BLOCK_REGEX.source +
/(?<serialized>[\s\S]*?)/.source +
Expand Down