@lblod/ember-rdfa-editor-lblod-plugins 37.2.0 → 37.2.1-dev.34534679eaf5d030e66f8a99790dd2a7af28314c

package/.changeset/tame-dryers-shout.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Update @rdfjs/types to v2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 37.2.1
+
+### Patch Changes
+
+- [#663](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/663) [`4938095`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/49380955ce5c33beac6013cea02a684558aa0701) Thanks [@lagartoverde](https://github.com/lagartoverde)! - Use parse slice to not include unneeded paragraphs on the inline locked placeholders parse
+
 ## 37.2.0
 
 ### Minor Changes

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

@@ -9,12 +9,7 @@ import {
   SayController,
 } from '@lblod/ember-rdfa-editor';
 import removeQuotes from '@lblod/ember-rdfa-editor-lblod-plugins/utils/remove-quotes';
-import {
-  DataFactory,
-  DatasetCore,
-  DatasetCoreFactory,
-  Quad,
-} from '@rdfjs/types';
+import { DatasetCore, Quad } from '@rdfjs/types';
 import ValidationReport from 'rdf-validate-shacl/src/validation-report';
 import { SayDataFactory } from '@lblod/ember-rdfa-editor/core/say-data-factory';
 import {
@@ -55,11 +50,6 @@ export interface DocumentValidationPluginArgs {
   rules: Rule[];
 }
 
-export type ShaclValidationReport = ValidationReport.ValidationReport<
-  DataFactory<Quad, Quad> &
-    DatasetCoreFactory<Quad, Quad, DatasetCore<Quad, Quad>>
->;
-
 type PropertyWithError = {
   message: string;
   subject: string | undefined;
@@ -133,10 +123,9 @@ async function validationCallback(view: EditorView, documentHtml: string) {
   const shacl = await parse(documentShape);
 
   const validator = new SHACLValidator(shacl, {
-    // @ts-expect-error ts doesn't recognize the configuration parameter not sure why
     allowNamedNodeInList: true,
   });
-  const report = validator.validate(rdf);
+  const report = await validator.validate(rdf);
   const sayFactory = new SayDataFactory();
   const propertyPred = sayFactory.namedNode(
     'http://www.w3.org/ns/shacl#property',
@@ -159,7 +148,7 @@ async function validationCallback(view: EditorView, documentHtml: string) {
           message: removeQuotes(message),
           subject: r.focusNode?.value,
           shape: sourceShape.value,
-          constraint: r.sourceConstraintComponent?.value as string,
+          constraint: r.sourceConstraintComponent?.value,
         });
       }
     }

package/addon/plugins/location-plugin/contextual-actions/index.ts

@@ -8,6 +8,7 @@ import { replaceLocationCommand } from '../utils/replace-location';
 import { Area, Place } from '../utils/geo-helpers';
 import { Address } from '../utils/address-helpers';
 import { getLocationUri } from '../_private/utils/location-helpers';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
 
 const otherElementsGroupId =
   'other-elements-e01f46a0-b323-4add-8035-d81dc2e8578d';
@@ -118,6 +119,6 @@ export function getContextualActionGroups() {
         ),
         sticky: 'bottom',
       },
-    ];
+    ] satisfies ContextualActionGroup[];
   };
 }

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

@@ -40,7 +40,7 @@ export function replaceLocationCommand(
   node: ResolvedPNode,
   location: Address | Place | Area,
 ) {
-  return function (state: EditorState, dispatch: (tr: Transaction) => void) {
+  return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
     const df = new SayDataFactory();
     const { pos, value: locNode } = node;
     // The location's subject has likely changed, so we should update the external links too
@@ -57,7 +57,7 @@ export function replaceLocationCommand(
       }
     }); // update the location value and the external triples
     const tr = state.tr;
-    const setLocationTr = transactionCombinator(
+    const { transaction: setLocationTr, result } = transactionCombinator(
       state,
       tr
         .setNodeAttribute(pos, 'value', location)
@@ -71,13 +71,16 @@ export function replaceLocationCommand(
         keepProperties: false,
         keepExternalTriples: true,
       }),
-    ]).transaction;
+    ]);
 
-    const newSelection = moveNodeSelectionForward(
-      state.selection.map(setLocationTr.doc, setLocationTr.mapping),
-      setLocationTr.doc,
-    );
-    setLocationTr.setSelection(newSelection);
-    dispatch(setLocationTr);
+    if (dispatch) {
+      const newSelection = moveNodeSelectionForward(
+        state.selection.map(setLocationTr.doc, setLocationTr.mapping),
+        setLocationTr.doc,
+      );
+      setLocationTr.setSelection(newSelection);
+      dispatch(setLocationTr);
+    }
+    return result.every((res) => res);
   };
 }

package/addon/plugins/locked-placeholder-plugin/utils/replace-content-function.ts

@@ -67,7 +67,7 @@ function replacePlaceholderWithHtml(
 ) {
   return (state: EditorState) => {
     const domParser = new DOMParser();
-    const contentFragment = ProseParser.fromSchema(state.schema).parse(
+    const contentFragment = ProseParser.fromSchema(state.schema).parseSlice(
       domParser.parseFromString(value, 'text/html'),
     ).content;
     const tr = state.tr;

package/addon/plugins/structure-plugin/monads/insert-structure.ts

@@ -83,7 +83,10 @@ export function findHowToInsertStructure(
 
     const closestAncestorRank = parentStructures[0]?.rank;
     // ### Either there is no parent structure or the nearest parent is higher in the hierarchy
-    if (parentStructures.length === 0 || closestAncestorRank < hierarchyRank) {
+    if (
+      parentStructures.length === 0 ||
+      (closestAncestorRank && closestAncestorRank < hierarchyRank)
+    ) {
       if (
         selection instanceof NodeSelection &&
         isHierarchyNode(selection.node)
@@ -112,7 +115,7 @@ export function findHowToInsertStructure(
       // ### We have parent structures that are lower in the hierarchy, so find one where we can insert
       for (let i = 0; i < parentStructures.length; i++) {
         const parentStructure = parentStructures[i];
-        const parentRank = parentStructure.rank;
+        const parentRank = parentStructure.rank ?? -1;
         if (hierarchyRank === parentRank) {
           // ### If parent we are looking at is same structure type, put an empty structure after that one
           const insertLocation =

package/addon/utils/option.ts

@@ -29,7 +29,7 @@ export function unwrapOr<A>(defaultValue: A, thing: Option<A>): A {
 }
 
 export function optionMap<A, U>(
-  func: (thing: A) => U | Option<U>,
+  func: (thing: A) => U,
   thing: Option<A>,
 ): Option<U> {
   if (isSome(thing)) {

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

@@ -73,12 +73,12 @@ export default class DocumentValidationPluginCard extends Component<Sig> {
     openDeveloperModal: (event: Event) => void;
     closeDeveloperModal: () => void;
     get formattedValidationResult(): {
-        focusNode: string | undefined;
-        path: string | undefined;
-        severity: string | undefined;
-        sourceConstraintComponent: string | undefined;
-        sourceShape: string | undefined;
-        value: string | undefined;
+        focusNode: string;
+        path: string;
+        severity: string;
+        sourceConstraintComponent: string;
+        sourceShape: string;
+        value: string;
     }[] | undefined;
 }
 export {};

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

@@ -1,5 +1,4 @@
 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>;
 type Violation = {
@@ -25,7 +24,6 @@ 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;

package/declarations/addon/plugins/location-plugin/contextual-actions/index.d.ts

@@ -3,7 +3,7 @@ export declare function getContextualActions(): (state: EditorState, searchQuery
     label: string;
     id: string;
     group: string;
-    command: (state: EditorState, dispatch: (tr: import("@lblod/ember-rdfa-editor").Transaction) => void) => void;
+    command: (state: EditorState, dispatch?: (tr: import("@lblod/ember-rdfa-editor").Transaction) => void) => boolean;
 }[];
 export declare function getContextualActionGroups(): (state: EditorState) => ({
     id: string;
@@ -12,5 +12,5 @@ export declare function getContextualActionGroups(): (state: EditorState) => ({
 } | {
     id: string;
     label: string;
-    sticky: string;
+    sticky: "bottom";
 })[];

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

@@ -2,4 +2,4 @@ import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 import { Address } from './address-helpers';
 import { Area, Place } from './geo-helpers';
 import { EditorState, Transaction } from '@lblod/ember-rdfa-editor';
-export declare function replaceLocationCommand(node: ResolvedPNode, location: Address | Place | Area): (state: EditorState, dispatch: (tr: Transaction) => void) => void;
+export declare function replaceLocationCommand(node: ResolvedPNode, location: Address | Place | Area): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;

package/declarations/addon/plugins/structure-plugin/structure-types.d.ts

@@ -34,7 +34,7 @@ export declare function calculateHierarchyRank(nodePosition: {
     node: PNode;
     pos: number;
 }): Option<{
-    rank: number;
+    rank: Option<number>;
     node: PNode;
     pos: number;
 }>;

package/declarations/addon/utils/option.d.ts

@@ -8,7 +8,7 @@ export type Option<A> = A | None;
 export declare function expect<A>(msg: string, thing: Option<A>): A;
 export declare function unwrap<A>(thing: Option<A>): A;
 export declare function unwrapOr<A>(defaultValue: A, thing: Option<A>): A;
-export declare function optionMap<A, U>(func: (thing: A) => U | Option<U>, thing: Option<A>): Option<U>;
+export declare function optionMap<A, U>(func: (thing: A) => U, thing: Option<A>): Option<U>;
 export declare function optionMapOr<A, U>(defaultValue: U, func: (thing: A) => U, thing: Option<A>): U;
 export declare function isSome<A>(thing: Option<A>): thing is A;
 export declare function isNone<A>(thing: Option<A>): thing is None;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "37.2.0",
+  "version": "37.2.1-dev.34534679eaf5d030e66f8a99790dd2a7af28314c",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -64,7 +64,6 @@
     "@rdfjs/data-model": "^2.0.2",
     "@rdfjs/dataset": "^2.0.2",
     "@rdfjs/parser-n3": "^2.0.2",
-    "@types/rdf-validate-shacl": "^0.4.7",
     "@types/rdfjs__parser-n3": "^2.0.6",
     "buffer": "^6.0.3",
     "codemirror": "^6.0.1",
@@ -82,7 +81,7 @@
     "process": "0.11.10",
     "proj4": "^2.11.0",
     "rdf-ext": "^2.5.2",
-    "rdf-validate-shacl": "^0.4.5",
+    "rdf-validate-shacl": "^0.6.5",
     "rdfa-streaming-parser": "^3.0.2",
     "reactiveweb": "^1.9.1",
     "stream-browserify": "^3.0.0",
@@ -114,7 +113,7 @@
     "@lblod/ember-rdfa-editor": "13.10.0",
     "@glint/template": "^1.7.7",
     "@rdfjs/to-ntriples": "^3.0.1",
-    "@rdfjs/types": "^1.1.0",
+    "@rdfjs/types": "^2.0.1",
     "@release-it/keep-a-changelog": "^4.0.0",
     "@tsconfig/ember": "^3.0.8",
     "@types/debug": "^4.1.12",

package/app/models/template.js

@@ -1 +0,0 @@
-export { default } from '@lblod/ember-rdfa-editor-lblod-plugins/models/template';