@kerebron/extension-odt 0.4.22 → 0.4.24

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.
@@ -1 +1 @@
1
- {"version":3,"file":"ExtensionOdt.d.ts","sourceRoot":"","sources":["../src/ExtensionOdt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EACL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,SAAS,EACT,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAa,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC;CACjC;AAED,qBAAa,YAAa,SAAQ,SAAS;IAIb,MAAM,EAAE,SAAS;IAH7C,IAAI,SAAS;IACN,eAAe,CAAC,EAAE,WAAW,CAAC;gBAET,MAAM,GAAE,SAAc;IAIzC,aAAa,CACpB,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;CAmE7B"}
1
+ {"version":3,"file":"ExtensionOdt.d.ts","sourceRoot":"","sources":["../src/ExtensionOdt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EACL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,SAAS,EACT,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAa,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAGpD,MAAM,WAAW,SAAU,SAAQ,eAAe;IAChD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC;CACjC;AAED,qBAAa,YAAa,SAAQ,SAAS;IAIb,MAAM,EAAE,SAAS;IAH7C,IAAI,SAAS;IACN,eAAe,CAAC,EAAE,WAAW,CAAC;gBAET,MAAM,GAAE,SAAc;IAIzC,aAAa,CACpB,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;CAoK7B"}
@@ -2,6 +2,7 @@ import { Extension, } from '@kerebron/editor';
2
2
  import { parse_content, parse_styles, unzip } from '@kerebron/odt-wasm';
3
3
  import { OdtParser } from './OdtParser.js';
4
4
  import { getDefaultsPostProcessFilters } from './postprocess/postProcess.js';
5
+ import { InputRulesPlugin } from '@kerebron/editor/plugins/input-rules';
5
6
  export class ExtensionOdt extends Extension {
6
7
  config;
7
8
  name = 'odt';
@@ -17,22 +18,88 @@ export class ExtensionOdt extends Extension {
17
18
  throw new Error('Not implemented');
18
19
  },
19
20
  toDoc: async (buffer) => {
20
- const { doc, filesMap } = await odtConverter.odtToJson(buffer);
21
+ const { doc, filesMap } = odtConverter.odtToJson(buffer);
21
22
  const filterCommands = getDefaultsPostProcessFilters({
22
23
  doc,
23
24
  filesMap,
24
25
  }).concat(this.config.postProcessCommands || []);
26
+ const plugin = editor.state.plugins.find((plugin) => plugin instanceof InputRulesPlugin);
27
+ if (plugin) {
28
+ // plugin.props.
29
+ }
30
+ const subEditor = editor.clone();
31
+ subEditor.setDocument(doc.toJSON());
32
+ let modified = false;
33
+ if (this.urlFromRewriter) {
34
+ const imageNodes = [];
35
+ subEditor.getDocument().descendants((node, pos) => {
36
+ if (node.type.name === 'image') {
37
+ imageNodes.push({ node, pos });
38
+ }
39
+ });
40
+ const linkNodes = [];
41
+ subEditor.getDocument().descendants((node, pos) => {
42
+ if (node.marks.find((mark) => mark.type.name === 'link')) {
43
+ linkNodes.push({ node, pos });
44
+ }
45
+ });
46
+ const tr = subEditor.state.tr;
47
+ for (const { node, pos } of linkNodes) {
48
+ const linkMark = node.marks.find((mark) => mark.type.name === 'link');
49
+ if (!linkMark) {
50
+ continue;
51
+ }
52
+ let href = linkMark.attrs.href || '';
53
+ href = await this.urlFromRewriter(href, {
54
+ type: 'A',
55
+ dest: 'kerebron',
56
+ });
57
+ if (href !== linkMark.attrs.href) {
58
+ const newMarks = node.marks.map((mark) => {
59
+ if (mark.type.name === 'link') {
60
+ const markType = this.editor.schema.marks['link'];
61
+ return markType.create({ ...mark.attrs, href });
62
+ }
63
+ return mark;
64
+ });
65
+ const nodeType = this.editor.schema.nodes[node.type.name];
66
+ let replaceNode;
67
+ if (nodeType.isText) {
68
+ replaceNode = this.editor.schema.text(node.text || '', newMarks);
69
+ }
70
+ else {
71
+ replaceNode = nodeType.create(node.attrs, node.content, newMarks);
72
+ }
73
+ tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize), replaceNode);
74
+ }
75
+ }
76
+ for (const { node, pos } of imageNodes) {
77
+ let src = node.attrs.src || '';
78
+ src = await this.urlFromRewriter(src, {
79
+ type: 'IMG',
80
+ dest: 'kerebron',
81
+ filesMap,
82
+ });
83
+ if (src !== node.attrs.src) {
84
+ const nodeType = this.editor.schema.nodes[node.type.name];
85
+ const replaceNode = nodeType.create({ ...node.attrs, src }, node.content, node.marks);
86
+ tr.replaceWith(tr.mapping.map(pos), tr.mapping.map(pos + node.nodeSize), replaceNode);
87
+ }
88
+ }
89
+ subEditor.dispatchTransaction(tr), modified = true;
90
+ }
25
91
  if (filterCommands.length > 0) {
26
- const subEditor = editor.clone();
27
- subEditor.setDocument(doc.toJSON());
28
92
  for (const filter of filterCommands) {
29
93
  filter(subEditor.state, (tr) => subEditor.dispatchTransaction(tr));
30
94
  }
95
+ modified = true;
96
+ }
97
+ if (modified) {
31
98
  return subEditor.getDocument();
32
99
  }
33
100
  return doc;
34
101
  },
35
- odtToJson: async (buffer) => {
102
+ odtToJson: (buffer) => {
36
103
  const files = unzip(buffer);
37
104
  const filesMap = {};
38
105
  for (const k of files.keys()) {
@@ -51,7 +118,6 @@ export class ExtensionOdt extends Extension {
51
118
  this.editor.dispatchEvent(event);
52
119
  }
53
120
  const parser = new OdtParser(editor.schema, this.config);
54
- parser.urlRewriter = this.urlFromRewriter;
55
121
  parser.filesMap = filesMap;
56
122
  const doc = parser.parse({ ...filesMap, contentTree, stylesTree });
57
123
  return { doc, stylesTree, contentTree, filesMap };
@@ -1,6 +1,5 @@
1
1
  import { Mark, Node, Schema } from 'prosemirror-model';
2
2
  import { ListTracker } from './lists.js';
3
- import { type UrlRewriter } from '@kerebron/editor';
4
3
  export interface OdtElement {
5
4
  $value: 'TODO';
6
5
  }
@@ -48,7 +47,6 @@ export declare class OdtStashContext {
48
47
  private ctxStash;
49
48
  private currentCtx;
50
49
  listTracker: ListTracker;
51
- urlRewriter?: UrlRewriter;
52
50
  constructor(schema: Schema, handlers: Record<string, NodeHandler>, stylesTree: StylesTree, automaticStyles: AutomaticStyles);
53
51
  stash(): number;
54
52
  unstash(): void;
@@ -66,7 +64,6 @@ export declare class OdtParser {
66
64
  private readonly config;
67
65
  constructor(schema: Schema, config?: OdtParserConfig);
68
66
  filesMap?: Record<string, Uint8Array<ArrayBufferLike>>;
69
- urlRewriter?: UrlRewriter;
70
67
  parse(files: any): Node;
71
68
  }
72
69
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"OdtParser.d.ts","sourceRoot":"","sources":["../src/OdtParser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OdtParser.d.ts","sourceRoot":"","sources":["../src/OdtParser.ts"],"names":[],"mappings":"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"}
package/esm/OdtParser.js CHANGED
@@ -79,7 +79,6 @@ export class OdtStashContext {
79
79
  ctxStash = [];
80
80
  currentCtx;
81
81
  listTracker = new ListTracker();
82
- urlRewriter;
83
82
  constructor(schema, handlers, stylesTree, automaticStyles) {
84
83
  this.schema = schema;
85
84
  this.stylesTree = stylesTree;
@@ -191,7 +190,6 @@ export class OdtParser {
191
190
  this.config = config;
192
191
  }
193
192
  filesMap;
194
- urlRewriter;
195
193
  parse(files) {
196
194
  const contentTree = files.contentTree;
197
195
  const stylesTree = files.stylesTree;
@@ -231,14 +229,7 @@ export class OdtParser {
231
229
  }
232
230
  if (odtElement.image && odtElement.image['@href']) { // TODO links rewrite
233
231
  const alt = odtElement.description?.value || '';
234
- let src = odtElement.image['@href'];
235
- if (ctx.urlRewriter) {
236
- src = ctx.urlRewriter(src, {
237
- type: 'IMG',
238
- dest: 'kerebron',
239
- filesMap: this.filesMap,
240
- });
241
- }
232
+ const src = odtElement.image['@href'];
242
233
  ctx.openNode();
243
234
  ctx.closeNode('image', {
244
235
  src,
@@ -251,7 +242,6 @@ export class OdtParser {
251
242
  },
252
243
  };
253
244
  const ctx = new OdtStashContext(this.schema, handlers, stylesTree, contentTree['automatic-styles']);
254
- ctx.urlRewriter = this.urlRewriter;
255
245
  ctx.openNode();
256
246
  ctx.handle('body', contentTree.body);
257
247
  return ctx.closeNode('doc');
@@ -1 +1 @@
1
- {"version":3,"file":"basic_node_handlers.d.ts","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAEhF,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA4DpE;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA+FnE"}
1
+ {"version":3,"file":"basic_node_handlers.d.ts","sourceRoot":"","sources":["../../src/node_handlers/basic_node_handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAEhF,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA4DpE;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA0FnE"}
@@ -112,12 +112,8 @@ export function getBasicNodesHandlers() {
112
112
  }
113
113
  },
114
114
  'a': (ctx, value) => {
115
- let href = value['@href'];
116
- if (ctx.urlRewriter) {
117
- href = ctx.urlRewriter(href, { type: 'A', dest: 'kerebron' });
118
- }
119
115
  const attrs = {
120
- href,
116
+ href: value['@href'],
121
117
  // title: tok.attrGet('title') || null,
122
118
  };
123
119
  const markType = ctx.schema.mark('link', attrs);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kerebron/extension-odt",
3
- "version": "0.4.22",
3
+ "version": "0.4.24",
4
4
  "license": "MIT",
5
5
  "module": "./esm/ExtensionOdt.js",
6
6
  "exports": {
@@ -10,8 +10,8 @@
10
10
  },
11
11
  "scripts": {},
12
12
  "dependencies": {
13
- "@kerebron/editor": "0.4.22",
14
- "@kerebron/odt-wasm": "0.4.22",
13
+ "@kerebron/editor": "0.4.24",
14
+ "@kerebron/odt-wasm": "0.4.24",
15
15
  "prosemirror-model": "1.25.3",
16
16
  "prosemirror-state": "1.4.3"
17
17
  },