@lblod/ember-rdfa-editor-lblod-plugins 25.2.1 → 25.2.2-dev.8c6eeae424ca290540b93b6d36df774f29ab2099

package/.changeset/quiet-poems-float.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Use new template uris on variables

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 25.2.2
+
+### Patch Changes
+
+- [`7a31422`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/7a314220944f266566efced7343d630810fc0247) Thanks [@abeforgit](https://github.com/abeforgit)! - loosen editor peerdep
+
+- [`1c165af`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/1c165afcf6793c6ec96c40a902d90bdcac60900c) Thanks [@abeforgit](https://github.com/abeforgit)! - bump editor to [v10.7.4](https://github.com/lblod/ember-rdfa-editor/releases/tag/v10.7.4)
+
 ## 25.2.1
 
 ### Patch Changes

package/addon/components/location-plugin/insert.gts

@@ -54,6 +54,7 @@ interface Signature {
     controller: SayController;
     config: LocationPluginConfig;
     defaultMunicipality?: string;
+    templateMode?: boolean;
   };
   Element: HTMLLIElement;
 }
@@ -194,6 +195,7 @@ export default class LocationPluginInsertComponent extends Component<Signature>
         this.intl.t('location-plugin.default-label', {
           locale: this.documentLanguage,
         }),
+        this.args.templateMode,
       );
     }
     this.modalOpen = true;

package/addon/components/variable-plugin/address/insert-variable.ts

@@ -8,6 +8,7 @@ import IntlService from 'ember-intl/services/intl';
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
@@ -35,6 +36,7 @@ export default class VariablePluginAddressInsertVariableComponent extends Compon
         this.intl.t('variable.address.label', {
           locale: this.documentLanguage,
         }),
+      this.args.templateMode,
     );
   }
 }

package/addon/components/variable-plugin/address/insert.ts

@@ -9,6 +9,7 @@ import { replaceSelectionWithAddress } from './utils';
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class InsertAddressComponent extends Component<Args> {
@@ -31,6 +32,7 @@ export default class InsertAddressComponent extends Component<Args> {
       this.intl.t('variable.address.label', {
         locale: this.documentLanguage,
       }),
+      this.args.templateMode,
     );
   }
 

package/addon/components/variable-plugin/address/utils.ts

@@ -10,9 +10,14 @@ import { v4 as uuidv4 } from 'uuid';
 export function replaceSelectionWithAddress(
   controller: SayController,
   label?: string,
+  templateMode?: boolean,
 ) {
-  const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-  const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+  const mappingResource = `http://data.lblod.info/mappings/${
+    templateMode ? '--ref-uuid4-' : ''
+  }${uuidv4()}`;
+  const variableInstance = `http://data.lblod.info/variables/${
+    templateMode ? '--ref-uuid4-' : ''
+  }${uuidv4()}`;
 
   controller.withTransaction((tr) => {
     tr.replaceSelectionWith(

package/addon/components/variable-plugin/autofilled/insert.gts

@@ -23,6 +23,7 @@ import LabelInput from '@lblod/ember-rdfa-editor-lblod-plugins/components/variab
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class AutoFilledVariableInsertComponent extends Component<Args> {
@@ -60,8 +61,12 @@ export default class AutoFilledVariableInsertComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingSubject = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingSubject = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
     const variableId = uuidv4();
 
     const placeholder = this.intl.t('variable.autofilled.label', {

package/addon/components/variable-plugin/codelist/insert.ts

@@ -26,6 +26,7 @@ export type CodelistInsertOptions = {
 type Args = {
   controller: SayController;
   options: CodelistInsertOptions;
+  templateMode?: boolean;
 };
 
 interface SelectStyle {
@@ -88,8 +89,12 @@ export default class CodelistInsertComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingResource = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
     const codelistResource = this.selectedCodelist?.uri;
     const label =
       this.label ??

package/addon/components/variable-plugin/date/insert-variable.ts

@@ -16,6 +16,7 @@ import { replaceSelectionWithAndSelectNode } from '@lblod/ember-rdfa-editor-lblo
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class DateInsertVariableComponent extends Component<Args> {
@@ -41,8 +42,12 @@ export default class DateInsertVariableComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingResource = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
 
     const defaultLabel = this.intl.t('variable.date.label', {
       locale: this.documentLanguage,

package/addon/components/variable-plugin/date/insert.ts

@@ -15,6 +15,7 @@ import { AddIcon } from '@appuniversum/ember-appuniversum/components/icons/add';
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class DateInsertComponent extends Component<Args> {
@@ -36,9 +37,12 @@ export default class DateInsertComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingResource = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
     const defaultLabel = this.intl.t('variable.date.label', {
       locale: this.documentLanguage,
     });

package/addon/components/variable-plugin/insert-variable-card.hbs

@@ -29,6 +29,7 @@
         <this.selectedVariable.component
           @controller={{this.controller}}
           @options={{this.selectedVariable.options}}
+          @templateMode={{@templateMode}}
         />
       {{/if}}
     </c.content>

package/addon/components/variable-plugin/location/insert.ts

@@ -14,6 +14,7 @@ export type LocationInsertOptions = {
 type Args = {
   controller: SayController;
   options: LocationInsertOptions;
+  templateMode?: boolean;
 };
 
 export default class LocationInsertComponent extends Component<Args> {
@@ -44,8 +45,12 @@ export default class LocationInsertComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingResource = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
 
     const placeholder = this.intl.t('variable.location.label', {
       locale: this.documentLanguage,

package/addon/components/variable-plugin/number/insert.ts

@@ -17,6 +17,7 @@ import { replaceSelectionWithAndSelectNode } from '@lblod/ember-rdfa-editor-lblo
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class NumberInsertComponent extends Component<Args> {
@@ -85,9 +86,13 @@ export default class NumberInsertComponent extends Component<Args> {
   insert() {
     if (this.numberVariableError !== '') return;
 
-    const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
+    const mappingResource = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
     const subject = mappingResource;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
 
     const defaultLabel = this.intl.t('variable.number.label', {
       locale: this.documentLanguage,

package/addon/components/variable-plugin/person/insert.ts

@@ -15,6 +15,7 @@ import { replaceSelectionWithAndSelectNode } from '@lblod/ember-rdfa-editor-lblo
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class PersonVariableInsertComponent extends Component<Args> {
@@ -40,8 +41,12 @@ export default class PersonVariableInsertComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingSubject = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingSubject = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
     const variableId = uuidv4();
 
     const placeholder = this.intl.t('variable.person.label', {

package/addon/components/variable-plugin/text/insert.ts

@@ -15,6 +15,7 @@ import { replaceSelectionWithAndSelectNode } from '@lblod/ember-rdfa-editor-lblo
 
 type Args = {
   controller: SayController;
+  templateMode?: boolean;
 };
 
 export default class TextVariableInsertComponent extends Component<Args> {
@@ -40,8 +41,12 @@ export default class TextVariableInsertComponent extends Component<Args> {
 
   @action
   insert() {
-    const mappingSubject = `http://data.lblod.info/mappings/${uuidv4()}`;
-    const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
+    const mappingSubject = `http://data.lblod.info/mappings/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
+    const variableInstance = `http://data.lblod.info/variables/${
+      this.args.templateMode ? '--ref-uuid4-' : ''
+    }${uuidv4()}`;
     const variableId = uuidv4();
 
     const placeholder = this.intl.t('variable.text.label', {

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

@@ -10,10 +10,14 @@ import { v4 as uuidv4 } from 'uuid';
 export function replaceSelectionWithAddress(
   controller: SayController,
   label?: string,
+  templateMode?: boolean,
 ) {
-  const mappingResource = `http://data.lblod.info/mappings/${uuidv4()}`;
-  const variableInstance = `http://data.lblod.info/variables/${uuidv4()}`;
-
+  const mappingResource = `http://data.lblod.info/mappings/${
+    templateMode ? '--ref-uuid4-' : ''
+  }$${uuidv4()}`;
+  const variableInstance = `http://data.lblod.info/variables/${
+    templateMode ? '--ref-uuid4-' : ''
+  }$${uuidv4()}`;
   controller.withTransaction((tr) => {
     tr.replaceSelectionWith(
       controller.schema.node('oslo_location', {

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

@@ -73,11 +73,19 @@ function recreateUuidsOnNode(node: Node, schema: Schema) {
 
   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(
-          `http://data.lblod.info/variables/${uuidv4()}`,
-        ),
+        object: sayDataFactory.namedNode(recreatedUri),
       };
     }
 

package/declarations/addon/components/location-plugin/insert.d.ts

@@ -13,6 +13,7 @@ interface Signature {
         controller: SayController;
         config: LocationPluginConfig;
         defaultMunicipality?: string;
+        templateMode?: boolean;
     };
     Element: HTMLLIElement;
 }

package/declarations/addon/components/variable-plugin/address/insert-variable.d.ts

@@ -3,6 +3,7 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class VariablePluginAddressInsertVariableComponent extends Component<Args> {
     intl: IntlService;

package/declarations/addon/components/variable-plugin/address/insert.d.ts

@@ -3,6 +3,7 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class InsertAddressComponent extends Component<Args> {
     AddIcon: TOC<import("@appuniversum/ember-appuniversum/components/icons/add").AddIconSignature>;

package/declarations/addon/components/variable-plugin/address/utils.d.ts

@@ -1,2 +1,2 @@
 import { SayController } from '@lblod/ember-rdfa-editor';
-export declare function replaceSelectionWithAddress(controller: SayController, label?: string): void;
+export declare function replaceSelectionWithAddress(controller: SayController, label?: string, templateMode?: boolean): void;

package/declarations/addon/components/variable-plugin/autofilled/insert.d.ts

@@ -3,6 +3,7 @@ import { type SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class AutoFilledVariableInsertComponent extends Component<Args> {
     intl: IntlService;

package/declarations/addon/components/variable-plugin/codelist/insert.d.ts

@@ -9,6 +9,7 @@ export type CodelistInsertOptions = {
 type Args = {
     controller: SayController;
     options: CodelistInsertOptions;
+    templateMode?: boolean;
 };
 interface SelectStyle {
     label: string;

package/declarations/addon/components/variable-plugin/date/insert-variable.d.ts

@@ -3,6 +3,7 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class DateInsertVariableComponent extends Component<Args> {
     intl: IntlService;

package/declarations/addon/components/variable-plugin/date/insert.d.ts

@@ -3,6 +3,7 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class DateInsertComponent extends Component<Args> {
     AddIcon: TOC<import("@appuniversum/ember-appuniversum/components/icons/add").AddIconSignature>;

package/declarations/addon/components/variable-plugin/location/insert.d.ts

@@ -7,6 +7,7 @@ export type LocationInsertOptions = {
 type Args = {
     controller: SayController;
     options: LocationInsertOptions;
+    templateMode?: boolean;
 };
 export default class LocationInsertComponent extends Component<Args> {
     label?: string;

package/declarations/addon/components/variable-plugin/number/insert.d.ts

@@ -3,6 +3,7 @@ import { SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class NumberInsertComponent extends Component<Args> {
     intl: IntlService;

package/declarations/addon/components/variable-plugin/person/insert.d.ts

@@ -3,6 +3,7 @@ import { type SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class PersonVariableInsertComponent extends Component<Args> {
     intl: IntlService;

package/declarations/addon/components/variable-plugin/text/insert.d.ts

@@ -3,6 +3,7 @@ import { type SayController } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
+    templateMode?: boolean;
 };
 export default class TextVariableInsertComponent extends Component<Args> {
     intl: IntlService;

package/declarations/addon/plugins/location-plugin/utils/node-utils.d.ts

@@ -1,2 +1,2 @@
 import { SayController } from '@lblod/ember-rdfa-editor';
-export declare function replaceSelectionWithAddress(controller: SayController, label?: string): void;
+export declare function replaceSelectionWithAddress(controller: SayController, label?: string, templateMode?: boolean): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "25.2.1",
+  "version": "25.2.2-dev.8c6eeae424ca290540b93b6d36df774f29ab2099",
   "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.3",
+    "@lblod/ember-rdfa-editor": "10.7.4",
     "@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.7.3",
     "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.3
-        version: 10.7.3(2ef3gpurqxbttnmniw6grhzpuy)
+        specifier: 10.7.4
+        version: 10.7.4(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.3':
-    resolution: {integrity: sha512-8VsatXPiST7AM4Ruf/DT0BvX5gotcL5DSTP9HZGmxZQV7QIp3XQyiey7zwGHaD0c/ZHneq/h+vbvg0/r08RIlw==}
+  '@lblod/ember-rdfa-editor@10.7.4':
+    resolution: {integrity: sha512-jEoiLejODzYB8kbaxDoB0xRP1SAfOzgKv23ZmoRXKu6bodv+5Vx8+N2r4zYVseoz/ZR70vd3Ltr95Ja13OV7Uw==}
     engines: {node: 16.* || 18.* || >= 20}
     peerDependencies:
       '@appuniversum/ember-appuniversum': ^3.4.2
@@ -4974,7 +4974,7 @@ packages:
     resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==}
     engines: {node: '>= 4.0'}
     os: [darwin]
-    deprecated: The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2
+    deprecated: Upgrade to fsevents v2 to mitigate potential security issues
 
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
@@ -10738,7 +10738,7 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  '@lblod/ember-rdfa-editor@10.7.3(2ef3gpurqxbttnmniw6grhzpuy)':
+  '@lblod/ember-rdfa-editor@10.7.4(2ef3gpurqxbttnmniw6grhzpuy)':
     dependencies:
       '@appuniversum/ember-appuniversum': 3.4.2(yenc6o4wruytt4u2jbwlbsqcl4)
       '@babel/core': 7.24.7