Skip to content

Commit f9023ae

Browse files
mProjectsCodemProjectsCode
committed
a better analysis setup
1 parent 48ab3fb commit f9023ae

File tree

8 files changed

+45
-115
lines changed

8 files changed

+45
-115
lines changed

‎packages/obsidian/src/cm6/Cm6_ViewPlugin.ts‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import { summary } from 'itertools-ts/es';
66
import { Component, editorLivePreviewField, type TFile } from 'obsidian';
77
import { Cm6_Util, MB_WidgetType } from 'packages/obsidian/src/cm6/Cm6_Util';
88
import type MetaBindPlugin from 'packages/obsidian/src/main';
9-
10-
import { type FieldType } from 'packages/core/src/config/APIConfigs';
9+
import { type InlineFieldType } from 'packages/core/src/config/APIConfigs';
1110

1211
// eslint-disable-next-line @typescript-eslint/no-explicit-any
1312
export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlugin): ViewPlugin<any> {
@@ -159,14 +158,14 @@ export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlug
159158
* @param view
160159
* @param content the content of the node
161160
* @param widgetType
162-
* @param mdrcType
161+
* @param inlineFieldType
163162
*/
164163
addDecoration(
165164
node: SyntaxNode,
166165
view: EditorView,
167166
widgetType: MB_WidgetType,
168167
content: string,
169-
mdrcType: FieldType,
168+
inlineFieldType: InlineFieldType,
170169
): void {
171170
const from = node.from - 1;
172171
const to = node.to + 1;
@@ -183,7 +182,7 @@ export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlug
183182

184183
const newDecoration: Range<Decoration> | Range<Decoration>[] = this.renderWidget(
185184
node,
186-
mdrcType,
185+
inlineFieldType,
187186
widgetType,
188187
content,
189188
currentFile,
@@ -211,7 +210,7 @@ export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlug
211210
shouldRender: boolean;
212211
shouldHighlight: boolean;
213212
content: string | undefined;
214-
widgetType: FieldType | undefined;
213+
widgetType: InlineFieldType | undefined;
215214
} {
216215
// get the node props
217216
// const propsString: string | undefined = node.type.prop<string>(tokenClassNodeProp);
@@ -250,7 +249,7 @@ export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlug
250249
view: EditorView,
251250
from: number,
252251
to: number,
253-
): { content: string; widgetType: FieldType | undefined } {
252+
): { content: string; widgetType: InlineFieldType | undefined } {
254253
const content = Cm6_Util.getContent(view.state, from, to);
255254
return {
256255
content: content,
@@ -324,20 +323,25 @@ export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlug
324323
* Renders a singe widget of the given widget type at a given node.
325324
*
326325
* @param node
327-
* @param mdrcType
326+
* @param inlineFieldType
328327
* @param widgetType
329328
* @param content
330329
* @param currentFile
331330
*/
332331
renderWidget(
333332
node: SyntaxNode,
334-
mdrcType: FieldType,
333+
inlineFieldType: InlineFieldType,
335334
widgetType: MB_WidgetType,
336335
content: string,
337336
currentFile: TFile,
338337
): Range<Decoration> | Range<Decoration>[] {
339338
if (widgetType === MB_WidgetType.FIELD) {
340-
const widget = plugin.api.constructMDRCWidget(mdrcType, content, currentFile.path, this.component);
339+
const widget = plugin.api.constructMDRCWidget(
340+
inlineFieldType,
341+
content,
342+
currentFile.path,
343+
this.component,
344+
);
341345

342346
return Decoration.replace({
343347
widget: widget,
@@ -347,7 +351,7 @@ export function createMarkdownRenderChildWidgetEditorPlugin(plugin: MetaBindPlug
347351
},
348352
}).range(node.from - 1, node.to + 1);
349353
} else {
350-
const highlight = plugin.api.syntaxHighlighting.highlight(content, mdrcType, false);
354+
const highlight = plugin.api.syntaxHighlighting.highlight(content, inlineFieldType, false);
351355

352356
return highlight.getHighlights().map(h => {
353357
// console.log(h);

‎packages/obsidian/src/settings/buttonTemplateSetting/ButtonTemplatesSettingComponent.svelte‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import ErrorCollectionComponent from 'packages/core/src/utils/errors/ErrorCollectionComponent.svelte';
44
import ModalButtonGroup from 'packages/core/src/utils/components/ModalButtonGroup.svelte';
55
import Button from 'packages/core/src/utils/components/Button.svelte';
6-
import { ButtonConfig } from 'packages/core/src/config/ButtonConfig';
7-
import { ButtonTemplatesSettingModal } from './ButtonTemplatesSettingModal';
8-
import ButtonTemplateSettingComponent from './ButtonTemplateSettingComponent.svelte';
6+
import { ButtonConfig, ButtonStyleType } from 'packages/core/src/config/ButtonConfig';
7+
import { ButtonTemplatesSettingModal } from 'packages/obsidian/src/settings/buttonTemplateSetting/ButtonTemplatesSettingModal';
8+
import ButtonTemplateSettingComponent from 'packages/obsidian/src/settings/buttonTemplateSetting/ButtonTemplateSettingComponent.svelte';
99
import { V_ButtonConfig } from 'packages/core/src/config/ButtonConfigValidators';
1010
import { fromZodError } from 'zod-validation-error';
1111
import { ErrorLevel, MetaBindButtonError } from 'packages/core/src/utils/errors/MetaBindErrors';
@@ -27,7 +27,7 @@
2727
buttonConfigs = buttonConfigs;
2828
}
2929
30-
async function addTemplateFromClipboard(): void {
30+
async function addTemplateFromClipboard(): Promise<void> {
3131
let unvalidatedConfig: ButtonConfig | undefined;
3232
try {
3333
unvalidatedConfig = parseYaml(await navigator.clipboard.readText());
@@ -94,10 +94,12 @@
9494
></ButtonTemplateSettingComponent>
9595
{/each}
9696

97-
<Button on:click={() => addTemplate()} variant="primary" tooltip="Create New Template">Add Template</Button>
97+
<Button on:click={() => addTemplate()} variant={ButtonStyleType.PRIMARY} tooltip="Create New Template"
98+
>Add Template</Button
99+
>
98100
<Button
99101
on:click={() => addTemplateFromClipboard()}
100-
variant="default"
102+
variant={ButtonStyleType.DEFAULT}
101103
tooltip="Create New Template from YAML in Clipboard"
102104
>Add Template from Clipboard
103105
</Button>
@@ -115,7 +117,7 @@
115117
{/if}
116118

117119
<ModalButtonGroup>
118-
<Button on:click={() => save()} variant="primary" tooltip="Save Changes">Save</Button>
120+
<Button on:click={() => save()} variant={ButtonStyleType.PRIMARY} tooltip="Save Changes">Save</Button>
119121
<Button on:click={() => cancel()} tooltip="Revert Changes">Cancel</Button>
120122
</ModalButtonGroup>
121123
</div>

‎packages/obsidian/src/settings/excludedFoldersSetting/ExcludedFoldersSettingComponent.svelte‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
import Button from 'packages/core/src/utils/components/Button.svelte';
66
import Icon from 'packages/core/src/utils/components/Icon.svelte';
77
import { ErrorCollection } from 'packages/core/src/utils/errors/ErrorCollection';
8+
import { ButtonStyleType } from 'packages/core/src/config/ButtonConfig';
9+
import { IPlugin } from 'packages/core/src/IPlugin';
810
911
export let excludedFolders: string[];
1012
export let modal: ExcludedFoldersSettingModal;
13+
export let plugin: IPlugin;
1114
1215
let errorCollection: ErrorCollection | undefined;
1316
@@ -50,27 +53,28 @@
5053
</td>
5154
<td>
5255
<Button on:click={() => deleteFolder(folder)} tooltip="Delete">
53-
<Icon plugin={modal.plugin} iconName="x"></Icon>
56+
<Icon plugin={plugin} iconName="x"></Icon>
5457
</Button>
5558
</td>
5659
</tr>
5760
{/each}
5861
</tbody>
5962
</table>
6063

61-
<Button on:click={() => addFolder()} variant="primary" tooltip="Add new excluded Folder">Add Folder</Button>
64+
<Button on:click={() => addFolder()} variant={ButtonStyleType.PRIMARY} tooltip="Add new excluded Folder"
65+
>Add Folder</Button
66+
>
6267

6368
{#if errorCollection}
6469
<div>
6570
<h3 class="mod-error">Some Folder Paths are invalid</h3>
6671

67-
<ErrorCollectionComponent errorCollection={errorCollection} declaration={undefined}
68-
></ErrorCollectionComponent>
72+
<ErrorCollectionComponent settings={{ errorCollection: errorCollection }}></ErrorCollectionComponent>
6973
</div>
7074
{/if}
7175

7276
<ModalButtonGroup>
73-
<Button on:click={() => save()} variant="primary" tooltip="Save Changes">Save</Button>
77+
<Button on:click={() => save()} variant={ButtonStyleType.PRIMARY} tooltip="Save Changes">Save</Button>
7478
<Button on:click={() => cancel()} tooltip="Revert Changes">Cancel</Button>
7579
</ModalButtonGroup>
7680
</div>

‎packages/obsidian/src/settings/excludedFoldersSetting/ExcludedFoldersSettingModal.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export class ExcludedFoldersSettingModal extends Modal {
2323
props: {
2424
excludedFolders: this.plugin.settings.excludedFolders.slice(),
2525
modal: this,
26+
plugin: this.plugin,
2627
},
2728
});
2829
}

‎packages/obsidian/src/settings/inputFieldTemplateSetting/InputFieldTemplateSettingComponent.svelte‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
</Button>
2828
</FlexRow>
2929
<textarea
30-
type="text"
3130
bind:value={template.declaration}
3231
placeholder="INPUT[slider(addLabels)]"
3332
style="width: 100%; height: 100px; resize: vertical;"

‎packages/obsidian/src/settings/inputFieldTemplateSetting/InputFieldTemplatesSettingComponent.svelte‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<script lang="ts">
2-
import InputFieldTemplateSettingComponent from './InputFieldTemplateSettingComponent.svelte';
3-
import { InputFieldTemplatesSettingModal } from './InputFieldTemplatesSettingModal';
2+
import InputFieldTemplateSettingComponent from 'packages/obsidian/src/settings/inputFieldTemplateSetting/InputFieldTemplateSettingComponent.svelte';
3+
import { InputFieldTemplatesSettingModal } from 'packages/obsidian/src/settings/inputFieldTemplateSetting/InputFieldTemplatesSettingModal';
44
import ErrorCollectionComponent from 'packages/core/src/utils/errors/ErrorCollectionComponent.svelte';
55
import ModalButtonGroup from 'packages/core/src/utils/components/ModalButtonGroup.svelte';
66
import Button from 'packages/core/src/utils/components/Button.svelte';
77
import { ErrorCollection } from 'packages/core/src/utils/errors/ErrorCollection';
88
import { InputFieldTemplate } from 'packages/core/src/Settings';
9+
import { ButtonStyleType } from 'packages/core/src/config/ButtonConfig';
910
1011
export let inputFieldTemplates: InputFieldTemplate[];
1112
export let modal: InputFieldTemplatesSettingModal;
@@ -49,7 +50,9 @@
4950
></InputFieldTemplateSettingComponent>
5051
{/each}
5152

52-
<Button on:click={() => addTemplate()} variant="primary" tooltip="Create New Template">Add Template</Button>
53+
<Button on:click={() => addTemplate()} variant={ButtonStyleType.PRIMARY} tooltip="Create New Template"
54+
>Add Template</Button
55+
>
5356

5457
{#if errorCollection}
5558
<div>
@@ -64,7 +67,7 @@
6467
{/if}
6568

6669
<ModalButtonGroup>
67-
<Button on:click={() => save()} variant="primary" tooltip="Save Changes">Save</Button>
70+
<Button on:click={() => save()} variant={ButtonStyleType.PRIMARY} tooltip="Save Changes">Save</Button>
6871
<Button on:click={() => cancel()} tooltip="Revert Changes">Cancel</Button>
6972
</ModalButtonGroup>
7073
</div>

‎packages/publish/src/PublishFieldComponent.svelte‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎tsconfig.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
"include": [
1919
"packages/core/**/*.ts",
2020
"packages/core/**/*.svelte",
21+
"packages/obsidian/**/*.ts",
22+
"packages/obsidian/**/*.svelte",
23+
"packages/publish/**/*.ts",
24+
"packages/publish/**/*.svelte",
2125
"tests/**/*.ts",
2226
"node_modules/obsidian/publish.d.ts"
2327
]

0 commit comments

Comments
 (0)