@lblod/ember-rdfa-editor-lblod-plugins 32.7.0 → 32.8.0-dev.ccd8888d1efc5ccdedb5c16e6a952e3a0892d760

package/addon/plugins/document-validation-plugin/index.ts

@@ -2,14 +2,17 @@ import factory from '@rdfjs/dataset';
 import SHACLValidator from 'rdf-validate-shacl';
 import { Parser as ParserN3 } from 'n3';
 import { RdfaParser } from 'rdfa-streaming-parser';
-import { ProsePlugin, PluginKey, EditorView } from '@lblod/ember-rdfa-editor';
+import {
+  ProsePlugin,
+  PluginKey,
+  EditorView,
+  SayController,
+} from '@lblod/ember-rdfa-editor';
 import removeQuotes from '@lblod/ember-rdfa-editor-lblod-plugins/utils/remove-quotes';
 import {
-  BlankNode,
   DataFactory,
   DatasetCore,
   DatasetCoreFactory,
-  NamedNode,
   Quad,
 } from '@rdfjs/types';
 import ValidationReport from 'rdf-validate-shacl/src/validation-report';
@@ -18,8 +21,34 @@ import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 export const documentValidationPluginKey =
   new PluginKey<DocumentValidationPluginState>('DOCUMENT_VALIDATION');
 
-interface DocumentValidationPluginArgs {
+type Violation =
+  | {
+      action: (controller: SayController, report: ValidationReport) => void;
+      buttonTitle: string;
+    }
+  | {
+      helpText: string;
+    };
+type Rule =
+  | {
+      shaclRule: string;
+      violations: {
+        [key: string]: Violation;
+      };
+    }
+  | {
+      shaclRule: string;
+      action: (controller: SayController, report: ValidationReport) => void;
+      buttonTitle: string;
+    }
+  | {
+      shaclRule: string;
+      helpText: string;
+    };
+
+export interface DocumentValidationPluginArgs {
   documentShape: string;
+  rules: Rule[];
 }
 
 export type ShaclValidationReport = ValidationReport.ValidationReport<
@@ -27,17 +56,16 @@ export type ShaclValidationReport = ValidationReport.ValidationReport<
     DatasetCoreFactory<Quad, Quad, DatasetCore<Quad, Quad>>
 >;
 
+type PropertyWithError = {
+  message: string;
+  subject: string | undefined;
+  shape: string;
+  constraint: string;
+};
 interface DocumentValidationResult {
   report?: ValidationReport;
   propertiesWithoutErrors: { message: string }[];
-  propertiesWithErrors: (
-    | {
-        message: string;
-        subject: string | undefined;
-      }
-    // TODO get rid of this?
-    | undefined
-  )[];
+  propertiesWithErrors: PropertyWithError[];
 }
 export interface DocumentValidationTransactionMeta
   extends DocumentValidationResult {
@@ -47,6 +75,7 @@ export interface DocumentValidationPluginState
   extends DocumentValidationResult {
   documentShape: string;
   validationCallback: typeof validationCallback;
+  rules: Rule[];
 }
 
 export const documentValidationPlugin = (
@@ -61,6 +90,7 @@ export const documentValidationPlugin = (
           documentShape: options.documentShape,
           propertiesWithoutErrors: [],
           propertiesWithErrors: [],
+          rules: options.rules,
         };
       },
       apply(tr, state) {
@@ -107,31 +137,30 @@ async function validationCallback(view: EditorView, documentHtml: string) {
     ...shacl.match(undefined, propertyPred, undefined),
   ].map((quad: Quad) => quad.object);
 
-  const propertiesWithErrors: {
-    sourceShape: BlankNode | NamedNode<string>;
-    focusNode: BlankNode | NamedNode<string> | null;
-  }[] = [];
-  for (const r of report.results) {
-    const sourceShape = r.sourceShape;
-    if (sourceShape)
-      propertiesWithErrors.push({ sourceShape, focusNode: r.focusNode });
-  }
   const errorMessagePred = sayFactory.namedNode(
     'http://www.w3.org/ns/shacl#resultMessage',
   );
-  const propertiesWithErrorsMessages = propertiesWithErrors
-    .map(({ sourceShape, focusNode }) => {
+  const propertiesWithErrors: PropertyWithError[] = [];
+  for (const r of report.results) {
+    const sourceShape = r.sourceShape;
+    if (sourceShape) {
       const match = shacl.match(sourceShape, errorMessagePred, undefined);
       const message = [...match][0]?.object.value;
-      return message
-        ? { message: removeQuotes(message), subject: focusNode?.value }
-        : undefined;
-    })
-    .filter((message) => message);
+      if (message) {
+        propertiesWithErrors.push({
+          message: removeQuotes(message),
+          subject: r.focusNode?.value,
+          shape: sourceShape.value,
+          constraint: r.sourceConstraintComponent?.value as string,
+        });
+      }
+    }
+  }
+
   const propertiesWithoutErrorsArray = propertyNodes.filter((propertyNode) =>
-    propertiesWithErrors.some((propertyWithError) => {
-      return propertyWithError.sourceShape.value !== propertyNode.value;
-    }),
+    propertiesWithErrors.every(
+      (propertyWithError) => propertyWithError.shape !== propertyNode.value,
+    ),
   );
 
   const successMessagePred = sayFactory.namedNode(
@@ -149,7 +178,7 @@ async function validationCallback(view: EditorView, documentHtml: string) {
     type: 'setNewReport',
     report,
     propertiesWithoutErrors,
-    propertiesWithErrors: propertiesWithErrorsMessages,
+    propertiesWithErrors: propertiesWithErrors,
   });
   transaction.setMeta('addToHistory', false);
   view.dispatch(transaction);

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

@@ -241,12 +241,14 @@ function constructSignNode(
           ),
         },
         {
-          predicate: MOBILITEIT('heeftVerkeersbordconcept'),
+          predicate: PROV('wasDerivedFrom').full,
           object: sayDataFactory.namedNode(signConcept.uri),
         },
       ],
     },
-    schema.text(`${prefix} ${signConcept.code}${zonalityText}`),
+    schema.text(
+      `${prefix} ${signConcept.regulatoryNotation || signConcept.code}${zonalityText}`,
+    ),
   );
   return node;
 }

package/addon/plugins/roadsign-regulation-plugin/constants.ts

@@ -23,9 +23,9 @@ export const TRAFFIC_SIGNAL_CONCEPT_TYPES = {
 
 export const TRAFFIC_SIGNAL_TYPES = {
   TRAFFIC_SIGNAL: MOBILITEIT('Verkeersteken').full,
-  ROAD_SIGN: MOBILITEIT('Verkeersbord').full,
-  TRAFFIC_LIGHT: MOBILITEIT('Verkeerslicht').full,
-  ROAD_MARKING: MOBILITEIT('Wegmarkering').full,
+  ROAD_SIGN: MOBILITEIT('VerkeersbordVerkeersteken').full,
+  TRAFFIC_LIGHT: MOBILITEIT('VerkeerslichtVerkeersteken').full,
+  ROAD_MARKING: MOBILITEIT('WegmarkeringVerkeersteken').full,
 } as const;
 
 export const TRAFFIC_SIGNAL_TYPE_MAPPING = {

package/addon/plugins/roadsign-regulation-plugin/nodes.ts

@@ -9,10 +9,25 @@ import {
   EXT,
   MOBILITEIT,
   PROV,
+  RDF,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import { hasRDFaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import {
+  getOutgoingTriple,
+  hasOutgoingNamedNodeTriple,
+  hasRDFaAttribute,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
 import getClassnamesFromNode from '@lblod/ember-rdfa-editor/utils/get-classnames-from-node';
-import { sayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import {
+  SayDataFactory,
+  sayDataFactory,
+} from '@lblod/ember-rdfa-editor/core/say-data-factory';
+import {
+  isResourceAttrs,
+  ModelMigration,
+  ModelMigrationGenerator,
+} from '@lblod/ember-rdfa-editor/core/rdfa-types';
+import { getRdfaContentElement } from '@lblod/ember-rdfa-editor/core/schema';
+import { TRAFFIC_SIGNAL_TYPES } from './constants';
 
 const CONTENT_SELECTOR = `div[property~='${
   DCT('description').full
@@ -124,3 +139,62 @@ export const roadsign_regulation: NodeSpec = {
     },
   ],
 };
+
+const replacements = [
+  [MOBILITEIT('Verkeersbord-Verkeersteken'), TRAFFIC_SIGNAL_TYPES.ROAD_SIGN],
+  [
+    MOBILITEIT('Verkeerslicht-Verkeersteken'),
+    TRAFFIC_SIGNAL_TYPES.TRAFFIC_LIGHT,
+  ],
+  [MOBILITEIT('Wegmarkering-Verkeersteken'), TRAFFIC_SIGNAL_TYPES.ROAD_MARKING],
+] as const;
+/**
+ * Migrates documents from a data model featuring multiple nested inline_rdfa nodes to one that uses
+ * namedNodes to encode everything in one inline_rdfa
+ **/
+export const trafficSignalMigration: ModelMigrationGenerator = (attrs) => {
+  const factory = new SayDataFactory();
+  for (const [source, replacement] of replacements) {
+    const conceptTriple = getOutgoingTriple(
+      attrs,
+      MOBILITEIT('heeftVerkeersbordconcept'),
+    );
+    if (
+      isResourceAttrs(attrs) &&
+      hasOutgoingNamedNodeTriple(attrs, RDF('type'), source) &&
+      conceptTriple
+    ) {
+      return {
+        getAttrs: () => {
+          const conceptProp = {
+            predicate: PROV('wasDerivedFrom').full,
+            object: factory.namedNode(conceptTriple.object.value),
+          };
+          return {
+            ...attrs,
+            properties: [
+              ...(conceptProp ? [conceptProp] : []),
+              {
+                predicate: RDF('type').full,
+                object: sayDataFactory.namedNode(
+                  TRAFFIC_SIGNAL_TYPES.TRAFFIC_SIGNAL,
+                ),
+              },
+              {
+                predicate: RDF('type').full,
+                object: sayDataFactory.namedNode(replacement),
+              },
+            ],
+          };
+        },
+        contentElement: (element) => {
+          const content = element.querySelector(
+            '[property="http://www.w3.org/2004/02/skos/core#prefLabel"]',
+          );
+          return getRdfaContentElement(content || element);
+        },
+      } satisfies ModelMigration;
+    }
+  }
+  return false;
+};

package/addon/plugins/roadsign-regulation-plugin/queries/road-sign-category.ts

@@ -29,7 +29,7 @@ export default async function queryRoadSignCategories(
       ?label
     WHERE {
       ?uri a mobiliteit:Verkeersbordcategorie;
-           skos:prefLabel ?label.
+          skos:prefLabel ?label.
 
       ${roadSignConceptUri ? `${sparqlEscapeUri(roadSignConceptUri)} dct:type ?uri` : ''}
     }

package/addon/plugins/roadsign-regulation-plugin/queries/traffic-signal-concept.ts

@@ -35,6 +35,7 @@ export async function queryTrafficSignalConcepts(
       ?uri
       ?type
       ?code
+      ?regulatoryNotation
       ?zonality
       ?image
       ?position
@@ -70,6 +71,10 @@ export async function queryTrafficSignalConcepts(
         ?uri ext:zonality ?zonality.
       }
 
+      OPTIONAL  {
+        ?uri ext:regulatoryNotation ?regulatoryNotation.
+      }
+
       VALUES ?type {
         <https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept>
         <https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept>

package/addon/plugins/roadsign-regulation-plugin/schemas/traffic-signal-concept.ts

@@ -6,6 +6,7 @@ export const TrafficSignalConceptSchema = z
   .object({
     uri: z.string(),
     code: z.string(),
+    regulatoryNotation: z.string().optional(),
     image: z.string(),
     zonality: z.nativeEnum(ZONALITY_OPTIONS).optional(),
     position: z.coerce.number().default(-1),

package/addon/plugins/structure-plugin/commands/move-structure.ts

@@ -8,14 +8,11 @@ import {
   findNodePosDown,
   findNodePosUp,
 } from '@lblod/ember-rdfa-editor/utils/position-utils';
-import { transactionCombinator } from '@lblod/ember-rdfa-editor/utils/transaction-utils';
 import { findAncestorOfType } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/_private/find-ancestor';
 import {
   isNone,
   unwrap,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
-import { recalculateNumbers } from '../monads/recalculate-structure-numbers';
-import { regenerateRdfaLinks } from '../monads/regenerate-rdfa-links';
 
 export function moveStructure(direction: 'up' | 'down'): Command {
   return (state, dispatch) => {
@@ -53,23 +50,18 @@ export function moveStructure(direction: 'up' | 'down'): Command {
           // previousStructurePos is the position right BEFORE the previous structure,
           // so inserting there is correct
           transaction.insert(previousStructurePos, node);
-          // after updating we have to recalculate the numbers
-          const { transaction: newTr } = transactionCombinator(
-            state,
-            transaction,
-          )([recalculateNumbers, regenerateRdfaLinks]);
 
           // previousStructurePos should now point to the position right before our moved structure
           // so we can simply add 1 to get the first position inside of it, and for the end
           // we add the nodesize and subtract one
-          newTr.setSelection(
+          transaction.setSelection(
             TextSelection.create(
-              newTr.doc,
+              transaction.doc,
               previousStructurePos + 1,
               previousStructurePos + node.nodeSize - 1,
             ),
           );
-          dispatch(newTr);
+          dispatch(transaction);
         }
         return true;
       }
@@ -107,21 +99,16 @@ export function moveStructure(direction: 'up' | 'down'): Command {
         );
         transaction.insert(insertPos, node);
 
-        const { transaction: newTr } = transactionCombinator(
-          state,
-          transaction,
-        )([recalculateNumbers, regenerateRdfaLinks]);
-
         // since we've deleted something before the insert position, we have to map
         // the positions through the transaction to find the moved node's new position
-        newTr.setSelection(
+        transaction.setSelection(
           TextSelection.create(
-            newTr.doc,
+            transaction.doc,
             insertPos + 1,
             insertPos + node.nodeSize - 1,
           ),
         );
-        dispatch(newTr);
+        dispatch(transaction);
       }
 
       return true;

package/addon/plugins/structure-plugin/monads/recalculate-structure-numbers.ts

@@ -50,5 +50,8 @@ export function recalculateNumbers(
       }
     },
   );
+  if (tr.docChanged) {
+    tr.setSelection(state.selection.getBookmark().resolve(tr.doc));
+  }
   return { transaction: tr, result: true, initialState: state };
 }

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

@@ -45,11 +45,6 @@ export function recreateVariableUris(attrs: Attrs) {
     }
     return newBacklink;
   });
-  console.log({
-    ...attrs,
-    externalTriples: newTriples,
-    backlinks: newBacklinks,
-  });
   return {
     ...attrs,
     externalTriples: newTriples,

package/addon/services/import-rdfa-snippet.ts

@@ -135,11 +135,7 @@ export default class ImportRdfaSnippet extends Service {
       .filter((triple) => triple.predicate === 'a')
       .map((triple) => triple.object)
       .filter((v, i, a) => a.indexOf(v) === i); //This filters only unique values
-    if (
-      types.includes(
-        'https://data.vlaanderen.be/ns/mobiliteit#Verkeersbord-Verkeersteken',
-      )
-    ) {
+    if (types.includes('Verkeersteken')) {
       return 'roadsign';
     } else {
       return 'generic';

package/addon/{plugins/besluit-topic-plugin/utils/helpers.ts → utils/decision-utils.ts}

@@ -7,6 +7,16 @@ import { hasOutgoingNamedNodeTriple } from '@lblod/ember-rdfa-editor-lblod-plugi
 import { ElementPNode } from '@lblod/ember-rdfa-editor/plugins/datastore';
 import { findAncestors } from '@lblod/ember-rdfa-editor/utils/position-utils';
 
+export function getDecisionNodeLocation(controller: SayController) {
+  const besluitRange = getCurrentBesluitRange(controller);
+  if (!besluitRange) return;
+  const decisionNodeLocation = {
+    pos: besluitRange.from,
+    node: besluitRange.node,
+  };
+  return decisionNodeLocation;
+}
+
 export const getCurrentBesluitRange = (
   controllerOrState: SayController | EditorState,
 ): ElementPNode | undefined => {
@@ -15,15 +25,29 @@ export const getCurrentBesluitRange = (
       ? controllerOrState.mainEditorState
       : controllerOrState;
   const selection = state.selection;
-
-  const besluit =
-    findAncestors(selection.$from, (node: PNode) => {
-      return hasOutgoingNamedNodeTriple(
-        node.attrs,
-        RDF('type'),
-        BESLUIT('Besluit'),
-      );
-    })[0] ?? null;
+  let besluit;
+  if (
+    selection.$from.nodeAfter &&
+    hasOutgoingNamedNodeTriple(
+      selection.$from.nodeAfter.attrs,
+      RDF('type'),
+      BESLUIT('Besluit'),
+    )
+  ) {
+    besluit = {
+      node: selection.$from.nodeAfter,
+      pos: selection.$from.pos,
+    };
+  } else {
+    besluit =
+      findAncestors(selection.$from, (node: PNode) => {
+        return hasOutgoingNamedNodeTriple(
+          node.attrs,
+          RDF('type'),
+          BESLUIT('Besluit'),
+        );
+      })[0] ?? null;
+  }
   if (!besluit) {
     return undefined;
   }

package/declarations/addon/components/document-validation-plugin/card.d.ts

@@ -1,5 +1,6 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import ValidationReport from 'rdf-validate-shacl/src/validation-report';
 interface Sig {
     Args: {
         controller: SayController;
@@ -9,14 +10,63 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
     get controller(): SayController;
     get validationState(): import("@lblod/ember-rdfa-editor-lblod-plugins/plugins/document-validation-plugin").DocumentValidationPluginState | undefined;
     get documentValidationErrors(): ({
+        rule: {
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            helpText: string;
+        };
         message: string;
         subject: string | undefined;
-    } | undefined)[] | undefined;
+        shape: string;
+        constraint: string;
+    } | {
+        rule: {
+            shaclRule: string;
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            shaclRule: string;
+            helpText: string;
+        } | undefined;
+        message: string;
+        subject: string | undefined;
+        shape: string;
+        constraint: string;
+    })[] | undefined;
     get propertiesWithoutErrors(): {
         message: string;
     }[];
     goToSubject: (subject: string) => void;
     get status(): "not-run" | "no-matches" | "valid" | "invalid";
     get isSuccesslike(): boolean;
+    doActionAndTriggerValidation: (action: (controller: SayController, report: ValidationReport) => void) => Promise<void>;
+    oldVal: typeof this.documentValidationErrors;
+    dedupeDocumentValidationErrors: (val: typeof this.documentValidationErrors) => ({
+        rule: {
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            helpText: string;
+        };
+        message: string;
+        subject: string | undefined;
+        shape: string;
+        constraint: string;
+    } | {
+        rule: {
+            shaclRule: string;
+            action: (controller: SayController, report: ValidationReport) => void;
+            buttonTitle: string;
+        } | {
+            shaclRule: string;
+            helpText: string;
+        } | undefined;
+        message: string;
+        subject: string | undefined;
+        shape: string;
+        constraint: string;
+    })[] | undefined;
+    compareDocumentValidationErrors: (val1: typeof this.documentValidationErrors, val2: typeof this.documentValidationErrors) => boolean;
 }
 export {};

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

@@ -91,6 +91,7 @@ export default class RoadsignsModal extends Component<Signature> {
                 image: string;
                 uri: string;
                 position: number;
+                regulatoryNotation?: string | undefined;
                 zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
             } & ({
                 type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";
@@ -119,6 +120,7 @@ export default class RoadsignsModal extends Component<Signature> {
             image: string;
             uri: string;
             position: number;
+            regulatoryNotation?: string | undefined;
             zonality?: "http://lblod.data.gift/concepts/8f9367b2-c717-4be7-8833-4c75bbb4ae1f" | "http://lblod.data.gift/concepts/c81c6b96-736a-48cf-b003-6f5cc3dbc55d" | "http://lblod.data.gift/concepts/b651931b-923c-477c-8da9-fc7dd841fdcc" | undefined;
         } & ({
             type: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept";

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

@@ -1,9 +1,11 @@
 import { Command } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
+import { NodeWithPos } from '@curvenote/prosemirror-utils';
 interface InsertArticleContainerArgs {
     intl: IntlService;
     decisionUri: string;
     articleUriGenerator?: () => string;
+    decisionLocation: NodeWithPos;
 }
-export default function insertArticleContainer({ decisionUri, articleUriGenerator, }: InsertArticleContainerArgs): Command;
+export default function insertArticleContainer({ decisionUri, articleUriGenerator, decisionLocation, }: InsertArticleContainerArgs): Command;
 export {};

package/declarations/addon/plugins/document-validation-plugin/common-fixes.d.ts

@@ -0,0 +1,6 @@
+import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
+export declare function insertTitleAtCursor(controller: SayController, intl: IntlService): void;
+export declare function insertDescriptionAtCursor(controller: SayController, intl: IntlService): void;
+export declare function insertMotivationAtCursor(controller: SayController, intl: IntlService): void;
+export declare function insertArticleContainerAtCursor(controller: SayController, intl: IntlService, articleUriGenerator?: () => string): void;

package/declarations/addon/plugins/document-validation-plugin/index.d.ts

@@ -1,20 +1,43 @@
-import { ProsePlugin, PluginKey, EditorView } from '@lblod/ember-rdfa-editor';
+import { ProsePlugin, PluginKey, EditorView, SayController } from '@lblod/ember-rdfa-editor';
 import { DataFactory, DatasetCore, DatasetCoreFactory, Quad } from '@rdfjs/types';
 import ValidationReport from 'rdf-validate-shacl/src/validation-report';
 export declare const documentValidationPluginKey: PluginKey<DocumentValidationPluginState>;
-interface DocumentValidationPluginArgs {
+type Violation = {
+    action: (controller: SayController, report: ValidationReport) => void;
+    buttonTitle: string;
+} | {
+    helpText: string;
+};
+type Rule = {
+    shaclRule: string;
+    violations: {
+        [key: string]: Violation;
+    };
+} | {
+    shaclRule: string;
+    action: (controller: SayController, report: ValidationReport) => void;
+    buttonTitle: string;
+} | {
+    shaclRule: string;
+    helpText: string;
+};
+export interface DocumentValidationPluginArgs {
     documentShape: string;
+    rules: Rule[];
 }
 export type ShaclValidationReport = ValidationReport.ValidationReport<DataFactory<Quad, Quad> & DatasetCoreFactory<Quad, Quad, DatasetCore<Quad, Quad>>>;
+type PropertyWithError = {
+    message: string;
+    subject: string | undefined;
+    shape: string;
+    constraint: string;
+};
 interface DocumentValidationResult {
     report?: ValidationReport;
     propertiesWithoutErrors: {
         message: string;
     }[];
-    propertiesWithErrors: ({
-        message: string;
-        subject: string | undefined;
-    } | undefined)[];
+    propertiesWithErrors: PropertyWithError[];
 }
 export interface DocumentValidationTransactionMeta extends DocumentValidationResult {
     type: string;
@@ -22,6 +45,7 @@ export interface DocumentValidationTransactionMeta extends DocumentValidationRes
 export interface DocumentValidationPluginState extends DocumentValidationResult {
     documentShape: string;
     validationCallback: typeof validationCallback;
+    rules: Rule[];
 }
 export declare const documentValidationPlugin: (options: DocumentValidationPluginArgs) => ProsePlugin<DocumentValidationPluginState>;
 declare function validationCallback(view: EditorView, documentHtml: string): Promise<void>;

package/declarations/addon/plugins/roadsign-regulation-plugin/constants.d.ts

@@ -14,15 +14,15 @@ export declare const TRAFFIC_SIGNAL_CONCEPT_TYPES: {
 };
 export declare const TRAFFIC_SIGNAL_TYPES: {
     readonly TRAFFIC_SIGNAL: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersteken";
-    readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbord";
-    readonly TRAFFIC_LIGHT: "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslicht";
-    readonly ROAD_MARKING: "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkering";
+    readonly ROAD_SIGN: "https://data.vlaanderen.be/ns/mobiliteit#VerkeersbordVerkeersteken";
+    readonly TRAFFIC_LIGHT: "https://data.vlaanderen.be/ns/mobiliteit#VerkeerslichtVerkeersteken";
+    readonly ROAD_MARKING: "https://data.vlaanderen.be/ns/mobiliteit#WegmarkeringVerkeersteken";
 };
 export declare const TRAFFIC_SIGNAL_TYPE_MAPPING: {
     readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerstekenconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeersteken";
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbord";
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept": "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslicht";
-    readonly "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept": "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkering";
+    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeersbordconcept": "https://data.vlaanderen.be/ns/mobiliteit#VerkeersbordVerkeersteken";
+    readonly "https://data.vlaanderen.be/ns/mobiliteit#Verkeerslichtconcept": "https://data.vlaanderen.be/ns/mobiliteit#VerkeerslichtVerkeersteken";
+    readonly "https://data.vlaanderen.be/ns/mobiliteit#Wegmarkeringconcept": "https://data.vlaanderen.be/ns/mobiliteit#WegmarkeringVerkeersteken";
 };
 export declare const ROAD_SIGN_CATEGORIES: {
     XXBORD: string;