@lblod/ember-rdfa-editor-lblod-plugins 35.3.0 → 35.4.0-dev.227e3fda9666fa2f52270074003b8aeaf320a473

package/.changeset/many-brooms-fetch.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Adds ability to choose insert position for a mobility measure article

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 35.4.0
+
+### Minor Changes
+
+- [#636](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/636) [`867383d`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/867383d8ee85dcf30ad7338cd80dc2c0802326c7) Thanks [@piemonkey](https://github.com/piemonkey)! - Use pointer functionality to link to make linking to codelist URIs possible
+
+### Patch Changes
+
+- [#636](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/636) [`aeb74b2`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/aeb74b22f159f0297749e430093d90a54f5f34f6) Thanks [@piemonkey](https://github.com/piemonkey)! - Update to [v13.6.0](https://github.com/lblod/ember-rdfa-editor/releases/tag/%40lblod%2Fember-rdfa-editor%4013.6.0) of the editor
+
 ## 35.3.0
 
 ### Minor Changes

package/addon/components/roadsign-regulation-plugin/expanded-measure.gts

@@ -5,7 +5,6 @@ import { tracked } from '@glimmer/tracking';
 import t from 'ember-intl/helpers/t';
 import MeasurePreview from './measure-preview';
 import AuRadioGroup from '@appuniversum/ember-appuniversum/components/au-radio-group';
-import AuButtonGroup from '@appuniversum/ember-appuniversum/components/au-button-group';
 import AuButton from '@appuniversum/ember-appuniversum/components/au-button';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { action } from '@ember/object';
@@ -16,10 +15,15 @@ import {
 } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { Task } from 'ember-concurrency';
 import { isSome } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import set from '@lblod/ember-rdfa-editor-lblod-plugins/helpers/set';
+import { service } from '@ember/service';
+import IntlService from 'ember-intl/services/intl';
+import { PNode } from '@lblod/ember-rdfa-editor';
+import PowerSelect from 'ember-power-select/components/power-select';
 
 export type InsertMobilityMeasureTask = Task<
   void,
-  [MobilityMeasureConcept, ZonalOrNot, boolean]
+  [MobilityMeasureConcept, ZonalOrNot, boolean, number?]
 >;
 type Signature = {
   Args: {
@@ -27,12 +31,43 @@ type Signature = {
     selectRow: (uri: string) => void;
     insert: InsertMobilityMeasureTask;
     endpoint: string;
+    articleNodes: PNode[];
   };
 };
 
+type InsertPositionOption = {
+  label: string;
+  position: 'first' | 'last' | 'custom';
+  insertIndex?: number;
+};
+
 export default class ExpandedMeasure extends Component<Signature> {
+  @service declare intl: IntlService;
+
   @tracked zonalityValue?: ZonalOrNot;
   @tracked temporalValue?: boolean;
+  @tracked selectedInsertPosition: InsertPositionOption;
+
+  insertPositionOptionFirst: InsertPositionOption;
+  insertPositionOptionLast: InsertPositionOption;
+
+  constructor(owner: unknown, args: Signature['Args']) {
+    super(owner, args);
+    this.insertPositionOptionFirst = {
+      label: this.intl.t(
+        'editor-plugins.roadsign-regulation.expanded-measure.as-first-article',
+      ),
+      position: 'first',
+      insertIndex: 0,
+    };
+    this.insertPositionOptionLast = {
+      label: this.intl.t(
+        'editor-plugins.roadsign-regulation.expanded-measure.as-last-article',
+      ),
+      position: 'last',
+    };
+    this.selectedInsertPosition = this.insertPositionOptionLast;
+  }
 
   get isPotentiallyZonal() {
     return this.args.concept.zonality === ZONALITY_OPTIONS.POTENTIALLY_ZONAL;
@@ -41,6 +76,7 @@ export default class ExpandedMeasure extends Component<Signature> {
   get insertButtonDisabled() {
     return (
       (this.isPotentiallyZonal && !this.zonalityValue) ||
+      this.args.insert.isRunning ||
       (this.args.concept.variableSignage && !isSome(this.temporalValue))
     );
   }
@@ -57,11 +93,13 @@ export default class ExpandedMeasure extends Component<Signature> {
 
   @action
   insert() {
+    const { insertIndex } = this.selectedInsertPosition;
     this.args.insert.perform(
       this.args.concept,
       // POTENTIALLY_ZONAL option is filtered out by requiring a zonalityValue to submit
       (this.zonalityValue ?? this.args.concept.zonality) as ZonalOrNot,
       this.temporalValue ?? false,
+      insertIndex,
     );
   }
 
@@ -70,6 +108,29 @@ export default class ExpandedMeasure extends Component<Signature> {
     this.args.selectRow(this.args.concept.uri);
   }
 
+  get articlesInDocument() {
+    return this.args.articleNodes;
+  }
+
+  get insertPositionOptions() {
+    return [
+      this.insertPositionOptionLast,
+      this.insertPositionOptionFirst,
+      ...this.articlesInDocument.slice(1).map((_, index) => ({
+        label: this.intl.t(
+          'editor-plugins.roadsign-regulation.expanded-measure.after-article-x',
+          { articleNumber: index + 1 },
+        ),
+        position: 'custom',
+        insertIndex: index + 1,
+      })),
+    ];
+  }
+
+  get insertPositionDropdownTitle() {
+    return this.selectedInsertPosition?.label.toLowerCase();
+  }
+
   <template>
     <tr class='au-c-data-table__detail'>
       <td colspan='5' class='au-o-flow au-o-flow--small'>
@@ -135,19 +196,28 @@ export default class ExpandedMeasure extends Component<Signature> {
             </AuRadioGroup>
           </div>
         {{/if}}
-        <AuButtonGroup>
-          <AuButton
-            {{on 'click' this.insert}}
-            @loading={{@insert.isRunning}}
-            @loadingMessage={{t 'common.loading'}}
-            @disabled={{this.insertButtonDisabled}}
-          >
-            {{t 'editor-plugins.utils.insert'}}
-          </AuButton>
-          <AuButton @skin='secondary' {{on 'click' this.unselectRow}}>
-            {{t 'editor-plugins.utils.cancel'}}
-          </AuButton>
-        </AuButtonGroup>
+        <AuHeading @level='6' @skin='6'>
+          {{t
+            'editor-plugins.roadsign-regulation.expanded-measure.insert-position'
+          }}
+        </AuHeading>
+        <PowerSelect
+          class='au-u-1-5'
+          @allowClear={{false}}
+          @onChange={{set this 'selectedInsertPosition'}}
+          @selected={{this.selectedInsertPosition}}
+          @options={{this.insertPositionOptions}}
+          as |option|
+        >{{option.label}}</PowerSelect>
+        <AuButton
+          {{on 'click' this.insert}}
+          @skin='primary'
+          @loading={{@insert.isRunning}}
+          @loadingMessage={{t 'common.loading'}}
+          @disabled={{this.insertButtonDisabled}}
+        >
+          {{t 'common.insert'}}
+        </AuButton>
       </td>
     </tr>
   </template>

package/addon/components/roadsign-regulation-plugin/roadsigns-modal.gts

@@ -41,6 +41,7 @@ import { Variable } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsig
 import { generateVariableInstanceUri } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/variable-helpers';
 import { mapObject } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/map-object';
 import { v4 as uuid } from 'uuid';
+import { getArticleNodes } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/document-structure-utils';
 
 type Option = {
   uri: string;
@@ -319,6 +320,7 @@ export default class RoadsignsModal extends Component<Signature> {
       concept: MobilityMeasureConcept,
       zonality: ZonalOrNot,
       temporal: boolean,
+      position?: number,
     ) => {
       if (!this.decisionLocation) {
         return;
@@ -355,6 +357,7 @@ export default class RoadsignsModal extends Component<Signature> {
               decisionUri,
               zonality,
               temporal,
+              position,
             })(this.controller.mainEditorState).transaction;
           },
           { view: this.controller.mainEditorView },
@@ -386,6 +389,12 @@ export default class RoadsignsModal extends Component<Signature> {
     this.pageNumber = pageNumber;
   }
 
+  get articleNodes() {
+    return getArticleNodes(this.controller.mainEditorState).map(
+      (node) => node.node,
+    );
+  }
+
   <template>
     <AuModal
       class='au-c-modal--flush'
@@ -516,6 +525,7 @@ export default class RoadsignsModal extends Component<Signature> {
             @isLoading={{this.measureConceptsQuery.isRunning}}
             @insert={{this.insertMeasure}}
             @options={{@options}}
+            @articleNodes={{this.articleNodes}}
           />
           {{#if this.measureConceptCount}}
             {{#let

package/addon/components/roadsign-regulation-plugin/roadsigns-table.gts

@@ -21,6 +21,7 @@ import { on } from '@ember/modifier';
 import { fn } from '@ember/helper';
 import { TRAFFIC_SIGNAL_CONCEPT_TYPES } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import removeZFromLabel from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/helpers/removeZFromLabel';
+import { PNode } from '@lblod/ember-rdfa-editor';
 
 type Signature = {
   Args: {
@@ -28,6 +29,7 @@ type Signature = {
     content?: MobilityMeasureConcept[];
     isLoading?: boolean;
     insert: InsertMobilityMeasureTask;
+    articleNodes: PNode[];
   };
 };
 
@@ -163,6 +165,7 @@ export default class RoadSignsTable extends Component<Signature> {
                     @insert={{@insert}}
                     @selectRow={{this.selectRow}}
                     @endpoint={{@options.endpoint}}
+                    @articleNodes={{@articleNodes}}
                   />
                 {{/if}}
               {{else}}

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

@@ -50,6 +50,7 @@ export default class MarcodeInsertComponent extends Component<Sig> {
       // list in code instead of in the doc?
       hardcodedOptionList: hardcodedMarcodeList,
       label,
+      hasNonLiteralContents: true,
     });
     this.controller.doCommand(replaceSelectionWithAndSelectNode(node), {
       view: this.controller.mainEditorView,

package/addon/plugins/decision-plugin/actions/insert-article.ts

@@ -20,6 +20,7 @@ interface InsertArticleToDecisionArgs {
   node: PNode;
   decisionUri: string;
   insertFreely?: false;
+  position?: number;
 }
 interface InsertArticleFreelyArgs {
   node: PNode;
@@ -46,7 +47,7 @@ export function insertArticle(
       };
     }
 
-    const { decisionUri } = args;
+    const { decisionUri, position } = args;
     const decision = getNodesBySubject(state, decisionUri)[0];
     if (!decision) {
       return {
@@ -55,56 +56,98 @@ export function insertArticle(
         result: false,
       };
     }
+
     const decisionResource = decision.value.attrs.subject;
     const container = getOutgoingTriple(decision.value.attrs, PROV('value'));
-    if (container) {
-      const location = findNodeByRdfaId(state.doc, container.object.value);
-      if (location) {
-        const insertLocation = location.pos + location.value.nodeSize - 1;
-        const factory = new SayDataFactory();
-        const tr = state.tr;
-        const combiResult = transactionCombinator(
-          state,
-          tr.replaceWith(insertLocation, insertLocation, node),
-        )([
-          addPropertyToNode({
-            resource: decisionResource,
-            property: {
-              predicate: ELI('has_part').full,
-              object: factory.resourceNode(node.attrs.subject),
-            },
-          }),
-          recalculateNumbers,
-        ]);
-
-        const { result, transaction } = combiResult;
-
-        transaction.setSelection(
-          TextSelection.create(
-            transaction.doc,
-            insertLocation + 1,
-            insertLocation + node.nodeSize - 1,
-          ),
-        );
-
-        transaction.scrollIntoView();
-        return {
-          initialState: state,
-          transaction,
-          result: result.every((ok) => ok),
-        };
-      } else {
-        return {
-          initialState: state,
-          transaction: state.tr,
-          result: false,
-        };
-      }
+    if (!container) {
+      return {
+        initialState: state,
+        transaction: state.tr,
+        result: false,
+      };
+    }
+
+    const location = findNodeByRdfaId(state.doc, container.object.value);
+    if (!location) {
+      return {
+        initialState: state,
+        transaction: state.tr,
+        result: false,
+      };
     }
+
+    const insertLocation = resolveInsertLocation(location, position);
+
+    const factory = new SayDataFactory();
+    const tr = state.tr;
+    const combiResult = transactionCombinator(
+      state,
+      tr.replaceWith(insertLocation, insertLocation, node),
+    )([
+      addPropertyToNode({
+        resource: decisionResource,
+        property: {
+          predicate: ELI('has_part').full,
+          object: factory.resourceNode(node.attrs.subject),
+        },
+      }),
+      recalculateNumbers,
+    ]);
+
+    const { result, transaction } = combiResult;
+
+    transaction.setSelection(
+      TextSelection.create(
+        transaction.doc,
+        insertLocation + 1,
+        insertLocation + node.nodeSize - 1,
+      ),
+    );
+
+    transaction.scrollIntoView();
     return {
       initialState: state,
-      transaction: state.tr,
-      result: false,
+      transaction,
+      result: result.every((ok) => ok),
     };
   };
 }
+
+/**
+ * Resolves the document position at which to insert a new article node
+ *
+ * - If `position` is undefined, insert at the end of the container.
+ * - If `position` is 0, insert before the first child.
+ * - If `position` >= childCount, insert after the last child (append).
+ * - Otherwise, insert before the child at that index.
+ */
+function resolveInsertLocation(
+  location: { pos: number; value: PNode },
+  position: number | undefined,
+): number {
+  const containerNode = location.value;
+
+  if (position === undefined) {
+    return location.pos + containerNode.nodeSize - 1;
+  }
+
+  const childCount = containerNode.childCount;
+
+  if (position >= childCount) {
+    return location.pos + containerNode.nodeSize - 1;
+  }
+
+  let offset = location.pos + 1; // +1 to step inside the container node
+  let articleIndex = 0;
+  for (const child of containerNode.children) {
+    if (articleIndex === position) {
+      return offset;
+    }
+    offset += child.nodeSize;
+    if (child.attrs.structureType === 'article') {
+      articleIndex += 1;
+    }
+  }
+
+  return location.pos + containerNode.nodeSize - 1;
+}

package/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.ts

@@ -60,6 +60,7 @@ type InsertMeasureArgs = {
   variables: Record<string, VariableInstance & { __rdfaId: string }>;
   templateString: string;
   decisionUri: string;
+  position?: number;
   articleUriGenerator?: () => string;
 } & (
   | {
@@ -78,6 +79,7 @@ export default function insertMeasure({
   templateString,
   articleUriGenerator,
   decisionUri,
+  position,
   ...args
 }: InsertMeasureArgs): TransactionMonad<boolean> {
   return function (state: EditorState) {
@@ -230,6 +232,7 @@ export default function insertMeasure({
     const initialTransaction = insertArticle({
       node: articleNode,
       decisionUri,
+      position,
     })(state).transaction;
     const resultingSelection = initialTransaction.selection;
     const { transaction, result } = transactionCombinator(

package/addon/plugins/variable-plugin/actions/create-codelist-variable.ts

@@ -30,6 +30,7 @@ export function createCodelistVariable(args: CreateCodelistVariableArgs) {
       subject: args.value,
       variableInstance: args.variableInstance,
       text: args.valueLabel,
+      pointsToNode: args.__rdfaId,
     });
     return schema.nodes.codelist.create(attrs, [codelistOption]);
   }
@@ -42,6 +43,7 @@ type CreateCodelistVariableAttrsArgs = {
   source: string;
   codelist: string;
   hardcodedOptionList?: CodeListOption[];
+  hasNonLiteralContents?: boolean;
 } & AllOrNone<{
   variable: string;
   variableInstance: string;
@@ -57,6 +59,7 @@ export function createCodelistVariableAttrs({
   variable,
   variableInstance,
   hardcodedOptionList,
+  hasNonLiteralContents,
 }: CreateCodelistVariableAttrsArgs) {
   const externalTriples: FullTriple[] = [];
   if (variable) {
@@ -90,6 +93,7 @@ export function createCodelistVariableAttrs({
     variable,
     variableInstance,
     hardcodedOptionList,
+    hasNonLiteralContents: !!hasNonLiteralContents,
   } as CodelistAttrs;
 }
 
@@ -109,12 +113,14 @@ type CreateCodelistOptionNodeAttrsArgs = {
   text: string;
   value?: string;
   variableInstance?: string;
+  pointsToNode?: string;
 };
 
 function createCodelistOptionNodeAttrs({
   subject,
   text,
   variableInstance,
+  pointsToNode,
 }: CreateCodelistOptionNodeAttrsArgs) {
   const backlinks: IncomingTriple[] = [];
   if (variableInstance) {
@@ -135,5 +141,6 @@ function createCodelistOptionNodeAttrs({
     subject,
     properties,
     backlinks,
+    pointsToNode,
   };
 }

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

@@ -35,12 +35,16 @@ export function updateCodelistVariable(
   const variableInstance = selectedCodelist.node.attrs['variableInstance'] as
     | string
     | undefined;
+  const pointerTarget = selectedCodelist.node.attrs['__rdfaId'] as
+    | string
+    | undefined;
   const codelistOptionNodes = selectedOptions.map((option) =>
     createCodelistOptionNode({
       schema: controller.schema,
       text: option.label,
       subject: option.uri,
       variableInstance,
+      pointsToNode: pointerTarget,
     }),
   );
   const range = {

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

@@ -5,6 +5,7 @@ import {
 } from '@lblod/ember-rdfa-editor/utils/ember-node';
 import {
   DOMOutputSpec,
+  EditorState,
   Fragment,
   PNode,
   Schema,
@@ -102,7 +103,7 @@ const parseDOM: TagParseRule[] = [
   },
 ];
 
-const toDOM = (node: PNode): DOMOutputSpec => {
+const toDOM = (node: PNode, state?: EditorState): DOMOutputSpec => {
   const {
     label = 'codelist',
     codelist,
@@ -119,30 +120,36 @@ const toDOM = (node: PNode): DOMOutputSpec => {
   for (let i = 0; i < codelist_option_nodes.length; i++) {
     const codelist_option_node = codelist_option_nodes[i];
     contentArray.push(
-      unwrap(codelist_option_node.type.spec.toDOM)(codelist_option_node),
+      unwrap((codelist_option_node.type.spec as SayNodeSpec).toDOM)(
+        codelist_option_node,
+        state,
+      ),
     );
     if (i !== codelist_option_nodes.length - 1) {
       contentArray.push(', ');
     }
   }
-  return renderRdfaAware({
-    renderable: node,
-    tag: 'span',
-    attrs: {
-      class: `${getClassnamesFromNode(node)}${className}`,
-      'data-say-variable': 'true',
-      'data-say-variable-type': 'codelist',
-      'data-say-node-version': '2',
-      'data-label': label as string | null,
-      'data-codelist': codelist as string,
-      'data-source': source as string,
-      'data-selection-style': selectionStyle as string,
-      'data-variable': variable as string,
-      'data-variable-instance': variableInstance as string,
-      'data-option-list': JSON.stringify(hardcodedOptionList),
+  return renderRdfaAware(
+    {
+      renderable: node,
+      tag: 'span',
+      attrs: {
+        class: `${getClassnamesFromNode(node)}${className}`,
+        'data-say-variable': 'true',
+        'data-say-variable-type': 'codelist',
+        'data-say-node-version': '2',
+        'data-label': label as string | null,
+        'data-codelist': codelist as string,
+        'data-source': source as string,
+        'data-selection-style': selectionStyle as string,
+        'data-variable': variable as string,
+        'data-variable-instance': variableInstance as string,
+        'data-option-list': JSON.stringify(hardcodedOptionList),
+      },
+      contentArray: contentArray.length ? contentArray : [label],
     },
-    contentArray: contentArray.length ? contentArray : [label],
-  });
+    state,
+  );
 };
 
 const emberNodeConfig: EmberNodeConfig = {
@@ -195,14 +202,17 @@ export const codelist_option: SayNodeSpec = {
   attrs: {
     ...rdfaAttrSpec({ rdfaAware }),
   },
-  toDOM: (node) => {
-    return renderRdfaAware({
-      renderable: node,
-      attrs: {
-        'data-say-type': 'codelist_option',
+  toDOM: (node, state) => {
+    return renderRdfaAware(
+      {
+        renderable: node,
+        attrs: {
+          'data-say-type': 'codelist_option',
+        },
+        tag: 'span',
+        content: node.textContent,
       },
-      tag: 'span',
-      content: node.textContent,
-    });
+      state,
+    );
   },
 };

package/addon/utils/document-structure-utils.ts

@@ -0,0 +1,17 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { PNode } from '@lblod/ember-rdfa-editor';
+
+export function getArticleNodes(state: EditorState) {
+  const articles: { node: PNode; pos: number }[] = [];
+
+  state.doc.descendants((node, pos) => {
+    if (node.attrs.structureType === 'article') {
+      articles.push({ node, pos });
+      return false;
+    }
+
+    return true;
+  });
+
+  return articles;
+}

package/declarations/addon/components/roadsign-regulation-plugin/expanded-measure.d.ts

@@ -2,10 +2,13 @@ import Component from '@glimmer/component';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { ZonalOrNot } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
 import { Task } from 'ember-concurrency';
+import IntlService from 'ember-intl/services/intl';
+import { PNode } from '@lblod/ember-rdfa-editor';
 export type InsertMobilityMeasureTask = Task<void, [
     MobilityMeasureConcept,
     ZonalOrNot,
-    boolean
+    boolean,
+    number?
 ]>;
 type Signature = {
     Args: {
@@ -13,16 +16,34 @@ type Signature = {
         selectRow: (uri: string) => void;
         insert: InsertMobilityMeasureTask;
         endpoint: string;
+        articleNodes: PNode[];
     };
 };
+type InsertPositionOption = {
+    label: string;
+    position: 'first' | 'last' | 'custom';
+    insertIndex?: number;
+};
 export default class ExpandedMeasure extends Component<Signature> {
+    intl: IntlService;
     zonalityValue?: ZonalOrNot;
     temporalValue?: boolean;
+    selectedInsertPosition: InsertPositionOption;
+    insertPositionOptionFirst: InsertPositionOption;
+    insertPositionOptionLast: InsertPositionOption;
+    constructor(owner: unknown, args: Signature['Args']);
     get isPotentiallyZonal(): boolean;
     get insertButtonDisabled(): boolean;
     changeZonality(zonality: ZonalOrNot): void;
     changeTemporality(temporality: 'true' | 'false'): void;
     insert(): void;
     unselectRow(): void;
+    get articlesInDocument(): PNode[];
+    get insertPositionOptions(): (InsertPositionOption | {
+        label: string;
+        position: string;
+        insertIndex: number;
+    })[];
+    get insertPositionDropdownTitle(): string;
 }
 export {};

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-modal.d.ts

@@ -134,10 +134,11 @@ export default class RoadsignsModal extends Component<Signature> {
         }))[];
     }[] | undefined;
     get measureConceptCount(): number | undefined;
-    insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: ZonalOrNot, temporal: boolean) => Promise<void>>;
+    insertMeasure: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (concept: MobilityMeasureConcept, zonality: ZonalOrNot, temporal: boolean, position?: number) => Promise<void>>;
     resetPagination(): void;
     goToPreviousPage(): void;
     goToNextPage(): void;
     goToPage(pageNumber: number): void;
+    get articleNodes(): import("prosemirror-model").Node[];
 }
 export {};

package/declarations/addon/components/roadsign-regulation-plugin/roadsigns-table.d.ts

@@ -2,12 +2,14 @@ import Component from '@glimmer/component';
 import { RoadsignRegulationPluginOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin';
 import { MobilityMeasureConcept } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/schemas/mobility-measure-concept';
 import { InsertMobilityMeasureTask } from './expanded-measure';
+import { PNode } from '@lblod/ember-rdfa-editor';
 type Signature = {
     Args: {
         options: RoadsignRegulationPluginOptions;
         content?: MobilityMeasureConcept[];
         isLoading?: boolean;
         insert: InsertMobilityMeasureTask;
+        articleNodes: PNode[];
     };
 };
 export default class RoadSignsTable extends Component<Signature> {

package/declarations/addon/plugins/decision-plugin/actions/insert-article.d.ts

@@ -4,6 +4,7 @@ interface InsertArticleToDecisionArgs {
     node: PNode;
     decisionUri: string;
     insertFreely?: false;
+    position?: number;
 }
 interface InsertArticleFreelyArgs {
     node: PNode;

package/declarations/addon/plugins/roadsign-regulation-plugin/actions/insert-measure.d.ts

@@ -12,11 +12,12 @@ type InsertMeasureArgs = {
     }>;
     templateString: string;
     decisionUri: string;
+    position?: number;
     articleUriGenerator?: () => string;
 } & ({
     measureConcept: MobilityMeasureConcept;
 } | {
     measureDesign: MobilityMeasureDesign;
 });
-export default function insertMeasure({ arDesignUri, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
+export default function insertMeasure({ arDesignUri, zonality, temporal, variables, templateString, articleUriGenerator, decisionUri, position, ...args }: InsertMeasureArgs): TransactionMonad<boolean>;
 export {};

package/declarations/addon/plugins/variable-plugin/actions/create-codelist-variable.d.ts

@@ -14,12 +14,13 @@ type CreateCodelistVariableAttrsArgs = {
     source: string;
     codelist: string;
     hardcodedOptionList?: CodeListOption[];
+    hasNonLiteralContents?: boolean;
 } & AllOrNone<{
     variable: string;
     variableInstance: string;
     __rdfaId?: string;
 }>;
-export declare function createCodelistVariableAttrs({ selectionStyle, label, source, codelist, __rdfaId, variable, variableInstance, hardcodedOptionList, }: CreateCodelistVariableAttrsArgs): CodelistAttrs;
+export declare function createCodelistVariableAttrs({ selectionStyle, label, source, codelist, __rdfaId, variable, variableInstance, hardcodedOptionList, hasNonLiteralContents, }: CreateCodelistVariableAttrsArgs): CodelistAttrs;
 type CreateCodelistOptionNodeArgs = {
     schema: Schema;
     text: string;
@@ -30,5 +31,6 @@ type CreateCodelistOptionNodeAttrsArgs = {
     text: string;
     value?: string;
     variableInstance?: string;
+    pointsToNode?: string;
 };
 export {};

package/declarations/addon/utils/document-structure-utils.d.ts

@@ -0,0 +1,6 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { PNode } from '@lblod/ember-rdfa-editor';
+export declare function getArticleNodes(state: EditorState): {
+    node: PNode;
+    pos: number;
+}[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "35.3.0",
+  "version": "35.4.0-dev.227e3fda9666fa2f52270074003b8aeaf320a473",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -38,8 +38,9 @@
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "lint:prettier": "prettier --check .",
-    "lint:prettier:fix": "prettier --write .",
+    "lint:prettier:fix": "pnpm format",
     "lint:types": "glint",
+    "format": "prettier --write .",
     "start": "concurrently -c \"auto\" -P \"pnpm:serve {@}\" \"pnpm:typecheck\" --",
     "typecheck": "glint --watch --preserveWatchOutput",
     "serve": "ember serve",
@@ -110,9 +111,8 @@
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
     "@glint/template": "^1.5.0",
-    "@graphy/content.ttl.write": "^4.3.7",
-    "@graphy/memory.dataset.fast": "4.3.3",
-    "@lblod/ember-rdfa-editor": "13.1.1",
+    "@lblod/ember-rdfa-editor": "13.6.0",
+    "@rdfjs/to-ntriples": "^3.0.1",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
@@ -207,6 +207,7 @@
   "pnpm": {
     "overrides": {
       "babel-plugin-ember-template-compilation": "^2.2.5",
+      "@codemirror/state": "6.5.2",
       "prosemirror-view": "^1.41.5"
     }
   },

package/translations/en-US.yaml

@@ -316,6 +316,10 @@ editor-plugins:
   roadsign-regulation:
     expanded-measure:
       insert-measure: 'Insert measure:'
+      as-last-article: As first article
+      as-first-article: As last article
+      after-article-x: After article {articleNumber}
+      insert-position: 'Insertion position:'
       select-zonality:
         label: 'Select zonal validity:'
         zonal: Zonal

package/translations/nl-BE.yaml

@@ -315,6 +315,10 @@ editor-plugins:
   roadsign-regulation:
     expanded-measure:
       insert-measure: 'Voeg maatregel in:'
+      as-last-article: Als laatste artikel
+      as-first-article: Als eerste artikel
+      after-article-x: Na artikel {articleNumber}
+      insert-position: 'Invoegpositie:'
       select-zonality:
         label: 'Selecteer zonale geldigheid:'
         zonal: Zonaal