@lblod/ember-rdfa-editor-lblod-plugins 22.4.1-dev.d49cf94f066e6920d2facf8a3cb5bbd97329a230 → 22.4.1-dev.e1219ca84efa2a05c61baa4649da5dfc38de256a

package/.changeset/late-onions-glow.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': major
+---
+
+Run recalculate numbers after inserting a snippet

package/addon/components/snippet-plugin/nodes/snippet.gts

@@ -8,22 +8,18 @@ import { action } from '@ember/object';
 import { SynchronizeIcon } from '@appuniversum/ember-appuniversum/components/icons/synchronize';
 import { BinIcon } from '@appuniversum/ember-appuniversum/components/icons/bin';
 import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
-import {
-  PNode,
-  ProseParser,
-  Selection,
-  Slice,
-  Transaction,
-} from '@lblod/ember-rdfa-editor';
-import { htmlToDoc } from '@lblod/ember-rdfa-editor/utils/_private/html-utils';
+import { PNode, ProseParser, Selection, Slice } from '@lblod/ember-rdfa-editor';
 import {
   EXT,
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { findAncestors } from '@lblod/ember-rdfa-editor/utils/position-utils';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import { v4 as uuidv4 } from 'uuid';
 import t from 'ember-intl/helpers/t';
+import insertSnippet from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/commands/insert-snippet';
+import { isNone } from '@lblod/ember-rdfa-editor/utils/_private/option';
+import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { recalculateNumbers } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/structure-plugin/recalculate-structure-numbers';
 
 interface Signature {
   Args: EmberNodeArgs;
@@ -63,7 +59,10 @@ export default class SnippetNode extends Component<Signature> {
     const position = this.args.getPos();
     if (position !== undefined) {
       this.controller.withTransaction((tr) => {
-        return tr.deleteRange(position, position + this.node.nodeSize);
+        return transactionCombinator(
+          this.controller.mainEditorState,
+          tr.deleteRange(position, position + this.node.nodeSize),
+        )([recalculateNumbers]).transaction;
       });
     }
   }
@@ -91,57 +90,31 @@ export default class SnippetNode extends Component<Signature> {
   }
   @action
   onInsert(content: string, title: string) {
+    this.closeModal();
     const assignedSnippetListsIds = this.node.attrs.assignedSnippetListsIds;
-    let rangeStart = 0;
-    let rangeEnd = 0;
-    if (this.args.getPos() === undefined) return;
+    let start = 0;
+    let end = 0;
+    const pos = this.args.getPos();
+    if (isNone(pos)) {
+      return;
+    }
     if (this.mode === 'add') {
       // Add new snippet
-      rangeStart = (this.args.getPos() as number) + this.node.nodeSize;
-      rangeEnd = (this.args.getPos() as number) + this.node.nodeSize;
+      start = pos + this.node.nodeSize;
+      end = pos + this.node.nodeSize;
     } else {
       //Replace current snippet
-      rangeStart = this.args.getPos() as number;
-      rangeEnd = (this.args.getPos() as number) + this.node.nodeSize;
+      start = pos;
+      end = pos + this.node.nodeSize;
     }
-
-    const domParser = new DOMParser();
-    const parsed = domParser.parseFromString(content, 'text/html').body;
-    const documentDiv = parsed.querySelector('div[data-say-document="true"]');
-
-    this.closeModal();
-    const parser = ProseParser.fromSchema(this.controller.schema);
-
-    if (documentDiv) {
-      return this.controller.withTransaction((tr: Transaction) => {
-        return tr.replaceRangeWith(
-          rangeStart,
-          rangeEnd,
-          this.controller.schema.node(
-            'snippet',
-            {
-              assignedSnippetListsIds,
-              title,
-              subject: `http://data.lblod.info/snippets/${uuidv4()}`,
-            },
-            htmlToDoc(content, {
-              schema: this.controller.schema,
-              parser,
-              editorView: this.controller.mainEditorView,
-            }).content,
-          ),
-        );
-      });
-    }
-
-    this.controller.withTransaction((tr) =>
-      tr.replaceRange(
-        rangeStart,
-        rangeEnd,
-        this.createSliceFromElement(parsed),
-      ),
+    this.controller.doCommand(
+      insertSnippet({
+        content,
+        title,
+        assignedSnippetListsIds,
+        range: { start, end },
+      }),
     );
-    this.closeModal();
   }
   <template>
     <div class='say-snippet-card'>

package/addon/components/snippet-plugin/snippet-insert.ts

@@ -4,15 +4,9 @@ import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
-import { htmlToDoc } from '@lblod/ember-rdfa-editor/utils/_private/html-utils';
-import {
-  ProseParser,
-  SayController,
-  Slice,
-  Transaction,
-} from '@lblod/ember-rdfa-editor';
+import { ProseParser, SayController, Slice } from '@lblod/ember-rdfa-editor';
 import { SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
-import { v4 as uuidv4 } from 'uuid';
+import insertSnippet from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin/commands/insert-snippet';
 
 interface Args {
   controller: SayController;
@@ -57,35 +51,13 @@ export default class SnippetInsertComponent extends Component<Args> {
 
   @action
   onInsert(content: string, title: string) {
-    const domParser = new DOMParser();
-    const parsed = domParser.parseFromString(content, 'text/html').body;
-    const documentDiv = parsed.querySelector('div[data-say-document="true"]');
-
     this.closeModal();
-    const parser = ProseParser.fromSchema(this.controller.schema);
-
-    if (documentDiv) {
-      return this.controller.withTransaction((tr: Transaction) => {
-        return tr.replaceSelectionWith(
-          this.controller.schema.node(
-            'snippet',
-            {
-              assignedSnippetListsIds: this.args.assignedSnippetListsIds,
-              title: title,
-              subject: `http://data.lblod.info/snippets/${uuidv4()}`,
-            },
-            htmlToDoc(content, {
-              schema: this.controller.schema,
-              parser,
-              editorView: this.controller.mainEditorView,
-            }).content,
-          ),
-        );
-      });
-    }
-
-    this.controller.withTransaction((tr) =>
-      tr.replaceSelection(this.createSliceFromElement(parsed)),
+    this.controller.doCommand(
+      insertSnippet({
+        content,
+        title,
+        assignedSnippetListsIds: this.args.assignedSnippetListsIds,
+      }),
     );
   }
 

package/addon/plugins/snippet-plugin/commands/insert-snippet.ts

@@ -0,0 +1,74 @@
+import { Command, ProseParser, Schema, Slice } from '@lblod/ember-rdfa-editor';
+import { htmlToDoc } from '@lblod/ember-rdfa-editor/utils/_private/html-utils';
+import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
+import { recalculateNumbers } from '../../structure-plugin/recalculate-structure-numbers';
+import { v4 as uuidv4 } from 'uuid';
+export interface InsertSnippetCommandArgs {
+  content: string;
+  title: string;
+  assignedSnippetListsIds: string[];
+  range?: { start: number; end: number };
+}
+const insertSnippet = ({
+  content,
+  title,
+  assignedSnippetListsIds,
+  range,
+}: InsertSnippetCommandArgs): Command => {
+  return (state, dispatch) => {
+    const domParser = new DOMParser();
+    const parsed = domParser.parseFromString(content, 'text/html').body;
+    const documentDiv = parsed.querySelector('div[data-say-document="true"]');
+
+    const schema = state.schema;
+
+    const parser = ProseParser.fromSchema(schema);
+
+    let tr = state.tr;
+    const insertRange = range ?? {
+      start: state.selection.from,
+      end: state.selection.to,
+    };
+
+    if (documentDiv) {
+      const node = schema.node(
+        'snippet',
+        {
+          assignedSnippetListsIds,
+          title: title,
+          subject: `http://data.lblod.info/snippets/${uuidv4()}`,
+        },
+        htmlToDoc(content, {
+          schema,
+          parser,
+        }).content,
+      );
+
+      tr = transactionCombinator(
+        state,
+        tr.replaceRangeWith(insertRange.start, insertRange.end, node),
+      )([recalculateNumbers]).transaction;
+    } else {
+      const slice = createSliceFromElement(parsed, schema);
+      tr = transactionCombinator(
+        state,
+        tr.replaceRange(insertRange.start, insertRange.end, slice),
+      )([recalculateNumbers]).transaction;
+    }
+    if (dispatch) {
+      dispatch(tr);
+    }
+    return true;
+  };
+};
+
+function createSliceFromElement(element: Element, schema: Schema) {
+  return new Slice(
+    ProseParser.fromSchema(schema).parse(element, {
+      preserveWhitespace: true,
+    }).content,
+    0,
+    0,
+  );
+}
+export default insertSnippet;

package/addon/plugins/snippet-plugin/index.ts

@@ -4,9 +4,6 @@ import { optionMapOr } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option
 import { dateValue } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/strings';
 import { SafeString } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
 
-export const SNIPPET_CONTENT_STRING =
-  'document_title? ((block|chapter)+|(block|title)+|(block|article)+)';
-
 export type SnippetPluginConfig = {
   endpoint: string;
 };

package/addon/plugins/snippet-plugin/nodes/snippet.ts

@@ -15,10 +15,7 @@ import {
   RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import {
-  SNIPPET_CONTENT_STRING,
-  SnippetPluginConfig,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
+import { SnippetPluginConfig } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/snippet-plugin';
 
 const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
   name: 'snippet',
@@ -44,7 +41,7 @@ const emberNodeConfig = (options: SnippetPluginConfig): EmberNodeConfig => ({
     config: { default: options },
   },
   component: SnippetComponent,
-  content: SNIPPET_CONTENT_STRING,
+  content: 'block+',
   serialize(node) {
     return renderRdfaAware({
       renderable: node,

package/declarations/addon/plugins/snippet-plugin/commands/insert-snippet.d.ts

@@ -0,0 +1,12 @@
+import { Command } from '@lblod/ember-rdfa-editor';
+export interface InsertSnippetCommandArgs {
+    content: string;
+    title: string;
+    assignedSnippetListsIds: string[];
+    range?: {
+        start: number;
+        end: number;
+    };
+}
+declare const insertSnippet: ({ content, title, assignedSnippetListsIds, range, }: InsertSnippetCommandArgs) => Command;
+export default insertSnippet;

package/declarations/addon/plugins/snippet-plugin/index.d.ts

@@ -1,5 +1,4 @@
 import { SafeString } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/types';
-export declare const SNIPPET_CONTENT_STRING = "document_title? ((block|chapter)+|(block|title)+|(block|article)+)";
 export type SnippetPluginConfig = {
     endpoint: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "22.4.1-dev.d49cf94f066e6920d2facf8a3cb5bbd97329a230",
+  "version": "22.4.1-dev.e1219ca84efa2a05c61baa4649da5dfc38de256a",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -102,7 +102,7 @@
     "@glint/template": "^1.4.0",
     "@graphy/content.ttl.write": "^4.3.7",
     "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "10.0.2",
+    "@lblod/ember-rdfa-editor": "10.3.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
@@ -189,7 +189,7 @@
     "@appuniversum/ember-appuniversum": "^3.4.1",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
-    "@lblod/ember-rdfa-editor": "^10.0.0",
+    "@lblod/ember-rdfa-editor": "^10.3.0",
     "ember-concurrency": "^3.1.0",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",

package/pnpm-lock.yaml

@@ -160,8 +160,8 @@ importers:
         specifier: 4.3.3
         version: 4.3.3
       '@lblod/ember-rdfa-editor':
-        specifier: 10.0.2
-        version: 10.0.2(2ef3gpurqxbttnmniw6grhzpuy)
+        specifier: 10.3.0
+        version: 10.3.0(2ef3gpurqxbttnmniw6grhzpuy)
       '@rdfjs/types':
         specifier: ^1.1.0
         version: 1.1.0
@@ -1586,8 +1586,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@lblod/ember-rdfa-editor@10.0.2':
-    resolution: {integrity: sha512-2tVTQeedXufvIPjt894Lr/7DpwdRXOH7WA5v2MK2Q4JMPdgTdLpb/JZYCrUIAVIen8qB/V2bFqcjNDitzrBq1w==}
+  '@lblod/ember-rdfa-editor@10.3.0':
+    resolution: {integrity: sha512-ip8e7q5inZyz6MQXBmx9MyzHRVrLkyHlntVrBmMx0z11RKfijCA+8G+LTTLo95udR/L5VNFVF+CPgkE3FEmwNA==}
     engines: {node: 16.* || 18.* || >= 20}
     peerDependencies:
       '@appuniversum/ember-appuniversum': ^3.4.2
@@ -10718,7 +10718,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@lblod/ember-rdfa-editor@10.0.2(2ef3gpurqxbttnmniw6grhzpuy)':
+  '@lblod/ember-rdfa-editor@10.3.0(2ef3gpurqxbttnmniw6grhzpuy)':
     dependencies:
       '@appuniversum/ember-appuniversum': 3.4.2(yenc6o4wruytt4u2jbwlbsqcl4)
       '@babel/core': 7.24.7
@@ -10778,6 +10778,7 @@ snapshots:
       tracked-built-ins: 3.3.0
       tracked-toolbox: 2.0.0(@babel/core@7.24.7)(ember-source@4.12.0(@babel/core@7.24.7)(@glimmer/component@1.1.2(@babel/core@7.24.7))(@glint/template@1.4.0)(webpack@5.92.1))
       uuid: 9.0.1
+      vm-browserify: 1.1.2
       yup: 1.4.0
     optionalDependencies:
       '@floating-ui/dom': 1.6.7

package/.changeset/bright-berries-impress.md

@@ -1,5 +0,0 @@
----
-'@lblod/ember-rdfa-editor-lblod-plugins': patch
----
-
-Allow document titles in snippet nodes and export constant for valid snippet contents