@lblod/ember-rdfa-editor-lblod-plugins 12.0.0 → 13.0.0

package/components/{rdfa-date-plugin/date.d.ts → variable-plugin/date/nodeview.d.ts}

@@ -1,5 +1,6 @@
 import Component from '@glimmer/component';
 import { DecorationSource, PNode, SayController, SayView } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     getPos: () => number | undefined;
     node: PNode;
@@ -9,7 +10,10 @@ type Args = {
     selected: boolean;
     contentDecorations?: DecorationSource;
 };
-export default class VariableComponent extends Component<Args> {
+export default class DateNodeviewComponent extends Component<Args> {
+    intl: IntlService;
+    get controller(): SayController;
+    get documentLanguage(): string;
     onClick(): void;
     get humanReadableDate(): string;
 }

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

@@ -13,6 +13,7 @@ export default class LocationInsertComponent extends Component<Args> {
     intl: IntlService;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
     get endpoint(): string;
     updateLabel(event: InputEvent): void;
     insert(): void;

package/components/variable-plugin/location/nodeview.d.ts

@@ -0,0 +1,12 @@
+import Component from '@glimmer/component';
+import { SayController, SayView } from '@lblod/ember-rdfa-editor';
+type Args = {
+    controller: SayController;
+};
+export default class LocationNodeViewComponent extends Component<Args> {
+    nodeViews: {
+        address: import("prosemirror-view").NodeViewConstructor;
+    };
+    innerView?: SayView;
+}
+export {};

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

@@ -27,6 +27,7 @@ export default class NumberInsertComponent extends Component<Args> {
     }>;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
     get numberVariableError(): string;
     updateLabel(event: InputEvent): void;
     updateMinimumValue: (event: InputEvent) => void;

package/components/variable-plugin/number/nodeview.d.ts

@@ -16,6 +16,11 @@ export default class NumberNodeviewComponent extends Component<Args> {
     intl: intlService;
     cursorPositionKeyDown: number | null;
     focus(element: HTMLInputElement): void;
+    get controller(): SayController;
+    get documentLanguage(): string;
+    get translations(): {
+        placeholder: string;
+    };
     get node(): PNode;
     get formattedNumber(): string;
     get selected(): boolean;

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

@@ -1,12 +1,15 @@
 import Component from '@glimmer/component';
 import { SayController } from '@lblod/ember-rdfa-editor';
+import IntlService from 'ember-intl/services/intl';
 type Args = {
     controller: SayController;
 };
 export default class TextVariableInsertComponent extends Component<Args> {
+    intl: IntlService;
     label?: string;
     get controller(): SayController;
     get schema(): import("prosemirror-model").Schema<any, any>;
+    get documentLanguage(): string;
     updateLabel(event: InputEvent): void;
     insert(): void;
 }

package/index.js

@@ -6,6 +6,9 @@ module.exports = {
     return process.env.EMBER_ENV === 'development';
   },
   options: {
+    'ember-cli-babel': {
+      enableTypeScriptTransform: true,
+    },
     babel: {
       sourceMaps: 'inline',
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -46,7 +46,6 @@
     "ember-auto-import": "~2.6.3",
     "ember-cli-babel": "^7.26.11",
     "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": "^6.0.1",
@@ -71,7 +70,8 @@
     "@embroider/test-setup": "^3.0.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@lblod/ember-rdfa-editor": "^5.3.0",
+    "@glint/template": "^1.1.0",
+    "@lblod/ember-rdfa-editor": "^6.1.0",
     "@rdfjs/types": "^1.1.0",
     "@release-it/keep-a-changelog": "^3.1.0",
     "@tsconfig/ember": "^3.0.0",
@@ -106,18 +106,19 @@
     "@types/rdfjs__dataset": "^2.0.0",
     "@types/rsvp": "^4.0.4",
     "@types/uuid": "^9.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.21.0",
-    "@typescript-eslint/parser": "^5.21.0",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "changesets-release-it-plugin": "^0.1.1",
-    "ember-cli": "~4.8.0",
+    "ember-cli": "~4.12.0",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "^3.28.12",
+    "ember-cli-typescript": "^5.2.1",
+    "ember-data": "^4.12.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-functions-as-helper-polyfill": "^2.1.1",
     "ember-intl": "^5.7.2",
@@ -126,7 +127,7 @@
     "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
     "ember-simple-auth": "4.2.2",
-    "ember-source": "~4.8.0",
+    "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^4.16.1",
     "ember-try": "^2.0.0",
@@ -149,9 +150,12 @@
   },
   "peerDependencies": {
     "@appuniversum/ember-appuniversum": "^2.4.2",
-    "@lblod/ember-rdfa-editor": "^5.3.0",
+    "@glint/template": "^1.1.0",
+    "@lblod/ember-rdfa-editor": "^6.0.0",
     "ember-concurrency": "^2.3.7",
-    "ember-modifier": "^3.2.7"
+    "ember-data": "^3.28.0 || ^4.0.0",
+    "ember-modifier": "^3.2.7",
+    "ember-source": "^3.28.0 || ^4.0.0"
   },
   "overrides": {
     "ember-intl": {

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

@@ -34,6 +34,7 @@ export type CitationPluginConfig = CitationPluginNodeConfig | CitationPluginRang
 export type CitationPluginEmberComponentConfig = CitationPluginConfig & {
     endpoint: string;
     decisionsEndpoint?: string;
+    defaultDecisionsGovernmentName?: string;
 };
 export declare function citationPlugin(config: CitationPluginConfig): CitationPlugin;
 export {};

package/plugins/citation-plugin/utils/legal-documents.d.ts

@@ -32,6 +32,7 @@ export interface LegalDocumentsQueryFilter {
     documentDateTo?: Option<string>;
     publicationDateFrom?: Option<string>;
     publicationDateTo?: Option<string>;
+    governmentName?: Option<string>;
 }
 export type LegalDocumentsQueryConfig = {
     endpoint: string;

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

@@ -1,4 +1,4 @@
-import { PNode } from '@lblod/ember-rdfa-editor';
+import { EditorState, PNode } from '@lblod/ember-rdfa-editor';
 export type OutlineEntry = {
     content: string;
     pos: number;
@@ -8,9 +8,10 @@ export declare function createTableOfContents(entries: OutlineEntry[]): [string,
 type Config = {
     nodeHierarchy: string[];
 }[];
-export declare function extractOutline({ node, pos, config, }: {
+export declare function extractOutline({ node, pos, config, state, }: {
     node: PNode;
     pos: number;
     config: Config;
+    state: EditorState;
 }): OutlineEntry[];
 export {};

package/plugins/{rdfa-date-plugin/nodes → variable-plugin/variables}/date.d.ts

@@ -1,3 +1,12 @@
-import { DateOptions } from '..';
+export type DateFormat = {
+    label?: string;
+    key: string;
+    dateFormat: string;
+    dateTimeFormat: string;
+};
+export type DateOptions = {
+    formats: DateFormat[];
+    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("prosemirror-view").NodeViewConstructor;

package/plugins/variable-plugin/variables/index.d.ts

@@ -3,3 +3,4 @@ export * from './text';
 export * from './codelist';
 export * from './location';
 export * from './address';
+export * from './date';

package/translations/en-US.yaml

@@ -69,6 +69,7 @@ citaten-plugin:
     title: Insert reference
   search:
     term: Search term
+    government-search: Filter by government
     advanced: Advanced search
     type: Type of document
     placeholder: Type to search
@@ -191,6 +192,7 @@ document-title-plugin:
 variable:
   number:
     placeholder: Insert number
+    label: number
     type-number: Type a number...
     error-not-integer: Only integers are allowed
     error-not-number: Only numbers are allowed
@@ -202,6 +204,15 @@ variable:
   codelist:
     single-select: Single selection
     multi-select: Multiple selection
+    label: codelist
+  location:
+    label: location
+  text:
+    label: text
+  date:
+    label: date
+  address:
+    label: address
 variable-plugin:
   insert-variable: Insert variable
   button: Insert
@@ -282,6 +293,7 @@ template-comments-plugin:
     remove: Remove template comment or example
     move-up: Move comment up
     move-down: Move comment down
+  heading: comment or example
 
 pagination:
   next: Next page

package/translations/nl-BE.yaml

@@ -70,6 +70,7 @@ citaten-plugin:
     title: Citeeropschrift invoegen
   search:
     term: Zoekterm
+    government-search: Filter op bestuursorgaan
     advanced: Uitgebreid zoeken
     type: Type van document
     placeholder: Typ om te zoeken
@@ -202,6 +203,7 @@ table-of-contents-plugin:
 variable:
   number:
     placeholder: Voeg getal in
+    label: nummer
     type-number: typ een nummer...
     error-not-integer: Enkel gehele getallen zijn toegelaten
     error-not-number: Enkel getallen zijn toegelaten
@@ -213,6 +215,15 @@ variable:
   codelist:
     single-select: Enkelvoudige selectie
     multi-select: Meervoudige selectie
+    label: codelijst
+  location:
+    label: locatie
+  text:
+    label: tekst
+  date:
+    label: datum
+  address:
+    label: adres
 variable-plugin:
   insert-variable: Voeg variabele in
   button: Voeg in
@@ -286,6 +297,8 @@ template-comments-plugin:
     remove: Verwijder Toelichtings- of voorbeeldbepaling
     move-down: Toelichtings- of voorbeeldbepaling naar onder
     move-up: Toelichtings- of voorbeeldbepaling naar boven
+  heading: toelichtingsbepaling
+
 pagination:
   next: Volgende pagina
   previous: Vorige pagina

package/utils/translation.d.ts

@@ -0,0 +1,3 @@
+import type { EditorState } from '@lblod/ember-rdfa-editor';
+import { type TOptions } from 'ember-intl/services/intl';
+export declare const getTranslationFunction: (state: EditorState) => (key: string, fallback: string, options?: TOptions) => string;

package/addon/components/rdfa-date-plugin/insert.hbs

@@ -1,9 +0,0 @@
-<AuList::Item>
-  <AuButton
-    @icon="add"
-    @iconAlignment="left"
-    @skin="link"
-    {{on 'click' (fn this.insertDate true)}}>
-    {{t "date-plugin.insert.date"}}
-  </AuButton>
-</AuList::Item>

package/addon/components/rdfa-date-plugin/insert.ts

@@ -1,52 +0,0 @@
-import Component from '@glimmer/component';
-import { action } from '@ember/object';
-import { SayController } from '@lblod/ember-rdfa-editor';
-import { NodeSelection } from '@lblod/ember-rdfa-editor';
-import {
-  DateFormat,
-  DateOptions,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin';
-import { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
-
-type Args = {
-  controller: SayController;
-  options: DateOptions;
-};
-
-export default class RdfaDatePluginInsertComponent extends Component<Args> {
-  get controller() {
-    return this.args.controller;
-  }
-
-  get schema() {
-    return this.controller.schema;
-  }
-
-  get formats(): DateFormat[] {
-    return this.args.options.formats;
-  }
-
-  get defaultDateFormat(): Option<string> {
-    return this.formats[0].dateFormat;
-  }
-
-  @action
-  insertDate() {
-    this.controller.withTransaction((tr) => {
-      tr.replaceSelectionWith(
-        this.schema.node('date', {
-          onlyDate: true,
-          format: this.defaultDateFormat,
-          value: new Date().toISOString(),
-        }),
-      );
-      if (tr.selection.$anchor.nodeBefore) {
-        const resolvedPos = tr.doc.resolve(
-          tr.selection.anchor - tr.selection.$anchor.nodeBefore?.nodeSize,
-        );
-        tr.setSelection(new NodeSelection(resolvedPos));
-      }
-      return tr;
-    });
-  }
-}

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

@@ -1,28 +0,0 @@
-export const defaultDateFormats: DateFormat[] = [
-  {
-    key: 'short',
-    dateFormat: 'dd/MM/yy',
-    dateTimeFormat: 'dd/MM/yy HH:mm',
-  },
-  {
-    key: 'long',
-    dateFormat: 'EEEE dd MMMM yyyy',
-    dateTimeFormat: 'PPPPp',
-  },
-];
-
-export type DateFormat = {
-  label?: string;
-  key: string;
-  dateFormat: string;
-  dateTimeFormat: string;
-};
-
-export type DateOptions = {
-  placeholder: {
-    insertDate: string;
-    insertDateTime: string;
-  };
-  formats: DateFormat[];
-  allowCustomFormat: boolean;
-};

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

@@ -1,167 +0,0 @@
-import {
-  createEmberNodeSpec,
-  createEmberNodeView,
-  EmberNodeConfig,
-} from '@lblod/ember-rdfa-editor/utils/ember-node';
-import {
-  EXT,
-  XSD,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
-import { hasRDFaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
-import { DateOptions } from '..';
-import { formatDate, validateDateFormat } from '../utils';
-import { PNode } from '@lblod/ember-rdfa-editor';
-import {
-  isVariable,
-  parseLabel,
-  parseVariableType,
-} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/utils/attribute-parsers';
-import {
-  mappingSpan,
-  typeSpan,
-} from '../../variable-plugin/utils/dom-constructors';
-import { span } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/dom-output-spec-helpers';
-
-const emberNodeConfig = (options: DateOptions): EmberNodeConfig => ({
-  name: 'date',
-  group: 'inline variable',
-  componentPath: 'rdfa-date-plugin/date',
-  inline: true,
-  selectable: true,
-  draggable: false,
-  atom: true,
-  defining: false,
-  options,
-  attrs: {
-    mappingResource: {
-      default: null,
-    },
-    humanReadableDate: {
-      default: options.placeholder.insertDate,
-    },
-    value: {},
-    format: {
-      default: options.formats[0].dateFormat,
-    },
-    onlyDate: {
-      default: true,
-    },
-    custom: {
-      default: false,
-    },
-    label: {
-      default: 'datum',
-    },
-  },
-  leafText: (node: PNode) => {
-    const { value, onlyDate, format } = node.attrs;
-    const humanReadableDate = value
-      ? formatDate(new Date(value), format)
-      : onlyDate
-      ? options.placeholder.insertDate
-      : options.placeholder.insertDateTime;
-    return humanReadableDate;
-  },
-  toDOM: (node) => {
-    const { value, onlyDate, format, mappingResource, custom, label } =
-      node.attrs;
-    const datatype = onlyDate ? XSD('date') : XSD('dateTime');
-    let humanReadableDate: string;
-    if (value) {
-      if (validateDateFormat(format).type === 'ok') {
-        humanReadableDate = formatDate(new Date(value), format);
-      } else {
-        humanReadableDate = 'Ongeldig formaat';
-      }
-    } else {
-      humanReadableDate = (onlyDate as boolean)
-        ? options.placeholder.insertDate
-        : options.placeholder.insertDateTime;
-    }
-    const dateAttrs = {
-      datatype: datatype.prefixed,
-      property: EXT('content').prefixed,
-      'data-format': format as string,
-      'data-custom': custom ? 'true' : 'false',
-      ...(!!value && { content: value as string }),
-    };
-    if (mappingResource) {
-      return mappingSpan(
-        mappingResource,
-        { class: 'date', 'data-label': label as string },
-        typeSpan('date'),
-        span(dateAttrs, humanReadableDate),
-      );
-    } else {
-      return span({ class: 'date', ...dateAttrs }, humanReadableDate);
-    }
-  },
-  parseDOM: [
-    {
-      tag: 'span',
-      getAttrs: (node: HTMLElement) => {
-        if (
-          hasRDFaAttribute(node, 'datatype', XSD('date')) ||
-          hasRDFaAttribute(node, 'datatype', XSD('dateTime'))
-        ) {
-          const onlyDate = hasRDFaAttribute(node, 'datatype', XSD('date'));
-          return {
-            value: node.getAttribute('content') ?? new Date().toISOString(),
-            onlyDate,
-            format: node.dataset.format,
-            custom: node.dataset.custom === 'true',
-          };
-        }
-        return false;
-      },
-    },
-    {
-      tag: 'span',
-      getAttrs: (node: HTMLElement) => {
-        if (isVariable(node) && parseVariableType(node) === 'date') {
-          const mappingResource = node.getAttribute('resource');
-          if (!mappingResource) {
-            return false;
-          }
-          const onlyDate = !![...node.children].find((el) =>
-            hasRDFaAttribute(el, 'datatype', XSD('date')),
-          );
-          const dateNode = [...node.children].find((el) =>
-            hasRDFaAttribute(el, 'property', EXT('content')),
-          ) as HTMLElement | undefined;
-          let humanReadableDate: string;
-          const value = dateNode?.getAttribute('content');
-          const format = dateNode?.dataset.format;
-          if (value && format) {
-            if (validateDateFormat(format).type === 'ok') {
-              humanReadableDate = formatDate(new Date(value), format);
-            } else {
-              humanReadableDate = 'Ongeldig formaat';
-            }
-          } else {
-            humanReadableDate = onlyDate
-              ? options.placeholder.insertDate
-              : options.placeholder.insertDateTime;
-          }
-          const label = parseLabel(node);
-          return {
-            mappingResource,
-            onlyDate,
-            humanReadableDate,
-            value: value,
-            format: format,
-            custom: dateNode?.dataset.custom === 'true',
-            label,
-          };
-        }
-
-        return false;
-      },
-    },
-  ],
-});
-
-export const date = (options: DateOptions) =>
-  createEmberNodeSpec(emberNodeConfig(options));
-export const dateView = (options: DateOptions) =>
-  createEmberNodeView(emberNodeConfig(options));

package/components/rdfa-date-plugin/insert.d.ts

@@ -1,16 +0,0 @@
-import Component from '@glimmer/component';
-import { SayController } from '@lblod/ember-rdfa-editor';
-import { DateFormat, DateOptions } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin';
-import { Option } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
-type Args = {
-    controller: SayController;
-    options: DateOptions;
-};
-export default class RdfaDatePluginInsertComponent extends Component<Args> {
-    get controller(): SayController;
-    get schema(): import("prosemirror-model").Schema<any, any>;
-    get formats(): DateFormat[];
-    get defaultDateFormat(): Option<string>;
-    insertDate(): void;
-}
-export {};

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

@@ -1,15 +0,0 @@
-export declare const defaultDateFormats: DateFormat[];
-export type DateFormat = {
-    label?: string;
-    key: string;
-    dateFormat: string;
-    dateTimeFormat: string;
-};
-export type DateOptions = {
-    placeholder: {
-        insertDate: string;
-        insertDateTime: string;
-    };
-    formats: DateFormat[];
-    allowCustomFormat: boolean;
-};