@lblod/ember-rdfa-editor-lblod-plugins 2.1.1 → 3.0.0

package/components/table-of-contents-plugin/ember-nodes/table-of-contents.d.ts

@@ -9,7 +9,7 @@ type OutlineEntry = {
 };
 export default class TableOfContentsComponent extends Component<EmberNodeArgs> {
     get config(): TableOfContentsConfig;
-    get controller(): import("@lblod/ember-rdfa-editor").ProseController;
+    get controller(): import("@lblod/ember-rdfa-editor").SayController;
     get outline(): {
         entries: OutlineEntry[];
     };

package/components/table-of-contents-plugin/toolbar-button.d.ts

@@ -1,11 +1,11 @@
 import Component from '@glimmer/component';
-import { ProseController } from '@lblod/ember-rdfa-editor/core/prosemirror';
+import { SayController } from '@lblod/ember-rdfa-editor';
 type Args = {
-    controller: ProseController;
+    controller: SayController;
 };
 export default class TableOfContentsCardComponent extends Component<Args> {
     get toggled(): boolean;
-    get controller(): ProseController;
+    get controller(): SayController;
     get tableOfContentsRange(): {
         from: number;
         to: number;

package/components/variable-plugin/insert-variable-card.d.ts

@@ -1,15 +1,13 @@
 import Component from '@glimmer/component';
-import { ProseController } from '@lblod/ember-rdfa-editor/core/prosemirror';
+import { SayController } from '@lblod/ember-rdfa-editor';
 import { VariableType } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/constants';
 import { CodeList } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data';
 type Args = {
-    controller: ProseController;
-    widgetArgs: {
-        options: {
-            publisher: string;
-            variableTypes: (VariableType | string)[];
-            defaultEndpoint: string;
-        };
+    controller: SayController;
+    options: {
+        publisher: string;
+        variableTypes: (VariableType | string)[];
+        defaultEndpoint: string;
     };
 };
 export default class EditorPluginsInsertCodelistCardComponent extends Component<Args> {
@@ -21,6 +19,7 @@ export default class EditorPluginsInsertCodelistCardComponent extends Component<
     publisher: string;
     endpoint: string;
     constructor(parent: unknown, args: Args);
+    get controller(): SayController;
     insert(): void;
     updateSelectedVariable(variable: VariableType): void;
     fetchSubtypes: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (fetchFunction: (endpoint: string, publisher: string) => Promise<CodeList[]>) => Promise<void>>;

package/components/variable-plugin/template-variable-card.d.ts

@@ -1,9 +1,9 @@
 import Component from '@glimmer/component';
-import { ProseController } from '@lblod/ember-rdfa-editor/core/prosemirror';
+import { SayController } from '@lblod/ember-rdfa-editor';
 import { CodeListOption } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/fetch-data';
 import { PNode } from '@lblod/ember-rdfa-editor';
 type Args = {
-    controller: ProseController;
+    controller: SayController;
 };
 export default class EditorPluginsTemplateVariableCardComponent extends Component<Args> {
     variableOptions: CodeListOption[];
@@ -19,7 +19,7 @@ export default class EditorPluginsTemplateVariableCardComponent extends Componen
     endpoint: string;
     nonZonalLocationCodelistUri: string;
     constructor(parent: unknown, args: Args);
-    get controller(): ProseController;
+    get controller(): SayController;
     insert(): void;
     wrapVariableInHighlight(text: string): string;
     selectionChanged(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -15,14 +15,14 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each",
     "release": "release-it",
@@ -39,13 +39,13 @@
     "@types/rdfjs__parser-n3": "^1.1.5",
     "buffer": "^6.0.3",
     "date-fns": "^2.29.3",
-    "ember-auto-import": "^2.4.1",
+    "ember-auto-import": "^2.4.3",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.1",
     "ember-cli-typescript": "^5.2.1",
     "ember-concurrency": "^2.3.7",
     "ember-mu-transform-helpers": "^2.0.0",
-    "ember-power-select": "^5.0.4",
+    "ember-power-select": "^6.0.1",
     "ember-resources": "^5.6.2",
     "ember-velcro": "^1.1.0",
     "fetch-sparql-endpoint": "^3.0.0",
@@ -57,13 +57,13 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@appuniversum/ember-appuniversum": "^2.2.0",
+    "@appuniversum/ember-appuniversum": "^2.4.2",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.7.0",
-    "@embroider/test-setup": "^1.6.0",
+    "@ember/test-helpers": "^2.8.1",
+    "@embroider/test-setup": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@lblod/ember-rdfa-editor": "^2.1.2",
+    "@lblod/ember-rdfa-editor": "^3.2.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^3.1.0",
     "@tsconfig/ember": "^1.0.1",
@@ -85,14 +85,12 @@
     "@types/ember__string": "^3.0.10",
     "@types/ember__template": "^4.0.1",
     "@types/ember__test": "^4.0.1",
-    "@types/ember__test-helpers": "^2.8.2",
     "@types/ember__utils": "^4.0.2",
-    "@types/ember-data": "^4.4.6",
+    "@types/ember-data": "^4.4.7",
     "@types/ember-data__adapter": "^4.0.1",
     "@types/ember-data__model": "^4.0.0",
     "@types/ember-data__serializer": "^4.0.1",
     "@types/ember-data__store": "^4.0.2",
-    "@types/ember-qunit": "^5.0.2",
     "@types/ember-resolver": "^5.0.13",
     "@types/prosemirror-dev-tools": "^3.0.3",
     "@types/qunit": "^2.19.3",
@@ -105,52 +103,51 @@
     "@typescript-eslint/parser": "^5.21.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~4.4.1",
+    "ember-cli": "~4.8.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-sass": "^10.0.1",
+    "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-string-helpers": "^6.1.0",
     "ember-cli-terser": "^4.0.2",
     "ember-data": "^3.28.12",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-functions-as-helper-polyfill": "^2.1.1",
     "ember-intl": "^5.7.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
+    "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
     "ember-simple-auth": "4.2.2",
-    "ember-source": "~4.4.0",
+    "ember-source": "~4.8.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^4.8.0",
+    "ember-template-lint": "^4.16.1",
     "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.6.1",
+    "eslint-plugin-ember": "^11.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-qunit": "^7.3.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "prosemirror-dev-tools": "^3.1.0",
-    "qunit": "^2.19.1",
+    "qunit": "^2.19.2",
     "qunit-dom": "^2.0.0",
     "release-it": "^15.5.0",
     "sass": "^1.49.7",
     "tracked-toolbox": "^1.2.3",
     "typescript": "^4.9.3",
-    "webpack": "^5.72.1"
+    "webpack": "^5.74.0"
   },
   "peerDependencies": {
-    "@appuniversum/ember-appuniversum": "^2.2.0",
-    "@lblod/ember-rdfa-editor": "^2.1.2",
+    "@appuniversum/ember-appuniversum": "^2.4.2",
+    "@lblod/ember-rdfa-editor": "^3.2.0",
     "ember-concurrency": "^2.3.7"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": ">= 18"
   },
   "volta": {
     "node": "18.14.0"

package/plugins/article-structure-plugin/index.d.ts

@@ -1,4 +1,4 @@
-import { Fragment, PNode, Schema, WidgetSpec, EditorState } from '@lblod/ember-rdfa-editor';
+import { Fragment, PNode, Schema, EditorState } from '@lblod/ember-rdfa-editor';
 import IntlService from 'ember-intl/services/intl';
 import { Transaction } from '@lblod/ember-rdfa-editor';
 export type SpecName = string;
@@ -35,7 +35,6 @@ export type StructureSpec = {
     }) => Fragment;
     continuous: boolean;
     limitTo?: string;
+    noUnwrap?: boolean;
 };
 export type ArticleStructurePluginOptions = StructureSpec[];
-export declare const articleStructureInsertWidget: (options?: ArticleStructurePluginOptions) => WidgetSpec;
-export declare const articleStructureContextWidget: (options?: ArticleStructurePluginOptions) => WidgetSpec;

package/plugins/besluit-plugin/utils/get-title-for-decision.d.ts

@@ -1,5 +1,5 @@
-import { ProseStore } from '@lblod/ember-rdfa-editor/plugins/datastore';
-export declare function getTitleForDecision(decisionUri: string, datastore: ProseStore): boolean;
+import { SayStore } from '@lblod/ember-rdfa-editor/plugins/datastore';
+export declare function getTitleForDecision(decisionUri: string, datastore: SayStore): boolean;
 /**
  * Gets all nodes defining a eli:title predicate for a certain
  * decision subject URI
@@ -7,4 +7,4 @@ export declare function getTitleForDecision(decisionUri: string, datastore: Pros
  * @param datastore
  * @returns {null|*}
  */
-export declare function getTitleNodesForDecision(decisionUri: string, datastore: ProseStore): import("@lblod/ember-rdfa-editor/plugins/datastore").ResolvedPNode[] | null;
+export declare function getTitleNodesForDecision(decisionUri: string, datastore: SayStore): import("@lblod/ember-rdfa-editor/plugins/datastore").ResolvedPNode[] | null;

package/plugins/citation-plugin/index.d.ts

@@ -1,4 +1,4 @@
-import { Decoration, DecorationSet, EditorState, InlineDecorationSpec, MarkSpec, NodeType, ProsePlugin, Schema, WidgetSpec } from '@lblod/ember-rdfa-editor';
+import { Decoration, DecorationSet, EditorState, InlineDecorationSpec, NodeType, ProsePlugin, Schema } from '@lblod/ember-rdfa-editor';
 /**
  * The monster regex that makes the citation plugin trigger.
  * In restructuring, I've made sure that I didn't abstract away any of the capturing groups,
@@ -20,16 +20,6 @@ interface CitationPluginState {
     activeRanges: [number, number][];
 }
 export type CitationPlugin = ProsePlugin<CitationPluginState>;
-export interface CitationPluginBundle {
-    plugin: ProsePlugin<CitationPluginState>;
-    widgets: {
-        citationCard: WidgetSpec;
-        citationInsert: WidgetSpec;
-    };
-    marks: {
-        citation: MarkSpec;
-    };
-}
 export interface CitationPluginNodeConfig {
     type: 'nodes';
     regex?: RegExp;
@@ -41,5 +31,5 @@ export interface CitationPluginRangeConfig {
     activeInRanges(state: EditorState): [number, number][];
 }
 export type CitationPluginConfig = CitationPluginNodeConfig | CitationPluginRangeConfig;
-export declare function setupCitationPlugin(config?: CitationPluginConfig): CitationPluginBundle;
+export declare function citationPlugin(config: CitationPluginConfig): CitationPlugin;
 export {};

package/plugins/rdfa-date-plugin/index.d.ts

@@ -1,15 +1,15 @@
-import { WidgetSpec } from '@lblod/ember-rdfa-editor';
 export declare const defaultDateFormats: DateFormat[];
-export declare function rdfaDateCardWidget(options?: DatePluginOptions): WidgetSpec;
-export declare function rdfaDateInsertWidget(options?: DatePluginOptions): WidgetSpec;
 export type DateFormat = {
     label: string;
     key: string;
     dateFormat: string;
     dateTimeFormat: string;
 };
-type DatePluginOptions = {
+export type DateOptions = {
+    placeholder: {
+        insertDate: string;
+        insertDateTime: string;
+    };
     formats: DateFormat[];
     allowCustomFormat: boolean;
 };
-export {};

package/plugins/rdfa-date-plugin/nodes/date.d.ts

@@ -1,9 +1,4 @@
 import { NodeSpec } from '@lblod/ember-rdfa-editor';
-export type DateOptions = {
-    placeholder: {
-        insertDate: string;
-        insertDateTime: string;
-    };
-};
+import { DateOptions } from '..';
 declare const date: (options: DateOptions) => NodeSpec;
 export default date;

package/plugins/standard-template-plugin/index.d.ts

@@ -1,5 +1,3 @@
-import { WidgetSpec } from '@lblod/ember-rdfa-editor';
-export declare const standardTemplateWidget: WidgetSpec;
 export declare const besluitNodes: {
     besluit: import("prosemirror-model").NodeSpec;
     title: import("prosemirror-model").NodeSpec;

package/plugins/table-of-contents-plugin/index.d.ts

@@ -1,5 +1,3 @@
-import { WidgetSpec } from '@lblod/ember-rdfa-editor';
 export type TableOfContentsConfig = {
     nodeHierarchy: string[];
 }[];
-export declare const tableOfContentsWidget: WidgetSpec;

package/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("prosemirror-model").NodeSpec;
-export declare const tableOfContentsView: (config: TableOfContentsConfig) => (controller: import("@lblod/ember-rdfa-editor/addon").ProseController) => import("prosemirror-view").NodeViewConstructor;
+export declare const tableOfContentsView: (config: TableOfContentsConfig) => (controller: import("@lblod/ember-rdfa-editor/addon").SayController) => import("prosemirror-view").NodeViewConstructor;

package/plugins/variable-plugin/nodes.d.ts

@@ -1,2 +1,2 @@
 export declare const variable: import("prosemirror-model").NodeSpec;
-export declare const variableView: (controller: import("@lblod/ember-rdfa-editor/addon").ProseController) => import("prosemirror-view").NodeViewConstructor;
+export declare const variableView: (controller: import("@lblod/ember-rdfa-editor/addon").SayController) => import("prosemirror-view").NodeViewConstructor;

package/translations/en-US.yaml

@@ -1,11 +1,61 @@
+article-structure-plugin:
+  insert:
+    paragraph: Insert paragraph
+    article: Insert article
+    title: Insert title
+    chapter: Insert chapter
+    section: Insert section
+    subsection: Insert subsection
+  move-up:
+    paragraph: Move paragraph up
+    article: Move article up
+    title: Move title up
+    chapter: Move chapter up
+    section: Move section up
+    subsection: Move subsection up
+  move-down:
+    paragraph: Move paragraph down
+    article: Move article down
+    title: Move title down
+    chapter: Move chapter down
+    section: Move section down
+    subsection: Move subsection down
+  title:
+    structure-card: Structure Card
+  remove:
+    article: Remove Article
+    paragraph: Remove Paragraph
+    subsection: Remove subsection
+    section: Remove section
+    chapter: Remove chapter
+    title: Remove title
+    content: Remove content
+  placeholder:
+    generic:
+      heading: Insert title
+      body: Insert content
+    chapter:
+      heading: Insert chapter heading
+      body: Insert chapter content
+    section:
+      heading: Insert section heading
+      body: Insert section content
+    subsection:
+      heading: Insert subsection heading
+      body: Insert subsection content
+    article:
+      heading: Insert article heading
+      body: Insert article content
+    paragraph:
+      body: Insert paragraph content
+
+
 citaten-plugin:
   card:
     title: Add reference
     suggestions: Suggestions
-
   insert:
     title: Insert reference
-
   search:
     term: Search term
     advanced: Advanced search
@@ -23,28 +73,24 @@ citaten-plugin:
     article-placeholder: Article number
     back: Back to search results
     results: Results
-
   pagination:
     next: Next page
     previous: Previous page
     of: of
-
   references:
     insert: Insert reference
     details: Details
     refer-whole: Refer to whole document
     refer-article: Refer to this article
     lookup-codex: Lookup in Flemish Codex
-
   alert:
     loading: Loading…
     no-results: No results found
     error-title: Error while loading results
     error-intro: "An error occured while loading results from the Flemish Codex:"
     error-outro: In case this problem keeps occuring, please contact
-table-of-contents-plugin:
-  title: Table of Contents
-  toggle: Show Table of Contents
+
+
 besluit-type-plugin:
   dt: "Decision type"
   insert-dt: "Select a decision type"
@@ -56,12 +102,16 @@ besluit-type-plugin:
   error-title: "Error"
   error-first-body: "An error occured while fetching the decision types. Try again later. If this problem persists, please contact"
   error-rest-body: ". For more specific details about this problem, inspect the browser console."
+
+
 besluit-plugin:
   missing-title-warning: This decision is missing a title
   insert:
     decision-title: Insert decision title
   placeholder:
     decision-title: Insert decision title
+
+
 date-plugin:
   help:
     title: "Custom format help"
@@ -112,56 +162,8 @@ variable-plugin:
   insert-variable: Insert variable
   button: Insert
   enter-variable-value: Select value
-article-structure-plugin:
-  insert:
-    paragraph: Insert paragraph
-    article: Insert article
-    articleBelow: Insert article below
-    title: Insert title
-    chapter: Insert chapter
-    section: Insert section
-    subsection: Insert subsection
-  move-up:
-    paragraph: Move paragraph up
-    article: Move article up
-    title: Move title up
-    chapter: Move chapter up
-    section: Move section up
-    subsection: Move subsection up
-  move-down:
-    paragraph: Move paragraph down
-    article: Move article down
-    title: Move title down
-    chapter: Move chapter down
-    section: Move section down
-    subsection: Move subsection down
-  title:
-    paragraphCard: Paragraph Card
-    articleCard: Article Card
-    structure-card: Structure Card
-  remove:
-    article: Remove Article
-    paragraph: Remove Paragraph
-    subsection: Remove subsection
-    section: Remove section
-    chapter: Remove chapter
-    title: Remove title
-    content: Remove content
-  placeholder:
-    generic:
-      heading: Insert title
-      body: Insert content
-    chapter:
-      heading: Insert chapter heading
-      body: Insert chapter content
-    section:
-      heading: Insert section heading
-      body: Insert section content
-    subsection:
-      heading: Insert subsection heading
-      body: Insert subsection content
-    article:
-      heading: Insert article heading
-      body: Insert article content
-    paragraph:
-      body: Insert paragraph content
+
+
+table-of-contents-plugin:
+  title: Table of Contents
+  toggle: Show Table of Contents