marhup 0.1.7 → 0.1.8
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 +62 -2
- package/dist/generator/pptx.d.ts.map +1 -1
- package/dist/generator/pptx.js +3 -3
- package/dist/generator/pptx.js.map +1 -1
- package/dist/mcp-handlers.d.ts.map +1 -1
- package/dist/mcp-handlers.js +30 -3
- package/dist/mcp-handlers.js.map +1 -1
- package/dist/parser/grid.d.ts +3 -3
- package/dist/parser/grid.d.ts.map +1 -1
- package/dist/parser/grid.js +35 -19
- package/dist/parser/grid.js.map +1 -1
- package/dist/parser/markdown.js +18 -16
- package/dist/parser/markdown.js.map +1 -1
- package/dist/theme/default.d.ts +1 -1
- package/dist/theme/default.d.ts.map +1 -1
- package/dist/theme/default.js +5 -2
- package/dist/theme/default.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -56,6 +56,11 @@ marhup input.md -o output.pptx --watch
|
|
|
56
56
|
title: プレゼンテーション
|
|
57
57
|
grid: 12x9
|
|
58
58
|
theme: default
|
|
59
|
+
aliases:
|
|
60
|
+
title: "[1-12, 1]"
|
|
61
|
+
contents: "[1-12, 2-8]"
|
|
62
|
+
left: "[1-6, 2-8]"
|
|
63
|
+
right: "[7-12, 2-8]"
|
|
59
64
|
---
|
|
60
65
|
```
|
|
61
66
|
|
|
@@ -65,19 +70,25 @@ theme: default
|
|
|
65
70
|
| `grid` | グリッドサイズ（列x行） | `12x9` |
|
|
66
71
|
| `theme` | テーマ名 | `default` |
|
|
67
72
|
| `layout` | プリセットレイアウト | なし |
|
|
73
|
+
| `aliases` | グリッド位置の別名定義 | なし |
|
|
74
|
+
| `classes` | カスタムスタイルクラス | なし |
|
|
68
75
|
|
|
69
76
|
### グリッド位置指定
|
|
70
77
|
|
|
71
|
-
`[列, 行]`
|
|
78
|
+
`[列, 行]` 形式または定義した別名で要素の位置を指定します：
|
|
72
79
|
|
|
73
80
|
```markdown
|
|
74
81
|
# タイトル [1-12, 1]
|
|
82
|
+
# タイトル [title] # 別名使用
|
|
75
83
|
|
|
76
84
|
[1-6, 2-8]
|
|
77
85
|
左側のコンテンツ
|
|
78
86
|
|
|
79
87
|
[7-12, 2-8]
|
|
80
88
|
右側のコンテンツ
|
|
89
|
+
|
|
90
|
+
[contents] # 別名使用
|
|
91
|
+
中央のコンテンツ
|
|
81
92
|
```
|
|
82
93
|
|
|
83
94
|
#### 記法
|
|
@@ -125,10 +136,16 @@ theme: default
|
|
|
125
136
|
| 配置 | `.center` | 中央揃え |
|
|
126
137
|
| | `.left` | 左揃え |
|
|
127
138
|
| | `.right` | 右揃え |
|
|
128
|
-
|
|
|
139
|
+
| 文字色 | `.red` | 赤色 |
|
|
129
140
|
| | `.blue` | 青色 |
|
|
130
141
|
| | `.green` | 緑色 |
|
|
131
142
|
| | `.gray` | グレー |
|
|
143
|
+
| | `.orange` | オレンジ色 |
|
|
144
|
+
| | `.purple` | 紫色 |
|
|
145
|
+
| 背景色 | `.bg-red` | 薄い赤背景 |
|
|
146
|
+
| | `.bg-blue` | 薄い青背景 |
|
|
147
|
+
| | `.bg-green` | 薄い緑背景 |
|
|
148
|
+
| | `.bg-gray` | 薄い灰背景 |
|
|
132
149
|
| サイズ | `.small` | 小さいフォント |
|
|
133
150
|
| | `.large` | 大きいフォント |
|
|
134
151
|
| 装飾 | `.bold` | 太字 |
|
|
@@ -138,6 +155,20 @@ theme: default
|
|
|
138
155
|
| | `.footer` | フッター領域 |
|
|
139
156
|
| | `.note` | 注釈スタイル |
|
|
140
157
|
|
|
158
|
+
**カスタムクラス**: Front Matterで独自のスタイルクラスを定義できます。定義したクラスはMarkdown内で使用可能です。
|
|
159
|
+
|
|
160
|
+
```markdown
|
|
161
|
+
---
|
|
162
|
+
classes:
|
|
163
|
+
myclass:
|
|
164
|
+
color: '#ff0000'
|
|
165
|
+
bold: true
|
|
166
|
+
fill: { color: '#ffe6e6' }
|
|
167
|
+
---
|
|
168
|
+
|
|
169
|
+
# タイトル {.myclass}
|
|
170
|
+
```
|
|
171
|
+
|
|
141
172
|
### 省略時のデフォルト動作
|
|
142
173
|
|
|
143
174
|
位置やスタイルは省略可能です：
|
|
@@ -351,6 +382,35 @@ AIアシスタントに以下のように依頼できます:
|
|
|
351
382
|
- 「このMarkdownをPowerPointに変換して」
|
|
352
383
|
- 「プレゼン資料を作成して、/path/to/output.pptx に保存して」
|
|
353
384
|
- 「marhupの記法を教えて」
|
|
385
|
+
- 「カスタムスタイルを使ってプレゼンを作成して」
|
|
386
|
+
|
|
387
|
+
#### カスタムクラスを使用した例
|
|
388
|
+
|
|
389
|
+
```markdown
|
|
390
|
+
---
|
|
391
|
+
classes:
|
|
392
|
+
highlight:
|
|
393
|
+
color: '#ff6b35'
|
|
394
|
+
bold: true
|
|
395
|
+
fill: { color: '#fff3cd' }
|
|
396
|
+
note:
|
|
397
|
+
fontSize: 12
|
|
398
|
+
color: '#6c757d'
|
|
399
|
+
italic: true
|
|
400
|
+
---
|
|
401
|
+
|
|
402
|
+
# プロジェクト概要 [1-12, 1]
|
|
403
|
+
|
|
404
|
+
[1-6, 2-8]
|
|
405
|
+
## 主な機能 {.highlight}
|
|
406
|
+
- 自動レイアウト
|
|
407
|
+
- スタイルカスタマイズ
|
|
408
|
+
- Mermaid図対応
|
|
409
|
+
|
|
410
|
+
[7-12, 2-8]
|
|
411
|
+
## 注意事項 {.note}
|
|
412
|
+
カスタムクラスはFront Matterで定義できます。
|
|
413
|
+
```
|
|
354
414
|
|
|
355
415
|
## 対応Markdown記法
|
|
356
416
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pptx.d.ts","sourceRoot":"","sources":["../../src/generator/pptx.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"pptx.d.ts","sourceRoot":"","sources":["../../src/generator/pptx.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAqB,MAAM,gBAAgB,CAAC;AAgBxE;;GAEG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,cAAc,EACxB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CA8Bf"}
|
package/dist/generator/pptx.js
CHANGED
|
@@ -41,7 +41,7 @@ async function generatePptx(document, outputPath, basePath) {
|
|
|
41
41
|
const layout = (0, index_1.layoutSlide)(slide, document.globalFrontmatter);
|
|
42
42
|
// 要素を配置
|
|
43
43
|
for (const element of layout.elements) {
|
|
44
|
-
await addElement(pptxSlide, element, slideGrid, basePath);
|
|
44
|
+
await addElement(pptxSlide, element, slideGrid, slide, basePath);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
47
|
// ファイル保存
|
|
@@ -50,12 +50,12 @@ async function generatePptx(document, outputPath, basePath) {
|
|
|
50
50
|
/**
|
|
51
51
|
* 要素をスライドに追加
|
|
52
52
|
*/
|
|
53
|
-
async function addElement(slide, element, grid, basePath) {
|
|
53
|
+
async function addElement(slide, element, grid, slideData, basePath) {
|
|
54
54
|
// グリッド位置を座標に変換
|
|
55
55
|
const coords = (0, index_1.gridToCoordinates)(element.position, grid, SLIDE_SIZE, MARGIN);
|
|
56
56
|
// スタイルを解決
|
|
57
57
|
const styleProps = element.style?.classes
|
|
58
|
-
? (0, index_3.resolveStyleClasses)(element.style.classes)
|
|
58
|
+
? (0, index_3.resolveStyleClasses)(element.style.classes, slideData.frontmatter.classes)
|
|
59
59
|
: {};
|
|
60
60
|
// 要素タイプに応じて追加
|
|
61
61
|
switch (element.type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pptx.js","sourceRoot":"","sources":["../../src/generator/pptx.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;AAsBH,oCAkCC;AAtDD,0DAAkC;AAElC,2CAAiE;AAEjE,2CAAkD;AAClD,0CAAqD;AACrD,iCAA2D;AAC3D,mCAA0C;AAC1C,mCAA0C;AAC1C,iCAAwC;AACxC,iCAAwC;AACxC,uCAA8C;AAE9C,qBAAqB;AACrB,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAChD,MAAM,MAAM,GAAG,GAAG,CAAC;AAEnB;;GAEG;AACI,KAAK,UAAU,YAAY,CAChC,QAAwB,EACxB,UAAkB,EAClB,QAAiB;IAEjB,MAAM,IAAI,GAAG,IAAI,mBAAS,EAAE,CAAC;IAE7B,cAAc;IACd,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;IAC5B,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,IAAI,cAAc,CAAC;IAChE,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IAEvB,cAAc;IACd,MAAM,aAAa,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAI,IAAI,MAAM,CAAC;IAEhE,WAAW;IACX,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAElC,cAAc;QACd,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,IAAI,aAAa,CAAC;QAC7D,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC,YAAY,CAAC,CAAC;QAEhD,UAAU;QACV,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAE9D,QAAQ;QACR,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"pptx.js","sourceRoot":"","sources":["../../src/generator/pptx.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-handlers.d.ts","sourceRoot":"","sources":["../src/mcp-handlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,QAAQ,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;CACH;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,cAAc,EAAE,CAyDrD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"mcp-handlers.d.ts","sourceRoot":"","sources":["../src/mcp-handlers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,QAAQ,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;CACH;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,cAAc,EAAE,CAyDrD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,CA0HvC;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,UAAU,CAAC,CA6FrB"}
|
package/dist/mcp-handlers.js
CHANGED
|
@@ -111,15 +111,20 @@ function getMarhupGuide() {
|
|
|
111
111
|
---
|
|
112
112
|
title: プレゼンテーションタイトル
|
|
113
113
|
grid: 12x9
|
|
114
|
+
aliases:
|
|
115
|
+
title: "[1-12, 1]"
|
|
116
|
+
contents: "[1-12, 2-8]"
|
|
117
|
+
left: "[1-6, 2-8]"
|
|
118
|
+
right: "[7-12, 2-8]"
|
|
114
119
|
---
|
|
115
120
|
|
|
116
|
-
# スライド1タイトル [
|
|
121
|
+
# スライド1タイトル [title]
|
|
117
122
|
|
|
118
123
|
コンテンツ...
|
|
119
124
|
|
|
120
125
|
---
|
|
121
126
|
|
|
122
|
-
# スライド2タイトル [
|
|
127
|
+
# スライド2タイトル [title]
|
|
123
128
|
|
|
124
129
|
コンテンツ...
|
|
125
130
|
\`\`\`
|
|
@@ -128,12 +133,34 @@ grid: 12x9
|
|
|
128
133
|
|
|
129
134
|
- **列**: 1〜12（左→右）
|
|
130
135
|
- **行**: 1〜9（上→下）
|
|
131
|
-
- **記法**: \`[列開始-列終了, 行開始-行終了]\`
|
|
136
|
+
- **記法**: \`[列開始-列終了, 行開始-行終了]\` または定義した別名
|
|
137
|
+
|
|
138
|
+
## 別名定義
|
|
139
|
+
|
|
140
|
+
Front Matterでグリッド位置に別名を定義できます：
|
|
141
|
+
|
|
142
|
+
\`\`\`markdown
|
|
143
|
+
---
|
|
144
|
+
aliases:
|
|
145
|
+
title: "[1-12, 1]"
|
|
146
|
+
contents: "[1-12, 2-8]"
|
|
147
|
+
left: "[1-6, 2-8]"
|
|
148
|
+
right: "[7-12, 2-8]"
|
|
149
|
+
---
|
|
150
|
+
\`\`\`
|
|
151
|
+
|
|
152
|
+
定義した別名は \`[別名]\` で使用できます：
|
|
153
|
+
|
|
154
|
+
\`\`\`markdown
|
|
155
|
+
# タイトル [title]
|
|
156
|
+
本文 [contents]
|
|
157
|
+
\`\`\`
|
|
132
158
|
|
|
133
159
|
例:
|
|
134
160
|
- \`[1-12, 1]\` - 全幅、1行目
|
|
135
161
|
- \`[1-6, 2-5]\` - 左半分、2〜5行目
|
|
136
162
|
- \`[7-12, 2-5]\` - 右半分、2〜5行目
|
|
163
|
+
- \`[title]\` - 定義したタイトル位置
|
|
137
164
|
|
|
138
165
|
## 要素の配置
|
|
139
166
|
|
package/dist/mcp-handlers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-handlers.js","sourceRoot":"","sources":["../src/mcp-handlers.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwBH,gDAyDC;AAKD,
|
|
1
|
+
{"version":3,"file":"mcp-handlers.js","sourceRoot":"","sources":["../src/mcp-handlers.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwBH,gDAyDC;AAKD,wCA0HC;AAKD,wCAgGC;AAnTD,uCAAyB;AACzB,2CAA6B;AAC7B,mCAA6C;AAiB7C;;GAEG;AACH,SAAgB,kBAAkB;IAChC,OAAO;QACL;YACE,IAAI,EAAE,0BAA0B;YAChC,WAAW,EACT,mGAAmG;YACrG,WAAW,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,QAAQ,EAAE;wBACR,IAAI,EAAE,QAAQ;wBACd,WAAW,EACT,6DAA6D;qBAChE;oBACD,UAAU,EAAE;wBACV,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,0CAA0C;qBACxD;oBACD,QAAQ,EAAE;wBACR,IAAI,EAAE,QAAQ;wBACd,WAAW,EACT,0CAA0C;qBAC7C;iBACF;gBACD,QAAQ,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC;aACrC;SACF;QACD;YACE,IAAI,EAAE,sBAAsB;YAC5B,WAAW,EACT,8EAA8E;YAChF,WAAW,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,SAAS,EAAE;wBACT,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,qBAAqB;qBACnC;oBACD,UAAU,EAAE;wBACV,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,0CAA0C;qBACxD;iBACF;gBACD,QAAQ,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC;aACtC;SACF;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,WAAW,EACT,yDAAyD;YAC3D,WAAW,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,EAAE;gBACd,QAAQ,EAAE,EAAE;aACb;SACF;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CAwHsC,CAAC;AAChD,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,cAAc,CAClC,IAAY,EACZ,IAA6B;IAE7B,IAAI,CAAC;QACH,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,0BAA0B,CAAC,CAAC,CAAC;gBAChC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAI1C,CAAC;gBAEF,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;gBACtD,CAAC;gBAED,sBAAsB;gBACtB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC3C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC/C,CAAC;gBAED,MAAM,IAAA,cAAM,EAAC,QAAQ,EAAE;oBACrB,MAAM,EAAE,UAAU;oBAClB,QAAQ,EAAE,QAAQ,IAAI,OAAO,CAAC,GAAG,EAAE;iBACpC,CAAC,CAAC;gBAEH,OAAO;oBACL,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,0BAA0B,UAAU,EAAE;yBAC7C;qBACF;iBACF,CAAC;YACJ,CAAC;YAED,KAAK,sBAAsB,CAAC,CAAC,CAAC;gBAC5B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAGjC,CAAC;gBAEF,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBACvD,CAAC;gBAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,mBAAmB,SAAS,EAAE,CAAC,CAAC;gBAClD,CAAC;gBAED,sBAAsB;gBACtB,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC3C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC/C,CAAC;gBAED,MAAM,IAAA,kBAAU,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;gBAEpD,OAAO;oBACL,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,0BAA0B,UAAU,SAAS,SAAS,EAAE;yBAC/D;qBACF;iBACF,CAAC;YACJ,CAAC;YAED,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBACxB,OAAO;oBACL,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,cAAc,EAAE;yBACvB;qBACF;iBACF,CAAC;YACJ,CAAC;YAED;gBACE,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,QAAQ,YAAY,EAAE;iBAC7B;aACF;YACD,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/parser/grid.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type { GridPosition, StyleOptions } from '../types/index';
|
|
|
5
5
|
/**
|
|
6
6
|
* 行からグリッド位置を抽出
|
|
7
7
|
*/
|
|
8
|
-
export declare function extractGridPosition(text: string): {
|
|
8
|
+
export declare function extractGridPosition(text: string, aliases?: Record<string, string>): {
|
|
9
9
|
position: GridPosition | undefined;
|
|
10
10
|
cleanText: string;
|
|
11
11
|
};
|
|
@@ -19,7 +19,7 @@ export declare function extractStyle(text: string): {
|
|
|
19
19
|
/**
|
|
20
20
|
* テキストからグリッド位置とスタイルを両方抽出
|
|
21
21
|
*/
|
|
22
|
-
export declare function extractGridAndStyle(text: string): {
|
|
22
|
+
export declare function extractGridAndStyle(text: string, aliases?: Record<string, string>): {
|
|
23
23
|
position: GridPosition | undefined;
|
|
24
24
|
style: StyleOptions | undefined;
|
|
25
25
|
cleanText: string;
|
|
@@ -28,7 +28,7 @@ export declare function extractGridAndStyle(text: string): {
|
|
|
28
28
|
* ブロックの開始行からグリッド位置を抽出（ブロック用）
|
|
29
29
|
* 例: "[1-6, 2-8]" で始まる行
|
|
30
30
|
*/
|
|
31
|
-
export declare function parseBlockGridLine(line: string): {
|
|
31
|
+
export declare function parseBlockGridLine(line: string, aliases?: Record<string, string>): {
|
|
32
32
|
isGridBlock: boolean;
|
|
33
33
|
position: GridPosition | undefined;
|
|
34
34
|
style: StyleOptions | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../src/parser/grid.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../src/parser/grid.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAWjE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnF,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB,CAiCA;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG;IAC1C,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB,CA+BA;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnF,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB,CAOA;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IAClF,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IACnC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;CACjC,CAkBA"}
|
package/dist/parser/grid.js
CHANGED
|
@@ -9,25 +9,41 @@ exports.extractGridAndStyle = extractGridAndStyle;
|
|
|
9
9
|
exports.parseBlockGridLine = parseBlockGridLine;
|
|
10
10
|
// グリッド位置パターン: [1-6, 2-8] または [3, 5]
|
|
11
11
|
const GRID_PATTERN = /\[(\d+)(?:-(\d+))?,\s*(\d+)(?:-(\d+))?\]/;
|
|
12
|
+
// 別名パターン: [title] など
|
|
13
|
+
const ALIAS_PATTERN = /\[([a-zA-Z_][a-zA-Z0-9_]*)\]/;
|
|
12
14
|
// スタイルパターン: {.class1 .class2 key=value}
|
|
13
15
|
const STYLE_PATTERN = /\{([^}]+)\}/;
|
|
14
16
|
/**
|
|
15
17
|
* 行からグリッド位置を抽出
|
|
16
18
|
*/
|
|
17
|
-
function extractGridPosition(text) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
function extractGridPosition(text, aliases) {
|
|
20
|
+
// まずグリッドパターンをチェック
|
|
21
|
+
let match = text.match(GRID_PATTERN);
|
|
22
|
+
if (match) {
|
|
23
|
+
const colStart = parseInt(match[1], 10);
|
|
24
|
+
const colEnd = match[2] ? parseInt(match[2], 10) : colStart;
|
|
25
|
+
const rowStart = parseInt(match[3], 10);
|
|
26
|
+
const rowEnd = match[4] ? parseInt(match[4], 10) : rowStart;
|
|
27
|
+
const cleanText = text.replace(GRID_PATTERN, '').trim();
|
|
28
|
+
return {
|
|
29
|
+
position: { colStart, colEnd, rowStart, rowEnd },
|
|
30
|
+
cleanText,
|
|
31
|
+
};
|
|
21
32
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
33
|
+
// 次に別名パターンをチェック
|
|
34
|
+
if (aliases) {
|
|
35
|
+
match = text.match(ALIAS_PATTERN);
|
|
36
|
+
if (match) {
|
|
37
|
+
const alias = match[1];
|
|
38
|
+
const gridStr = aliases[alias];
|
|
39
|
+
if (gridStr) {
|
|
40
|
+
// 別名をグリッド文字列に置き換えて再帰的にパース
|
|
41
|
+
const tempText = text.replace(ALIAS_PATTERN, gridStr);
|
|
42
|
+
return extractGridPosition(tempText, aliases);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return { position: undefined, cleanText: text };
|
|
31
47
|
}
|
|
32
48
|
/**
|
|
33
49
|
* 行からスタイルを抽出
|
|
@@ -64,9 +80,9 @@ function extractStyle(text) {
|
|
|
64
80
|
/**
|
|
65
81
|
* テキストからグリッド位置とスタイルを両方抽出
|
|
66
82
|
*/
|
|
67
|
-
function extractGridAndStyle(text) {
|
|
83
|
+
function extractGridAndStyle(text, aliases) {
|
|
68
84
|
// まずグリッド位置を抽出
|
|
69
|
-
const { position, cleanText: afterGrid } = extractGridPosition(text);
|
|
85
|
+
const { position, cleanText: afterGrid } = extractGridPosition(text, aliases);
|
|
70
86
|
// 次にスタイルを抽出
|
|
71
87
|
const { style, cleanText: finalText } = extractStyle(afterGrid);
|
|
72
88
|
return { position, style, cleanText: finalText };
|
|
@@ -75,13 +91,13 @@ function extractGridAndStyle(text) {
|
|
|
75
91
|
* ブロックの開始行からグリッド位置を抽出（ブロック用）
|
|
76
92
|
* 例: "[1-6, 2-8]" で始まる行
|
|
77
93
|
*/
|
|
78
|
-
function parseBlockGridLine(line) {
|
|
94
|
+
function parseBlockGridLine(line, aliases) {
|
|
79
95
|
const trimmed = line.trim();
|
|
80
|
-
// 行が [数字 で始まるかチェック
|
|
81
|
-
if (!trimmed.match(/^\[\d/)) {
|
|
96
|
+
// 行が [数字 または [文字 で始まるかチェック
|
|
97
|
+
if (!trimmed.match(/^\[[\d[a-zA-Z_]/)) {
|
|
82
98
|
return { isGridBlock: false, position: undefined, style: undefined };
|
|
83
99
|
}
|
|
84
|
-
const { position, cleanText } = extractGridPosition(trimmed);
|
|
100
|
+
const { position, cleanText } = extractGridPosition(trimmed, aliases);
|
|
85
101
|
if (!position) {
|
|
86
102
|
return { isGridBlock: false, position: undefined, style: undefined };
|
|
87
103
|
}
|
package/dist/parser/grid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../src/parser/grid.ts"],"names":[],"mappings":";AAAA;;GAEG;;
|
|
1
|
+
{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../src/parser/grid.ts"],"names":[],"mappings":"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"}
|
package/dist/parser/markdown.js
CHANGED
|
@@ -16,7 +16,7 @@ function parseMarkdown(markdown) {
|
|
|
16
16
|
// スライド区切りで分割
|
|
17
17
|
const slideContents = splitSlides(body);
|
|
18
18
|
// 各スライドをパース
|
|
19
|
-
const slides = slideContents.map((content) => parseSlide(content));
|
|
19
|
+
const slides = slideContents.map((content) => parseSlide(content, globalFrontmatter.aliases));
|
|
20
20
|
return {
|
|
21
21
|
globalFrontmatter,
|
|
22
22
|
slides,
|
|
@@ -34,11 +34,13 @@ function splitSlides(content) {
|
|
|
34
34
|
/**
|
|
35
35
|
* 1スライド分のコンテンツをパース
|
|
36
36
|
*/
|
|
37
|
-
function parseSlide(content) {
|
|
37
|
+
function parseSlide(content, globalAliases) {
|
|
38
38
|
// スライド個別のFront Matterがあれば抽出
|
|
39
39
|
const { frontmatter, body } = (0, frontmatter_1.parseFrontmatter)(content);
|
|
40
|
+
// aliases をマージ（スライド個別が優先）
|
|
41
|
+
const mergedAliases = { ...globalAliases, ...frontmatter.aliases };
|
|
40
42
|
// 要素をパース
|
|
41
|
-
const elements = parseSlideElements(body);
|
|
43
|
+
const elements = parseSlideElements(body, mergedAliases);
|
|
42
44
|
return {
|
|
43
45
|
frontmatter,
|
|
44
46
|
elements,
|
|
@@ -47,7 +49,7 @@ function parseSlide(content) {
|
|
|
47
49
|
/**
|
|
48
50
|
* スライド内の要素をパース
|
|
49
51
|
*/
|
|
50
|
-
function parseSlideElements(content) {
|
|
52
|
+
function parseSlideElements(content, aliases) {
|
|
51
53
|
const elements = [];
|
|
52
54
|
const lines = content.split('\n');
|
|
53
55
|
let currentBlock = null;
|
|
@@ -65,13 +67,13 @@ function parseSlideElements(content) {
|
|
|
65
67
|
for (let i = 0; i < lines.length; i++) {
|
|
66
68
|
const line = lines[i];
|
|
67
69
|
// グリッドブロックの開始をチェック
|
|
68
|
-
const { isGridBlock, position, style } = (0, grid_1.parseBlockGridLine)(line);
|
|
70
|
+
const { isGridBlock, position, style } = (0, grid_1.parseBlockGridLine)(line, aliases);
|
|
69
71
|
if (isGridBlock) {
|
|
70
72
|
// 前のノンブロック行があれば処理
|
|
71
73
|
flushNonBlockLines();
|
|
72
74
|
// 前のグリッドブロックがあれば処理
|
|
73
75
|
if (currentBlock && currentBlock.lines.length > 0) {
|
|
74
|
-
const blockElements = parseBlockContent(currentBlock.lines.join('\n'), currentBlock.position, currentBlock.style);
|
|
76
|
+
const blockElements = parseBlockContent(currentBlock.lines.join('\n'), currentBlock.position, currentBlock.style, aliases);
|
|
75
77
|
elements.push(...blockElements);
|
|
76
78
|
}
|
|
77
79
|
// 新しいブロックを開始
|
|
@@ -95,7 +97,7 @@ function parseSlideElements(content) {
|
|
|
95
97
|
flushNonBlockLines();
|
|
96
98
|
// 最後のグリッドブロックを処理
|
|
97
99
|
if (currentBlock && currentBlock.lines.length > 0) {
|
|
98
|
-
const blockElements = parseBlockContent(currentBlock.lines.join('\n'), currentBlock.position, currentBlock.style);
|
|
100
|
+
const blockElements = parseBlockContent(currentBlock.lines.join('\n'), currentBlock.position, currentBlock.style, aliases);
|
|
99
101
|
elements.push(...blockElements);
|
|
100
102
|
}
|
|
101
103
|
return elements;
|
|
@@ -103,13 +105,13 @@ function parseSlideElements(content) {
|
|
|
103
105
|
/**
|
|
104
106
|
* 1行をパース（見出しなど、インラインでグリッド指定があるケース）
|
|
105
107
|
*/
|
|
106
|
-
function _parseLine(line) {
|
|
108
|
+
function _parseLine(line, aliases) {
|
|
107
109
|
const elements = [];
|
|
108
110
|
// 見出しチェック
|
|
109
111
|
const headingMatch = line.match(/^(#{1,6})\s+(.+)$/);
|
|
110
112
|
if (headingMatch) {
|
|
111
113
|
const level = headingMatch[1].length;
|
|
112
|
-
const { position, style, cleanText } = (0, grid_1.extractGridAndStyle)(headingMatch[2]);
|
|
114
|
+
const { position, style, cleanText } = (0, grid_1.extractGridAndStyle)(headingMatch[2], aliases);
|
|
113
115
|
elements.push({
|
|
114
116
|
type: 'heading',
|
|
115
117
|
level,
|
|
@@ -126,7 +128,7 @@ function _parseLine(line) {
|
|
|
126
128
|
const _altText = imageMatch[1];
|
|
127
129
|
const src = imageMatch[2];
|
|
128
130
|
const rest = imageMatch[3];
|
|
129
|
-
const { position, style } = (0, grid_1.extractGridAndStyle)(rest);
|
|
131
|
+
const { position, style } = (0, grid_1.extractGridAndStyle)(rest, aliases);
|
|
130
132
|
elements.push({
|
|
131
133
|
type: 'image',
|
|
132
134
|
content: src,
|
|
@@ -141,13 +143,13 @@ function _parseLine(line) {
|
|
|
141
143
|
/**
|
|
142
144
|
* ブロックコンテンツをパース
|
|
143
145
|
*/
|
|
144
|
-
function parseBlockContent(content, position, style) {
|
|
146
|
+
function parseBlockContent(content, position, style, aliases) {
|
|
145
147
|
const elements = [];
|
|
146
148
|
const tokens = marked_1.marked.lexer(content);
|
|
147
149
|
// グリッドブロック内の要素を収集
|
|
148
150
|
const blockElements = [];
|
|
149
151
|
for (const token of tokens) {
|
|
150
|
-
const element = tokenToElement(token);
|
|
152
|
+
const element = tokenToElement(token, aliases);
|
|
151
153
|
if (element) {
|
|
152
154
|
blockElements.push(element);
|
|
153
155
|
}
|
|
@@ -183,11 +185,11 @@ function parseBlockContent(content, position, style) {
|
|
|
183
185
|
/**
|
|
184
186
|
* marked トークンをSlideElementに変換
|
|
185
187
|
*/
|
|
186
|
-
function tokenToElement(token) {
|
|
188
|
+
function tokenToElement(token, aliases) {
|
|
187
189
|
switch (token.type) {
|
|
188
190
|
case 'heading': {
|
|
189
191
|
const headingToken = token;
|
|
190
|
-
const { position, style, cleanText } = (0, grid_1.extractGridAndStyle)(headingToken.text);
|
|
192
|
+
const { position, style, cleanText } = (0, grid_1.extractGridAndStyle)(headingToken.text, aliases);
|
|
191
193
|
return {
|
|
192
194
|
type: 'heading',
|
|
193
195
|
level: headingToken.depth,
|
|
@@ -199,13 +201,13 @@ function tokenToElement(token) {
|
|
|
199
201
|
}
|
|
200
202
|
case 'paragraph': {
|
|
201
203
|
const paragraphToken = token;
|
|
202
|
-
const { position, style, cleanText } = (0, grid_1.extractGridAndStyle)(paragraphToken.text);
|
|
204
|
+
const { position, style, cleanText } = (0, grid_1.extractGridAndStyle)(paragraphToken.text, aliases);
|
|
203
205
|
// 画像をチェック
|
|
204
206
|
const imageMatch = paragraphToken.text.match(/^!\[([^\]]*)\]\(([^)]+)\)(.*)$/);
|
|
205
207
|
if (imageMatch) {
|
|
206
208
|
const src = imageMatch[2];
|
|
207
209
|
const rest = imageMatch[3];
|
|
208
|
-
const { position: imgPos, style: imgStyle } = (0, grid_1.extractGridAndStyle)(rest);
|
|
210
|
+
const { position: imgPos, style: imgStyle } = (0, grid_1.extractGridAndStyle)(rest, aliases);
|
|
209
211
|
return {
|
|
210
212
|
type: 'image',
|
|
211
213
|
content: src,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/parser/markdown.ts"],"names":[],"mappings":";AAAA;;GAEG;;AAkBH,sCAcC;AA9BD,mCAAyD;AAUzD,+CAAiD;AACjD,iCAAiE;AAEjE;;GAEG;AACH,SAAgB,aAAa,CAAC,QAAgB;IAC5C,uBAAuB;IACvB,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,IAAA,8BAAgB,EAAC,QAAQ,CAAC,CAAC;IAE5E,aAAa;IACb,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAExC,YAAY;IACZ,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"markdown.js","sourceRoot":"","sources":["../../src/parser/markdown.ts"],"names":[],"mappings":"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"}
|
package/dist/theme/default.d.ts
CHANGED
|
@@ -7,5 +7,5 @@ export declare const styleClasses: Record<string, Record<string, unknown>>;
|
|
|
7
7
|
/**
|
|
8
8
|
* スタイルクラスをpptxgenjs形式に変換
|
|
9
9
|
*/
|
|
10
|
-
export declare function resolveStyleClasses(classes: string[]): Record<string, unknown>;
|
|
10
|
+
export declare function resolveStyleClasses(classes: string[], customClasses?: Record<string, Record<string, unknown>>): Record<string, unknown>;
|
|
11
11
|
//# sourceMappingURL=default.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../src/theme/default.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,YAAY,EAAE,WAqB1B,CAAC;AAGF,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoChE,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../../src/theme/default.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,eAAO,MAAM,YAAY,EAAE,WAqB1B,CAAC;AAGF,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoChE,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAcvI"}
|
package/dist/theme/default.js
CHANGED
|
@@ -63,10 +63,13 @@ exports.styleClasses = {
|
|
|
63
63
|
/**
|
|
64
64
|
* スタイルクラスをpptxgenjs形式に変換
|
|
65
65
|
*/
|
|
66
|
-
function resolveStyleClasses(classes) {
|
|
66
|
+
function resolveStyleClasses(classes, customClasses) {
|
|
67
67
|
let result = {};
|
|
68
68
|
for (const className of classes) {
|
|
69
|
-
|
|
69
|
+
let style = customClasses?.[className];
|
|
70
|
+
if (!style) {
|
|
71
|
+
style = exports.styleClasses[className];
|
|
72
|
+
}
|
|
70
73
|
if (style) {
|
|
71
74
|
result = { ...result, ...style };
|
|
72
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/theme/default.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAqEH,
|
|
1
|
+
{"version":3,"file":"default.js","sourceRoot":"","sources":["../../src/theme/default.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAsHH,YAAY;AACC,QAAA,YAAY,GAAe;IACtC,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,CAAC;CACR,CAAC;AAEF,gBAAgB;AACH,QAAA,sBAAsB,GAAgC;IACjE,OAAO,EAAE,CAAC;IACV,SAAS,EAAE,CAAC;IACZ,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IACR,IAAI,EAAE,CAAC;IACP,UAAU,EAAE,CAAC;IACb,OAAO,EAAE,CAAC;CACX,CAAC"}
|