@lblod/ember-rdfa-editor-lblod-plugins 26.0.1 → 26.0.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 26.0.2
+
+### Patch Changes
+
+- [#511](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/511) [`4237506`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/4237506d5bd6659786a50a14b89a8febe590eedb) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Implement new recreateUuids plugin
+
 ## 26.0.1
 
 ### Patch Changes

package/addon/plugins/location-plugin/node.ts

@@ -42,6 +42,7 @@ import {
   Place,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/location-plugin/utils/geo-helpers';
 import { NodeContentsUtils } from './node-contents';
+import { recreateVariableUris } from '../variable-plugin/utils/recreate-variable-uris';
 
 export interface LocationPluginConfig {
   defaultAddressUriRoot: string;
@@ -193,8 +194,7 @@ const emberNodeConfig = (config: LocationPluginConfig): EmberNodeConfig => ({
   group: 'inline variable',
   atom: true,
   editable: true,
-  recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   selectable: true,

package/addon/plugins/variable-plugin/utils/recreate-variable-uris.ts

@@ -0,0 +1,36 @@
+import { EXT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import { v4 as uuidv4 } from 'uuid';
+import { Attrs } from '@lblod/ember-rdfa-editor';
+import { getOutgoingTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+
+export function recreateVariableUris(nodeAttrs: Attrs) {
+  const attrs = { ...nodeAttrs };
+  if (
+    attrs.subject &&
+    (attrs.subject as string).includes(
+      'http://data.lblod.info/mappings/--ref-uuid4-',
+    )
+  ) {
+    attrs.subject = `http://data.lblod.info/mappings/--ref-uuid4-${uuidv4()}`;
+  } else if (
+    attrs.subject &&
+    (attrs.subject as string).includes('http://data.lblod.info/mappings/')
+  ) {
+    attrs.subject = `http://data.lblod.info/mappings/${uuidv4()}`;
+  }
+  const instanceTriple = getOutgoingTriple(attrs, EXT('instance'));
+  if (!instanceTriple) return attrs;
+  let recreatedUri;
+  if (
+    instanceTriple.object.value.includes(
+      'http://data.lblod.info/variables/--ref-uuid4-',
+    )
+  ) {
+    recreatedUri = `http://data.lblod.info/variables/--ref-uuid4-${uuidv4()}`;
+  } else {
+    recreatedUri = `http://data.lblod.info/variables/${uuidv4()}`;
+  }
+  instanceTriple.object = sayDataFactory.namedNode(recreatedUri);
+  return attrs;
+}

package/addon/plugins/variable-plugin/variables/address.ts

@@ -52,6 +52,7 @@ import {
   parseLambert72GMLString,
   parseLambert72WKTString,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/address-helpers';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const rdfaAware = true;
 
@@ -387,7 +388,7 @@ const emberNodeConfig: EmberNodeConfig = {
   atom: true,
   editable: true,
   recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   selectable: true,

package/addon/plugins/variable-plugin/variables/autofilled.ts

@@ -27,6 +27,7 @@ import type { ComponentLike } from '@glint/template';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { renderRdfaAware } from '@lblod/ember-rdfa-editor/core/schema';
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const CONTENT_SELECTOR = `span[property~='${EXT('content').prefixed}'],
                           span[property~='${EXT('content').full}']`;
@@ -144,8 +145,7 @@ const emberNodeConfig: EmberNodeConfig = {
   group: 'inline variable',
   content: 'inline*',
   atom: true,
-  recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   editable: true,

package/addon/plugins/variable-plugin/variables/codelist.ts

@@ -32,6 +32,7 @@ import {
 import VariableNodeViewComponent from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/variable/nodeview';
 import type { ComponentLike } from '@glint/template';
 import { renderRdfaAware } from '@lblod/ember-rdfa-editor/core/schema';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const CONTENT_SELECTOR = `span[property~='${EXT('content').prefixed}'],
                           span[property~='${EXT('content').full}']`;
@@ -163,8 +164,7 @@ const emberNodeConfig: EmberNodeConfig = {
   content: 'inline*',
   atom: true,
   editable: true,
-  recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   selectable: true,

package/addon/plugins/variable-plugin/variables/date.ts

@@ -36,6 +36,7 @@ import {
   RdfaAttrs,
   renderRdfaAware,
 } from '@lblod/ember-rdfa-editor/core/schema';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const TRANSLATION_FALLBACKS = {
   insertDate: 'Datum invoegen',
@@ -259,6 +260,7 @@ const emberNodeConfig = (options: DateOptions): EmberNodeConfig => ({
   selectable: true,
   draggable: false,
   atom: true,
+  recreateUriFunction: recreateVariableUris,
   defining: false,
   options,
   attrs: {

package/addon/plugins/variable-plugin/variables/location.ts

@@ -22,6 +22,7 @@ import {
 import { contentSpan } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/dom-output-spec-helpers';
 import NodeViewComponent from '@lblod/ember-rdfa-editor-lblod-plugins/components/variable-plugin/variable/nodeview';
 import type { ComponentLike } from '@glint/template';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const CONTENT_SELECTOR = `span[property~='${EXT('content').prefixed}'],
                           span[property~='${EXT('content').full}']`;
@@ -78,9 +79,8 @@ const emberNodeConfig: EmberNodeConfig = {
   group: 'inline variable',
   content: 'inline*',
   atom: true,
-  recreateUri: true,
   selectable: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   attrs: {

package/addon/plugins/variable-plugin/variables/number.ts

@@ -36,6 +36,7 @@ import type { ComponentLike } from '@glint/template';
 import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 import { renderRdfaAware } from '@lblod/ember-rdfa-editor/core/schema';
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const rdfaAware = true;
 const parseDOM: TagParseRule[] = [
@@ -171,8 +172,7 @@ const emberNodeConfig: EmberNodeConfig = {
   group: 'inline variable',
   content: 'inline*',
   atom: true,
-  recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   editable: true,
   draggable: false,
   needsFFKludge: true,

package/addon/plugins/variable-plugin/variables/person.ts

@@ -20,6 +20,7 @@ import type { ComponentLike } from '@glint/template';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { renderRdfaAware } from '@lblod/ember-rdfa-editor/core/schema';
 import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const TRANSLATION_FALLBACKS = {
   nodeview_placeholder: 'persoon',
@@ -105,8 +106,7 @@ const emberNodeConfig: EmberNodeConfig = {
   group: 'inline variable',
   content: 'inline*',
   atom: true,
-  recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   editable: true,

package/addon/plugins/variable-plugin/variables/text.ts

@@ -27,6 +27,7 @@ import type { ComponentLike } from '@glint/template';
 import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import { renderRdfaAware } from '@lblod/ember-rdfa-editor/core/schema';
 import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import { recreateVariableUris } from '../utils/recreate-variable-uris';
 
 const CONTENT_SELECTOR = `span[property~='${EXT('content').prefixed}'],
                           span[property~='${EXT('content').full}']`;
@@ -125,8 +126,7 @@ const emberNodeConfig: EmberNodeConfig = {
   group: 'inline variable',
   content: 'inline*',
   atom: true,
-  recreateUri: true,
-  uriAttributes: ['variableInstance'],
+  recreateUriFunction: recreateVariableUris,
   draggable: false,
   needsFFKludge: true,
   editable: true,

package/declarations/addon/plugins/variable-plugin/utils/recreate-variable-uris.d.ts

@@ -0,0 +1,4 @@
+import { Attrs } from '@lblod/ember-rdfa-editor';
+export declare function recreateVariableUris(nodeAttrs: Attrs): {
+    [x: string]: any;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "26.0.1",
+  "version": "26.0.2",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -105,7 +105,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.7.4",
+    "@lblod/ember-rdfa-editor": "10.8.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
@@ -192,7 +192,7 @@
     "@appuniversum/ember-appuniversum": "^3.4.1",
     "@ember/string": "3.x",
     "@glint/template": "^1.4.0",
-    "@lblod/ember-rdfa-editor": "^10.7.3",
+    "@lblod/ember-rdfa-editor": "^10.8.0",
     "ember-concurrency": "^3.1.0",
     "ember-element-helper": "^0.8.6",
     "ember-intl": "^7.0.0",

package/pnpm-lock.yaml

@@ -169,8 +169,8 @@ importers:
         specifier: 4.3.3
         version: 4.3.3
       '@lblod/ember-rdfa-editor':
-        specifier: 10.7.4
-        version: 10.7.4(2ef3gpurqxbttnmniw6grhzpuy)
+        specifier: 10.8.0
+        version: 10.8.0(2ef3gpurqxbttnmniw6grhzpuy)
       '@rdfjs/types':
         specifier: ^1.1.0
         version: 1.1.0
@@ -1595,8 +1595,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
-  '@lblod/ember-rdfa-editor@10.7.4':
-    resolution: {integrity: sha512-jEoiLejODzYB8kbaxDoB0xRP1SAfOzgKv23ZmoRXKu6bodv+5Vx8+N2r4zYVseoz/ZR70vd3Ltr95Ja13OV7Uw==}
+  '@lblod/ember-rdfa-editor@10.8.0':
+    resolution: {integrity: sha512-Xmcs8+e5sC9aDKz6hB5PslIePKizvh294O9A1JpKx00TzZhIFVBZeyW2baKiBpKpMjR/SyXj4WyryUKLYDldWw==}
     engines: {node: 16.* || 18.* || >= 20}
     peerDependencies:
       '@appuniversum/ember-appuniversum': ^3.4.2
@@ -3900,8 +3900,8 @@ packages:
     resolution: {integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==}
     engines: {node: '>=0.4', npm: '>=1.2'}
 
-  dompurify@3.1.7:
-    resolution: {integrity: sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==}
+  dompurify@3.2.0:
+    resolution: {integrity: sha512-AMdOzK44oFWqHEi0wpOqix/fUNY707OmoeFDnbi3Q5I8uOpy21ufUA5cDJPr0bosxrflOVD/H2DMSvuGKJGfmQ==}
 
   dot-case@3.0.4:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
@@ -6016,8 +6016,8 @@ packages:
   linkify-it@4.0.1:
     resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==}
 
-  linkifyjs@4.1.3:
-    resolution: {integrity: sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg==}
+  linkifyjs@4.1.4:
+    resolution: {integrity: sha512-0/NxkHNpiJ0k9VrYCkAn9OtU1eu8xEr1tCCpDtSsVRm/SF0xAak2Gzv3QimSfgUgqLBCDlfhMbu73XvaEHUTPQ==}
 
   livereload-js@3.4.1:
     resolution: {integrity: sha512-5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g==}
@@ -10738,7 +10738,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@lblod/ember-rdfa-editor@10.7.4(2ef3gpurqxbttnmniw6grhzpuy)':
+  '@lblod/ember-rdfa-editor@10.8.0(2ef3gpurqxbttnmniw6grhzpuy)':
     dependencies:
       '@appuniversum/ember-appuniversum': 3.4.2(yenc6o4wruytt4u2jbwlbsqcl4)
       '@babel/core': 7.24.7
@@ -10761,7 +10761,7 @@ snapshots:
       common-tags: 1.8.2
       crypto-browserify: 3.12.0
       debug: 4.3.5
-      dompurify: 3.1.7
+      dompurify: 3.2.0
       ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1)
       ember-changeset: 4.1.2(@glint/template@1.4.0)(webpack@5.92.1)
       ember-cli-babel: 8.2.0(@babel/core@7.24.7)
@@ -10778,7 +10778,7 @@ snapshots:
       handlebars-loader: 1.7.3(handlebars@4.7.8)
       iter-tools: 7.5.3
       js-beautify: 1.15.1
-      linkifyjs: 4.1.3
+      linkifyjs: 4.1.4
       mdn-polyfills: 5.20.0
       process: 0.11.10
       prosemirror-commands: 1.6.2
@@ -13794,7 +13794,7 @@ snapshots:
 
   domain-browser@1.2.0: {}
 
-  dompurify@3.1.7: {}
+  dompurify@3.2.0: {}
 
   dot-case@3.0.4:
     dependencies:
@@ -16977,7 +16977,7 @@ snapshots:
     dependencies:
       uc.micro: 1.0.6
 
-  linkifyjs@4.1.3: {}
+  linkifyjs@4.1.4: {}
 
   livereload-js@3.4.1: {}
 

package/addon/plugins/variable-plugin/recreateUuidsOnPaste.ts

@@ -1,103 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-import {
-  Fragment,
-  Slice,
-  Node,
-  Schema,
-  ProsePlugin,
-} from '@lblod/ember-rdfa-editor';
-
-import { recreateUuidsOnPasteKey } from '@lblod/ember-rdfa-editor/plugins/recreateUuidsOnPaste';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
-
-import { EXT } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import { OutgoingTriple } from '@lblod/ember-rdfa-editor/core/rdfa-processor';
-
-const recreateUuidsOnPaste = new ProsePlugin({
-  key: recreateUuidsOnPasteKey,
-  props: {
-    transformPasted(slice, view) {
-      const schema = view.state.schema;
-      return new Slice(
-        recreateUuidsFromFragment(slice.content, schema),
-        slice.openStart,
-        slice.openEnd,
-      );
-    },
-  },
-});
-
-function recreateUuidsFromFragment(fragment: Fragment, schema: Schema) {
-  const newNodes: Node[] = [];
-
-  fragment.forEach((node) => {
-    const newNode = recreateUuidsOnNode(node, schema);
-    newNodes.push(newNode);
-  });
-
-  return Fragment.fromArray(newNodes);
-}
-
-function recreateUuidsOnNode(node: Node, schema: Schema) {
-  if (node.isText) {
-    return node;
-  }
-
-  const children: Node[] = [];
-
-  node.content.forEach((node) => {
-    const child = recreateUuidsOnNode(node, schema);
-    children.push(child);
-  });
-
-  const type = node.type;
-  const spec = type.spec;
-
-  const uriAttributes = spec['uriAttributes'];
-
-  if (
-    !spec['recreateUri'] ||
-    !uriAttributes ||
-    !Array.isArray(uriAttributes) ||
-    !node.attrs['rdfaNodeType']
-  ) {
-    return schema.node(
-      node.type,
-      node.attrs,
-      Fragment.fromArray(children),
-      node.marks,
-    );
-  }
-
-  const attrs = { ...node.attrs };
-
-  attrs.properties = (attrs.properties as OutgoingTriple[]).map((prop) => {
-    if (prop.predicate === EXT('instance').full) {
-      let recreatedUri;
-      if (
-        prop.object.value.includes(
-          'http://data.lblod.info/variables/--ref-uuid4-',
-        )
-      ) {
-        recreatedUri = `http://data.lblod.info/variables/--ref-uuid4-${uuidv4()}`;
-      } else {
-        recreatedUri = `http://data.lblod.info/variables/${uuidv4()}`;
-      }
-      return {
-        predicate: prop.predicate,
-        object: sayDataFactory.namedNode(recreatedUri),
-      };
-    }
-
-    return prop;
-  });
-
-  return schema.node(
-    node.type,
-    attrs,
-    Fragment.fromArray(children),
-    node.marks,
-  );
-}
-
-export default recreateUuidsOnPaste;

package/declarations/addon/plugins/variable-plugin/recreateUuidsOnPaste.d.ts

@@ -1,3 +0,0 @@
-import { ProsePlugin } from '@lblod/ember-rdfa-editor';
-declare const recreateUuidsOnPaste: ProsePlugin<any>;
-export default recreateUuidsOnPaste;