@lblod/ember-rdfa-editor-lblod-plugins 14.0.0 → 14.2.0

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 14.2.0
+
+### Minor Changes
+
+- [#322](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/322) [`a168dc5`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/a168dc54b5ddc0a4a5b3bf8c521ccb914bb91b7a) Thanks [@x-m-el](https://github.com/x-m-el)! - For article-structure plugin
+
+  - The `StructureSpec`'s `constructor` now also contains the optional argument `state` (an EditorState)
+  - The existing structures' placeholders are translated using the document language
+    - This is only the case if emberApplication plugin is configured.
+      **Recommended change**: activate emberApplication plugin
+    - Will fallback to translating based on browser locale (=old logic) if emberApplication plugin is not configured
+
+- [#322](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/322) [`690738f`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/690738f56692555880c5ad29c25c76f400a48bcb) Thanks [@x-m-el](https://github.com/x-m-el)! - For decision-plugin and standard-template-plugin
+
+  Make use of `state` argument to translate placeholders based on document language instead of browser locale
+  Depending on the place where placeholders are defined either of the following logic happens:
+
+  - will always use document language
+  - will use document language if emberApplication plugin is active. If not, defaults to browser locale (like before)
+
+### Patch Changes
+
+- [#322](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/322) [`5ceca68`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/5ceca68ec271477dfcf75c7d9fba35c21880642e) Thanks [@x-m-el](https://github.com/x-m-el)! - Using "show as words" for a number variable will convert the number to a string in the language in the document, instead of always showing Dutch.
+
+## 14.1.0
+
+### Minor Changes
+
+- [#315](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/315) [`01163d8`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/01163d8d45b801a50728b9aeabaf0e52a1cf9a33) Thanks [@piemonkey](https://github.com/piemonkey)! - Export standard-template-plugin's uuid instantiation function
+
+### Patch Changes
+
+- [#317](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/317) [`1d28bc9`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/1d28bc9b9b0e07e8eb5698988dfe0e3dd946c2a3) Thanks [@dkozickis](https://github.com/dkozickis)! - GN-4538: Display correctly that there are no streets when searching in the address plugin
+
+- [#316](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/pull/316) [`e109035`](https://github.com/lblod/ember-rdfa-editor-lblod-plugins/commit/e109035809df341ede0a03fb0b146909883903ef) Thanks [@x-m-el](https://github.com/x-m-el)! - - Bugfix: `allowCustomFormat` for rdfa-date variable will now disable custom formats if set to false.
+  - No changes for old documents: date variables in old documents will allow custom formats, which is the default.
+
 ## 14.0.0
 
 ### Major Changes

package/README.md

@@ -140,6 +140,7 @@ export type StructureSpec = {
     number?: number;
     intl?: IntlService;
     content?: PNode | Fragment;
+    state?: EditorState;
   }) => {
     node: PNode;
     selectionConfig: {
@@ -695,7 +696,7 @@ get dateOptions(){
 	- `key`: A **unique** identifier used for identification in the internal code. 
 	- `dateFormat`: The date format used when this is selected.
 	- `dateTimeFormat`: The datetime format to use when this is selected. Used when the user selects "Include time".
-- `allowCustomFormat`: true/false, determines if the option to insert a fully custom format is available.
+- `allowCustomFormat`: true by default, determines if the option to insert a fully custom format is available for newly created date nodes.
 
 The syntax of formats can be found at [date-fns](https://date-fns.org/v2.29.3/docs/format).
 

package/addon/components/document-title-plugin/insert-title-card.ts

@@ -17,6 +17,7 @@ export default class InsertTitleCardComponent extends Component<Args> {
       insertDocumentTitle({
         placeholder: this.intl.t(
           'document-title-plugin.document-title-placeholder',
+          { locale: this.args.controller.documentLanguage },
         ),
       }),
       {
@@ -31,6 +32,7 @@ export default class InsertTitleCardComponent extends Component<Args> {
       insertDocumentTitle({
         placeholder: this.intl.t(
           'document-title-plugin.document-title-placeholder',
+          { locale: this.args.controller.documentLanguage },
         ),
       }),
       {

package/addon/components/variable-plugin/date/edit.hbs

@@ -56,16 +56,18 @@
               />
             </AuFormRow>
           {{/each}}
-          <AuFormRow>
-            <AuControlRadio
-              @label={{t "date-plugin.card.custom-date" }}
-              @identifier="custom"
-              @name="dateFormat"
-              @value="custom"
-              checked={{eq this.dateFormatType "custom"}}
-              @onChange={{this.setDateFormatFromKey}}
-            />
-          </AuFormRow>
+          {{#if this.isCustomAllowed}}
+            <AuFormRow>
+              <AuControlRadio
+                @label={{t "date-plugin.card.custom-date" }}
+                @identifier="custom"
+                @name="dateFormat"
+                @value="custom"
+                checked={{eq this.dateFormatType "custom"}}
+                @onChange={{this.setDateFormatFromKey}}
+              />
+            </AuFormRow>
+          {{/if}}  
           {{#if (eq this.dateFormatType "custom")}}
             <AuFormRow @alignment="post">
               <AuButton @skin="secondary" @icon="info-circle"

package/addon/components/variable-plugin/date/edit.ts

@@ -125,6 +125,13 @@ export default class DateEditComponent extends Component<Args> {
     return unwrapOr(false, this.selectedDateNode?.attrs.custom as boolean);
   }
 
+  get isCustomAllowed(): boolean {
+    return unwrapOr(
+      true,
+      this.selectedDateNode?.attrs.customAllowed as boolean,
+    );
+  }
+
   get dateFormatType(): string {
     if (this.isCustom) {
       return 'custom';

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

@@ -63,7 +63,7 @@ export default class NumberNodeviewComponent extends Component<Args> {
     if (!this.writtenNumber) {
       return value;
     } else {
-      return numberToWords(Number(value), { lang: 'nl' });
+      return numberToWords(Number(value), { lang: this.documentLanguage });
     }
   }
 

package/addon/plugins/article-structure-plugin/commands/insert-structure.ts

@@ -32,7 +32,7 @@ const insertStructure = (
     }
     if (dispatch) {
       const { node: newStructureNode, selectionConfig } =
-        structureSpec.constructor({ schema, intl, content });
+        structureSpec.constructor({ schema, intl, content, state });
       const transaction = state.tr;
 
       transaction.replaceWith(

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

@@ -14,6 +14,7 @@ import { findNodes } from '@lblod/ember-rdfa-editor/utils/position-utils';
 import IntlService from 'ember-intl/services/intl';
 import { findParentNodeOfType } from '@curvenote/prosemirror-utils';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 const moveSelectedStructure = (
   options: ArticleStructurePluginOptions,
   direction: 'up' | 'down',
@@ -52,11 +53,14 @@ const moveSelectedStructure = (
       );
       const parent = doc.resolve(currentStructure.pos).parent;
       if (parent.childCount === 1) {
+        const translationWithDocLang = getTranslationFunction(state);
         transaction.insert(
           currentStructure.pos,
           schema.node(schema.nodes['placeholder'], {
-            placeholderText: intl.t(
+            placeholderText: translationWithDocLang(
               'article-structure-plugin.placeholder.generic.body',
+              intl?.t('article-structure-plugin.placeholder.generic.body') ||
+                '',
             ),
           }),
         );

package/addon/plugins/article-structure-plugin/commands/wrap-structure-content.ts

@@ -41,6 +41,7 @@ const wrapStructureContent = (
         schema,
         content: contentToWrap,
         intl,
+        state,
       });
     } catch (e) {
       return false;

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

@@ -25,6 +25,7 @@ export type StructureSpec = {
     number?: number;
     intl?: IntlService;
     content?: PNode | Fragment;
+    state?: EditorState;
   }) => {
     node: PNode;
     selectionConfig: {

package/addon/plugins/article-structure-plugin/structures/article-paragraph.ts

@@ -7,6 +7,7 @@ import {
   XSD,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { hasRDFaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/namespace';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 const PLACEHOLDERS = {
   body: 'article-structure-plugin.placeholder.paragraph.body',
@@ -25,8 +26,9 @@ export const articleParagraphSpec: StructureSpec = {
   },
   continuous: false,
   noUnwrap: true,
-  constructor: ({ schema, number, intl }) => {
+  constructor: ({ schema, number, intl, state }) => {
     const numberConverted = number?.toString() ?? '1';
+    const translationWithDocLang = getTranslationFunction(state);
     const node = schema.node(
       `article_paragraph`,
       {
@@ -37,7 +39,10 @@ export const articleParagraphSpec: StructureSpec = {
         'paragraph',
         {},
         schema.node('placeholder', {
-          placeholderText: intl?.t(PLACEHOLDERS.body),
+          placeholderText: translationWithDocLang(
+            PLACEHOLDERS.body,
+            intl?.t(PLACEHOLDERS.body) || '',
+          ),
         }),
       ),
     );

package/addon/plugins/article-structure-plugin/structures/article.ts

@@ -13,6 +13,7 @@ import {
   XSD,
 } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 const PLACEHOLDERS = {
   title: 'article-structure-plugin.placeholder.article.heading',
@@ -30,8 +31,9 @@ export const articleSpec: StructureSpec = {
     removeWithContent: 'article-structure-plugin.remove-with-content.article',
   },
   continuous: true,
-  constructor: ({ schema, number, content, intl }) => {
+  constructor: ({ schema, number, content, intl, state }) => {
     const numberConverted = number?.toString() ?? '1';
+    const translationWithDocLang = getTranslationFunction(state);
     const node = schema.node(
       `article`,
       { resource: `http://data.lblod.info/articles/${uuid()}` },
@@ -40,7 +42,10 @@ export const articleSpec: StructureSpec = {
           'article_header',
           { level: 4, number: numberConverted },
           schema.node('placeholder', {
-            placeholderText: intl?.t(PLACEHOLDERS.title),
+            placeholderText: translationWithDocLang(
+              PLACEHOLDERS.title,
+              intl?.t(PLACEHOLDERS.title) || '',
+            ),
           }),
         ),
         schema.node(
@@ -51,7 +56,10 @@ export const articleSpec: StructureSpec = {
               'paragraph',
               {},
               schema.node('placeholder', {
-                placeholderText: intl?.t(PLACEHOLDERS.body),
+                placeholderText: translationWithDocLang(
+                  PLACEHOLDERS.body,
+                  intl?.t(PLACEHOLDERS.body) || '',
+                ),
               }),
             ),
         ),

package/addon/plugins/article-structure-plugin/structures/chapter.ts

@@ -7,6 +7,7 @@ import {
 import { v4 as uuid } from 'uuid';
 import { SAY } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 const PLACEHOLDERS = {
   title: 'article-structure-plugin.placeholder.chapter.heading',
@@ -24,8 +25,9 @@ export const chapterSpec: StructureSpec = {
     remove: 'article-structure-plugin.remove.chapter',
     removeWithContent: 'article-structure-plugin.remove-with-content.chapter',
   },
-  constructor: ({ schema, number, content, intl }) => {
+  constructor: ({ schema, number, content, intl, state }) => {
     const numberConverted = romanize(number ?? 1);
+    const translationWithDocLang = getTranslationFunction(state);
     const node = schema.node(
       `chapter`,
       { resource: `http://data.lblod.info/chapters/${uuid()}` },
@@ -34,7 +36,10 @@ export const chapterSpec: StructureSpec = {
           'structure_header',
           { level: 4, number: numberConverted },
           schema.node('placeholder', {
-            placeholderText: intl?.t(PLACEHOLDERS.title),
+            placeholderText: translationWithDocLang(
+              PLACEHOLDERS.title,
+              intl?.t(PLACEHOLDERS.title) || '',
+            ),
           }),
         ),
         schema.node(
@@ -45,7 +50,10 @@ export const chapterSpec: StructureSpec = {
               'paragraph',
               {},
               schema.node('placeholder', {
-                placeholderText: intl?.t(PLACEHOLDERS.body),
+                placeholderText: translationWithDocLang(
+                  PLACEHOLDERS.body,
+                  intl?.t(PLACEHOLDERS.body) || '',
+                ),
               }),
             ),
         ),

package/addon/plugins/article-structure-plugin/structures/section.ts

@@ -7,6 +7,7 @@ import { v4 as uuid } from 'uuid';
 import { StructureSpec } from '..';
 import { SAY } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 const PLACEHOLDERS = {
   title: 'article-structure-plugin.placeholder.section.heading',
@@ -24,8 +25,9 @@ export const sectionSpec: StructureSpec = {
     remove: 'article-structure-plugin.remove.section',
     removeWithContent: 'article-structure-plugin.remove-with-content.section',
   },
-  constructor: ({ schema, number, content, intl }) => {
+  constructor: ({ schema, number, content, intl, state }) => {
     const numberConverted = romanize(number || 1);
+    const translationWithDocLang = getTranslationFunction(state);
     const node = schema.node(
       `section`,
       { resource: `http://data.lblod.info/sections/${uuid()}` },
@@ -34,7 +36,10 @@ export const sectionSpec: StructureSpec = {
           'structure_header',
           { level: 5, number: numberConverted },
           schema.node('placeholder', {
-            placeholderText: intl?.t(PLACEHOLDERS.title),
+            placeholderText: translationWithDocLang(
+              PLACEHOLDERS.title,
+              intl?.t(PLACEHOLDERS.title) || '',
+            ),
           }),
         ),
         schema.node(
@@ -45,7 +50,10 @@ export const sectionSpec: StructureSpec = {
               'paragraph',
               {},
               schema.node('placeholder', {
-                placeholderText: intl?.t(PLACEHOLDERS.body),
+                placeholderText: translationWithDocLang(
+                  PLACEHOLDERS.body,
+                  intl?.t(PLACEHOLDERS.body) || '',
+                ),
               }),
             ),
         ),

package/addon/plugins/article-structure-plugin/structures/subsection.ts

@@ -7,6 +7,7 @@ import {
 import { v4 as uuid } from 'uuid';
 import { SAY } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 const PLACEHOLDERS = {
   title: 'article-structure-plugin.placeholder.subsection.heading',
@@ -26,8 +27,9 @@ export const subsectionSpec: StructureSpec = {
     removeWithContent:
       'article-structure-plugin.remove-with-content.subsection',
   },
-  constructor: ({ schema, number, intl, content }) => {
+  constructor: ({ schema, number, intl, content, state }) => {
     const numberConverted = romanize(number ?? 1);
+    const translationWithDocLang = getTranslationFunction(state);
     const node = schema.node(
       `subsection`,
       { resource: `http://data.lblod.info/subsections/${uuid()}` },
@@ -36,7 +38,10 @@ export const subsectionSpec: StructureSpec = {
           'structure_header',
           { level: 6, number: numberConverted },
           schema.node('placeholder', {
-            placeholderText: intl?.t(PLACEHOLDERS.title),
+            placeholderText: translationWithDocLang(
+              PLACEHOLDERS.title,
+              intl?.t(PLACEHOLDERS.title) || '',
+            ),
           }),
         ),
         schema.node(
@@ -47,7 +52,10 @@ export const subsectionSpec: StructureSpec = {
               'paragraph',
               {},
               schema.node('placeholder', {
-                placeholderText: intl?.t(PLACEHOLDERS.body),
+                placeholderText: translationWithDocLang(
+                  PLACEHOLDERS.body,
+                  intl?.t(PLACEHOLDERS.body) || '',
+                ),
               }),
             ),
         ),

package/addon/plugins/article-structure-plugin/structures/title.ts

@@ -7,6 +7,7 @@ import {
 import { v4 as uuid } from 'uuid';
 import { SAY } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/constants';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 const PLACEHOLDERS = {
   heading: 'article-structure-plugin.placeholder.generic.heading',
@@ -24,8 +25,9 @@ export const titleSpec: StructureSpec = {
     remove: 'article-structure-plugin.remove.title',
     removeWithContent: 'article-structure-plugin.remove-with-content.title',
   },
-  constructor: ({ schema, number, content, intl }) => {
+  constructor: ({ schema, number, content, intl, state }) => {
     const numberConverted = romanize(number ?? 1);
+    const translationWithDocLang = getTranslationFunction(state);
     const node = schema.node(
       `title`,
       { resource: `http://data.lblod.info/titles/${uuid()}` },
@@ -34,7 +36,10 @@ export const titleSpec: StructureSpec = {
           'structure_header',
           { level: 3, number: numberConverted },
           schema.node('placeholder', {
-            placeholderText: intl?.t(PLACEHOLDERS.heading),
+            placeholderText: translationWithDocLang(
+              PLACEHOLDERS.heading,
+              intl?.t(PLACEHOLDERS.heading) || '',
+            ),
           }),
         ),
         schema.node(
@@ -45,7 +50,10 @@ export const titleSpec: StructureSpec = {
               'paragraph',
               {},
               schema.node('placeholder', {
-                placeholderText: intl?.t(PLACEHOLDERS.body),
+                placeholderText: translationWithDocLang(
+                  PLACEHOLDERS.body,
+                  intl?.t(PLACEHOLDERS.body) || '',
+                ),
               }),
             ),
         ),

package/addon/plugins/decision-plugin/commands/insert-motivation.ts

@@ -9,6 +9,7 @@ import { isNone } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
 import { transactionCompliesWithShapes } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/validation/utils/transaction-complies-with-shapes';
 import { findInsertionPosInAncestorOfType } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/find-insertion-pos-in-ancestor-of-type';
 import IntlService from 'ember-intl/services/intl';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 interface InsertMotivationArgs {
   intl: IntlService;
@@ -20,13 +21,17 @@ export default function insertMotivation({
   validateShapes,
 }: InsertMotivationArgs): Command {
   return function (state: EditorState, dispatch?: (tr: Transaction) => void) {
+    const translationWithDocLang = getTranslationFunction(state);
     const { selection, schema } = state;
     const nodeToInsert = schema.node('motivering', { __rdfaId: uuid() }, [
       schema.node(
         'paragraph',
         null,
         schema.node('placeholder', {
-          placeholderText: intl.t('besluit-plugin.placeholder.government-body'),
+          placeholderText: translationWithDocLang(
+            'besluit-plugin.placeholder.government-body',
+            intl.t('besluit-plugin.placeholder.government-body'),
+          ),
         }),
       ),
       schema.node(
@@ -40,8 +45,9 @@ export default function insertMotivation({
         schema.node('list_item', null, [
           schema.node('paragraph', null, [
             schema.node('placeholder', {
-              placeholderText: intl.t(
+              placeholderText: translationWithDocLang(
                 'besluit-plugin.placeholder.legal-jurisdiction',
+                intl.t('besluit-plugin.placeholder.legal-jurisdiction'),
               ),
             }),
           ]),
@@ -52,14 +58,22 @@ export default function insertMotivation({
         {
           level: 5,
         },
-        [schema.text(intl.t('besluit-plugin.text.legal-context'))],
+        [
+          schema.text(
+            translationWithDocLang(
+              'besluit-plugin.text.legal-context',
+              intl.t('besluit-plugin.text.legal-context'),
+            ),
+          ),
+        ],
       ),
       schema.node('bullet_list', null, [
         schema.node('list_item', null, [
           schema.node('paragraph', null, [
             schema.node('placeholder', {
-              placeholderText: intl.t(
+              placeholderText: translationWithDocLang(
                 'besluit-plugin.placeholder.insert-legal-context',
+                intl.t('besluit-plugin.placeholder.insert-legal-context'),
               ),
             }),
           ]),
@@ -70,14 +84,22 @@ export default function insertMotivation({
         {
           level: 5,
         },
-        [schema.text(intl.t('besluit-plugin.text.factual-context'))],
+        [
+          schema.text(
+            translationWithDocLang(
+              'besluit-plugin.text.factual-context',
+              intl.t('besluit-plugin.text.factual-context'),
+            ),
+          ),
+        ],
       ),
       schema.node('bullet_list', null, [
         schema.node('list_item', null, [
           schema.node('paragraph', null, [
             schema.node('placeholder', {
-              placeholderText: intl.t(
+              placeholderText: translationWithDocLang(
                 'besluit-plugin.placeholder.insert-factual-context',
+                intl.t('besluit-plugin.placeholder.insert-factual-context'),
               ),
             }),
           ]),

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

@@ -11,6 +11,8 @@ import {
   besluitArticleStructure,
 } from './utils/nodes';
 
+export { default as instantiateUuids } from './utils/instantiate-uuids';
+
 export const besluitNodes = {
   besluit,
   besluit_title,

package/addon/plugins/standard-template-plugin/utils/instantiate-uuids.ts

@@ -17,7 +17,8 @@ import { v4 as uuidv4 } from 'uuid';
  */
 
 export default function instantiateUuids(templateString: string) {
-  const generateBoundUuid = memoize(uuidv4) as (...args: unknown[]) => string;
+  // We're not interested in the args in this case, we just use them to memoize
+  const generateBoundUuid = memoize((..._args: unknown[]) => uuidv4());
 
   const determineFunction = (string: string) => {
     switch (string) {
@@ -31,18 +32,9 @@ export default function instantiateUuids(templateString: string) {
   };
   return templateString.replace(
     /\$\{(generateUuid|generateBoundUuid)\(([^()]*)\)\}/g,
-    (string) => {
-      const match = /\$\{(generateUuid|generateBoundUuid)\(([^()]*)\)\}/.exec(
-        string,
-      );
-      if (match) {
-        const functionName = match[1];
-        const functionArgs = match[2];
-        const func = determineFunction(functionName);
-        return functionArgs ? func(functionArgs) : func();
-      } else {
-        return string;
-      }
+    (_match, functionName, functionArgs) => {
+      const func = determineFunction(functionName);
+      return functionArgs ? func(functionArgs) : func();
     },
   );
 }

package/addon/plugins/standard-template-plugin/utils/nodes.ts

@@ -15,6 +15,7 @@ import { hasRDFaAttribute } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/n
 import { StructureSpec } from '../../article-structure-plugin';
 import { v4 as uuid } from 'uuid';
 import { unwrap } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/option';
+import { getTranslationFunction } from '@lblod/ember-rdfa-editor-lblod-plugins/utils/translation';
 
 export const besluit_title: NodeSpec = {
   content: 'paragraph+',
@@ -180,7 +181,8 @@ export const besluitArticleStructure: StructureSpec = {
     remove: 'article-structure-plugin.remove.article',
   },
   limitTo: 'besluit',
-  constructor: ({ schema, number, content, intl }) => {
+  constructor: ({ schema, number, content, intl, state }) => {
+    const translationWithDocLang = getTranslationFunction(state);
     const numberConverted = number?.toString() ?? '1';
     const node = schema.node(
       `besluit_article`,
@@ -201,8 +203,11 @@ export const besluitArticleStructure: StructureSpec = {
               'paragraph',
               {},
               schema.node('placeholder', {
-                placeholderText: intl?.t(
+                placeholderText: translationWithDocLang(
                   'article-structure-plugin.placeholder.article.body',
+                  intl?.t(
+                    'article-structure-plugin.placeholder.article.body',
+                  ) || '',
                 ),
               }),
             ),

package/addon/plugins/variable-plugin/utils/address-helpers.ts

@@ -22,7 +22,7 @@ type StreetSearchResult = {
       gemeente: {
         gemeentenaam: { geografischeNaam: { spelling: string } };
       };
-      straatnaam: {
+      straatnaam?: {
         straatnaam: {
           geografischeNaam: { spelling: string };
         };
@@ -135,9 +135,11 @@ export async function fetchStreets(term: string, municipality: string) {
   });
   if (result.ok) {
     const jsonResult = (await result.json()) as StreetSearchResult;
-    const streetnames = jsonResult.adresMatches.map((entry) => {
-      return entry.straatnaam.straatnaam.geografischeNaam.spelling;
-    });
+
+    const streetnames = jsonResult.adresMatches
+      .map((entry) => entry.straatnaam?.straatnaam.geografischeNaam.spelling)
+      .filter(Boolean);
+
     return streetnames;
   } else {
     throw new AddressError({

package/addon/plugins/variable-plugin/utils/number-to-words.ts

@@ -2,14 +2,19 @@ import n2words from 'n2words';
 
 /**
  * Wrapper around the `n2words` function which catches possible errors thrown by n2words.
+ * If an invalid `lang` is used, `nl` is used by default.
  * If `n2words` throws an error (because of inability to convert the number),
  * this function displays the error as a warning and returns the provided number as a string.
  */
 export function numberToWords(number: number, options: { lang: string }) {
   try {
     return n2words(number, options);
-  } catch (e) {
-    console.warn(e);
-    return number.toString();
+  } catch {
+    try {
+      return n2words(number, { ...options, lang: 'nl' });
+    } catch (e) {
+      console.warn(e);
+      return number.toString();
+    }
   }
 }

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

@@ -65,6 +65,7 @@ const parseDOM = [
           onlyDate,
           format: node.dataset.format,
           custom: node.dataset.custom === 'true',
+          customAllowed: node.dataset.customAllowed !== 'false',
         };
       }
       return false;
@@ -96,6 +97,7 @@ const parseDOM = [
           value: value,
           format: format,
           custom: dateNode?.dataset.custom === 'true',
+          customAllowed: dateNode?.dataset.customAllowed !== 'false',
           label,
         };
       }
@@ -108,8 +110,15 @@ const parseDOM = [
 const serialize = (node: PNode, state: EditorState) => {
   const t = getTranslationFunction(state);
 
-  const { value, onlyDate, format, mappingResource, custom, label } =
-    node.attrs;
+  const {
+    value,
+    onlyDate,
+    format,
+    mappingResource,
+    custom,
+    customAllowed,
+    label,
+  } = node.attrs;
   const datatype = onlyDate ? XSD('date') : XSD('dateTime');
   let humanReadableDate: string;
   if (value) {
@@ -130,6 +139,7 @@ const serialize = (node: PNode, state: EditorState) => {
     datatype: datatype.prefixed,
     'data-format': format as string,
     'data-custom': custom ? 'true' : 'false',
+    'data-custom-allowed': customAllowed ? 'true' : 'false',
     ...(!!value && { content: value as string }),
   };
   return mappingSpan(
@@ -164,6 +174,9 @@ const emberNodeConfig = (options: DateOptions): EmberNodeConfig => ({
     custom: {
       default: false,
     },
+    customAllowed: {
+      default: options.allowCustomFormat,
+    },
     label: { default: null },
   },
   // TODO: is this property still required?

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

@@ -73,7 +73,7 @@ const parseDOM = [
 
 const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
   const t = getTranslationFunction(state);
-
+  const docLang = state.doc.attrs.lang as string;
   const {
     mappingResource,
     variableInstance,
@@ -88,7 +88,7 @@ const serialize = (node: PNode, state: EditorState): DOMOutputSpec => {
 
   if (isNumber(value)) {
     if (writtenNumber) {
-      humanReadableContent = numberToWords(Number(value), { lang: 'nl' });
+      humanReadableContent = numberToWords(Number(value), { lang: docLang });
     } else {
       humanReadableContent = value as string;
     }

package/addon/utils/memoize.ts

@@ -1,8 +1,16 @@
-export default function memoize(func: (...a: unknown[]) => unknown) {
-  const cache: Record<string, unknown> = {};
+/**
+ * Return memoized version of the passed function.
+ * Memoization is done on the JSON stringified arguments, passing no args, undefined, or any number
+ * of only undefined arguments does not do any caching.
+ */
+export default function memoize<T>(func: (...a: unknown[]) => T) {
+  const cache: Record<string, T> = {};
   return (...args: unknown[]) => {
+    if (args.length === 0 || args.every((arg) => arg === undefined)) {
+      return func(...args);
+    }
     const serializedArgs = JSON.stringify(args);
-    cache[serializedArgs] = cache[serializedArgs] || func(args);
+    cache[serializedArgs] = cache[serializedArgs] || func(...args);
     return cache[serializedArgs];
   };
 }

package/addon/utils/translation.ts

@@ -2,12 +2,16 @@ import type { EditorState } from '@lblod/ember-rdfa-editor';
 import IntlService, { type TOptions } from 'ember-intl/services/intl';
 import { emberApplicationPluginKey } from '@lblod/ember-rdfa-editor/plugins/ember-application';
 
-export const getTranslationFunction = (state: EditorState) => {
-  const intl = emberApplicationPluginKey
-    .getState(state)
-    ?.application.lookup('service:intl') as IntlService | undefined;
+/* Get a function that will translate the string through `intl` based on the document language
+   or returns the fallback string if no state is provided or emberApplication plugin is not found */
+export const getTranslationFunction = (state?: EditorState) => {
+  const intl =
+    state &&
+    (emberApplicationPluginKey
+      .getState(state)
+      ?.application.lookup('service:intl') as IntlService | undefined);
 
-  const locale = state.doc.attrs.lang as string;
+  const locale = state?.doc.attrs.lang as string;
 
   return (key: string, fallback: string, options?: TOptions) => {
     if (!intl) {

package/components/variable-plugin/address/edit.d.ts

@@ -43,6 +43,6 @@ export default class AddressEditComponent extends Component<Args> {
     updateBusnumber(event: InputEvent): void;
     get controller(): SayController;
     searchMunicipality: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<string[]>>;
-    searchStreet: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<string[]>>;
+    searchStreet: import("ember-concurrency").TaskForAsyncTaskFunction<unknown, (term: string) => Promise<(string | undefined)[]>>;
 }
 export {};

package/components/variable-plugin/date/edit.d.ts

@@ -25,6 +25,7 @@ export default class DateEditComponent extends Component<Args> {
     get documentDateFormat(): Option<string>;
     get documentDateFormatType(): Option<DateFormat>;
     get isCustom(): boolean;
+    get isCustomAllowed(): boolean;
     get dateFormatType(): string;
     get customDateFormatError(): ValidationError | null;
     get humanError(): string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lblod/ember-rdfa-editor-lblod-plugins",
-  "version": "14.0.0",
+  "version": "14.2.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -52,7 +52,7 @@
     "ember-resources": "^6.1.1",
     "ember-velcro": "^2.1.0",
     "fetch-sparql-endpoint": "^3.0.0",
-    "n2words": "^1.16.4",
+    "n2words": "^1.18.0",
     "process": "0.11.10",
     "rdf-ext": "^2.1.0",
     "rdf-validate-shacl": "^0.4.5",
@@ -126,7 +126,7 @@
     "ember-template-lint": "^4.16.1",
     "ember-try": "^2.0.0",
     "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-ember": "^11.1.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.0.0",

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

@@ -17,6 +17,7 @@ export type StructureSpec = {
         number?: number;
         intl?: IntlService;
         content?: PNode | Fragment;
+        state?: EditorState;
     }) => {
         node: PNode;
         selectionConfig: {

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

@@ -1,3 +1,4 @@
+export { default as instantiateUuids } from './utils/instantiate-uuids';
 export declare const besluitNodes: {
     besluit: import("prosemirror-model").NodeSpec;
     besluit_title: import("prosemirror-model").NodeSpec;

package/plugins/variable-plugin/utils/address-helpers.d.ts

@@ -15,7 +15,7 @@ export declare class AddressError extends Error {
 }
 export declare const replaceAccents: (string: string) => string;
 export declare function fetchMunicipalities(term: string): Promise<string[]>;
-export declare function fetchStreets(term: string, municipality: string): Promise<string[]>;
+export declare function fetchStreets(term: string, municipality: string): Promise<(string | undefined)[]>;
 type StreetInfo = {
     municipality: string;
     street: string;

package/plugins/variable-plugin/utils/number-to-words.d.ts

@@ -1,5 +1,6 @@
 /**
  * Wrapper around the `n2words` function which catches possible errors thrown by n2words.
+ * If an invalid `lang` is used, `nl` is used by default.
  * If `n2words` throws an error (because of inability to convert the number),
  * this function displays the error as a warning and returns the provided number as a string.
  */

package/utils/memoize.d.ts

@@ -1 +1,6 @@
-export default function memoize(func: (...a: unknown[]) => unknown): (...args: unknown[]) => unknown;
+/**
+ * Return memoized version of the passed function.
+ * Memoization is done on the JSON stringified arguments, passing no args, undefined, or any number
+ * of only undefined arguments does not do any caching.
+ */
+export default function memoize<T>(func: (...a: unknown[]) => T): (...args: unknown[]) => T;

package/utils/translation.d.ts

@@ -1,3 +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;
+export declare const getTranslationFunction: (state?: EditorState) => (key: string, fallback: string, options?: TOptions) => string;