@lblod/ember-rdfa-editor-lblod-plugins 38.0.2 → 38.0.3-dev.8a844bd88a2bc1786034136bb02c3d7891ef57ac

package/.changeset/four-kiwis-smash.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Fix bug in location description context actions where one cache was used for both zonal and non-zonal options

package/.changeset/khaki-poets-remain.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': patch
+---
+
+Keep context menu open after selecting codelist options

package/.changeset/kind-humans-allow.md

@@ -0,0 +1,5 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Make endpoint arg for location variable config required in the typescript type, which matches the documentation, and the reality of handling locations without a source attribute

package/.changeset/soft-rabbits-jump.md

@@ -0,0 +1,8 @@
+---
+'@lblod/ember-rdfa-editor-lblod-plugins': minor
+---
+
+Add contextual actions for filling in codelist values. This introduces new contextual actions for
+the variable-plugin, so the import for place description actions has moved to
+`@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/contextual-actions/place-description`.
+The old import location remains for backwards compatibility.

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 38.0.3
+
+### Patch Changes
+
+- [`448e7e3`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/448e7e324996d4422d2ba236bd3fba8970a8bb5d) Thanks [@abeforgit](https://github.com/abeforgit)! - Republish 38.0.2
+
 ## 38.0.2
 
 ### Patch Changes

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

@@ -0,0 +1,132 @@
+import { v4 as uuidv4 } from 'uuid';
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { getActiveEditableNode } from '@lblod/ember-rdfa-editor/plugins/editable-node';
+import { isRdfaAttrs } from '@lblod/ember-rdfa-editor/core/rdfa-types';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
+import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
+import { updateCodelistVariableCommand } from '../utils/codelist-utils';
+import {
+  type CodeListOptions,
+  fetchCodeListOptions,
+  CodeListOption,
+} from '../utils/fetch-data';
+import { CodelistAttrs } from '../variables';
+
+const codelistGroupId = 'codelist-db36f85d-edbf-45dc-85fc-9fb67649fe00';
+
+const codelistOptionsCache: Map<string, CodeListOptions> = new Map();
+
+function getSource(codelistAttrs: CodelistAttrs, fallback?: string) {
+  if (codelistAttrs) {
+    const source = codelistAttrs['source'];
+    if (source && source !== 'UNKNOWN') {
+      return source;
+    }
+  }
+  return fallback;
+}
+
+type GetContextualActionsAttrs = {
+  endpoint?: string;
+};
+
+function humanReadableLabel(label: string) {
+  return label.replace(/\$\{[^}]+\}/g, '…');
+}
+
+async function getCodelistOptionsCached(
+  activeNode: ResolvedPNode,
+  { endpoint }: GetContextualActionsAttrs,
+) {
+  const codelistAttrs = activeNode.value.attrs as CodelistAttrs | undefined;
+  const source = codelistAttrs && getSource(codelistAttrs, endpoint);
+  const codelistUri = codelistAttrs?.codelist;
+
+  let result = codelistUri && codelistOptionsCache.get(codelistUri);
+  if (!result && codelistAttrs?.hardcodedOptionList) {
+    result = {
+      type: '',
+      options: codelistAttrs.hardcodedOptionList,
+    } as CodeListOptions;
+  }
+  if (!result && source && codelistUri) {
+    result = await fetchCodeListOptions(source, codelistUri);
+    codelistOptionsCache.set(codelistUri, result);
+    if (!result) {
+      console.warn(
+        `Failed to fetch codelist options for ${codelistUri} from ${source}`,
+      );
+    }
+  }
+
+  return result || { type: '', options: [] };
+}
+
+export function getContextualActions(attrs: GetContextualActionsAttrs) {
+  return async function (state: EditorState, searchQuery?: string) {
+    const activeNode = getActiveEditableNode(state);
+    if (!activeNode) return [];
+    const result = await getCodelistOptionsCached(activeNode, attrs);
+    const isMultiSelect = activeNode.value.attrs['selectionStyle'] === 'multi';
+    const selectedOptions: CodeListOption[] = [];
+    activeNode.value.content.forEach((contentNode) => {
+      selectedOptions.push({
+        uri: contentNode.attrs.subject,
+        label: contentNode.textContent,
+      });
+    });
+
+    return result.options
+      .filter(
+        (option) =>
+          !searchQuery ||
+          option.label.toLowerCase().includes(searchQuery.toLowerCase()),
+      )
+      .map((option) => {
+        const selected = selectedOptions.some(
+          (selOption) => selOption.uri === option.uri,
+        );
+        const newOptions = selected
+          ? selectedOptions.filter((selOption) => selOption.uri !== option.uri)
+          : isMultiSelect
+            ? [...selectedOptions, option]
+            : option;
+        return {
+          id: uuidv4(),
+          label: humanReadableLabel(option.label),
+          group: codelistGroupId,
+          command: updateCodelistVariableCommand(activeNode, newOptions),
+          selected,
+        };
+      });
+  };
+}
+
+function contextualGroupIsVisible(state: EditorState) {
+  const activeNode = getActiveEditableNode(state);
+  const isCodelist =
+    activeNode &&
+    isRdfaAttrs(activeNode.value.attrs) &&
+    activeNode?.value.type.name === 'codelist';
+
+  return isCodelist;
+}
+
+export function getCodelistActionGroups(attrs: GetContextualActionsAttrs) {
+  return function (state: EditorState): ContextualActionGroup[] {
+    return contextualGroupIsVisible(state)
+      ? [
+          {
+            id: codelistGroupId,
+            label: getTranslationFunction(state)(
+              'variable.codelist.label',
+              'Codelijst',
+            ),
+            keepOpen: true,
+            getActions: getContextualActions(attrs),
+          },
+        ]
+      : [];
+  };
+}

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

@@ -1,217 +1,6 @@
-import {
-  EditorState,
-  NodeSelection,
-  Transaction,
-} from '@lblod/ember-rdfa-editor';
-import { fetchCodeListOptions } from '../utils/fetch-data';
-import { findParentNode } from '@curvenote/prosemirror-utils';
-import {
-  getOutgoingTriple,
-  hasOutgoingNamedNodeTriple,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import {
-  EXT,
-  MOBILITEIT,
-  RDF,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import {
-  ZONALITY_OPTIONS,
-  ZONALITY_OPTIONS_LEGACY,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
-import { ProseParser } from '@lblod/ember-rdfa-editor';
-import { wrapVariableInHighlight } from '../utils/codelist-utils';
-import { getActiveEditableNode } from '@lblod/ember-rdfa-editor/plugins/editable-node';
-import { isRdfaAttrs } from '@lblod/ember-rdfa-editor/core/rdfa-types';
-import { v4 as uuidv4 } from 'uuid';
-import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
-import { type CodeListOptions } from '../utils/fetch-data';
-import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
-
-const plaatsbepalingGroupId =
-  'plaatsbepaling-1d8563d6-bfd8-487f-a2a0-6d7a6ab01cb5';
-
-const placeDescriptionCodelistCache: {
-  placeDescriptions: CodeListOptions | null;
-} = {
-  placeDescriptions: null,
-};
-
-function getSelectedLocation(state: EditorState) {
-  const { selection } = state;
-  if (
-    selection instanceof NodeSelection &&
-    selection.node.type === state.schema.nodes.location
-  ) {
-    return {
-      node: selection.node,
-      pos: selection.from,
-    };
-  } else {
-    return;
-  }
-}
-
-function getSource(state: EditorState, fallback?: string) {
-  const selectedLocation = getSelectedLocation(state);
-  if (selectedLocation) {
-    const { node } = selectedLocation;
-    const source = node.attrs.source;
-    if (source) {
-      return source;
-    }
-  }
-
-  return fallback;
-}
-
-function getIsZonal(state: EditorState) {
-  const { selection } = state;
-  const mobilityMeasureNode = findParentNode((node) =>
-    hasOutgoingNamedNodeTriple(
-      node.attrs,
-      RDF('type'),
-      MOBILITEIT('Mobiliteitsmaatregel'),
-    ),
-  )(selection)?.node;
-  if (!mobilityMeasureNode) {
-    return false;
-  }
-  const zonalityTriple = getOutgoingTriple(
-    mobilityMeasureNode.attrs,
-    EXT('zonality'),
-  );
-  if (!zonalityTriple) {
-    return false;
-  }
-  return (
-    zonalityTriple.object.value === ZONALITY_OPTIONS.ZONAL ||
-    zonalityTriple.object.value === ZONALITY_OPTIONS_LEGACY.ZONAL
-  );
-}
-
-type GetContextualActionsAttrs = {
-  zonalLocationCodelistUri: string;
-  nonZonalLocationCodelistUri: string;
-  endpoint?: string;
-};
-
-function humanReadableLabel(label: string) {
-  return label.replace(/\$\{[^}]+\}/g, '…');
-}
-
-function createInsertPlaceDescriptionCommand(label: string) {
-  return (state: EditorState, dispatch?: (tr: Transaction) => void) => {
-    if (dispatch) {
-      let htmlToInsert = label;
-      htmlToInsert = wrapVariableInHighlight(htmlToInsert);
-      const domParser = new DOMParser();
-      const htmlNode = domParser.parseFromString(htmlToInsert, 'text/html');
-      const contentFragment = ProseParser.fromSchema(state.schema).parseSlice(
-        htmlNode,
-        {
-          preserveWhitespace: false,
-        },
-      );
-
-      const tr = state.tr;
-      const startPos = tr.selection.from;
-      tr.replaceSelection(contentFragment);
-
-      let highlightPos: number | null = null;
-
-      contentFragment.content.descendants((child, pos) => {
-        if (highlightPos !== null) {
-          return false;
-        }
-        if (child.type.name === state.schema.nodes.placeholder.name) {
-          highlightPos = startPos + pos;
-          return false;
-        }
-        return true;
-      });
-
-      if (highlightPos !== null) {
-        tr.setSelection(NodeSelection.create(tr.doc, highlightPos));
-      }
-      dispatch(tr);
-    }
-    return true;
-  };
-}
-
-async function getPlaceDescriptionsCached(
-  state: EditorState,
-  {
-    zonalLocationCodelistUri,
-    nonZonalLocationCodelistUri,
-    endpoint,
-  }: GetContextualActionsAttrs,
-) {
-  const source = getSource(state, endpoint);
-  const isZonal = getIsZonal(state);
-  let options;
-  if (!placeDescriptionCodelistCache.placeDescriptions) {
-    options = await fetchCodeListOptions(
-      source,
-      isZonal ? zonalLocationCodelistUri : nonZonalLocationCodelistUri,
-    );
-    placeDescriptionCodelistCache.placeDescriptions = options;
-  } else {
-    options = placeDescriptionCodelistCache.placeDescriptions;
-  }
-
-  return options;
-}
-
-export function getContextualActions(attrs: GetContextualActionsAttrs) {
-  return async function (state: EditorState, searchQuery?: string) {
-    const result = await getPlaceDescriptionsCached(state, attrs);
-    return result.options
-      .filter(
-        (option) =>
-          !searchQuery ||
-          option.label.toLowerCase().includes(searchQuery.toLowerCase()),
-      )
-      .map((option) => {
-        return {
-          id: uuidv4(),
-          label: humanReadableLabel(option.label),
-          group: plaatsbepalingGroupId,
-          command: createInsertPlaceDescriptionCommand(option.label),
-        };
-      });
-  };
-}
-
-function contextualGroupIsVisible(state: EditorState) {
-  const activeNode = getActiveEditableNode(state);
-  const isPlaatsbepaling =
-    activeNode &&
-    isRdfaAttrs(activeNode.value.attrs) &&
-    activeNode.value.attrs.backlinks.some((value) =>
-      MOBILITEIT('plaatsbepaling').matches(value.predicate),
-    );
-
-  const isEmptySelection = state.selection.empty;
-  return (
-    (activeNode?.value.type.name === 'location' || isPlaatsbepaling) &&
-    isEmptySelection
-  );
-}
-
-export function getContextualActionGroups(attrs: GetContextualActionsAttrs) {
-  return function (state: EditorState): ContextualActionGroup[] {
-    return contextualGroupIsVisible(state)
-      ? [
-          {
-            id: plaatsbepalingGroupId,
-            label: getTranslationFunction(state)(
-              'variable.location.label',
-              'Plaatsbeschrijving',
-            ),
-            getActions: getContextualActions(attrs),
-          },
-        ]
-      : [];
-  };
-}
+export {
+  /** @deprecated these imports have been moved to contextual-actions/place-description.ts */
+  getContextualActions,
+  /** @deprecated these imports have been moved to contextual-actions/place-description.ts */
+  getPlaceDescriptionActionGroups as getContextualActionGroups,
+} from './place-description';

package/addon/plugins/variable-plugin/contextual-actions/place-description.ts

@@ -0,0 +1,222 @@
+import {
+  EditorState,
+  NodeSelection,
+  Transaction,
+} from '@lblod/ember-rdfa-editor';
+import { fetchCodeListOptions } from '../utils/fetch-data';
+import { findParentNode } from '@curvenote/prosemirror-utils';
+import {
+  getOutgoingTriple,
+  hasOutgoingNamedNodeTriple,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import {
+  EXT,
+  MOBILITEIT,
+  RDF,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
+import {
+  ZONALITY_OPTIONS,
+  ZONALITY_OPTIONS_LEGACY,
+} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/roadsign-regulation-plugin/constants';
+import { ProseParser } from '@lblod/ember-rdfa-editor';
+import { wrapVariableInHighlight } from '../utils/codelist-utils';
+import { getActiveEditableNode } from '@lblod/ember-rdfa-editor/plugins/editable-node';
+import { isRdfaAttrs } from '@lblod/ember-rdfa-editor/core/rdfa-types';
+import { v4 as uuidv4 } from 'uuid';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
+import { type CodeListOptions } from '../utils/fetch-data';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
+
+const plaatsbepalingGroupId =
+  'plaatsbepaling-1d8563d6-bfd8-487f-a2a0-6d7a6ab01cb5';
+
+const placeDescriptionCodelistCache: {
+  zonal: CodeListOptions | null;
+  nonZonal: CodeListOptions | null;
+} = {
+  zonal: null,
+  nonZonal: null,
+};
+
+function getSelectedLocation(state: EditorState) {
+  const { selection } = state;
+  if (
+    selection instanceof NodeSelection &&
+    selection.node.type === state.schema.nodes.location
+  ) {
+    return {
+      node: selection.node,
+      pos: selection.from,
+    };
+  } else {
+    return;
+  }
+}
+
+function getSource(state: EditorState, fallback: string) {
+  const selectedLocation = getSelectedLocation(state);
+  if (selectedLocation) {
+    const { node } = selectedLocation;
+    const source = node.attrs.source as string | undefined;
+    if (source) {
+      return source;
+    }
+  }
+
+  return fallback;
+}
+
+function getIsZonal(state: EditorState) {
+  const { selection } = state;
+  const mobilityMeasureNode = findParentNode((node) =>
+    hasOutgoingNamedNodeTriple(
+      node.attrs,
+      RDF('type'),
+      MOBILITEIT('Mobiliteitsmaatregel'),
+    ),
+  )(selection)?.node;
+  if (!mobilityMeasureNode) {
+    return false;
+  }
+  const zonalityTriple = getOutgoingTriple(
+    mobilityMeasureNode.attrs,
+    EXT('zonality'),
+  );
+  if (!zonalityTriple) {
+    return false;
+  }
+  return (
+    zonalityTriple.object.value === ZONALITY_OPTIONS.ZONAL ||
+    zonalityTriple.object.value === ZONALITY_OPTIONS_LEGACY.ZONAL
+  );
+}
+
+type GetContextualActionsAttrs = {
+  zonalLocationCodelistUri: string;
+  nonZonalLocationCodelistUri: string;
+  endpoint: string;
+};
+
+function humanReadableLabel(label: string) {
+  return label.replace(/\$\{[^}]+\}/g, '…');
+}
+
+function createInsertPlaceDescriptionCommand(label: string) {
+  return (state: EditorState, dispatch?: (tr: Transaction) => void) => {
+    if (dispatch) {
+      let htmlToInsert = label;
+      htmlToInsert = wrapVariableInHighlight(htmlToInsert);
+      const domParser = new DOMParser();
+      const htmlNode = domParser.parseFromString(htmlToInsert, 'text/html');
+      const contentFragment = ProseParser.fromSchema(state.schema).parseSlice(
+        htmlNode,
+        {
+          preserveWhitespace: false,
+        },
+      );
+
+      const tr = state.tr;
+      const startPos = tr.selection.from;
+      tr.replaceSelection(contentFragment);
+
+      let highlightPos: number | null = null;
+
+      contentFragment.content.descendants((child, pos) => {
+        if (highlightPos !== null) {
+          return false;
+        }
+        if (child.type.name === state.schema.nodes.placeholder.name) {
+          highlightPos = startPos + pos;
+          return false;
+        }
+        return true;
+      });
+
+      if (highlightPos !== null) {
+        tr.setSelection(NodeSelection.create(tr.doc, highlightPos));
+      }
+      dispatch(tr);
+    }
+    return true;
+  };
+}
+
+async function getPlaceDescriptionsCached(
+  state: EditorState,
+  {
+    zonalLocationCodelistUri,
+    nonZonalLocationCodelistUri,
+    endpoint,
+  }: GetContextualActionsAttrs,
+) {
+  const source = getSource(state, endpoint);
+  const isZonal = getIsZonal(state);
+  const zonality = isZonal ? 'zonal' : 'nonZonal';
+  let options;
+  if (!placeDescriptionCodelistCache[zonality]) {
+    options = await fetchCodeListOptions(
+      source,
+      isZonal ? zonalLocationCodelistUri : nonZonalLocationCodelistUri,
+    );
+    placeDescriptionCodelistCache[zonality] = options;
+  } else {
+    options = placeDescriptionCodelistCache[zonality];
+  }
+
+  return options;
+}
+
+export function getContextualActions(attrs: GetContextualActionsAttrs) {
+  return async function (state: EditorState, searchQuery?: string) {
+    const result = await getPlaceDescriptionsCached(state, attrs);
+    return result.options
+      .filter(
+        (option) =>
+          !searchQuery ||
+          option.label.toLowerCase().includes(searchQuery.toLowerCase()),
+      )
+      .map((option) => {
+        return {
+          id: uuidv4(),
+          label: humanReadableLabel(option.label),
+          group: plaatsbepalingGroupId,
+          command: createInsertPlaceDescriptionCommand(option.label),
+        };
+      });
+  };
+}
+
+function contextualGroupIsVisible(state: EditorState) {
+  const activeNode = getActiveEditableNode(state);
+  const isPlaatsbepaling =
+    activeNode &&
+    isRdfaAttrs(activeNode.value.attrs) &&
+    activeNode.value.attrs.backlinks.some((value) =>
+      MOBILITEIT('plaatsbepaling').matches(value.predicate),
+    );
+
+  const isEmptySelection = state.selection.empty;
+  return (
+    (activeNode?.value.type.name === 'location' || isPlaatsbepaling) &&
+    isEmptySelection
+  );
+}
+
+export function getPlaceDescriptionActionGroups(
+  attrs: GetContextualActionsAttrs,
+) {
+  return function (state: EditorState): ContextualActionGroup[] {
+    return contextualGroupIsVisible(state)
+      ? [
+          {
+            id: plaatsbepalingGroupId,
+            label: getTranslationFunction(state)(
+              'variable.location.label',
+              'Plaatsbeschrijving',
+            ),
+            getActions: getContextualActions(attrs),
+          },
+        ]
+      : [];
+  };
+}

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

@@ -1,7 +1,14 @@
 // This file contains helpers for both the codelist and location variable types
 
+import {
+  EditorState,
+  PNode,
+  ProseParser,
+  SayController,
+  Transaction,
+} from '@lblod/ember-rdfa-editor';
+import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 import { CodeListOption } from './fetch-data';
-import { PNode, ProseParser, SayController } from '@lblod/ember-rdfa-editor';
 import { createCodelistOptionNode } from '../actions/create-codelist-variable';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 
@@ -21,6 +28,40 @@ export function wrapVariableInHighlight(text: string) {
   );
 }
 
+export function updateCodelistVariableCommand(
+  selectedCodelist: ResolvedPNode,
+  selectedOption: CodeListOption | CodeListOption[],
+) {
+  return (state: EditorState, dispatch?: (tr: Transaction) => void) => {
+    const selectedOptions = Array.isArray(selectedOption)
+      ? selectedOption
+      : [selectedOption];
+    const variableInstance = selectedCodelist.value.attrs[
+      'variableInstance'
+    ] as string | undefined;
+    const pointerTarget = selectedCodelist.value.attrs['__rdfaId'] as
+      | string
+      | undefined;
+    const codelistOptionNodes = selectedOptions.map((option) =>
+      createCodelistOptionNode({
+        schema: state.schema,
+        text: option.label,
+        subject: option.uri,
+        variableInstance,
+        pointsToNode: pointerTarget,
+      }),
+    );
+    const range = {
+      from: selectedCodelist.pos + 1,
+      to: selectedCodelist.pos + selectedCodelist.value.nodeSize - 1,
+    };
+    if (dispatch) {
+      dispatch(state.tr.replaceWith(range.from, range.to, codelistOptionNodes));
+    }
+    return true;
+  };
+}
+
 export function updateCodelistVariable(
   selectedCodelist: {
     node: PNode;
@@ -29,31 +70,11 @@ export function updateCodelistVariable(
   selectedOption: CodeListOption | CodeListOption[],
   controller: SayController,
 ) {
-  const selectedOptions = Array.isArray(selectedOption)
-    ? selectedOption
-    : [selectedOption];
-  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 command = updateCodelistVariableCommand(
+    { value: selectedCodelist.node, pos: selectedCodelist.pos },
+    selectedOption,
   );
-  const range = {
-    from: selectedCodelist.pos + 1,
-    to: selectedCodelist.pos + selectedCodelist.node.nodeSize - 1,
-  };
-  controller.withTransaction((tr) => {
-    return tr.replaceWith(range.from, range.to, codelistOptionNodes);
-  });
+  controller.doCommand(command, { view: controller.mainEditorView });
 }
 
 /**

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

@@ -9,4 +9,4 @@ export interface LocationPluginConfig {
     additionalRDFTypes?: NamedNode[];
 }
 export declare const osloLocation: (config: LocationPluginConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const osloLocationView: (config: LocationPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const osloLocationView: (config: LocationPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/locked-placeholder-plugin/nodes/block-locked-placeholder.d.ts

@@ -1,2 +1,2 @@
 export declare const blockLockedPlaceholder: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const blockLockedPlaceholderView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const blockLockedPlaceholderView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/locked-placeholder-plugin/nodes/inline-locked-placeholder.d.ts

@@ -1,2 +1,2 @@
 export declare const inlineLockedPlaceholder: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const inlineLockedPlaceholderView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const inlineLockedPlaceholderView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/mandatee-table-plugin/node.d.ts

@@ -1,4 +1,4 @@
 import { EmberNodeConfig } from '@lblod/ember-rdfa-editor/utils/ember-node';
 export declare const emberNodeConfig: () => EmberNodeConfig;
 export declare const mandatee_table: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const mandateeTableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const mandateeTableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/snippet-plugin/nodes/snippet-placeholder.d.ts

@@ -13,5 +13,5 @@ type CreateSnippetPlaceholderArgs = {
 });
 export declare function createSnippetPlaceholder({ schema, allowMultipleSnippets, ...args }: CreateSnippetPlaceholderArgs): import("prosemirror-model").Node;
 export declare const snippetPlaceholder: (config: SnippetPluginConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const snippetPlaceholderView: (config: SnippetPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const snippetPlaceholderView: (config: SnippetPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;
 export {};

package/declarations/addon/plugins/snippet-plugin/nodes/snippet.d.ts

@@ -16,5 +16,5 @@ interface CreateSnippetArgs {
  **/
 export declare function createSnippet({ schema, content, title, allowMultipleSnippets, listProperties: { listUris, names: snippetListNames, importedResources, placeholderId, }, }: CreateSnippetArgs): [PNode, Map<string, OutgoingTriple[]>];
 export declare const snippet: (config: SnippetPluginConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const snippetView: (config: SnippetPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const snippetView: (config: SnippetPluginConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;
 export {};

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

@@ -4,6 +4,6 @@ import { StructurePluginOptions, StructureType } from './structure-types';
 export declare function getNameForStructureType(structureType: StructureType, number: number, fullLengthArticles?: boolean, intl?: IntlService, locale?: string): string;
 export declare const emberNodeConfig: (config?: StructurePluginOptions) => EmberNodeConfig;
 export declare const structure: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const structureView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const structureView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;
 export declare const structureWithConfig: (config?: StructurePluginOptions) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const structureViewWithConfig: (config?: StructurePluginOptions) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const structureViewWithConfig: (config?: StructurePluginOptions) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/table-of-contents-plugin/nodes/table-of-contents.d.ts

@@ -2,4 +2,4 @@ import { EmberNodeConfig } from '@lblod/ember-rdfa-editor/utils/ember-node';
 import { TableOfContentsConfig } from '..';
 export declare const emberNodeConfig: (config?: TableOfContentsConfig) => EmberNodeConfig;
 export declare const table_of_contents: (config?: TableOfContentsConfig) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const tableOfContentsView: (config?: TableOfContentsConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const tableOfContentsView: (config?: TableOfContentsConfig) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/template-comments-plugin/node.d.ts

@@ -1,4 +1,4 @@
 import { EmberNodeConfig } from '@lblod/ember-rdfa-editor/utils/ember-node';
 export declare const emberNodeConfig: () => EmberNodeConfig;
 export declare const templateComment: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const templateCommentView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const templateCommentView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -0,0 +1,14 @@
+import { EditorState } from '@lblod/ember-rdfa-editor';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
+type GetContextualActionsAttrs = {
+    endpoint?: string;
+};
+export declare function getContextualActions(attrs: GetContextualActionsAttrs): (state: EditorState, searchQuery?: string) => Promise<{
+    id: string;
+    label: string;
+    group: string;
+    command: (state: EditorState, dispatch?: (tr: import("@lblod/ember-rdfa-editor").Transaction) => void) => boolean;
+    selected: boolean;
+}[]>;
+export declare function getCodelistActionGroups(attrs: GetContextualActionsAttrs): (state: EditorState) => ContextualActionGroup[];
+export {};

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

@@ -1,15 +1,5 @@
-import { EditorState, Transaction } from '@lblod/ember-rdfa-editor';
-import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
-type GetContextualActionsAttrs = {
-    zonalLocationCodelistUri: string;
-    nonZonalLocationCodelistUri: string;
-    endpoint?: string;
-};
-export declare function getContextualActions(attrs: GetContextualActionsAttrs): (state: EditorState, searchQuery?: string) => Promise<{
-    id: string;
-    label: string;
-    group: string;
-    command: (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
-}[]>;
-export declare function getContextualActionGroups(attrs: GetContextualActionsAttrs): (state: EditorState) => ContextualActionGroup[];
-export {};
+export { 
+/** @deprecated these imports have been moved to contextual-actions/place-description.ts */
+getContextualActions, 
+/** @deprecated these imports have been moved to contextual-actions/place-description.ts */
+getPlaceDescriptionActionGroups as getContextualActionGroups, } from './place-description';

package/declarations/addon/plugins/variable-plugin/contextual-actions/place-description.d.ts

@@ -0,0 +1,15 @@
+import { EditorState, Transaction } from '@lblod/ember-rdfa-editor';
+import { ContextualActionGroup } from '@lblod/ember-rdfa-editor/plugins/contextual-actions';
+type GetContextualActionsAttrs = {
+    zonalLocationCodelistUri: string;
+    nonZonalLocationCodelistUri: string;
+    endpoint: string;
+};
+export declare function getContextualActions(attrs: GetContextualActionsAttrs): (state: EditorState, searchQuery?: string) => Promise<{
+    id: string;
+    label: string;
+    group: string;
+    command: (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
+}[]>;
+export declare function getPlaceDescriptionActionGroups(attrs: GetContextualActionsAttrs): (state: EditorState) => ContextualActionGroup[];
+export {};

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

@@ -1,5 +1,6 @@
+import { EditorState, PNode, SayController, Transaction } from '@lblod/ember-rdfa-editor';
+import { ResolvedPNode } from '@lblod/ember-rdfa-editor/utils/_private/types';
 import { CodeListOption } from './fetch-data';
-import { PNode, SayController } from '@lblod/ember-rdfa-editor';
 /**
  *
  * @param text content of variable option which needs to be inserted
@@ -10,6 +11,7 @@ import { PNode, SayController } from '@lblod/ember-rdfa-editor';
  * `This is a variable with <span class="mark-highlight-manual">${placeholder}</span>`
  */
 export declare function wrapVariableInHighlight(text: string): string;
+export declare function updateCodelistVariableCommand(selectedCodelist: ResolvedPNode, selectedOption: CodeListOption | CodeListOption[]): (state: EditorState, dispatch?: (tr: Transaction) => void) => boolean;
 export declare function updateCodelistVariable(selectedCodelist: {
     node: PNode;
     pos: number;

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

@@ -7,4 +7,4 @@ export declare const address: import("@lblod/ember-rdfa-editor/core/say-node-spe
  * @deprecated Use oslo_location node instead which inserts valid OSLO model RDFa and supports
  * linking to the document it is in.
  */
-export declare const addressView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const addressView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -1,2 +1,2 @@
 export declare const autofilled_variable: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const autofilledVariableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const autofilledVariableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -11,5 +11,5 @@ export type CodelistAttrs = {
     hardcodedOptionList: Option<CodeListOption[]>;
 };
 export declare const codelist: SayNodeSpec;
-export declare const codelistView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const codelistView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;
 export declare const codelist_option: SayNodeSpec;

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

@@ -9,4 +9,4 @@ export type DateOptions = {
     allowCustomFormat: boolean;
 };
 export declare const date: (options: DateOptions) => import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const dateView: (options: DateOptions) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const dateView: (options: DateOptions) => (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/declarations/addon/plugins/variable-plugin/variables/legacy-codelist.d.ts

@@ -1,2 +1,2 @@
 export declare const legacy_codelist: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const legacyCodelistView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const legacyCodelistView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -1,2 +1,2 @@
 export declare const location: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const locationView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const locationView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -1,2 +1,2 @@
 export declare const number: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const numberView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const numberView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -4,4 +4,4 @@ export type Person = {
     lastName: string;
 };
 export declare const person_variable: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const personVariableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const personVariableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

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

@@ -1,2 +1,2 @@
 export declare const text_variable: import("@lblod/ember-rdfa-editor/core/say-node-spec").default;
-export declare const textVariableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor/utils/ember-node").SayNodeViewConstructor;
+export declare const textVariableView: (controller: import("@lblod/ember-rdfa-editor").SayController) => import("@lblod/ember-rdfa-editor").NodeViewConstructor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "38.0.2",
+  "version": "38.0.3-dev.8a844bd88a2bc1786034136bb02c3d7891ef57ac",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -54,7 +54,7 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@codemirror/lang-html": "^6.4.9",
-    "@codemirror/state": "^6.4.1",
+    "@codemirror/state": "^6.7.0",
     "@codemirror/view": "^6.28.3",
     "@curvenote/prosemirror-utils": "^1.0.5",
     "@embroider/macros": "^1.19.7",
@@ -110,7 +110,7 @@
     "@glint/ember-tsc": "^1.5.0",
     "@glint/environment-ember-loose": "^1.5.0",
     "@glint/environment-ember-template-imports": "^1.5.0",
-    "@lblod/ember-rdfa-editor": "13.12.0",
+    "@lblod/ember-rdfa-editor": "13.15.1-dev.c5cefcf9a50117c08ff14a54a8b585d176b0654c",
     "@glint/template": "^1.7.7",
     "@rdfjs/to-ntriples": "^3.0.1",
     "@rdfjs/types": "^2.0.1",

package/pnpm-workspace.yaml

@@ -1,2 +1,3 @@
 overrides:
   'prosemirror-model': '^1.25.9'
+  '@codemirror/state': '^6.7.0'