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

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @lblod/ember-rdfa-editor-lblod-plugins
 
+## 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

@@ -695,7 +695,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/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/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/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/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/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/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.1.0",
   "description": "Ember addon providing lblod specific plugins for the ember-rdfa-editor",
   "keywords": [
     "ember-addon",
@@ -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/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/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;