flowdini-spec 0.1.2 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # flowdini-spec
2
2
 
3
- Парсер `.md`-файлов для flowdini: заголовки первых трёх уровней и Obsidian Inline Fields (`[param:: value]`). TypeScript, ESM, npm-пакет.
3
+ Низкоуровневая «карта» flowdini: парсер и сериализатор `.md`-файлов (заголовки 1–3 уровней и Obsidian Inline Fields `[param:: value]`) + сырой доступ к файлам. TypeScript, ESM, npm-пакет. Без процесса/ролей/LLM — объект `fd` поверх этих функций собирает `flowdini-engine`.
4
4
 
5
5
  ## Установка
6
6
 
@@ -11,29 +11,43 @@ npm i flowdini-spec
11
11
  ## Использование
12
12
 
13
13
  ```ts
14
- import { FdMd } from 'flowdini-spec';
15
-
16
- const fd = new FdMd({ dir: './specs' });
17
- await fd.scan();
18
-
19
- for (const file of fd.getFileList()) {
20
- const schema = await fd.getSchema(file);
21
- // schema.inlineList — поля до первого заголовка
22
- // schema.contentList — записи по заголовкам
14
+ import { FdTaskFile, textToStructure } from 'flowdini-spec';
15
+
16
+ const files = new FdTaskFile('./specs');
17
+ for (const file of await files.list()) {
18
+ const text = await files.read(file);
19
+ const content = textToStructure(text, true);
20
+ // content.inlineList — поля до первого заголовка
21
+ // content.itemList — записи по заголовкам (topic + text)
23
22
  }
24
23
  ```
25
24
 
26
- Низкоуровневый парсинг строки: `parseMarkdown(content)` (тот же `TFdSchema`).
27
-
28
25
  ## API
29
26
 
27
+ ### `FdTaskFile` — сырой доступ к файлам
28
+
30
29
  | Метод | Сигнатура | Описание |
31
30
  |---|---|---|
32
- | `scan` | `async scan(): Promise<void>` | Рекурсивно обходит `dir`, формирует список файлов; повторный вызов сбрасывает кэш. |
33
- | `getFileList` | `getFileList(): string[]` | Относительные пути от `dir`, разделитель `/`, лексикографический порядок. |
34
- | `getSchema` | `async getSchema(fileItem): Promise<TFdSchema>` | Схема файла (элемент `getFileList`), кэш по `mtime + size`. |
31
+ | `list` | `async list(): Promise<string[]>` | Рекурсивный обход `.md`-файлов (скрытые пропускаются), пути относительно каталога, разделитель `/`, сортировка. |
32
+ | `read` | `async read(file): Promise<string>` | Сырое содержимое файла. |
33
+ | `write` | `async write(file, text): Promise<void>` | Запись; создаёт родительские каталоги при необходимости. |
35
34
 
36
- Конструктор: `new FdMd({ dir, filter? })`, где `filter: { list: string[], action: 'allow' | 'deny' }`.
35
+ Конструктор: `new FdTaskFile(taskDir)`.
36
+
37
+ ### `parser` — текст ↔ структура
38
+
39
+ | Функция | Сигнатура | Описание |
40
+ |---|---|---|
41
+ | `textToStructure` | `(text, allowText: boolean): TFdContent` | Парсинг md в структуру. `allowText: false` → `text` везде `null` (тело не накапливается), структура и inline-поля — на месте. |
42
+ | `inlineFieldToText` | `(field): string` | `[param:: v1, v2]`. |
43
+ | `levelToText` | `(level, headingLevel: 1\|2\|3): string` | Заголовок: `### title 2`. |
44
+ | `topicToText` | `(topic): string` | Заголовок самого глубокого заданного уровня + inline-поля в ту же строку. |
45
+ | `itemToText` | `(item): string` | Заголовок + `\n` + тело (если есть). |
46
+ | `contentToText` | `(content): string` | Преамбула (по строке на поле) + элементы через `\n`. |
47
+
48
+ ### `builder` — фабрики пустых структур
49
+
50
+ `newInlineField()`, `newLevel()`, `newTopic()`, `newItem()`, `newContent()` — и объект `builder` с теми же функциями (без `this`, безопасны при деструктуризации).
37
51
 
38
52
  ## Типы
39
53
 
@@ -48,16 +62,21 @@ interface TFdInlineField {
48
62
  valueList: string[];
49
63
  }
50
64
 
51
- interface TFdContentItem {
65
+ interface TFdTopic {
52
66
  level1: TFdLevel | null;
53
67
  level2: TFdLevel | null;
54
68
  level3: TFdLevel | null;
55
69
  inlineList: TFdInlineField[];
56
70
  }
57
71
 
58
- interface TFdSchema {
72
+ interface TFdItem {
73
+ topic: TFdTopic;
74
+ text: string | null; // тело раздела (сырой текст), null — тела нет
75
+ }
76
+
77
+ interface TFdContent {
59
78
  inlineList: TFdInlineField[]; // преамбула: поля до первого заголовка
60
- contentList: TFdContentItem[];
79
+ itemList: TFdItem[];
61
80
  }
62
81
  ```
63
82
 
@@ -66,7 +85,7 @@ interface TFdSchema {
66
85
  ### Заголовки
67
86
 
68
87
  - ATX-заголовки уровней 1–3; уровень = числу `#`. Уровни 4+ игнорируются.
69
- - Каждый заголовок создаёт новую запись `contentList`; старший уровень сбрасывает младшие в `null`. Отсутствующие предки — `null`.
88
+ - Каждый заголовок создаёт новую запись `itemList`; старший уровень сбрасывает младшие в `null`. Отсутствующие предки — `null`.
70
89
  - Заголовок разбивается на `title` + `idx`: если последний whitespace-токен — целое число (со знаком `-`), он уходит в `idx`, остаток — в `title`; иначе `idx: null`, `title` — весь текст.
71
90
  - `# question 2` → `{ title: 'question', idx: 2 }`
72
91
  - `# question ` → `{ title: 'question', idx: null }`
@@ -88,16 +107,16 @@ interface TFdSchema {
88
107
  - Поля до первого заголовка → верхний `inlineList` (преамбула).
89
108
  - Поле на строке заголовка → в новую запись, из текста заголовка вычищается.
90
109
 
91
- ## Фильтр
110
+ ### Тело раздела (`text`)
92
111
 
93
- - Дефолт — все `*.md` рекурсивно (`**/*.md`).
94
- - Матчинг micromatch против относительного пути (разделитель `/`), регистрозависимый: `*` не пересекает `/`, `**` пересекает. `111.md` — только корень, `**/*2.md` — любая глубина.
95
- - `allow` — оставить подходящие; `deny` — исключить подходящие.
112
+ - Строки между заголовком и следующим заголовком — тело раздела; сохраняются в `text` сырыми (как есть, включая строки с inline-полями и fenced-блоки).
113
+ - Inline-поля тела дополнительно индексируются в `topic.inlineList` (не вычищаются из `text` — `text` каноничен для обратной сборки).
114
+ - Пустое тело (только whitespace) → `text: null`.
115
+ - При `allowText: false` тело не накапливается, `text` всегда `null`; поля индексируются как обычно.
96
116
 
97
- ## Кэш и ошибки
117
+ ## Сериализация
98
118
 
99
- - Кэш по `mtime + size`; без изменений файл не перечитывается.
100
- - Ошибка чтения/парсинга → пустая схема `{ inlineList: [], contentList: [] }`, кэш для файла сбрасывается.
119
+ Собирает структуру обратно в md: `contentToText` → `itemToText` → `topicToText` → `levelToText` / `inlineFieldToText`. `text` сериализуется как есть. Точный round-trip исходного форматирования (пробелы, положение поля в теле vs в заголовке) не гарантируется: inline-поля `topic.inlineList` выводятся в строку заголовка.
101
120
 
102
121
  ## Пример
103
122
 
@@ -111,29 +130,43 @@ interface TFdSchema {
111
130
  [par1:: val4, val5]
112
131
  ```
113
132
 
114
- Выход (`getSchema`):
133
+ Выход (`textToStructure(text, true)`):
115
134
 
116
135
  ```json
117
136
  {
118
137
  "inlineList": [],
119
- "contentList": [
120
- { "level1": { "title": "chapter", "idx": 1 }, "level2": null, "level3": null, "inlineList": [] },
138
+ "itemList": [
139
+ {
140
+ "topic": {
141
+ "level1": { "title": "chapter", "idx": 1 },
142
+ "level2": null,
143
+ "level3": null,
144
+ "inlineList": []
145
+ },
146
+ "text": null
147
+ },
121
148
  {
122
- "level1": { "title": "chapter", "idx": 1 },
123
- "level2": { "title": "chapter", "idx": 2 },
124
- "level3": null,
125
- "inlineList": [
126
- { "param": "par1", "valueList": ["val1"] },
127
- { "param": "par2", "valueList": ["val1", "val2"] }
128
- ]
149
+ "topic": {
150
+ "level1": { "title": "chapter", "idx": 1 },
151
+ "level2": { "title": "chapter", "idx": 2 },
152
+ "level3": null,
153
+ "inlineList": [
154
+ { "param": "par1", "valueList": ["val1"] },
155
+ { "param": "par2", "valueList": ["val1", "val2"] }
156
+ ]
157
+ },
158
+ "text": "[par1:: val1] [par2:: val1, val2]"
129
159
  },
130
160
  {
131
- "level1": { "title": "chapter", "idx": 1 },
132
- "level2": { "title": "chapter", "idx": 2 },
133
- "level3": { "title": "chapter", "idx": 3 },
134
- "inlineList": [
135
- { "param": "par1", "valueList": ["val4", "val5"] }
136
- ]
161
+ "topic": {
162
+ "level1": { "title": "chapter", "idx": 1 },
163
+ "level2": { "title": "chapter", "idx": 2 },
164
+ "level3": { "title": "chapter", "idx": 3 },
165
+ "inlineList": [
166
+ { "param": "par1", "valueList": ["val4", "val5"] }
167
+ ]
168
+ },
169
+ "text": "[par1:: val4, val5]"
137
170
  }
138
171
  ]
139
172
  }
@@ -0,0 +1,12 @@
1
+ /** Сырой доступ к `.md`-файлам каталога задачи: список / чтение / запись. */
2
+ export declare class FdTaskFile {
3
+ private readonly dir;
4
+ constructor(taskDir: string);
5
+ /** Рекурсивный обход `.md`-файлов (скрытые папки/файлы пропускаются), пути относительно `dir`. */
6
+ list(): Promise<string[]>;
7
+ read(relativeFileName: string): Promise<string>;
8
+ /** Создаёт родительские каталоги при необходимости. */
9
+ write(relativeFileName: string, text: string): Promise<void>;
10
+ private walk;
11
+ }
12
+ //# sourceMappingURL=FdTaskFile.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FdTaskFile.d.ts","sourceRoot":"","sources":["../src/FdTaskFile.ts"],"names":[],"mappings":"AAGA,6EAA6E;AAC7E,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;gBAEjB,OAAO,EAAE,MAAM;IAI3B,kGAAkG;IAC5F,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAOzB,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD,uDAAuD;IACjD,KAAK,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAMpD,IAAI;CAoBnB"}
@@ -0,0 +1,48 @@
1
+ import { promises as fs } from 'node:fs';
2
+ import * as path from 'node:path';
3
+ /** Сырой доступ к `.md`-файлам каталога задачи: список / чтение / запись. */
4
+ export class FdTaskFile {
5
+ dir;
6
+ constructor(taskDir) {
7
+ this.dir = path.resolve(taskDir);
8
+ }
9
+ /** Рекурсивный обход `.md`-файлов (скрытые папки/файлы пропускаются), пути относительно `dir`. */
10
+ async list() {
11
+ const abs = await this.walk(this.dir);
12
+ return abs
13
+ .map((f) => path.relative(this.dir, f).split(path.sep).join('/'))
14
+ .sort();
15
+ }
16
+ async read(relativeFileName) {
17
+ return fs.readFile(path.resolve(this.dir, relativeFileName), 'utf8');
18
+ }
19
+ /** Создаёт родительские каталоги при необходимости. */
20
+ async write(relativeFileName, text) {
21
+ const fullPath = path.resolve(this.dir, relativeFileName);
22
+ await fs.mkdir(path.dirname(fullPath), { recursive: true });
23
+ await fs.writeFile(fullPath, text, 'utf8');
24
+ }
25
+ async walk(dir) {
26
+ let entries;
27
+ try {
28
+ entries = await fs.readdir(dir, { withFileTypes: true });
29
+ }
30
+ catch {
31
+ return [];
32
+ }
33
+ const out = [];
34
+ for (const entry of entries) {
35
+ if (entry.name.startsWith('.'))
36
+ continue;
37
+ const full = path.join(dir, entry.name);
38
+ if (entry.isDirectory()) {
39
+ out.push(...(await this.walk(full)));
40
+ }
41
+ else if (entry.isFile() && entry.name.endsWith('.md')) {
42
+ out.push(full);
43
+ }
44
+ }
45
+ return out;
46
+ }
47
+ }
48
+ //# sourceMappingURL=FdTaskFile.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FdTaskFile.js","sourceRoot":"","sources":["../src/FdTaskFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,6EAA6E;AAC7E,MAAM,OAAO,UAAU;IACJ,GAAG,CAAS;IAE7B,YAAY,OAAe;QACzB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAED,kGAAkG;IAClG,KAAK,CAAC,IAAI;QACR,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,OAAO,GAAG;aACP,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAChE,IAAI,EAAE,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,gBAAwB;QACjC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;IACvE,CAAC;IAED,uDAAuD;IACvD,KAAK,CAAC,KAAK,CAAC,gBAAwB,EAAE,IAAY;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC1D,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,GAAW;QAC5B,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,GAAG,GAAa,EAAE,CAAC;QACzB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;gBACxB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC;iBAAM,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF"}
@@ -0,0 +1,15 @@
1
+ import type { TFdContent, TFdInlineField, TFdItem, TFdLevel, TFdTopic } from './types.js';
2
+ export declare function newInlineField(): TFdInlineField;
3
+ export declare function newLevel(): TFdLevel;
4
+ export declare function newTopic(): TFdTopic;
5
+ export declare function newItem(): TFdItem;
6
+ export declare function newContent(): TFdContent;
7
+ /** Фабрики пустых структур (без `this` — безопасны при деструктуризации). */
8
+ export declare const builder: {
9
+ newInlineField: typeof newInlineField;
10
+ newLevel: typeof newLevel;
11
+ newTopic: typeof newTopic;
12
+ newItem: typeof newItem;
13
+ newContent: typeof newContent;
14
+ };
15
+ //# sourceMappingURL=builder.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,OAAO,EACP,QAAQ,EACR,QAAQ,EACT,MAAM,YAAY,CAAC;AAEpB,wBAAgB,cAAc,IAAI,cAAc,CAE/C;AAED,wBAAgB,QAAQ,IAAI,QAAQ,CAEnC;AAED,wBAAgB,QAAQ,IAAI,QAAQ,CAEnC;AAED,wBAAgB,OAAO,IAAI,OAAO,CAEjC;AAED,wBAAgB,UAAU,IAAI,UAAU,CAEvC;AAED,6EAA6E;AAC7E,eAAO,MAAM,OAAO;;;;;;CAMnB,CAAC"}
@@ -0,0 +1,24 @@
1
+ export function newInlineField() {
2
+ return { param: '', valueList: [] };
3
+ }
4
+ export function newLevel() {
5
+ return { title: '', idx: null };
6
+ }
7
+ export function newTopic() {
8
+ return { level1: null, level2: null, level3: null, inlineList: [] };
9
+ }
10
+ export function newItem() {
11
+ return { topic: newTopic(), text: null };
12
+ }
13
+ export function newContent() {
14
+ return { inlineList: [], itemList: [] };
15
+ }
16
+ /** Фабрики пустых структур (без `this` — безопасны при деструктуризации). */
17
+ export const builder = {
18
+ newInlineField,
19
+ newLevel,
20
+ newTopic,
21
+ newItem,
22
+ newContent,
23
+ };
24
+ //# sourceMappingURL=builder.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"builder.js","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,cAAc;IAC5B,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,OAAO;IACrB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAC1C,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,OAAO;IACP,UAAU;CACX,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
- export { FdMd } from './FdMd.js';
2
- export { parseMarkdown } from './parse.js';
3
- export type { TFdSchema, TFdContentItem, TFdInlineField, TFdLevel, FdMdParams, FdMdFilter, } from './types.js';
1
+ export { FdTaskFile } from './FdTaskFile.js';
2
+ export { textToStructure, inlineFieldToText, levelToText, topicToText, itemToText, contentToText, } from './parse.js';
3
+ export { builder, newInlineField, newLevel, newTopic, newItem, newContent, } from './builder.js';
4
+ export type { TFdContent, TFdItem, TFdTopic, TFdLevel, TFdInlineField, } from './types.js';
4
5
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,YAAY,EACV,SAAS,EACT,cAAc,EACd,cAAc,EACd,QAAQ,EACR,UAAU,EACV,UAAU,GACX,MAAM,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,UAAU,EACV,aAAa,GACd,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,OAAO,EACP,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,UAAU,GACX,MAAM,cAAc,CAAC;AACtB,YAAY,EACV,UAAU,EACV,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,cAAc,GACf,MAAM,YAAY,CAAC"}
package/dist/index.js CHANGED
@@ -1,3 +1,4 @@
1
- export { FdMd } from './FdMd.js';
2
- export { parseMarkdown } from './parse.js';
1
+ export { FdTaskFile } from './FdTaskFile.js';
2
+ export { textToStructure, inlineFieldToText, levelToText, topicToText, itemToText, contentToText, } from './parse.js';
3
+ export { builder, newInlineField, newLevel, newTopic, newItem, newContent, } from './builder.js';
3
4
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,UAAU,EACV,aAAa,GACd,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,OAAO,EACP,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,UAAU,GACX,MAAM,cAAc,CAAC"}
package/dist/parse.d.ts CHANGED
@@ -1,3 +1,19 @@
1
- import type { TFdSchema } from './types.js';
2
- export declare function parseMarkdown(content: string): TFdSchema;
1
+ import type { TFdContent, TFdInlineField, TFdItem, TFdLevel, TFdTopic } from './types.js';
2
+ /**
3
+ * Парсинг md в структуру. `allowText` управляет телом разделов:
4
+ * `true` — тело сохраняется в `item.text`; `false` — `text` везде `null`
5
+ * (тело не накапливается — когда нужна только структура/навигация).
6
+ * Inline-поля индексируются в `topic.inlineList` в обоих режимах.
7
+ */
8
+ export declare function textToStructure(text: string, allowText: boolean): TFdContent;
9
+ export declare function inlineFieldToText(field: TFdInlineField): string;
10
+ export declare function levelToText(level: TFdLevel, headingLevel: 1 | 2 | 3): string;
11
+ /**
12
+ * Заголовок самого глубокого заданного уровня + inline-поля в ту же строку.
13
+ * Пустой топик (все уровни `null`) → `''`.
14
+ */
15
+ export declare function topicToText(topic: TFdTopic): string;
16
+ export declare function itemToText(item: TFdItem): string;
17
+ /** Преамбула (по строке на поле) + элементы, склеенные через `\n`. */
18
+ export declare function contentToText(content: TFdContent): string;
3
19
  //# sourceMappingURL=parse.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,SAAS,EACV,MAAM,YAAY,CAAC;AA4EpB,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAuDxD"}
1
+ {"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,OAAO,EACP,QAAQ,EACR,QAAQ,EACT,MAAM,YAAY,CAAC;AAwEpB;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,GAAG,UAAU,CAmE5E;AAID,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAE/D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAI5E;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAOnD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAGhD;AAED,sEAAsE;AACtE,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAKzD"}
package/dist/parse.js CHANGED
@@ -56,19 +56,32 @@ function isClosingFence(line, char, len) {
56
56
  const re = new RegExp(`^ {0,3}${char}{${len},}\\s*$`);
57
57
  return re.test(line);
58
58
  }
59
- export function parseMarkdown(content) {
60
- const schema = { inlineList: [], contentList: [] };
61
- const lines = content.split(/\r?\n/);
59
+ /** Пустое тело (только whitespace) → `null`. */
60
+ function finishText(bodyLines) {
61
+ const text = bodyLines.join('\n');
62
+ return text.trim() === '' ? null : text;
63
+ }
64
+ /**
65
+ * Парсинг md в структуру. `allowText` управляет телом разделов:
66
+ * `true` — тело сохраняется в `item.text`; `false` — `text` везде `null`
67
+ * (тело не накапливается — когда нужна только структура/навигация).
68
+ * Inline-поля индексируются в `topic.inlineList` в обоих режимах.
69
+ */
70
+ export function textToStructure(text, allowText) {
71
+ const result = { inlineList: [], itemList: [] };
72
+ const lines = text.split(/\r?\n/);
62
73
  let level1 = null;
63
74
  let level2 = null;
64
75
  let level3 = null;
65
- let currentInline = schema.inlineList;
76
+ let currentItem = null;
77
+ let bodyLines = [];
66
78
  let inFence = false;
67
79
  let fenceChar = '';
68
80
  let fenceLen = 0;
69
- // Fenced-блок: заголовки и inline-поля внутри — литерал, не парсятся.
70
81
  for (const line of lines) {
71
82
  if (inFence) {
83
+ if (allowText)
84
+ bodyLines.push(line);
72
85
  if (isClosingFence(line, fenceChar, fenceLen))
73
86
  inFence = false;
74
87
  continue;
@@ -78,10 +91,15 @@ export function parseMarkdown(content) {
78
91
  inFence = true;
79
92
  fenceChar = open.char;
80
93
  fenceLen = open.len;
94
+ if (allowText)
95
+ bodyLines.push(line);
81
96
  continue;
82
97
  }
83
98
  const heading = matchHeading(line);
84
99
  if (heading) {
100
+ if (allowText && currentItem)
101
+ currentItem.text = finishText(bodyLines);
102
+ bodyLines = [];
85
103
  const level = parseLevel(stripFields(heading.text));
86
104
  const fields = extractFields(heading.text);
87
105
  if (heading.level === 1) {
@@ -96,16 +114,60 @@ export function parseMarkdown(content) {
96
114
  else {
97
115
  level3 = level;
98
116
  }
99
- const item = { level1, level2, level3, inlineList: fields };
100
- schema.contentList.push(item);
101
- currentInline = item.inlineList;
117
+ const topic = { level1, level2, level3, inlineList: fields };
118
+ const item = { topic, text: null };
119
+ result.itemList.push(item);
120
+ currentItem = item;
102
121
  continue;
103
122
  }
123
+ // Обычная строка тела: текст только при allowText; поля индексируются всегда.
124
+ if (allowText)
125
+ bodyLines.push(line);
104
126
  const fields = extractFields(line);
105
127
  if (fields.length > 0) {
106
- currentInline.push(...fields);
128
+ if (currentItem)
129
+ currentItem.topic.inlineList.push(...fields);
130
+ else
131
+ result.inlineList.push(...fields);
107
132
  }
108
133
  }
109
- return schema;
134
+ if (allowText && currentItem)
135
+ currentItem.text = finishText(bodyLines);
136
+ return result;
137
+ }
138
+ // ---- Сериализация (структура → текст) ----
139
+ export function inlineFieldToText(field) {
140
+ return `[${field.param}:: ${field.valueList.join(', ')}]`;
141
+ }
142
+ export function levelToText(level, headingLevel) {
143
+ const hashes = '#'.repeat(headingLevel);
144
+ const idx = level.idx === null ? '' : ` ${level.idx}`;
145
+ return `${hashes} ${level.title}${idx}`;
146
+ }
147
+ /**
148
+ * Заголовок самого глубокого заданного уровня + inline-поля в ту же строку.
149
+ * Пустой топик (все уровни `null`) → `''`.
150
+ */
151
+ export function topicToText(topic) {
152
+ const deepest = topic.level3 ?? topic.level2 ?? topic.level1;
153
+ if (!deepest)
154
+ return '';
155
+ const headingLevel = topic.level3 ? 3 : topic.level2 ? 2 : 1;
156
+ const head = levelToText(deepest, headingLevel);
157
+ const fields = topic.inlineList.map(inlineFieldToText).join(' ');
158
+ return fields ? `${head} ${fields}` : head;
159
+ }
160
+ export function itemToText(item) {
161
+ const head = topicToText(item.topic);
162
+ return item.text === null ? head : `${head}\n${item.text}`;
163
+ }
164
+ /** Преамбула (по строке на поле) + элементы, склеенные через `\n`. */
165
+ export function contentToText(content) {
166
+ const parts = [];
167
+ for (const field of content.inlineList)
168
+ parts.push(inlineFieldToText(field));
169
+ for (const item of content.itemList)
170
+ parts.push(itemToText(item));
171
+ return parts.join('\n');
110
172
  }
111
173
  //# sourceMappingURL=parse.js.map
package/dist/parse.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -3,26 +3,26 @@ export interface TFdInlineField {
3
3
  valueList: string[];
4
4
  }
5
5
  export interface TFdLevel {
6
+ /** Текст заголовка без `idx`. */
6
7
  title: string;
7
8
  idx: number | null;
8
9
  }
9
- export interface TFdContentItem {
10
+ /** Адресуемый узел: заголовки 1–3 уровней + привязанные inline-поля. Без текста. */
11
+ export interface TFdTopic {
10
12
  level1: TFdLevel | null;
11
13
  level2: TFdLevel | null;
12
14
  level3: TFdLevel | null;
13
15
  inlineList: TFdInlineField[];
14
16
  }
15
- export interface TFdSchema {
17
+ /** Элемент контента: узел (topic) + тело раздела. `text: null` — тела нет. */
18
+ export interface TFdItem {
19
+ topic: TFdTopic;
20
+ text: string | null;
21
+ }
22
+ /** Распарсенный контент одного файла: преамбула + элементы. */
23
+ export interface TFdContent {
16
24
  /** Преамбула: inline-поля до первого заголовка. */
17
25
  inlineList: TFdInlineField[];
18
- contentList: TFdContentItem[];
19
- }
20
- export interface FdMdFilter {
21
- list: string[];
22
- action: 'allow' | 'deny';
23
- }
24
- export interface FdMdParams {
25
- dir: string;
26
- filter?: FdMdFilter;
26
+ itemList: TFdItem[];
27
27
  }
28
28
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,SAAS;IACxB,mDAAmD;IACnD,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,oFAAoF;AACpF,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,cAAc,EAAE,CAAC;CAC9B;AAED,8EAA8E;AAC9E,MAAM,WAAW,OAAO;IACtB,KAAK,EAAE,QAAQ,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,+DAA+D;AAC/D,MAAM,WAAW,UAAU;IACzB,mDAAmD;IACnD,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,QAAQ,EAAE,OAAO,EAAE,CAAC;CACrB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "flowdini-spec",
3
- "version": "0.1.2",
3
+ "version": "0.3.0",
4
4
  "description": "Markdown parser for flowdini specs: headings (levels 1-3) and Obsidian inline fields",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
package/dist/FdMd.d.ts DELETED
@@ -1,16 +0,0 @@
1
- import type { FdMdParams, TFdSchema } from './types.js';
2
- export declare class FdMd {
3
- private readonly dir;
4
- private readonly filter?;
5
- private fileList;
6
- private readonly cache;
7
- constructor(params: FdMdParams);
8
- scan(): Promise<void>;
9
- getFileList(): string[];
10
- /** Кэш по `mtime + size`; ошибка чтения → пустая схема, кэш файла сбрасывается. */
11
- getSchema(fileItem: string): Promise<TFdSchema>;
12
- /** micromatch против относительного пути: `*` не пересекает `/`, `**` — пересекает; регистрозависимо. */
13
- private applyFilter;
14
- private walk;
15
- }
16
- //# sourceMappingURL=FdMd.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"FdMd.d.ts","sourceRoot":"","sources":["../src/FdMd.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAc,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAYpE,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;gBAE3C,MAAM,EAAE,UAAU;IAKxB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAS3B,WAAW,IAAI,MAAM,EAAE;IAIvB,mFAAmF;IAC7E,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAgCrD,yGAAyG;IACzG,OAAO,CAAC,WAAW;YAUL,IAAI;CAoBnB"}
package/dist/FdMd.js DELETED
@@ -1,91 +0,0 @@
1
- import { promises as fs } from 'node:fs';
2
- import * as path from 'node:path';
3
- import micromatch from 'micromatch';
4
- import { parseMarkdown } from './parse.js';
5
- function emptySchema() {
6
- return { inlineList: [], contentList: [] };
7
- }
8
- export class FdMd {
9
- dir;
10
- filter;
11
- fileList = [];
12
- cache = new Map();
13
- constructor(params) {
14
- this.dir = path.resolve(params.dir);
15
- this.filter = params.filter;
16
- }
17
- async scan() {
18
- const absFiles = await this.walk(this.dir);
19
- const relFiles = absFiles
20
- .map((f) => path.relative(this.dir, f).split(path.sep).join('/'))
21
- .sort();
22
- this.fileList = this.applyFilter(relFiles);
23
- this.cache.clear();
24
- }
25
- getFileList() {
26
- return [...this.fileList];
27
- }
28
- /** Кэш по `mtime + size`; ошибка чтения → пустая схема, кэш файла сбрасывается. */
29
- async getSchema(fileItem) {
30
- const fullPath = path.resolve(this.dir, fileItem);
31
- let mtimeMs;
32
- let size;
33
- try {
34
- const stat = await fs.stat(fullPath);
35
- mtimeMs = stat.mtimeMs;
36
- size = stat.size;
37
- }
38
- catch {
39
- this.cache.delete(fileItem);
40
- return emptySchema();
41
- }
42
- const cached = this.cache.get(fileItem);
43
- if (cached && cached.mtimeMs === mtimeMs && cached.size === size) {
44
- return cached.schema;
45
- }
46
- let schema;
47
- try {
48
- const content = await fs.readFile(fullPath, 'utf8');
49
- schema = parseMarkdown(content);
50
- }
51
- catch {
52
- this.cache.delete(fileItem);
53
- return emptySchema();
54
- }
55
- this.cache.set(fileItem, { mtimeMs, size, schema });
56
- return schema;
57
- }
58
- /** micromatch против относительного пути: `*` не пересекает `/`, `**` — пересекает; регистрозависимо. */
59
- applyFilter(relFiles) {
60
- if (!this.filter)
61
- return relFiles;
62
- const { list, action } = this.filter;
63
- const matches = (p) => list.some((pat) => micromatch.isMatch(p, pat));
64
- if (action === 'allow')
65
- return relFiles.filter(matches);
66
- return relFiles.filter((p) => !matches(p));
67
- }
68
- async walk(dir) {
69
- let entries;
70
- try {
71
- entries = await fs.readdir(dir, { withFileTypes: true });
72
- }
73
- catch {
74
- return [];
75
- }
76
- const out = [];
77
- for (const entry of entries) {
78
- if (entry.name.startsWith('.'))
79
- continue;
80
- const full = path.join(dir, entry.name);
81
- if (entry.isDirectory()) {
82
- out.push(...(await this.walk(full)));
83
- }
84
- else if (entry.isFile() && entry.name.endsWith('.md')) {
85
- out.push(full);
86
- }
87
- }
88
- return out;
89
- }
90
- }
91
- //# sourceMappingURL=FdMd.js.map
package/dist/FdMd.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"FdMd.js","sourceRoot":"","sources":["../src/FdMd.ts"],"names":[],"mappings":"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"}